Rename traits and mojo directory in //skia/public
This CL renames mojo to mojom and *_struct_traits.* to
*_mojom_traits.* in //skia/public.
*_struct_traits.* => *_mojom_traits.*
skia/public/interfaces => skia/public/mojom
Bug: 806965
Change-Id: I9b322799a7726149a1d685608b2e417e58107e0c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1722837
Commit-Queue: Miyoung Shin <[email protected]>
Reviewed-by: Nico Weber <[email protected]>
Reviewed-by: Scott Violet <[email protected]>
Reviewed-by: Kinuko Yasuda <[email protected]>
Cr-Commit-Position: refs/heads/master@{#682179}
diff --git a/BUILD.gn b/BUILD.gn
index 9799353..21cfbdc 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1039,7 +1039,7 @@
"//services/device/public/mojom:mojom_js_data_deps",
"//services/device/public/mojom:generic_sensor_js_data_deps",
"//services/device/public/mojom:usb_js_data_deps",
- "//skia/public/interfaces:interfaces_js_data_deps",
+ "//skia/public/mojom:mojom_js_data_deps",
"//testing/buildbot/filters:blink_web_tests_filter",
"//third_party/blink/public:blink_devtools_frontend_resources_files",
"//third_party/blink/public/mojom:mojom_platform_js_data_deps",
diff --git a/ash/public/cpp/BUILD.gn b/ash/public/cpp/BUILD.gn
index a16a6b3..2447bdf 100644
--- a/ash/public/cpp/BUILD.gn
+++ b/ash/public/cpp/BUILD.gn
@@ -230,7 +230,7 @@
"//components/sync:rest_of_sync",
"//mojo/public/cpp/bindings",
"//services/service_manager/public/cpp",
- "//skia/public/interfaces",
+ "//skia/public/mojom",
"//ui/aura",
"//ui/chromeos/strings",
"//ui/compositor_extra",
diff --git a/ash/public/cpp/DEPS b/ash/public/cpp/DEPS
index 76bf43e1d..401e5bf 100644
--- a/ash/public/cpp/DEPS
+++ b/ash/public/cpp/DEPS
@@ -5,6 +5,6 @@
"+components/prefs",
"+services/data_decoder/public",
"+services/device/public",
- "+skia/public/interfaces",
+ "+skia/public/mojom",
"+ui/display",
]
diff --git a/ash/public/interfaces/BUILD.gn b/ash/public/interfaces/BUILD.gn
index 45e8258..e4804c6 100644
--- a/ash/public/interfaces/BUILD.gn
+++ b/ash/public/interfaces/BUILD.gn
@@ -27,7 +27,7 @@
"//mojo/public/mojom/base",
"//services/content/public/mojom",
"//services/preferences/public/mojom",
- "//skia/public/interfaces",
+ "//skia/public/mojom",
"//ui/base/ime/chromeos/public/mojom",
"//ui/base/mojom",
"//ui/display/mojom:mojom",
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 8440b54..3ffa062 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -350,7 +350,7 @@
"//services/service_manager/public/mojom:mojom_java",
"//services/shape_detection:shape_detection_java",
"//services/shape_detection/public/mojom:mojom_java",
- "//skia/public/interfaces:interfaces_java",
+ "//skia/public/mojom:mojom_java",
"//third_party/android_data_chart:android_data_chart_java",
"//third_party/android_deps:android_arch_lifecycle_common_java",
"//third_party/android_deps:android_arch_lifecycle_common_java8_java",
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index 47a9d312..55d166e 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -198,8 +198,8 @@
<!-- App Management. -->
<if expr="not is_android">
- <include name="IDR_APP_MANAGEMENT_BITMAP_MOJO_LITE_JS" file="${root_gen_dir}\skia\public\interfaces\bitmap.mojom-lite.js" use_base_dir="false" type="BINDATA" />
- <include name="IDR_APP_MANAGEMENT_IMAGE_INFO_MOJO_LITE_JS" file="${root_gen_dir}\skia\public\interfaces\image_info.mojom-lite.js" use_base_dir="false" type="BINDATA" />
+ <include name="IDR_APP_MANAGEMENT_BITMAP_MOJO_LITE_JS" file="${root_gen_dir}\skia\public\mojom\bitmap.mojom-lite.js" use_base_dir="false" type="BINDATA" />
+ <include name="IDR_APP_MANAGEMENT_IMAGE_INFO_MOJO_LITE_JS" file="${root_gen_dir}\skia\public\mojom\image_info.mojom-lite.js" use_base_dir="false" type="BINDATA" />
<include name="IDR_APP_MANAGEMENT_IMAGE_MOJO_LITE_JS" file="${root_gen_dir}\ui\gfx\image\mojom\image.mojom-lite.js" use_base_dir="false" type="BINDATA" />
<include name="IDR_APP_MANAGEMENT_MOJO_LITE_JS" file="${root_gen_dir}\chrome\browser\ui\webui\app_management\app_management.mojom-lite.js" use_base_dir="false" type="BINDATA" />
<include name="IDR_APP_MANAGEMENT_TYPES_MOJO_LITE_JS" file="${root_gen_dir}\chrome\services\app_service\public\mojom\types.mojom-lite.js" use_base_dir="false" type="BINDATA" />
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
index 29729ee4..d6e6292 100644
--- a/content/common/BUILD.gn
+++ b/content/common/BUILD.gn
@@ -515,7 +515,7 @@
"//services/service_manager/public/mojom",
"//services/video_capture/public/mojom",
"//services/viz/public/mojom",
- "//skia/public/interfaces",
+ "//skia/public/mojom",
"//third_party/blink/public/mojom:mojom_core",
"//third_party/blink/public/mojom:web_feature_mojo_bindings",
"//ui/base/ime/mojom",
diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn
index 979f3f3..3531f97 100644
--- a/content/public/android/BUILD.gn
+++ b/content/public/android/BUILD.gn
@@ -78,7 +78,7 @@
"//services/service_manager/public/mojom:mojom_java",
"//services/shape_detection:shape_detection_java",
"//services/shape_detection/public/mojom:mojom_java",
- "//skia/public/interfaces:interfaces_java",
+ "//skia/public/mojom:mojom_java",
"//third_party/android_deps:com_android_support_support_annotations_java",
"//third_party/android_deps:com_android_support_support_compat_java",
"//third_party/blink/public:blink_headers_java",
diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn
index f53086a..e42a042 100644
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -941,7 +941,7 @@
]
public_deps = [
"//mojo/public/mojom/base",
- "//skia/public/interfaces",
+ "//skia/public/mojom",
"//ui/gfx/geometry/mojom",
"//url/mojom:url_mojom_gurl",
"//url/mojom:url_mojom_origin",
diff --git a/content/shell/common/web_test.mojom b/content/shell/common/web_test.mojom
index 6555596..6e08214 100644
--- a/content/shell/common/web_test.mojom
+++ b/content/shell/common/web_test.mojom
@@ -5,7 +5,7 @@
module content.mojom;
import "mojo/public/mojom/base/file_path.mojom";
-import "skia/public/interfaces/bitmap.mojom";
+import "skia/public/mojom/bitmap.mojom";
import "ui/gfx/geometry/mojom/geometry.mojom";
import "url/mojom/url.mojom";
diff --git a/fuchsia/engine/BUILD.gn b/fuchsia/engine/BUILD.gn
index c999193..e6badcc 100644
--- a/fuchsia/engine/BUILD.gn
+++ b/fuchsia/engine/BUILD.gn
@@ -83,7 +83,7 @@
"//mojo/public/cpp/bindings",
"//services/network/public/cpp",
"//services/service_manager/sandbox",
- "//skia/public/interfaces",
+ "//skia/public/mojom",
"//third_party/blink/public/common",
"//third_party/fuchsia-sdk/sdk:web",
"//ui/aura",
diff --git a/mojo/public/tools/bindings/chromium_bindings_configuration.gni b/mojo/public/tools/bindings/chromium_bindings_configuration.gni
index 4f3ca29a..13fad5d7 100644
--- a/mojo/public/tools/bindings/chromium_bindings_configuration.gni
+++ b/mojo/public/tools/bindings/chromium_bindings_configuration.gni
@@ -45,7 +45,7 @@
"//services/viz/privileged/mojom/compositing/typemaps.gni",
"//services/viz/public/cpp/compositing/typemaps.gni",
"//services/viz/public/cpp/hit_test/typemaps.gni",
- "//skia/public/interfaces/typemaps.gni",
+ "//skia/public/mojom/typemaps.gni",
"//third_party/blink/common/typemaps.gni",
"//third_party/blink/public/public_typemaps.gni",
"//ui/accessibility/mojom/typemaps.gni",
diff --git a/services/BUILD.gn b/services/BUILD.gn
index 4b8853d1..25ad869 100644
--- a/services/BUILD.gn
+++ b/services/BUILD.gn
@@ -123,7 +123,7 @@
"//services/device/public/mojom:generic_sensor_java",
"//services/device/public/mojom:mojom_java",
"//services/shape_detection:shape_detection_java",
- "//skia/public/interfaces:interfaces_java",
+ "//skia/public/mojom:mojom_java",
"//third_party/android_deps:com_android_support_support_annotations_java",
]
}
@@ -148,7 +148,7 @@
"//mojo/public/mojom/base:base_java",
"//services/shape_detection:shape_detection_java",
"//services/shape_detection/public/mojom:mojom_java",
- "//skia/public/interfaces:interfaces_java",
+ "//skia/public/mojom:mojom_java",
"//third_party/android_support_test_runner:runner_java",
"//third_party/junit",
"//ui/gfx/geometry/mojom:mojom_java",
diff --git a/services/data_decoder/public/mojom/BUILD.gn b/services/data_decoder/public/mojom/BUILD.gn
index 84b4c2f..7d424f49 100644
--- a/services/data_decoder/public/mojom/BUILD.gn
+++ b/services/data_decoder/public/mojom/BUILD.gn
@@ -15,7 +15,7 @@
public_deps = [
":constants",
"//mojo/public/mojom/base",
- "//skia/public/interfaces",
+ "//skia/public/mojom",
"//ui/gfx/geometry/mojom",
"//url/mojom:url_mojom_gurl",
]
diff --git a/services/data_decoder/public/mojom/image_decoder.mojom b/services/data_decoder/public/mojom/image_decoder.mojom
index b5f992c..59f6a28 100644
--- a/services/data_decoder/public/mojom/image_decoder.mojom
+++ b/services/data_decoder/public/mojom/image_decoder.mojom
@@ -5,7 +5,7 @@
module data_decoder.mojom;
import "mojo/public/mojom/base/time.mojom";
-import "skia/public/interfaces/bitmap.mojom";
+import "skia/public/mojom/bitmap.mojom";
import "ui/gfx/geometry/mojom/geometry.mojom";
enum ImageCodec {
diff --git a/services/shape_detection/BUILD.gn b/services/shape_detection/BUILD.gn
index 969e74d..6b4e4ac 100644
--- a/services/shape_detection/BUILD.gn
+++ b/services/shape_detection/BUILD.gn
@@ -108,7 +108,7 @@
"//services/service_manager/public/java:service_manager_java",
"//services/service_manager/public/mojom:mojom_java",
"//services/shape_detection/public/mojom:mojom_java",
- "//skia/public/interfaces:interfaces_java",
+ "//skia/public/mojom:mojom_java",
"//ui/gfx/geometry/mojom:mojom_java",
]
}
diff --git a/services/shape_detection/public/mojom/BUILD.gn b/services/shape_detection/public/mojom/BUILD.gn
index 8536f45..704defc 100644
--- a/services/shape_detection/public/mojom/BUILD.gn
+++ b/services/shape_detection/public/mojom/BUILD.gn
@@ -15,7 +15,7 @@
]
public_deps = [
- "//skia/public/interfaces",
+ "//skia/public/mojom",
"//ui/gfx/geometry/mojom",
]
}
diff --git a/services/shape_detection/public/mojom/barcodedetection.mojom b/services/shape_detection/public/mojom/barcodedetection.mojom
index c66bb9ba..d8d8ab76 100644
--- a/services/shape_detection/public/mojom/barcodedetection.mojom
+++ b/services/shape_detection/public/mojom/barcodedetection.mojom
@@ -6,7 +6,7 @@
module shape_detection.mojom;
-import "skia/public/interfaces/bitmap.mojom";
+import "skia/public/mojom/bitmap.mojom";
import "ui/gfx/geometry/mojom/geometry.mojom";
// https://wicg.github.io/shape-detection-api/#barcodeformat-section
diff --git a/services/shape_detection/public/mojom/facedetection.mojom b/services/shape_detection/public/mojom/facedetection.mojom
index f69f3ca4..de44ad1d 100644
--- a/services/shape_detection/public/mojom/facedetection.mojom
+++ b/services/shape_detection/public/mojom/facedetection.mojom
@@ -6,7 +6,7 @@
module shape_detection.mojom;
-import "skia/public/interfaces/bitmap.mojom";
+import "skia/public/mojom/bitmap.mojom";
import "ui/gfx/geometry/mojom/geometry.mojom";
// https://wicg.github.io/shape-detection-api/#enumdef-landmarktype
diff --git a/services/shape_detection/public/mojom/textdetection.mojom b/services/shape_detection/public/mojom/textdetection.mojom
index 0e630f434..6367167 100644
--- a/services/shape_detection/public/mojom/textdetection.mojom
+++ b/services/shape_detection/public/mojom/textdetection.mojom
@@ -6,7 +6,7 @@
module shape_detection.mojom;
-import "skia/public/interfaces/bitmap.mojom";
+import "skia/public/mojom/bitmap.mojom";
import "ui/gfx/geometry/mojom/geometry.mojom";
struct TextDetectionResult {
diff --git a/services/viz/privileged/mojom/compositing/BUILD.gn b/services/viz/privileged/mojom/compositing/BUILD.gn
index 4fbdee1a..3b386a3 100644
--- a/services/viz/privileged/mojom/compositing/BUILD.gn
+++ b/services/viz/privileged/mojom/compositing/BUILD.gn
@@ -23,7 +23,7 @@
"//media/mojo/interfaces:interfaces",
"//mojo/public/mojom/base",
"//services/viz/public/mojom",
- "//skia/public/interfaces",
+ "//skia/public/mojom",
"//ui/gfx/geometry/mojom",
"//ui/gfx/mojom",
"//ui/latency/mojom",
diff --git a/services/viz/privileged/mojom/compositing/frame_sink_video_capture.mojom b/services/viz/privileged/mojom/compositing/frame_sink_video_capture.mojom
index bf43897..0144fbeb 100644
--- a/services/viz/privileged/mojom/compositing/frame_sink_video_capture.mojom
+++ b/services/viz/privileged/mojom/compositing/frame_sink_video_capture.mojom
@@ -9,7 +9,7 @@
import "mojo/public/mojom/base/time.mojom";
import "mojo/public/mojom/base/shared_memory.mojom";
import "services/viz/public/mojom/compositing/frame_sink_id.mojom";
-import "skia/public/interfaces/bitmap.mojom";
+import "skia/public/mojom/bitmap.mojom";
import "ui/gfx/geometry/mojom/geometry.mojom";
import "ui/gfx/mojom/color_space.mojom";
diff --git a/services/viz/public/cpp/compositing/BUILD.gn b/services/viz/public/cpp/compositing/BUILD.gn
index 8f806de..59527f7e 100644
--- a/services/viz/public/cpp/compositing/BUILD.gn
+++ b/services/viz/public/cpp/compositing/BUILD.gn
@@ -19,7 +19,7 @@
"//mojo/public/cpp/test_support:test_utils",
"//services/service_manager/public/cpp",
"//services/viz/public/mojom",
- "//skia/public/interfaces",
+ "//skia/public/mojom",
"//testing/gtest",
"//ui/gfx:test_support",
"//ui/gfx/geometry/mojom:mojom_traits",
diff --git a/services/viz/public/cpp/compositing/DEPS b/services/viz/public/cpp/compositing/DEPS
index 4ba173d..6773e83 100644
--- a/services/viz/public/cpp/compositing/DEPS
+++ b/services/viz/public/cpp/compositing/DEPS
@@ -2,7 +2,7 @@
"+cc",
"+gpu/ipc",
"+gpu/ipc/common",
- "+skia/public/interfaces",
+ "+skia/public/mojom",
"+third_party/skia/include",
"+ui/gfx",
"+ui/latency/mojom",
diff --git a/services/viz/public/cpp/compositing/compositor_frame_for_blink.typemap b/services/viz/public/cpp/compositing/compositor_frame_for_blink.typemap
index 2664907..f4c685b 100644
--- a/services/viz/public/cpp/compositing/compositor_frame_for_blink.typemap
+++ b/services/viz/public/cpp/compositing/compositor_frame_for_blink.typemap
@@ -26,7 +26,7 @@
"//components/viz/common",
"//gpu/ipc/common:interfaces",
"//services/viz/public/mojom",
- "//skia/public/interfaces",
+ "//skia/public/mojom",
"//ui/gfx/geometry/mojom",
"//ui/gfx/mojom",
"//ui/latency/mojom",
diff --git a/services/viz/public/cpp/compositing/copy_output_result_mojom_traits.h b/services/viz/public/cpp/compositing/copy_output_result_mojom_traits.h
index dda08fe..81f2aeb 100644
--- a/services/viz/public/cpp/compositing/copy_output_result_mojom_traits.h
+++ b/services/viz/public/cpp/compositing/copy_output_result_mojom_traits.h
@@ -10,7 +10,7 @@
#include "gpu/ipc/common/sync_token_struct_traits.h"
#include "services/viz/public/mojom/compositing/copy_output_result.mojom-shared.h"
#include "services/viz/public/mojom/compositing/texture_releaser.mojom.h"
-#include "skia/public/interfaces/bitmap_skbitmap_struct_traits.h"
+#include "skia/public/mojom/bitmap_skbitmap_mojom_traits.h"
#include "ui/gfx/geometry/mojom/geometry_mojom_traits.h"
#include "ui/gfx/ipc/color/gfx_param_traits.h"
#include "ui/gfx/mojom/color_space_mojom_traits.h"
diff --git a/services/viz/public/cpp/compositing/filter_operation_mojom_traits.h b/services/viz/public/cpp/compositing/filter_operation_mojom_traits.h
index c87291c..cf5fb22 100644
--- a/services/viz/public/cpp/compositing/filter_operation_mojom_traits.h
+++ b/services/viz/public/cpp/compositing/filter_operation_mojom_traits.h
@@ -12,7 +12,7 @@
#include "cc/paint/paint_filter.h"
#include "services/viz/public/cpp/compositing/paint_filter_mojom_traits.h"
#include "services/viz/public/mojom/compositing/filter_operation.mojom-shared.h"
-#include "skia/public/interfaces/blur_image_filter_tile_mode_struct_traits.h"
+#include "skia/public/mojom/blur_image_filter_tile_mode_mojom_traits.h"
#include "ui/gfx/geometry/mojom/geometry_mojom_traits.h"
namespace mojo {
diff --git a/services/viz/public/cpp/compositing/mojom_traits_unittest.cc b/services/viz/public/cpp/compositing/mojom_traits_unittest.cc
index 222efea..da0aacd0 100644
--- a/services/viz/public/cpp/compositing/mojom_traits_unittest.cc
+++ b/services/viz/public/cpp/compositing/mojom_traits_unittest.cc
@@ -52,8 +52,8 @@
#include "services/viz/public/mojom/compositing/surface_info.mojom.h"
#include "services/viz/public/mojom/compositing/surface_range.mojom.h"
#include "services/viz/public/mojom/compositing/transferable_resource.mojom.h"
-#include "skia/public/interfaces/bitmap_skbitmap_struct_traits.h"
-#include "skia/public/interfaces/blur_image_filter_tile_mode_struct_traits.h"
+#include "skia/public/mojom/bitmap_skbitmap_mojom_traits.h"
+#include "skia/public/mojom/blur_image_filter_tile_mode_mojom_traits.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/skia/include/core/SkString.h"
#include "ui/gfx/geometry/mojom/geometry_mojom_traits.h"
diff --git a/services/viz/public/mojom/BUILD.gn b/services/viz/public/mojom/BUILD.gn
index 2edd80d..d2563382 100644
--- a/services/viz/public/mojom/BUILD.gn
+++ b/services/viz/public/mojom/BUILD.gn
@@ -43,7 +43,7 @@
"//gpu/ipc/common:interfaces",
"//media/mojo/interfaces",
"//mojo/public/mojom/base",
- "//skia/public/interfaces",
+ "//skia/public/mojom",
"//ui/gfx/geometry/mojom",
"//ui/gfx/mojom",
"//ui/latency/mojom",
diff --git a/services/viz/public/mojom/compositing/copy_output_result.mojom b/services/viz/public/mojom/compositing/copy_output_result.mojom
index c5f34a715..c23cbe2 100644
--- a/services/viz/public/mojom/compositing/copy_output_result.mojom
+++ b/services/viz/public/mojom/compositing/copy_output_result.mojom
@@ -7,7 +7,7 @@
import "gpu/ipc/common/mailbox.mojom";
import "gpu/ipc/common/sync_token.mojom";
import "services/viz/public/mojom/compositing/texture_releaser.mojom";
-import "skia/public/interfaces/bitmap.mojom";
+import "skia/public/mojom/bitmap.mojom";
import "ui/gfx/geometry/mojom/geometry.mojom";
import "ui/gfx/mojom/color_space.mojom";
diff --git a/services/viz/public/mojom/compositing/filter_operation.mojom b/services/viz/public/mojom/compositing/filter_operation.mojom
index 9ce1e26..4b32add 100644
--- a/services/viz/public/mojom/compositing/filter_operation.mojom
+++ b/services/viz/public/mojom/compositing/filter_operation.mojom
@@ -5,7 +5,7 @@
module viz.mojom;
import "services/viz/public/mojom/compositing/paint_filter.mojom";
-import "skia/public/interfaces/blur_image_filter_tile_mode.mojom";
+import "skia/public/mojom/blur_image_filter_tile_mode.mojom";
import "ui/gfx/geometry/mojom/geometry.mojom";
enum FilterType {
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index 31aae1e..4cf2642 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -873,12 +873,12 @@
]
if (!is_ios) {
- sources += [ "public/interfaces/test/struct_traits_unittest.cc" ]
+ sources += [ "public/mojom/test/mojom_traits_unittest.cc" ]
deps += [
# TODO: Fix this test to not depend on cc.
"//cc:test_support",
"//mojo/public/cpp/bindings",
- "//skia/public/interfaces:test_interfaces",
+ "//skia/public/mojom:test_interfaces",
]
}
diff --git a/skia/public/interfaces/test/OWNERS b/skia/public/interfaces/test/OWNERS
deleted file mode 100644
index 2f63e24..0000000
--- a/skia/public/interfaces/test/OWNERS
+++ /dev/null
@@ -1,4 +0,0 @@
-per-file struct_traits_unittest.cc=file://ipc/SECURITY_OWNERS
-
-per-file *.mojom=set noparent
-per-file *.mojom=file://ipc/SECURITY_OWNERS
diff --git a/skia/public/interfaces/typemaps.gni b/skia/public/interfaces/typemaps.gni
deleted file mode 100644
index 71c2c6b..0000000
--- a/skia/public/interfaces/typemaps.gni
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-typemaps = [
- "//skia/public/interfaces/blur_image_filter_tile_mode.typemap",
- "//skia/public/interfaces/skbitmap.typemap",
- "//skia/public/interfaces/skimageinfo.typemap",
-]
diff --git a/skia/public/interfaces/BUILD.gn b/skia/public/mojom/BUILD.gn
similarity index 92%
rename from skia/public/interfaces/BUILD.gn
rename to skia/public/mojom/BUILD.gn
index 19181699..578cc41 100644
--- a/skia/public/interfaces/BUILD.gn
+++ b/skia/public/mojom/BUILD.gn
@@ -4,7 +4,7 @@
import("//mojo/public/tools/bindings/mojom.gni")
-mojom("interfaces") {
+mojom("mojom") {
sources = [
"bitmap.mojom",
"blur_image_filter_tile_mode.mojom",
@@ -23,6 +23,6 @@
]
public_deps = [
- ":interfaces",
+ ":mojom",
]
}
diff --git a/skia/public/interfaces/OWNERS b/skia/public/mojom/OWNERS
similarity index 61%
rename from skia/public/interfaces/OWNERS
rename to skia/public/mojom/OWNERS
index e75daf74..7ed4e44 100644
--- a/skia/public/interfaces/OWNERS
+++ b/skia/public/mojom/OWNERS
@@ -1,5 +1,5 @@
-per-file *_struct_traits*.*=set noparent
-per-file *_struct_traits*.*=file://ipc/SECURITY_OWNERS
+per-file *_mojom_traits*.*=set noparent
+per-file *_mojom_traits*.*=file://ipc/SECURITY_OWNERS
per-file *.mojom=set noparent
per-file *.mojom=file://ipc/SECURITY_OWNERS
diff --git a/skia/public/interfaces/bitmap.mojom b/skia/public/mojom/bitmap.mojom
similarity index 92%
rename from skia/public/interfaces/bitmap.mojom
rename to skia/public/mojom/bitmap.mojom
index 4e3cbb1..e9051b7 100644
--- a/skia/public/interfaces/bitmap.mojom
+++ b/skia/public/mojom/bitmap.mojom
@@ -6,7 +6,7 @@
module skia.mojom;
import "mojo/public/mojom/base/big_buffer.mojom";
-import "skia/public/interfaces/image_info.mojom";
+import "skia/public/mojom/image_info.mojom";
struct Bitmap {
ImageInfo image_info;
diff --git a/skia/public/interfaces/bitmap_skbitmap_struct_traits.cc b/skia/public/mojom/bitmap_skbitmap_mojom_traits.cc
similarity index 97%
rename from skia/public/interfaces/bitmap_skbitmap_struct_traits.cc
rename to skia/public/mojom/bitmap_skbitmap_mojom_traits.cc
index 50b6020..7d405c25 100644
--- a/skia/public/interfaces/bitmap_skbitmap_struct_traits.cc
+++ b/skia/public/mojom/bitmap_skbitmap_mojom_traits.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "skia/public/interfaces/bitmap_skbitmap_struct_traits.h"
+#include "skia/public/mojom/bitmap_skbitmap_mojom_traits.h"
namespace mojo {
diff --git a/skia/public/interfaces/bitmap_skbitmap_struct_traits.h b/skia/public/mojom/bitmap_skbitmap_mojom_traits.h
similarity index 80%
rename from skia/public/interfaces/bitmap_skbitmap_struct_traits.h
rename to skia/public/mojom/bitmap_skbitmap_mojom_traits.h
index 8f911d7..0045fbe7 100644
--- a/skia/public/interfaces/bitmap_skbitmap_struct_traits.h
+++ b/skia/public/mojom/bitmap_skbitmap_mojom_traits.h
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SKIA_PUBLIC_INTERFACES_BITMAP_SKBITMAP_STRUCT_TRAITS_H_
-#define SKIA_PUBLIC_INTERFACES_BITMAP_SKBITMAP_STRUCT_TRAITS_H_
+#ifndef SKIA_PUBLIC_MOJOM_BITMAP_SKBITMAP_MOJOM_TRAITS_H_
+#define SKIA_PUBLIC_MOJOM_BITMAP_SKBITMAP_MOJOM_TRAITS_H_
#include "base/containers/span.h"
#include "mojo/public/cpp/base/big_buffer.h"
#include "mojo/public/cpp/base/big_buffer_mojom_traits.h"
#include "mojo/public/cpp/bindings/array_traits.h"
-#include "skia/public/interfaces/bitmap.mojom.h"
-#include "skia/public/interfaces/image_info_struct_traits.h"
+#include "skia/public/mojom/bitmap.mojom.h"
+#include "skia/public/mojom/image_info_mojom_traits.h"
#include "third_party/skia/include/core/SkBitmap.h"
namespace mojo {
@@ -38,4 +38,4 @@
} // namespace mojo
-#endif // SKIA_PUBLIC_INTERFACES_BITMAP_SKBITMAP_STRUCT_TRAITS_H_
+#endif // SKIA_PUBLIC_MOJOM_BITMAP_SKBITMAP_MOJOM_TRAITS_H_
diff --git a/skia/public/interfaces/blur_image_filter_tile_mode.mojom b/skia/public/mojom/blur_image_filter_tile_mode.mojom
similarity index 100%
rename from skia/public/interfaces/blur_image_filter_tile_mode.mojom
rename to skia/public/mojom/blur_image_filter_tile_mode.mojom
diff --git a/skia/public/interfaces/blur_image_filter_tile_mode.typemap b/skia/public/mojom/blur_image_filter_tile_mode.typemap
similarity index 69%
rename from skia/public/interfaces/blur_image_filter_tile_mode.typemap
rename to skia/public/mojom/blur_image_filter_tile_mode.typemap
index 35c22f7..4a4c2db 100644
--- a/skia/public/interfaces/blur_image_filter_tile_mode.typemap
+++ b/skia/public/mojom/blur_image_filter_tile_mode.typemap
@@ -2,8 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-mojom = "//skia/public/interfaces/blur_image_filter_tile_mode.mojom"
+mojom = "//skia/public/mojom/blur_image_filter_tile_mode.mojom"
public_headers = [ "//third_party/skia/include/effects/SkBlurImageFilter.h" ]
traits_headers =
- [ "//skia/public/interfaces/blur_image_filter_tile_mode_struct_traits.h" ]
+ [ "//skia/public/mojom/blur_image_filter_tile_mode_mojom_traits.h" ]
type_mappings = [ "skia.mojom.BlurTileMode=SkBlurImageFilter::TileMode" ]
diff --git a/skia/public/interfaces/blur_image_filter_tile_mode_struct_traits.h b/skia/public/mojom/blur_image_filter_tile_mode_mojom_traits.h
similarity index 81%
rename from skia/public/interfaces/blur_image_filter_tile_mode_struct_traits.h
rename to skia/public/mojom/blur_image_filter_tile_mode_mojom_traits.h
index d6416295..62cf60b 100644
--- a/skia/public/interfaces/blur_image_filter_tile_mode_struct_traits.h
+++ b/skia/public/mojom/blur_image_filter_tile_mode_mojom_traits.h
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SKIA_PUBLIC_INTERFACES_BLUR_IMAGE_FILTER_TILE_MODE_STRUCT_TRAITS_H_
-#define SKIA_PUBLIC_INTERFACES_BLUR_IMAGE_FILTER_TILE_MODE_STRUCT_TRAITS_H_
+#ifndef SKIA_PUBLIC_MOJOM_BLUR_IMAGE_FILTER_TILE_MODE_MOJOM_TRAITS_H_
+#define SKIA_PUBLIC_MOJOM_BLUR_IMAGE_FILTER_TILE_MODE_MOJOM_TRAITS_H_
-#include "skia/public/interfaces/blur_image_filter_tile_mode.mojom-shared.h"
+#include "skia/public/mojom/blur_image_filter_tile_mode.mojom-shared.h"
#include "third_party/skia/include/effects/SkBlurImageFilter.h"
namespace mojo {
@@ -45,4 +45,4 @@
} // namespace mojo
-#endif // SKIA_PUBLIC_INTERFACES_BLUR_IMAGE_FILTER_TILE_MODE_STRUCT_TRAITS_H_
+#endif // SKIA_PUBLIC_MOJOM_BLUR_IMAGE_FILTER_TILE_MODE_MOJOM_TRAITS_H_
diff --git a/skia/public/interfaces/image_filter_struct_traits.cc b/skia/public/mojom/image_filter_mojom_traits.cc
similarity index 94%
rename from skia/public/interfaces/image_filter_struct_traits.cc
rename to skia/public/mojom/image_filter_mojom_traits.cc
index 7fbbc925..d70ceda 100644
--- a/skia/public/interfaces/image_filter_struct_traits.cc
+++ b/skia/public/mojom/image_filter_mojom_traits.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "skia/public/interfaces/image_filter_struct_traits.h"
+#include "skia/public/mojom/image_filter_mojom_traits.h"
namespace mojo {
diff --git a/skia/public/interfaces/image_info.mojom b/skia/public/mojom/image_info.mojom
similarity index 100%
rename from skia/public/interfaces/image_info.mojom
rename to skia/public/mojom/image_info.mojom
diff --git a/skia/public/interfaces/image_info_struct_traits.cc b/skia/public/mojom/image_info_mojom_traits.cc
similarity index 98%
rename from skia/public/interfaces/image_info_struct_traits.cc
rename to skia/public/mojom/image_info_mojom_traits.cc
index 6089408..cedf3e9 100644
--- a/skia/public/interfaces/image_info_struct_traits.cc
+++ b/skia/public/mojom/image_info_mojom_traits.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "skia/public/interfaces/image_info_struct_traits.h"
+#include "skia/public/mojom/image_info_mojom_traits.h"
namespace mojo {
diff --git a/skia/public/interfaces/image_info_struct_traits.h b/skia/public/mojom/image_info_mojom_traits.h
similarity index 76%
rename from skia/public/interfaces/image_info_struct_traits.h
rename to skia/public/mojom/image_info_mojom_traits.h
index a48101f..eb8cbbfb 100644
--- a/skia/public/interfaces/image_info_struct_traits.h
+++ b/skia/public/mojom/image_info_mojom_traits.h
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SKIA_PUBLIC_INTERFACES_IMAGE_INFO_STRUCT_TRAITS_H_
-#define SKIA_PUBLIC_INTERFACES_IMAGE_INFO_STRUCT_TRAITS_H_
+#ifndef SKIA_PUBLIC_MOJOM_IMAGE_INFO_MOJOM_TRAITS_H_
+#define SKIA_PUBLIC_MOJOM_IMAGE_INFO_MOJOM_TRAITS_H_
#include <vector>
-#include "skia/public/interfaces/image_info.mojom.h"
+#include "skia/public/mojom/image_info.mojom.h"
#include "third_party/skia/include/core/SkImageInfo.h"
namespace mojo {
@@ -24,4 +24,4 @@
} // namespace mojo
-#endif // SKIA_PUBLIC_INTERFACES_IMAGE_INFO_STRUCT_TRAITS_H_
+#endif // SKIA_PUBLIC_MOJOM_IMAGE_INFO_MOJOM_TRAITS_H_
diff --git a/skia/public/interfaces/skbitmap.typemap b/skia/public/mojom/skbitmap.typemap
similarity index 70%
rename from skia/public/interfaces/skbitmap.typemap
rename to skia/public/mojom/skbitmap.typemap
index e8f9436..e4cef53 100644
--- a/skia/public/interfaces/skbitmap.typemap
+++ b/skia/public/mojom/skbitmap.typemap
@@ -2,11 +2,11 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-mojom = "//skia/public/interfaces/bitmap.mojom"
+mojom = "//skia/public/mojom/bitmap.mojom"
public_headers = [ "//third_party/skia/include/core/SkBitmap.h" ]
-traits_headers = [ "//skia/public/interfaces/bitmap_skbitmap_struct_traits.h" ]
+traits_headers = [ "//skia/public/mojom/bitmap_skbitmap_mojom_traits.h" ]
sources = [
- "//skia/public/interfaces/bitmap_skbitmap_struct_traits.cc",
+ "//skia/public/mojom/bitmap_skbitmap_mojom_traits.cc",
]
deps = [
"//mojo/public/cpp/bindings",
diff --git a/skia/public/interfaces/skbitmap_for_blink.typemap b/skia/public/mojom/skbitmap_for_blink.typemap
similarity index 70%
rename from skia/public/interfaces/skbitmap_for_blink.typemap
rename to skia/public/mojom/skbitmap_for_blink.typemap
index 5ae2366..543b448 100644
--- a/skia/public/interfaces/skbitmap_for_blink.typemap
+++ b/skia/public/mojom/skbitmap_for_blink.typemap
@@ -2,14 +2,14 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-mojom = "//skia/public/interfaces/bitmap.mojom"
+mojom = "//skia/public/mojom/bitmap.mojom"
public_headers = [ "//third_party/skia/include/core/SkBitmap.h" ]
-traits_headers = [ "//skia/public/interfaces/bitmap_skbitmap_struct_traits.h" ]
+traits_headers = [ "//skia/public/mojom/bitmap_skbitmap_mojom_traits.h" ]
deps = [
"//mojo/public/cpp/bindings",
]
public_deps = [
"//skia",
- "//skia/public/interfaces",
+ "//skia/public/mojom",
]
type_mappings = [ "skia.mojom.Bitmap=SkBitmap[nullable_is_same_type]" ]
diff --git a/skia/public/interfaces/skimageinfo.typemap b/skia/public/mojom/skimageinfo.typemap
similarity index 66%
rename from skia/public/interfaces/skimageinfo.typemap
rename to skia/public/mojom/skimageinfo.typemap
index ae4a1f78..f9779b4 100644
--- a/skia/public/interfaces/skimageinfo.typemap
+++ b/skia/public/mojom/skimageinfo.typemap
@@ -2,11 +2,11 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-mojom = "//skia/public/interfaces/image_info.mojom"
+mojom = "//skia/public/mojom/image_info.mojom"
public_headers = [ "//third_party/skia/include/core/SkImageInfo.h" ]
-traits_headers = [ "//skia/public/interfaces/image_info_struct_traits.h" ]
+traits_headers = [ "//skia/public/mojom/image_info_mojom_traits.h" ]
sources = [
- "//skia/public/interfaces/image_info_struct_traits.cc",
+ "//skia/public/mojom/image_info_mojom_traits.cc",
]
deps = [
"//mojo/public/cpp/bindings",
diff --git a/skia/public/mojom/test/OWNERS b/skia/public/mojom/test/OWNERS
new file mode 100644
index 0000000..a40e0a3
--- /dev/null
+++ b/skia/public/mojom/test/OWNERS
@@ -0,0 +1,4 @@
+per-file mojom_traits_unittest.cc=file://ipc/SECURITY_OWNERS
+
+per-file *.mojom=set noparent
+per-file *.mojom=file://ipc/SECURITY_OWNERS
diff --git a/skia/public/interfaces/test/struct_traits_unittest.cc b/skia/public/mojom/test/mojom_traits_unittest.cc
similarity index 97%
rename from skia/public/interfaces/test/struct_traits_unittest.cc
rename to skia/public/mojom/test/mojom_traits_unittest.cc
index 0ec1d48..e4087ed3 100644
--- a/skia/public/interfaces/test/struct_traits_unittest.cc
+++ b/skia/public/mojom/test/mojom_traits_unittest.cc
@@ -4,7 +4,7 @@
#include "base/test/scoped_task_environment.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "skia/public/interfaces/test/traits_test_service.mojom.h"
+#include "skia/public/mojom/test/traits_test_service.mojom.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/skia/include/core/SkColorFilter.h"
#include "third_party/skia/include/core/SkImageInfo.h"
diff --git a/skia/public/interfaces/test/traits_test_service.mojom b/skia/public/mojom/test/traits_test_service.mojom
similarity index 76%
rename from skia/public/interfaces/test/traits_test_service.mojom
rename to skia/public/mojom/test/traits_test_service.mojom
index b77f41c..69edcf7 100644
--- a/skia/public/interfaces/test/traits_test_service.mojom
+++ b/skia/public/mojom/test/traits_test_service.mojom
@@ -4,9 +4,9 @@
module skia.mojom;
-import "skia/public/interfaces/image_info.mojom";
-import "skia/public/interfaces/bitmap.mojom";
-import "skia/public/interfaces/blur_image_filter_tile_mode.mojom";
+import "skia/public/mojom/image_info.mojom";
+import "skia/public/mojom/bitmap.mojom";
+import "skia/public/mojom/blur_image_filter_tile_mode.mojom";
// All functions on this interface echo their arguments to test StructTraits
// serialization and deserialization.
diff --git a/skia/public/mojom/typemaps.gni b/skia/public/mojom/typemaps.gni
new file mode 100644
index 0000000..1fdd6bc
--- /dev/null
+++ b/skia/public/mojom/typemaps.gni
@@ -0,0 +1,9 @@
+# Copyright 2016 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+typemaps = [
+ "//skia/public/mojom/blur_image_filter_tile_mode.typemap",
+ "//skia/public/mojom/skbitmap.typemap",
+ "//skia/public/mojom/skimageinfo.typemap",
+]
diff --git a/third_party/blink/common/BUILD.gn b/third_party/blink/common/BUILD.gn
index 4ce8da7..2a5b7b8 100644
--- a/third_party/blink/common/BUILD.gn
+++ b/third_party/blink/common/BUILD.gn
@@ -168,7 +168,7 @@
"//base/test:test_support",
"//mojo/core/embedder",
"//net",
- "//skia/public/interfaces",
+ "//skia/public/mojom",
"//testing/gtest",
"//third_party/blink/public/common:headers",
"//third_party/boringssl",
diff --git a/third_party/blink/common/DEPS b/third_party/blink/common/DEPS
index 83711aa..0a072bb7 100644
--- a/third_party/blink/common/DEPS
+++ b/third_party/blink/common/DEPS
@@ -14,7 +14,7 @@
"+services/metrics/public/cpp",
"+services/network/public/cpp",
"+services/network/public/mojom/url_loader.mojom.h",
- "+skia/public/interfaces/bitmap_skbitmap_struct_traits.h",
+ "+skia/public/mojom/bitmap_skbitmap_mojom_traits.h",
"+testing/gmock/include/gmock",
"+testing/gtest/include/gtest",
"+third_party/blink/common",
diff --git a/third_party/blink/common/messaging/transferable_message.typemap b/third_party/blink/common/messaging/transferable_message.typemap
index a90a34f..b111d11 100644
--- a/third_party/blink/common/messaging/transferable_message.typemap
+++ b/third_party/blink/common/messaging/transferable_message.typemap
@@ -10,7 +10,7 @@
traits_headers = [ "//third_party/blink/public/common/messaging/transferable_message_struct_traits.h" ]
deps = [
- "//skia/public/interfaces",
+ "//skia/public/mojom",
]
type_mappings = [
"blink.mojom.TransferableMessage=::blink::TransferableMessage[move_only]",
diff --git a/third_party/blink/public/blink_typemaps.gni b/third_party/blink/public/blink_typemaps.gni
index 14d823c..6bd96e3b 100644
--- a/third_party/blink/public/blink_typemaps.gni
+++ b/third_party/blink/public/blink_typemaps.gni
@@ -23,7 +23,7 @@
"//services/viz/public/cpp/compositing/returned_resource.typemap",
"//services/viz/public/cpp/compositing/surface_id.typemap",
"//services/viz/public/cpp/compositing/surface_info.typemap",
- "//skia/public/interfaces/skbitmap_for_blink.typemap",
+ "//skia/public/mojom/skbitmap_for_blink.typemap",
"//ui/display/mojom/display_rotation_for_blink.typemap",
"//ui/gfx/mojom/gpu_fence_handle_for_blink.typemap",
]
diff --git a/third_party/blink/public/common/DEPS b/third_party/blink/public/common/DEPS
index 6a73e19..56d0145 100644
--- a/third_party/blink/public/common/DEPS
+++ b/third_party/blink/public/common/DEPS
@@ -15,7 +15,7 @@
"+services/network/public/cpp/shared_url_loader_factory.h",
"+services/network/public/mojom/url_loader.mojom.h",
"+services/network/public/mojom/url_loader_factory.mojom.h",
- "+skia/public/interfaces",
+ "+skia/public/mojom",
"+third_party/blink/public/common",
"+third_party/blink/public/mojom",
"+ui/gfx/geometry",
diff --git a/third_party/blink/public/common/messaging/transferable_message_struct_traits.h b/third_party/blink/public/common/messaging/transferable_message_struct_traits.h
index a01c9838..41cb43e4 100644
--- a/third_party/blink/public/common/messaging/transferable_message_struct_traits.h
+++ b/third_party/blink/public/common/messaging/transferable_message_struct_traits.h
@@ -5,7 +5,7 @@
#ifndef THIRD_PARTY_BLINK_PUBLIC_COMMON_MESSAGING_TRANSFERABLE_MESSAGE_STRUCT_TRAITS_H_
#define THIRD_PARTY_BLINK_PUBLIC_COMMON_MESSAGING_TRANSFERABLE_MESSAGE_STRUCT_TRAITS_H_
-#include "skia/public/interfaces/bitmap_skbitmap_struct_traits.h"
+#include "skia/public/mojom/bitmap_skbitmap_mojom_traits.h"
#include "third_party/blink/public/common/messaging/cloneable_message_struct_traits.h"
#include "third_party/blink/public/common/messaging/transferable_message.h"
#include "third_party/blink/public/mojom/messaging/transferable_message.mojom.h"
diff --git a/third_party/blink/public/common/notifications/notification_struct_traits.h b/third_party/blink/public/common/notifications/notification_struct_traits.h
index 6c269f2..c9a2701 100644
--- a/third_party/blink/public/common/notifications/notification_struct_traits.h
+++ b/third_party/blink/public/common/notifications/notification_struct_traits.h
@@ -10,7 +10,7 @@
#include "mojo/public/cpp/base/string16_mojom_traits.h"
#include "mojo/public/cpp/base/time_mojom_traits.h"
#include "mojo/public/cpp/bindings/struct_traits.h"
-#include "skia/public/interfaces/bitmap_skbitmap_struct_traits.h"
+#include "skia/public/mojom/bitmap_skbitmap_mojom_traits.h"
#include "third_party/blink/public/common/common_export.h"
#include "third_party/blink/public/common/notifications/platform_notification_data.h"
#include "third_party/blink/public/mojom/notifications/notification.mojom.h"
diff --git a/third_party/blink/public/mojom/BUILD.gn b/third_party/blink/public/mojom/BUILD.gn
index 03d9640..a412a9e 100644
--- a/third_party/blink/public/mojom/BUILD.gn
+++ b/third_party/blink/public/mojom/BUILD.gn
@@ -166,7 +166,7 @@
"//services/network/public/mojom:websocket_mojom",
"//services/service_manager/public/mojom",
"//services/viz/public/mojom",
- "//skia/public/interfaces",
+ "//skia/public/mojom",
"//third_party/blink/public/mojom/usb",
"//ui/base/ime/mojom",
"//ui/gfx/geometry/mojom",
@@ -294,7 +294,7 @@
"//mojo/public/mojom/base",
"//services/network/public/mojom",
"//services/service_manager/public/mojom",
- "//skia/public/interfaces",
+ "//skia/public/mojom",
"//url/mojom:url_mojom_gurl",
"//url/mojom:url_mojom_origin",
]
diff --git a/third_party/blink/public/mojom/background_fetch/background_fetch.mojom b/third_party/blink/public/mojom/background_fetch/background_fetch.mojom
index 5a4a20b..2a5f3eb 100644
--- a/third_party/blink/public/mojom/background_fetch/background_fetch.mojom
+++ b/third_party/blink/public/mojom/background_fetch/background_fetch.mojom
@@ -4,7 +4,7 @@
module blink.mojom;
-import "skia/public/interfaces/bitmap.mojom";
+import "skia/public/mojom/bitmap.mojom";
import "third_party/blink/public/mojom/cache_storage/cache_storage.mojom";
import "third_party/blink/public/mojom/fetch/fetch_api_request.mojom";
import "third_party/blink/public/mojom/fetch/fetch_api_response.mojom";
diff --git a/third_party/blink/public/mojom/clipboard/clipboard.mojom b/third_party/blink/public/mojom/clipboard/clipboard.mojom
index 0b38cb7..f7064c8 100644
--- a/third_party/blink/public/mojom/clipboard/clipboard.mojom
+++ b/third_party/blink/public/mojom/clipboard/clipboard.mojom
@@ -5,7 +5,7 @@
module blink.mojom;
import "mojo/public/mojom/base/string16.mojom";
-import "skia/public/interfaces/bitmap.mojom";
+import "skia/public/mojom/bitmap.mojom";
import "url/mojom/url.mojom";
enum ClipboardFormat {
diff --git a/third_party/blink/public/mojom/content_index/content_index.mojom b/third_party/blink/public/mojom/content_index/content_index.mojom
index 4829af7..e5e10e7 100644
--- a/third_party/blink/public/mojom/content_index/content_index.mojom
+++ b/third_party/blink/public/mojom/content_index/content_index.mojom
@@ -4,7 +4,7 @@
module blink.mojom;
-import "skia/public/interfaces/bitmap.mojom";
+import "skia/public/mojom/bitmap.mojom";
import "url/mojom/url.mojom";
// As per https://github.com/rknoll/content-index.
diff --git a/third_party/blink/public/mojom/image_downloader/image_downloader.mojom b/third_party/blink/public/mojom/image_downloader/image_downloader.mojom
index 990228e..4e6e2f8 100644
--- a/third_party/blink/public/mojom/image_downloader/image_downloader.mojom
+++ b/third_party/blink/public/mojom/image_downloader/image_downloader.mojom
@@ -4,7 +4,7 @@
module blink.mojom;
-import "skia/public/interfaces/bitmap.mojom";
+import "skia/public/mojom/bitmap.mojom";
import "ui/gfx/geometry/mojom/geometry.mojom";
import "url/mojom/url.mojom";
diff --git a/third_party/blink/public/mojom/messaging/transferable_message.mojom b/third_party/blink/public/mojom/messaging/transferable_message.mojom
index a536011..5872648 100644
--- a/third_party/blink/public/mojom/messaging/transferable_message.mojom
+++ b/third_party/blink/public/mojom/messaging/transferable_message.mojom
@@ -8,7 +8,7 @@
import "third_party/blink/public/mojom/blob/serialized_blob.mojom";
import "third_party/blink/public/mojom/messaging/cloneable_message.mojom";
import "third_party/blink/public/mojom/messaging/user_activation_snapshot.mojom";
-import "skia/public/interfaces/bitmap.mojom";
+import "skia/public/mojom/bitmap.mojom";
// A MessagePort is represented as a raw mojo message pipe, as such no interface
// definition exists for it here. Messages on this pipe are serialized versions
diff --git a/third_party/blink/public/mojom/notifications/notification.mojom b/third_party/blink/public/mojom/notifications/notification.mojom
index b4d00ec..0697fb7 100644
--- a/third_party/blink/public/mojom/notifications/notification.mojom
+++ b/third_party/blink/public/mojom/notifications/notification.mojom
@@ -6,7 +6,7 @@
import "mojo/public/mojom/base/string16.mojom";
import "mojo/public/mojom/base/time.mojom";
-import "skia/public/interfaces/bitmap.mojom";
+import "skia/public/mojom/bitmap.mojom";
import "url/mojom/url.mojom";
// Directionality options that can be indicated for notifications.
diff --git a/third_party/blink/renderer/core/DEPS b/third_party/blink/renderer/core/DEPS
index fa25e8a..98634ef 100644
--- a/third_party/blink/renderer/core/DEPS
+++ b/third_party/blink/renderer/core/DEPS
@@ -63,7 +63,7 @@
"+services/resource_coordinator/public/cpp/resource_coordinator_features.h",
"+services/resource_coordinator/public/mojom/coordination_unit.mojom-blink.h",
"+services/service_manager/public",
- "+skia/public/interfaces/bitmap_skbitmap_struct_traits.h",
+ "+skia/public/mojom/bitmap_skbitmap_mojom_traits.h",
"+skia/ext/image_operations.h",
"+skia/ext/skia_utils_mac.h",
"+third_party/blink/public/common",
diff --git a/third_party/blink/renderer/core/messaging/blink_transferable_message_struct_traits.h b/third_party/blink/renderer/core/messaging/blink_transferable_message_struct_traits.h
index 32e4ffc..ae70605 100644
--- a/third_party/blink/renderer/core/messaging/blink_transferable_message_struct_traits.h
+++ b/third_party/blink/renderer/core/messaging/blink_transferable_message_struct_traits.h
@@ -6,7 +6,7 @@
#define THIRD_PARTY_BLINK_RENDERER_CORE_MESSAGING_BLINK_TRANSFERABLE_MESSAGE_STRUCT_TRAITS_H_
#include "mojo/public/cpp/bindings/array_traits_wtf_vector.h"
-#include "skia/public/interfaces/bitmap_skbitmap_struct_traits.h"
+#include "skia/public/mojom/bitmap_skbitmap_mojom_traits.h"
#include "third_party/blink/public/common/messaging/message_port_channel.h"
#include "third_party/blink/public/mojom/messaging/transferable_message.mojom-blink.h"
#include "third_party/blink/renderer/bindings/core/v8/serialization/serialized_script_value.h"
diff --git a/third_party/blink/renderer/modules/shapedetection/BUILD.gn b/third_party/blink/renderer/modules/shapedetection/BUILD.gn
index 4c66418..4442ea5 100644
--- a/third_party/blink/renderer/modules/shapedetection/BUILD.gn
+++ b/third_party/blink/renderer/modules/shapedetection/BUILD.gn
@@ -27,6 +27,6 @@
public_deps = [
"//services/shape_detection/public/mojom:mojom_blink",
- "//skia/public/interfaces",
+ "//skia/public/mojom",
]
}
diff --git a/third_party/blink/renderer/modules/shapedetection/DEPS b/third_party/blink/renderer/modules/shapedetection/DEPS
index 6e62d23e..c1b5ad3 100644
--- a/third_party/blink/renderer/modules/shapedetection/DEPS
+++ b/third_party/blink/renderer/modules/shapedetection/DEPS
@@ -1,7 +1,7 @@
include_rules = [
"+services/shape_detection/public/mojom",
"+services/service_manager/public/cpp",
- "+skia/public/interfaces/bitmap.mojom-blink.h",
+ "+skia/public/mojom/bitmap.mojom-blink.h",
"-third_party/blink/renderer/modules",
"+third_party/blink/renderer/modules/canvas/canvas2d",
"+third_party/blink/renderer/modules/imagecapture/point_2d.h",
diff --git a/third_party/blink/renderer/modules/shapedetection/shape_detector.h b/third_party/blink/renderer/modules/shapedetection/shape_detector.h
index 7b7e2cd..bb7e075 100644
--- a/third_party/blink/renderer/modules/shapedetection/shape_detector.h
+++ b/third_party/blink/renderer/modules/shapedetection/shape_detector.h
@@ -5,7 +5,7 @@
#ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_SHAPEDETECTION_SHAPE_DETECTOR_H_
#define THIRD_PARTY_BLINK_RENDERER_MODULES_SHAPEDETECTION_SHAPE_DETECTOR_H_
-#include "skia/public/interfaces/bitmap.mojom-blink.h"
+#include "skia/public/mojom/bitmap.mojom-blink.h"
#include "third_party/blink/renderer/bindings/core/v8/script_promise.h"
#include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
#include "third_party/blink/renderer/core/frame/window_or_worker_global_scope.h"
diff --git a/third_party/blink/renderer/platform/mojo/DEPS b/third_party/blink/renderer/platform/mojo/DEPS
index cb52188..0486ee2f 100644
--- a/third_party/blink/renderer/platform/mojo/DEPS
+++ b/third_party/blink/renderer/platform/mojo/DEPS
@@ -15,7 +15,7 @@
"+mojo/public/cpp/base/time_mojom_traits.h",
"+mojo/public/cpp/bindings/binding.h",
"+mojo/public/mojom/base/string16.mojom-blink.h",
- "+skia/public/interfaces/bitmap_skbitmap_struct_traits.h",
+ "+skia/public/mojom/bitmap_skbitmap_mojom_traits.h",
"+third_party/blink/renderer/platform/blob/blob_data.h",
"+third_party/blink/renderer/platform/blob/serialized_blob_struct_traits.h",
diff --git a/third_party/blink/web_tests/external/wpt/shape-detection/resources/shapedetection-helpers.js b/third_party/blink/web_tests/external/wpt/shape-detection/resources/shapedetection-helpers.js
index de1e681..eed4484 100644
--- a/third_party/blink/web_tests/external/wpt/shape-detection/resources/shapedetection-helpers.js
+++ b/third_party/blink/web_tests/external/wpt/shape-detection/resources/shapedetection-helpers.js
@@ -21,8 +21,8 @@
[
'/gen/layout_test_data/mojo/public/js/mojo_bindings.js',
'/gen/mojo/public/mojom/base/big_buffer.mojom.js',
- '/gen/skia/public/interfaces/image_info.mojom.js',
- '/gen/skia/public/interfaces/bitmap.mojom.js',
+ '/gen/skia/public/mojom/image_info.mojom.js',
+ '/gen/skia/public/mojom/bitmap.mojom.js',
'/gen/ui/gfx/geometry/mojom/geometry.mojom.js',
`${prefix}/barcodedetection.mojom.js`,
`${prefix}/barcodedetection_provider.mojom.js`,
diff --git a/third_party/blink/web_tests/shapedetection/resources/worker.js b/third_party/blink/web_tests/shapedetection/resources/worker.js
index 64edf6b..d47775fb 100644
--- a/third_party/blink/web_tests/shapedetection/resources/worker.js
+++ b/third_party/blink/web_tests/shapedetection/resources/worker.js
@@ -1,8 +1,8 @@
importScripts("../../resources/testharness.js");
importScripts("file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js");
importScripts("file:///gen/mojo/public/mojom/base/big_buffer.mojom.js");
-importScripts("file:///gen/skia/public/interfaces/image_info.mojom.js");
-importScripts("file:///gen/skia/public/interfaces/bitmap.mojom.js");
+importScripts("file:///gen/skia/public/mojom/image_info.mojom.js");
+importScripts("file:///gen/skia/public/mojom/bitmap.mojom.js");
importScripts("file:///gen/ui/gfx/geometry/mojom/geometry.mojom.js");
importScripts("file:///gen/services/shape_detection/public/mojom/textdetection.mojom.js");
importScripts("big-buffer-helpers.js");
diff --git a/ui/base/mojom/BUILD.gn b/ui/base/mojom/BUILD.gn
index 8c2449f..0ce418f 100644
--- a/ui/base/mojom/BUILD.gn
+++ b/ui/base/mojom/BUILD.gn
@@ -14,7 +14,7 @@
public_deps = [
"//mojo/public/mojom/base",
- "//skia/public/interfaces",
+ "//skia/public/mojom",
"//ui/gfx/geometry/mojom",
"//url/mojom:url_mojom_gurl",
]
@@ -45,7 +45,7 @@
]
deps = [
":mojom",
- "//skia/public/interfaces",
+ "//skia/public/mojom",
"//testing/gtest",
"//ui/base",
"//ui/events",
diff --git a/ui/base/mojom/DEPS b/ui/base/mojom/DEPS
index 3bce672..4c3c7486 100644
--- a/ui/base/mojom/DEPS
+++ b/ui/base/mojom/DEPS
@@ -2,5 +2,5 @@
"+mojo/public/cpp/base",
"+mojo/public/cpp/bindings",
"+third_party/blink/public/mojom/clipboard/clipboard.mojom-shared.h",
- "+skia/public/interfaces"
+ "+skia/public/mojom"
]
diff --git a/ui/base/mojom/clipboard.mojom b/ui/base/mojom/clipboard.mojom
index 1fe8574..f151fa2 100644
--- a/ui/base/mojom/clipboard.mojom
+++ b/ui/base/mojom/clipboard.mojom
@@ -7,7 +7,7 @@
import "mojo/public/mojom/base/big_string.mojom";
import "mojo/public/mojom/base/string16.mojom";
import "mojo/public/mojom/base/time.mojom";
-import "skia/public/interfaces/bitmap.mojom";
+import "skia/public/mojom/bitmap.mojom";
enum ClipboardType {
COPY_PASTE,
diff --git a/ui/base/mojom/cursor.mojom b/ui/base/mojom/cursor.mojom
index adb0c25..f2c80dd 100644
--- a/ui/base/mojom/cursor.mojom
+++ b/ui/base/mojom/cursor.mojom
@@ -5,7 +5,7 @@
module ui.mojom;
import "mojo/public/mojom/base/time.mojom";
-import "skia/public/interfaces/bitmap.mojom";
+import "skia/public/mojom/bitmap.mojom";
import "ui/gfx/geometry/mojom/geometry.mojom";
// Standard Cursor numbers. These are the same as Chrome's ui::Cursor and
diff --git a/ui/base/mojom/cursor_mojom_traits.cc b/ui/base/mojom/cursor_mojom_traits.cc
index 1ce586af..cace815 100644
--- a/ui/base/mojom/cursor_mojom_traits.cc
+++ b/ui/base/mojom/cursor_mojom_traits.cc
@@ -4,7 +4,7 @@
#include "ui/base/mojom/cursor_mojom_traits.h"
-#include "skia/public/interfaces/bitmap_skbitmap_struct_traits.h"
+#include "skia/public/mojom/bitmap_skbitmap_mojom_traits.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/base/mojom/cursor.mojom.h"
#include "ui/gfx/geometry/mojom/geometry_mojom_traits.h"
diff --git a/ui/base/mojom/cursor_mojom_traits_unittest.cc b/ui/base/mojom/cursor_mojom_traits_unittest.cc
index 03178963..ed7e124 100644
--- a/ui/base/mojom/cursor_mojom_traits_unittest.cc
+++ b/ui/base/mojom/cursor_mojom_traits_unittest.cc
@@ -5,7 +5,7 @@
#include "ui/base/mojom/cursor_mojom_traits.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "skia/public/interfaces/bitmap_skbitmap_struct_traits.h"
+#include "skia/public/mojom/bitmap_skbitmap_mojom_traits.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/cursor/cursor.h"
#include "ui/base/mojom/cursor.mojom.h"
diff --git a/ui/gfx/image/mojom/BUILD.gn b/ui/gfx/image/mojom/BUILD.gn
index 1e4077f..26dc635 100644
--- a/ui/gfx/image/mojom/BUILD.gn
+++ b/ui/gfx/image/mojom/BUILD.gn
@@ -10,7 +10,7 @@
]
public_deps = [
- "//skia/public/interfaces",
+ "//skia/public/mojom",
]
}
@@ -22,7 +22,7 @@
public_deps = [
":mojom_shared_cpp_sources",
- "//skia/public/interfaces",
+ "//skia/public/mojom",
"//ui/gfx",
]
}
diff --git a/ui/gfx/image/mojom/DEPS b/ui/gfx/image/mojom/DEPS
index 47eded13..2f6a444 100644
--- a/ui/gfx/image/mojom/DEPS
+++ b/ui/gfx/image/mojom/DEPS
@@ -1,5 +1,5 @@
include_rules = [
"+mojo/public",
- "+skia/public/interfaces",
+ "+skia/public/mojom",
"+ui/gfx/image",
]
diff --git a/ui/gfx/image/mojom/image.mojom b/ui/gfx/image/mojom/image.mojom
index 3a34bff..af602d6 100644
--- a/ui/gfx/image/mojom/image.mojom
+++ b/ui/gfx/image/mojom/image.mojom
@@ -4,7 +4,7 @@
module gfx.mojom;
-import "skia/public/interfaces/bitmap.mojom";
+import "skia/public/mojom/bitmap.mojom";
struct ImageSkiaRep {
// Transport of the bitmap in this representation.
diff --git a/ui/gfx/image/mojom/image_skia_mojom_traits.h b/ui/gfx/image/mojom/image_skia_mojom_traits.h
index 7943c74..d648a39 100644
--- a/ui/gfx/image/mojom/image_skia_mojom_traits.h
+++ b/ui/gfx/image/mojom/image_skia_mojom_traits.h
@@ -9,7 +9,7 @@
#include <vector>
-#include "skia/public/interfaces/bitmap_skbitmap_struct_traits.h"
+#include "skia/public/mojom/bitmap_skbitmap_mojom_traits.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/image/image_skia_rep.h"
diff --git a/ui/ozone/public/mojom/BUILD.gn b/ui/ozone/public/mojom/BUILD.gn
index 052760a..947b207 100644
--- a/ui/ozone/public/mojom/BUILD.gn
+++ b/ui/ozone/public/mojom/BUILD.gn
@@ -15,7 +15,7 @@
public_deps = [
"//mojo/public/mojom/base",
- "//skia/public/interfaces:interfaces",
+ "//skia/public/mojom",
"//ui/display/mojom",
"//ui/gfx/geometry/mojom",
"//ui/gfx/mojom",
diff --git a/ui/ozone/public/mojom/device_cursor.mojom b/ui/ozone/public/mojom/device_cursor.mojom
index 97fea79..a86e099 100644
--- a/ui/ozone/public/mojom/device_cursor.mojom
+++ b/ui/ozone/public/mojom/device_cursor.mojom
@@ -4,7 +4,7 @@
module ui.ozone.mojom;
-import "skia/public/interfaces/bitmap.mojom";
+import "skia/public/mojom/bitmap.mojom";
import "ui/gfx/geometry/mojom/geometry.mojom";
import "ui/gfx/mojom/accelerated_widget.mojom";
