summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
Diffstat (limited to 'ui')
-rw-r--r--ui/android/java/src/org/chromium/ui/gfx/BitmapHelper.java2
-rw-r--r--ui/android/ui_jni_registrar.cc2
-rw-r--r--ui/app_list/app_list.gyp1
-rw-r--r--ui/aura/aura.gyp5
-rw-r--r--ui/compositor/compositor.gyp3
-rw-r--r--ui/gfx/android/gfx_jni_registrar.cc26
-rw-r--r--ui/gfx/android/gfx_jni_registrar.h21
-rw-r--r--ui/gfx/android/java_bitmap.cc6
-rw-r--r--ui/gfx/gfx.gyp385
-rw-r--r--ui/gfx/gfx_export.h6
-rw-r--r--ui/gfx/rect_base_impl.h2
-rw-r--r--ui/gl/gl.gyp1
-rw-r--r--ui/keyboard/keyboard.gyp2
-rw-r--r--ui/message_center/message_center.gyp3
-rw-r--r--ui/native_theme/native_theme.gyp1
-rw-r--r--ui/oak/oak.gyp1
-rw-r--r--ui/snapshot/snapshot.gyp2
-rw-r--r--ui/surface/surface.gyp2
-rw-r--r--ui/ui.gyp303
-rw-r--r--ui/ui_unittests.gypi1
-rw-r--r--ui/v2/v2.gyp1
-rw-r--r--ui/views/controls/webview/webview.gyp1
-rw-r--r--ui/views/views.gyp7
23 files changed, 311 insertions, 473 deletions
diff --git a/ui/android/java/src/org/chromium/ui/gfx/BitmapHelper.java b/ui/android/java/src/org/chromium/ui/gfx/BitmapHelper.java
index 341eba0..97511a1 100644
--- a/ui/android/java/src/org/chromium/ui/gfx/BitmapHelper.java
+++ b/ui/android/java/src/org/chromium/ui/gfx/BitmapHelper.java
@@ -10,7 +10,7 @@ import android.graphics.BitmapFactory;
import org.chromium.base.CalledByNative;
import org.chromium.base.JNINamespace;
-@JNINamespace("gfx")
+@JNINamespace("ui")
public class BitmapHelper {
@CalledByNative
public static Bitmap createBitmap(int width, int height) {
diff --git a/ui/android/ui_jni_registrar.cc b/ui/android/ui_jni_registrar.cc
index 33aeeaf..8216e01 100644
--- a/ui/android/ui_jni_registrar.cc
+++ b/ui/android/ui_jni_registrar.cc
@@ -18,6 +18,8 @@ namespace android {
static base::android::RegistrationMethod kUiRegisteredMethods[] = {
{ "Clipboard", ui::RegisterClipboardAndroid },
+ { "DeviceDisplayInfo", gfx::DeviceDisplayInfo::RegisterDeviceDisplayInfo },
+ { "JavaBitmap", gfx::JavaBitmap::RegisterJavaBitmap },
{ "LocalizationUtils", l10n_util::RegisterLocalizationUtil },
{ "ViewAndroid", ui::ViewAndroid::RegisterViewAndroid },
{ "WindowAndroid", ui::WindowAndroid::RegisterWindowAndroid },
diff --git a/ui/app_list/app_list.gyp b/ui/app_list/app_list.gyp
index ce7ce2a..1d96871 100644
--- a/ui/app_list/app_list.gyp
+++ b/ui/app_list/app_list.gyp
@@ -17,7 +17,6 @@
'../../skia/skia.gyp:skia',
'../base/strings/ui_strings.gyp:ui_strings',
'../compositor/compositor.gyp:compositor',
- '../gfx/gfx.gyp:gfx',
'../ui.gyp:ui',
'../ui.gyp:ui_resources',
],
diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp
index d4d89e4..c2983e9 100644
--- a/ui/aura/aura.gyp
+++ b/ui/aura/aura.gyp
@@ -18,7 +18,6 @@
'../../gpu/gpu.gyp:gpu',
'../../skia/skia.gyp:skia',
'../compositor/compositor.gyp:compositor',
- '../gfx/gfx.gyp:gfx',
'../ui.gyp:ui',
'../ui.gyp:ui_resources',
],
@@ -125,7 +124,6 @@
'dependencies': [
'../../skia/skia.gyp:skia',
'../../testing/gtest.gyp:gtest',
- '../gfx/gfx.gyp:gfx',
'../ui.gyp:ui',
'../ui.gyp:ui_test_support',
'aura',
@@ -209,7 +207,6 @@
'../../third_party/icu/icu.gyp:icuuc',
'../compositor/compositor.gyp:compositor',
'../compositor/compositor.gyp:compositor_test_support',
- '../gfx/gfx.gyp:gfx',
'../ui.gyp:ui',
'../ui.gyp:ui_resources',
'../../ipc/ipc.gyp:ipc',
@@ -234,7 +231,6 @@
'../../third_party/icu/icu.gyp:icuuc',
'../compositor/compositor.gyp:compositor',
'../compositor/compositor.gyp:compositor_test_support',
- '../gfx/gfx.gyp:gfx',
'../ui.gyp:ui',
'../ui.gyp:ui_resources',
'aura',
@@ -257,7 +253,6 @@
'../../testing/gtest.gyp:gtest',
'../compositor/compositor.gyp:compositor_test_support',
'../compositor/compositor.gyp:compositor',
- '../gfx/gfx.gyp:gfx',
'../gl/gl.gyp:gl',
'../ui.gyp:ui',
'../ui.gyp:ui_resources',
diff --git a/ui/compositor/compositor.gyp b/ui/compositor/compositor.gyp
index 62d03e3..de62e6d 100644
--- a/ui/compositor/compositor.gyp
+++ b/ui/compositor/compositor.gyp
@@ -16,7 +16,6 @@
'<(DEPTH)/cc/cc.gyp:cc',
'<(DEPTH)/skia/skia.gyp:skia',
'<(DEPTH)/third_party/WebKit/public/blink.gyp:blink_minimal',
- '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
'<(DEPTH)/ui/gl/gl.gyp:gl',
'<(DEPTH)/ui/ui.gyp:ui',
'<(DEPTH)/webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
@@ -78,7 +77,6 @@
'dependencies': [
'<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/skia/skia.gyp:skia',
- '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
'<(DEPTH)/ui/gl/gl.gyp:gl',
'<(DEPTH)/ui/ui.gyp:ui',
'compositor',
@@ -100,7 +98,6 @@
'<(DEPTH)/cc/cc_tests.gyp:cc_test_utils',
'<(DEPTH)/skia/skia.gyp:skia',
'<(DEPTH)/testing/gtest.gyp:gtest',
- '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
'<(DEPTH)/ui/gl/gl.gyp:gl',
'<(DEPTH)/ui/ui.gyp:ui',
'<(DEPTH)/ui/ui.gyp:ui_resources',
diff --git a/ui/gfx/android/gfx_jni_registrar.cc b/ui/gfx/android/gfx_jni_registrar.cc
deleted file mode 100644
index 8aa8551..0000000
--- a/ui/gfx/android/gfx_jni_registrar.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2013 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.
-
-#include "ui/gfx/android/gfx_jni_registrar.h"
-
-#include "base/android/jni_android.h"
-#include "base/android/jni_registrar.h"
-#include "ui/gfx/android/device_display_info.h"
-#include "ui/gfx/android/java_bitmap.h"
-
-namespace gfx {
-namespace android {
-
-static base::android::RegistrationMethod kGfxRegisteredMethods[] = {
- { "DeviceDisplayInfo", gfx::DeviceDisplayInfo::RegisterDeviceDisplayInfo },
- { "JavaBitmap", gfx::JavaBitmap::RegisterJavaBitmap },
-};
-
-bool RegisterJni(JNIEnv* env) {
- return RegisterNativeMethods(env, kGfxRegisteredMethods,
- arraysize(kGfxRegisteredMethods));
-}
-
-} // namespace android
-} // namespace gfx
diff --git a/ui/gfx/android/gfx_jni_registrar.h b/ui/gfx/android/gfx_jni_registrar.h
deleted file mode 100644
index 3d4947c..0000000
--- a/ui/gfx/android/gfx_jni_registrar.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) 2013 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.
-
-#ifndef UI_GFX_ANDROID_GFX_JNI_REGISTRAR_H_
-#define UI_GFX_ANDROID_GFX_JNI_REGISTRAR_H_
-
-#include <jni.h>
-
-#include "ui/gfx/gfx_export.h"
-
-namespace gfx {
-namespace android {
-
-// Register all JNI bindings necessary for chrome.
-GFX_EXPORT bool RegisterJni(JNIEnv* env);
-
-} // namespace android
-} // namespace gfx
-
-#endif // UI_GFX_ANDROID_GFX_JNI_REGISTRAR_H_
diff --git a/ui/gfx/android/java_bitmap.cc b/ui/gfx/android/java_bitmap.cc
index 2a1be65..6c2eaa8 100644
--- a/ui/gfx/android/java_bitmap.cc
+++ b/ui/gfx/android/java_bitmap.cc
@@ -39,11 +39,11 @@ JavaBitmap::~JavaBitmap() {
// static
bool JavaBitmap::RegisterJavaBitmap(JNIEnv* env) {
- return RegisterNativesImpl(env);
+ return ui::RegisterNativesImpl(env);
}
static ScopedJavaLocalRef<jobject> CreateJavaBitmap(const gfx::Size& size) {
- return Java_BitmapHelper_createBitmap(AttachCurrentThread(),
+ return ui::Java_BitmapHelper_createBitmap(AttachCurrentThread(),
size.width(), size.height());
}
@@ -87,7 +87,7 @@ SkBitmap CreateSkBitmapFromResource(const char* name, gfx::Size size) {
DCHECK(!size.IsEmpty());
JNIEnv* env = AttachCurrentThread();
ScopedJavaLocalRef<jstring> jname(env, env->NewStringUTF(name));
- ScopedJavaLocalRef<jobject> jobj(Java_BitmapHelper_decodeDrawableResource(
+ ScopedJavaLocalRef<jobject> jobj(ui::Java_BitmapHelper_decodeDrawableResource(
env, jname.obj(), size.width(), size.height()));
if (jobj.is_null())
return SkBitmap();
diff --git a/ui/gfx/gfx.gyp b/ui/gfx/gfx.gyp
deleted file mode 100644
index 946700e..0000000
--- a/ui/gfx/gfx.gyp
+++ /dev/null
@@ -1,385 +0,0 @@
-# Copyright (c) 2013 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.
-
-{
- 'variables': {
- 'chromium_code': 1,
- },
- 'targets': [
- {
- 'target_name': 'gfx',
- 'type': '<(component)',
- 'dependencies': [
- '<(DEPTH)/base/base.gyp:base',
- '<(DEPTH)/base/base.gyp:base_i18n',
- '<(DEPTH)/base/base.gyp:base_static',
- '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
- '<(DEPTH)/net/net.gyp:net',
- '<(DEPTH)/skia/skia.gyp:skia',
- '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
- '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
- '<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
- '<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
- '<(DEPTH)/url/url.gyp:url_lib',
- ],
- 'defines': [
- 'GFX_IMPLEMENTATION',
- ],
- 'sources': [
- 'android/device_display_info.cc',
- 'android/device_display_info.h',
- 'android/gfx_jni_registrar.cc',
- 'android/gfx_jni_registrar.h',
- 'android/java_bitmap.cc',
- 'android/java_bitmap.h',
- 'animation/animation.cc',
- 'animation/animation.h',
- 'animation/animation_container.cc',
- 'animation/animation_container.h',
- 'animation/animation_container_element.h',
- 'animation/animation_container_observer.h',
- 'animation/animation_delegate.h',
- 'animation/linear_animation.cc',
- 'animation/linear_animation.h',
- 'animation/multi_animation.cc',
- 'animation/multi_animation.h',
- 'animation/slide_animation.cc',
- 'animation/slide_animation.h',
- 'animation/throb_animation.cc',
- 'animation/throb_animation.h',
- 'animation/tween.cc',
- 'animation/tween.h',
- 'blit.cc',
- 'blit.h',
- 'box_f.cc',
- 'box_f.h',
- 'break_list.h',
- 'canvas.cc',
- 'canvas.h',
- 'canvas_android.cc',
- 'canvas_paint_gtk.cc',
- 'canvas_paint_gtk.h',
- 'canvas_paint_mac.h',
- 'canvas_paint_mac.mm',
- 'canvas_paint_win.cc',
- 'canvas_paint_win.h',
- 'canvas_skia.cc',
- 'canvas_skia_paint.h',
- 'codec/jpeg_codec.cc',
- 'codec/jpeg_codec.h',
- 'codec/png_codec.cc',
- 'codec/png_codec.h',
- 'color_analysis.cc',
- 'color_analysis.h',
- 'color_profile.cc',
- 'color_profile.h',
- 'color_profile_mac.cc',
- 'color_profile_win.cc',
- 'color_utils.cc',
- 'color_utils.h',
- 'display.cc',
- 'display.h',
- 'display_observer.cc',
- 'display_observer.h',
- 'favicon_size.cc',
- 'favicon_size.h',
- 'font.cc',
- 'font.h',
- 'font_fallback_win.cc',
- 'font_fallback_win.h',
- 'font_list.cc',
- 'font_list.h',
- 'font_render_params_android.cc',
- 'font_render_params_linux.cc',
- 'font_render_params_linux.h',
- 'font_smoothing_win.cc',
- 'font_smoothing_win.h',
- 'gfx_export.h',
- 'gfx_paths.cc',
- 'gfx_paths.h',
- 'gpu_memory_buffer.cc',
- 'gpu_memory_buffer.h',
- 'image/canvas_image_source.cc',
- 'image/canvas_image_source.h',
- 'image/image.cc',
- 'image/image.h',
- 'image/image_family.cc',
- 'image/image_family.h',
- 'image/image_ios.mm',
- 'image/image_mac.mm',
- 'image/image_png_rep.cc',
- 'image/image_png_rep.h',
- 'image/image_skia.cc',
- 'image/image_skia.h',
- 'image/image_skia_operations.cc',
- 'image/image_skia_operations.h',
- 'image/image_skia_rep.cc',
- 'image/image_skia_rep.h',
- 'image/image_skia_source.h',
- 'image/image_skia_util_ios.h',
- 'image/image_skia_util_ios.mm',
- 'image/image_skia_util_mac.h',
- 'image/image_skia_util_mac.mm',
- 'image/image_util.cc',
- 'image/image_util.h',
- 'image/image_util_ios.mm',
- 'insets.cc',
- 'insets.h',
- 'insets_base.h',
- 'insets_f.cc',
- 'insets_f.h',
- 'interpolated_transform.cc',
- 'interpolated_transform.h',
- 'mac/scoped_ns_disable_screen_updates.h',
- 'matrix3_f.cc',
- 'matrix3_f.h',
- 'native_widget_types.h',
- 'ozone/surface_factory_ozone.cc',
- 'ozone/surface_factory_ozone.h',
- 'pango_util.cc',
- 'pango_util.h',
- 'path.cc',
- 'path.h',
- 'path_aura.cc',
- 'path_gtk.cc',
- 'path_win.cc',
- 'path_win.h',
- 'path_x11.cc',
- 'path_x11.h',
- 'platform_font.h',
- 'platform_font_android.cc',
- 'platform_font_ios.h',
- 'platform_font_ios.mm',
- 'platform_font_mac.h',
- 'platform_font_mac.mm',
- 'platform_font_pango.cc',
- 'platform_font_pango.h',
- 'platform_font_win.cc',
- 'platform_font_win.h',
- 'point.cc',
- 'point.h',
- 'point3_f.cc',
- 'point3_f.h',
- 'point_base.h',
- 'point_conversions.cc',
- 'point_conversions.h',
- 'point_f.cc',
- 'point_f.h',
- 'quad_f.cc',
- 'quad_f.h',
- 'range/range.cc',
- 'range/range.h',
- 'range/range_mac.mm',
- 'range/range_win.cc',
- 'rect.cc',
- 'rect.h',
- 'rect_base.h',
- 'rect_base_impl.h',
- 'rect_conversions.cc',
- 'rect_conversions.h',
- 'rect_f.cc',
- 'rect_f.h',
- 'render_text.cc',
- 'render_text.h',
- 'render_text_linux.cc',
- 'render_text_linux.h',
- 'render_text_mac.cc',
- 'render_text_mac.h',
- 'render_text_win.cc',
- 'render_text_win.h',
- 'safe_integer_conversions.h',
- 'scoped_cg_context_save_gstate_mac.h',
- 'scoped_ns_graphics_context_save_gstate_mac.h',
- 'scoped_ns_graphics_context_save_gstate_mac.mm',
- 'scoped_ui_graphics_push_context_ios.h',
- 'scoped_ui_graphics_push_context_ios.mm',
- 'screen.cc',
- 'screen.h',
- 'screen_android.cc',
- 'screen_aura.cc',
- 'screen_gtk.cc',
- 'screen_ios.mm',
- 'screen_mac.mm',
- 'screen_win.cc',
- 'screen_win.h',
- 'scrollbar_size.cc',
- 'scrollbar_size.h',
- 'selection_model.cc',
- 'selection_model.h',
- 'sequential_id_generator.cc',
- 'sequential_id_generator.h',
- 'shadow_value.cc',
- 'shadow_value.h',
- 'size.cc',
- 'size.h',
- 'size_base.h',
- 'size_conversions.cc',
- 'size_conversions.h',
- 'size_f.cc',
- 'size_f.h',
- 'skbitmap_operations.cc',
- 'skbitmap_operations.h',
- 'skia_util.cc',
- 'skia_util.h',
- 'skia_utils_gtk.cc',
- 'skia_utils_gtk.h',
- 'switches.cc',
- 'switches.h',
- 'sys_color_change_listener.cc',
- 'sys_color_change_listener.h',
- 'text_constants.h',
- 'text_elider.cc',
- 'text_elider.h',
- 'text_utils.cc',
- 'text_utils.h',
- 'text_utils_android.cc',
- 'text_utils_ios.mm',
- 'text_utils_skia.cc',
- 'transform.cc',
- 'transform.h',
- 'transform_util.cc',
- 'transform_util.h',
- 'utf16_indexing.cc',
- 'utf16_indexing.h',
- 'vector2d.cc',
- 'vector2d.h',
- 'vector2d_conversions.cc',
- 'vector2d_conversions.h',
- 'vector2d_f.cc',
- 'vector2d_f.h',
- 'vector3d_f.cc',
- 'vector3d_f.h',
- 'win/dpi.cc',
- 'win/dpi.h',
- 'win/hwnd_util.cc',
- 'win/hwnd_util.h',
- 'win/scoped_set_map_mode.h',
- 'win/singleton_hwnd.cc',
- 'win/singleton_hwnd.h',
- 'win/window_impl.cc',
- 'win/window_impl.h',
- 'x/x11_atom_cache.cc',
- 'x/x11_atom_cache.h',
- 'x/x11_types.cc',
- 'x/x11_types.h',
- ],
- 'conditions': [
- ['OS=="ios"', {
- # iOS only uses a subset of UI.
- 'sources/': [
- ['exclude', '^codec/jpeg_codec\\.cc$'],
- ],
- }, {
- 'dependencies': [
- '<(libjpeg_gyp_path):libjpeg',
- ],
- }],
- # TODO(asvitkine): Switch all platforms to use canvas_skia.cc.
- # http://crbug.com/105550
- ['use_canvas_skia==1', {
- 'sources!': [
- 'canvas_android.cc',
- ],
- }, { # use_canvas_skia!=1
- 'sources!': [
- 'canvas_skia.cc',
- ],
- }],
- ['use_pango==0', {
- 'sources/': [
- ['exclude', '^pango_util\\.'],
- ['exclude', '^platform_font_pango\\.'],
- ],
- }],
- ['toolkit_uses_gtk == 1', {
- 'dependencies': [
- '<(DEPTH)/build/linux/system.gyp:gtk',
- ],
- 'sources': [
- 'gtk_native_view_id_manager.cc',
- 'gtk_native_view_id_manager.h',
- 'gtk_preserve_window.cc',
- 'gtk_preserve_window.h',
- 'gdk_compat.h',
- 'gtk_compat.h',
- 'gtk_util.cc',
- 'gtk_util.h',
- 'image/cairo_cached_surface.cc',
- 'image/cairo_cached_surface.h',
- 'scoped_gobject.h',
- ],
- }],
- ['OS=="win"', {
- 'sources': [
- 'gdi_util.cc',
- 'gdi_util.h',
- 'icon_util.cc',
- 'icon_util.h',
- ],
- # TODO(jschuh): C4267: http://crbug.com/167187 size_t -> int
- # C4324 is structure was padded due to __declspec(align()), which is
- # uninteresting.
- 'msvs_disabled_warnings': [ 4267, 4324 ],
- }],
- ['OS=="android"', {
- 'sources!': [
- 'animation/throb_animation.cc',
- 'display_observer.cc',
- 'path.cc',
- 'selection_model.cc',
- ],
- 'dependencies': [
- 'gfx_jni_headers',
- ],
- 'link_settings': {
- 'libraries': [
- '-landroid',
- '-ljnigraphics',
- ],
- },
- }],
- ['OS=="android" and android_webview_build==0', {
- 'dependencies': [
- '<(DEPTH)/base/base.gyp:base_java',
- ],
- }],
- ['OS=="android" or OS=="ios"', {
- 'sources!': [
- 'render_text.cc',
- 'render_text.h',
- 'text_utils_skia.cc',
- ],
- }],
- ['use_pango==1', {
- 'dependencies': [
- '<(DEPTH)/build/linux/system.gyp:pangocairo',
- ],
- }],
- ],
- }
- ],
- 'conditions': [
- ['OS=="android"' , {
- 'targets': [
- {
- 'target_name': 'gfx_jni_headers',
- 'type': 'none',
- 'direct_dependent_settings': {
- 'include_dirs': [
- '<(SHARED_INTERMEDIATE_DIR)/ui/gfx',
- ],
- },
- 'sources': [
- '../android/java/src/org/chromium/ui/gfx/BitmapHelper.java',
- '../android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java',
- ],
- 'variables': {
- 'jni_gen_package': 'ui/gfx',
- },
- 'includes': [ '../../build/jni_generator.gypi' ],
- },
- ],
- }],
- ],
-}
diff --git a/ui/gfx/gfx_export.h b/ui/gfx/gfx_export.h
index 20c8bb1..a6aaf02 100644
--- a/ui/gfx/gfx_export.h
+++ b/ui/gfx/gfx_export.h
@@ -8,14 +8,14 @@
#if defined(COMPONENT_BUILD)
#if defined(WIN32)
-#if defined(GFX_IMPLEMENTATION)
+#if defined(UI_IMPLEMENTATION)
#define GFX_EXPORT __declspec(dllexport)
#else
#define GFX_EXPORT __declspec(dllimport)
-#endif // defined(GFX_IMPLEMENTATION)
+#endif // defined(UI_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(GFX_IMPLEMENTATION)
+#if defined(UI_IMPLEMENTATION)
#define GFX_EXPORT __attribute__((visibility("default")))
#else
#define GFX_EXPORT
diff --git a/ui/gfx/rect_base_impl.h b/ui/gfx/rect_base_impl.h
index c6de71d..a068d15 100644
--- a/ui/gfx/rect_base_impl.h
+++ b/ui/gfx/rect_base_impl.h
@@ -9,7 +9,7 @@
// This file provides the implementation for RectBaese template and
// used to instantiate the base class for Rect and RectF classes.
-#if !defined(GFX_IMPLEMENTATION)
+#if !defined(UI_IMPLEMENTATION)
#error "This file is intended for UI implementation only"
#endif
diff --git a/ui/gl/gl.gyp b/ui/gl/gl.gyp
index 95db809..274065b 100644
--- a/ui/gl/gl.gyp
+++ b/ui/gl/gl.gyp
@@ -18,7 +18,6 @@
'<(DEPTH)/gpu/command_buffer/command_buffer.gyp:gles2_utils',
'<(DEPTH)/skia/skia.gyp:skia',
'<(DEPTH)/third_party/mesa/mesa.gyp:mesa_headers',
- '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
'<(DEPTH)/ui/ui.gyp:ui',
],
'variables': {
diff --git a/ui/keyboard/keyboard.gyp b/ui/keyboard/keyboard.gyp
index 41605ba..7ec43f3 100644
--- a/ui/keyboard/keyboard.gyp
+++ b/ui/keyboard/keyboard.gyp
@@ -44,7 +44,6 @@
'../../url/url.gyp:url_lib',
'../aura/aura.gyp:aura',
'../compositor/compositor.gyp:compositor',
- '../gfx/gfx.gyp:gfx',
'../ui.gyp:ui',
'keyboard_resources',
],
@@ -84,7 +83,6 @@
'../aura/aura.gyp:aura',
'../aura/aura.gyp:aura_test_support',
'../compositor/compositor.gyp:compositor',
- '../gfx/gfx.gyp:gfx',
'../ui.gyp:run_ui_unittests',
'../ui.gyp:ui',
'keyboard',
diff --git a/ui/message_center/message_center.gyp b/ui/message_center/message_center.gyp
index e91e7e5..46f4d5b 100644
--- a/ui/message_center/message_center.gyp
+++ b/ui/message_center/message_center.gyp
@@ -17,7 +17,6 @@
'../../skia/skia.gyp:skia',
'../../url/url.gyp:url_lib',
'../base/strings/ui_strings.gyp:ui_strings',
- '../gfx/gfx.gyp:gfx',
'../ui.gyp:ui',
'../ui.gyp:ui_resources',
],
@@ -143,7 +142,6 @@
'../../base/base.gyp:base',
'../../base/base.gyp:test_support_base',
'../../skia/skia.gyp:skia',
- '../gfx/gfx.gyp:gfx',
'../ui.gyp:ui',
'message_center',
],
@@ -162,7 +160,6 @@
'../../base/base.gyp:test_support_base',
'../../skia/skia.gyp:skia',
'../../testing/gtest.gyp:gtest',
- '../gfx/gfx.gyp:gfx',
'../ui.gyp:run_ui_unittests',
'../ui.gyp:ui',
'../../url/url.gyp:url_lib',
diff --git a/ui/native_theme/native_theme.gyp b/ui/native_theme/native_theme.gyp
index 2edba03..671f286 100644
--- a/ui/native_theme/native_theme.gyp
+++ b/ui/native_theme/native_theme.gyp
@@ -14,7 +14,6 @@
'../../base/base.gyp:base',
'../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../../skia/skia.gyp:skia',
- '../gfx/gfx.gyp:gfx',
'../ui.gyp:ui',
'../ui.gyp:ui_resources',
],
diff --git a/ui/oak/oak.gyp b/ui/oak/oak.gyp
index 6bfcac6..ac07c63 100644
--- a/ui/oak/oak.gyp
+++ b/ui/oak/oak.gyp
@@ -18,7 +18,6 @@
'../../url/url.gyp:url_lib',
'../aura/aura.gyp:aura',
'../compositor/compositor.gyp:compositor',
- '../gfx/gfx.gyp:gfx',
'../ui.gyp:ui',
'../ui.gyp:ui_resources',
'../views/views.gyp:views',
diff --git a/ui/snapshot/snapshot.gyp b/ui/snapshot/snapshot.gyp
index b96567a..2346483 100644
--- a/ui/snapshot/snapshot.gyp
+++ b/ui/snapshot/snapshot.gyp
@@ -13,7 +13,6 @@
'dependencies': [
'../../skia/skia.gyp:skia',
'../../base/base.gyp:base',
- '../gfx/gfx.gyp:gfx',
'../ui.gyp:ui',
],
'defines': [
@@ -50,7 +49,6 @@
'../../base/base.gyp:base',
'../../base/base.gyp:test_support_base',
'../../testing/gtest.gyp:gtest',
- '../gfx/gfx.gyp:gfx',
'../ui.gyp:ui',
'snapshot'
],
diff --git a/ui/surface/surface.gyp b/ui/surface/surface.gyp
index 1f310dc..5887e06 100644
--- a/ui/surface/surface.gyp
+++ b/ui/surface/surface.gyp
@@ -61,7 +61,6 @@
'<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'<(DEPTH)/media/media.gyp:media',
'<(DEPTH)/skia/skia.gyp:skia',
- '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
'<(DEPTH)/ui/gl/gl.gyp:gl',
'<(DEPTH)/ui/ui.gyp:ui',
],
@@ -101,7 +100,6 @@
'<(DEPTH)/media/media.gyp:media',
'<(DEPTH)/skia/skia.gyp:skia',
'<(DEPTH)/testing/gtest.gyp:gtest',
- '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
'<(DEPTH)/ui/ui.gyp:ui',
'surface',
],
diff --git a/ui/ui.gyp b/ui/ui.gyp
index ce767ac..3c5dbcb 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -28,10 +28,11 @@
'../third_party/zlib/zlib.gyp:zlib',
'../url/url.gyp:url_lib',
'base/strings/ui_strings.gyp:ui_strings',
- 'gfx/gfx.gyp:gfx',
'ui_resources',
],
'defines': [
+ # TODO(sky): remove once gfx dependencies are corrected.
+ 'GFX_IMPLEMENTATION',
'UI_IMPLEMENTATION',
],
# Export these dependencies since text_elider.h includes ICU headers.
@@ -39,7 +40,6 @@
'../net/net.gyp:net',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
- 'gfx/gfx.gyp:gfx',
],
'sources' : [
'android/ui_jni_registrar.cc',
@@ -380,6 +380,240 @@
'events/x/events_x_utils.h',
'events/x/touch_factory_x11.cc',
'events/x/touch_factory_x11.h',
+ 'gfx/android/device_display_info.cc',
+ 'gfx/android/device_display_info.h',
+ 'gfx/android/java_bitmap.cc',
+ 'gfx/android/java_bitmap.h',
+ 'gfx/animation/animation.cc',
+ 'gfx/animation/animation.h',
+ 'gfx/animation/animation_container.cc',
+ 'gfx/animation/animation_container.h',
+ 'gfx/animation/animation_container_element.h',
+ 'gfx/animation/animation_container_observer.h',
+ 'gfx/animation/animation_delegate.h',
+ 'gfx/animation/linear_animation.cc',
+ 'gfx/animation/linear_animation.h',
+ 'gfx/animation/multi_animation.cc',
+ 'gfx/animation/multi_animation.h',
+ 'gfx/animation/slide_animation.cc',
+ 'gfx/animation/slide_animation.h',
+ 'gfx/animation/throb_animation.cc',
+ 'gfx/animation/throb_animation.h',
+ 'gfx/animation/tween.cc',
+ 'gfx/animation/tween.h',
+ 'gfx/blit.cc',
+ 'gfx/blit.h',
+ 'gfx/box_f.cc',
+ 'gfx/box_f.h',
+ 'gfx/break_list.h',
+ 'gfx/canvas.cc',
+ 'gfx/canvas.h',
+ 'gfx/canvas_android.cc',
+ 'gfx/canvas_paint_gtk.cc',
+ 'gfx/canvas_paint_gtk.h',
+ 'gfx/canvas_paint_mac.h',
+ 'gfx/canvas_paint_mac.mm',
+ 'gfx/canvas_paint_win.cc',
+ 'gfx/canvas_paint_win.h',
+ 'gfx/canvas_skia.cc',
+ 'gfx/canvas_skia_paint.h',
+ 'gfx/codec/jpeg_codec.cc',
+ 'gfx/codec/jpeg_codec.h',
+ 'gfx/codec/png_codec.cc',
+ 'gfx/codec/png_codec.h',
+ 'gfx/color_analysis.cc',
+ 'gfx/color_analysis.h',
+ 'gfx/color_profile.cc',
+ 'gfx/color_profile.h',
+ 'gfx/color_profile_mac.cc',
+ 'gfx/color_profile_win.cc',
+ 'gfx/color_utils.cc',
+ 'gfx/color_utils.h',
+ 'gfx/display.cc',
+ 'gfx/display.h',
+ 'gfx/display_observer.cc',
+ 'gfx/display_observer.h',
+ 'gfx/favicon_size.cc',
+ 'gfx/favicon_size.h',
+ 'gfx/font.cc',
+ 'gfx/font.h',
+ 'gfx/font_fallback_win.cc',
+ 'gfx/font_fallback_win.h',
+ 'gfx/font_list.cc',
+ 'gfx/font_list.h',
+ 'gfx/font_render_params_android.cc',
+ 'gfx/font_render_params_linux.cc',
+ 'gfx/font_render_params_linux.h',
+ 'gfx/font_smoothing_win.cc',
+ 'gfx/font_smoothing_win.h',
+ 'gfx/gfx_export.h',
+ 'gfx/gfx_paths.cc',
+ 'gfx/gfx_paths.h',
+ 'gfx/gpu_memory_buffer.cc',
+ 'gfx/gpu_memory_buffer.h',
+ 'gfx/image/canvas_image_source.cc',
+ 'gfx/image/canvas_image_source.h',
+ 'gfx/image/image.cc',
+ 'gfx/image/image.h',
+ 'gfx/image/image_family.cc',
+ 'gfx/image/image_family.h',
+ 'gfx/image/image_ios.mm',
+ 'gfx/image/image_mac.mm',
+ 'gfx/image/image_png_rep.cc',
+ 'gfx/image/image_png_rep.h',
+ 'gfx/image/image_skia.cc',
+ 'gfx/image/image_skia.h',
+ 'gfx/image/image_skia_operations.cc',
+ 'gfx/image/image_skia_operations.h',
+ 'gfx/image/image_skia_rep.cc',
+ 'gfx/image/image_skia_rep.h',
+ 'gfx/image/image_skia_source.h',
+ 'gfx/image/image_skia_util_ios.h',
+ 'gfx/image/image_skia_util_ios.mm',
+ 'gfx/image/image_skia_util_mac.h',
+ 'gfx/image/image_skia_util_mac.mm',
+ 'gfx/image/image_util.cc',
+ 'gfx/image/image_util.h',
+ 'gfx/image/image_util_ios.mm',
+ 'gfx/insets.cc',
+ 'gfx/insets.h',
+ 'gfx/insets_base.h',
+ 'gfx/insets_f.cc',
+ 'gfx/insets_f.h',
+ 'gfx/interpolated_transform.cc',
+ 'gfx/interpolated_transform.h',
+ 'gfx/mac/scoped_ns_disable_screen_updates.h',
+ 'gfx/matrix3_f.cc',
+ 'gfx/matrix3_f.h',
+ 'gfx/native_widget_types.h',
+ 'gfx/ozone/surface_factory_ozone.cc',
+ 'gfx/ozone/surface_factory_ozone.h',
+ 'gfx/pango_util.cc',
+ 'gfx/pango_util.h',
+ 'gfx/path.cc',
+ 'gfx/path.h',
+ 'gfx/path_aura.cc',
+ 'gfx/path_gtk.cc',
+ 'gfx/path_win.cc',
+ 'gfx/path_win.h',
+ 'gfx/path_x11.cc',
+ 'gfx/path_x11.h',
+ 'gfx/platform_font.h',
+ 'gfx/platform_font_android.cc',
+ 'gfx/platform_font_ios.h',
+ 'gfx/platform_font_ios.mm',
+ 'gfx/platform_font_mac.h',
+ 'gfx/platform_font_mac.mm',
+ 'gfx/platform_font_pango.cc',
+ 'gfx/platform_font_pango.h',
+ 'gfx/platform_font_win.cc',
+ 'gfx/platform_font_win.h',
+ 'gfx/point.cc',
+ 'gfx/point.h',
+ 'gfx/point3_f.cc',
+ 'gfx/point3_f.h',
+ 'gfx/point_base.h',
+ 'gfx/point_conversions.cc',
+ 'gfx/point_conversions.h',
+ 'gfx/point_f.cc',
+ 'gfx/point_f.h',
+ 'gfx/quad_f.cc',
+ 'gfx/quad_f.h',
+ 'gfx/range/range.cc',
+ 'gfx/range/range.h',
+ 'gfx/range/range_mac.mm',
+ 'gfx/range/range_win.cc',
+ 'gfx/rect.cc',
+ 'gfx/rect.h',
+ 'gfx/rect_base.h',
+ 'gfx/rect_base_impl.h',
+ 'gfx/rect_conversions.cc',
+ 'gfx/rect_conversions.h',
+ 'gfx/rect_f.cc',
+ 'gfx/rect_f.h',
+ 'gfx/render_text.cc',
+ 'gfx/render_text.h',
+ 'gfx/render_text_linux.cc',
+ 'gfx/render_text_linux.h',
+ 'gfx/render_text_mac.cc',
+ 'gfx/render_text_mac.h',
+ 'gfx/render_text_win.cc',
+ 'gfx/render_text_win.h',
+ 'gfx/safe_integer_conversions.h',
+ 'gfx/scoped_cg_context_save_gstate_mac.h',
+ 'gfx/scoped_ns_graphics_context_save_gstate_mac.h',
+ 'gfx/scoped_ns_graphics_context_save_gstate_mac.mm',
+ 'gfx/scoped_ui_graphics_push_context_ios.h',
+ 'gfx/scoped_ui_graphics_push_context_ios.mm',
+ 'gfx/screen.cc',
+ 'gfx/screen.h',
+ 'gfx/screen_android.cc',
+ 'gfx/screen_aura.cc',
+ 'gfx/screen_gtk.cc',
+ 'gfx/screen_ios.mm',
+ 'gfx/screen_mac.mm',
+ 'gfx/screen_win.cc',
+ 'gfx/screen_win.h',
+ 'gfx/scrollbar_size.cc',
+ 'gfx/scrollbar_size.h',
+ 'gfx/selection_model.cc',
+ 'gfx/selection_model.h',
+ 'gfx/sequential_id_generator.cc',
+ 'gfx/sequential_id_generator.h',
+ 'gfx/shadow_value.cc',
+ 'gfx/shadow_value.h',
+ 'gfx/size.cc',
+ 'gfx/size.h',
+ 'gfx/size_base.h',
+ 'gfx/size_conversions.cc',
+ 'gfx/size_conversions.h',
+ 'gfx/size_f.cc',
+ 'gfx/size_f.h',
+ 'gfx/skbitmap_operations.cc',
+ 'gfx/skbitmap_operations.h',
+ 'gfx/skia_util.cc',
+ 'gfx/skia_util.h',
+ 'gfx/skia_utils_gtk.cc',
+ 'gfx/skia_utils_gtk.h',
+ 'gfx/switches.cc',
+ 'gfx/switches.h',
+ 'gfx/sys_color_change_listener.cc',
+ 'gfx/sys_color_change_listener.h',
+ 'gfx/text_constants.h',
+ 'gfx/text_elider.cc',
+ 'gfx/text_elider.h',
+ 'gfx/text_utils.cc',
+ 'gfx/text_utils.h',
+ 'gfx/text_utils_android.cc',
+ 'gfx/text_utils_ios.mm',
+ 'gfx/text_utils_skia.cc',
+ 'gfx/transform.cc',
+ 'gfx/transform.h',
+ 'gfx/transform_util.cc',
+ 'gfx/transform_util.h',
+ 'gfx/utf16_indexing.cc',
+ 'gfx/utf16_indexing.h',
+ 'gfx/vector2d.cc',
+ 'gfx/vector2d.h',
+ 'gfx/vector2d_conversions.cc',
+ 'gfx/vector2d_conversions.h',
+ 'gfx/vector2d_f.cc',
+ 'gfx/vector2d_f.h',
+ 'gfx/vector3d_f.cc',
+ 'gfx/vector3d_f.h',
+ 'gfx/win/dpi.cc',
+ 'gfx/win/dpi.h',
+ 'gfx/win/hwnd_util.cc',
+ 'gfx/win/hwnd_util.h',
+ 'gfx/win/scoped_set_map_mode.h',
+ 'gfx/win/singleton_hwnd.cc',
+ 'gfx/win/singleton_hwnd.h',
+ 'gfx/win/window_impl.cc',
+ 'gfx/win/window_impl.h',
+ 'gfx/x/x11_atom_cache.cc',
+ 'gfx/x/x11_atom_cache.h',
+ 'gfx/x/x11_types.cc',
+ 'gfx/x/x11_types.h',
'webui/jstemplate_builder.cc',
'webui/jstemplate_builder.h',
'webui/web_ui_util.cc',
@@ -397,12 +631,19 @@
'includes': [
'base/ime/ime.gypi',
],
+ 'dependencies': [
+ '<(libjpeg_gyp_path):libjpeg',
+ ],
}, { # OS=="ios"
# iOS only uses a subset of UI.
'sources/': [
['exclude', '\\.(cc|mm)$'],
['include', '_ios\\.(cc|mm)$'],
['include', '(^|/)ios/'],
+ ['include', '^gfx/'],
+ ['include', '^gfx/animation/'],
+ ['exclude', '^gfx/codec/jpeg_codec\\.cc$'],
+ ['include', '^gfx/range/'],
['include', '^base/l10n/'],
['include', '^base/layout'],
['include', '^base/resource/'],
@@ -414,8 +655,23 @@
],
},
}],
+ # TODO(asvitkine): Switch all platforms to use canvas_skia.cc.
+ # http://crbug.com/105550
+ ['use_canvas_skia==1', {
+ 'sources!': [
+ 'gfx/canvas_android.cc',
+ ],
+ }, { # use_canvas_skia!=1
+ 'sources!': [
+ 'gfx/canvas_skia.cc',
+ ],
+ }],
['use_aura==1', {
'sources/': [
+ ['exclude', 'gfx/gtk_'],
+ ['exclude', 'gfx/gtk_util.cc'],
+ ['exclude', 'gfx/gtk_util.h'],
+ ['exclude', 'gfx/screen_gtk.cc'],
['exclude', 'base/work_area_watcher_observer.h'],
['exclude', 'base/x/active_window_watcher_x.cc'],
['exclude', 'base/x/active_window_watcher_x.h'],
@@ -441,6 +697,12 @@
'base/x/selection_utils.h',
]
}],
+ ['use_pango==0', {
+ 'sources/': [
+ ['exclude', '^gfx/pango_util\\.'],
+ ['exclude', '^gfx/platform_font_pango\\.'],
+ ],
+ }],
['use_aura==0 or OS!="linux"', {
'sources!': [
'base/resource/resource_bundle_auralinux.cc',
@@ -486,6 +748,24 @@
}],
],
}],
+ ['toolkit_uses_gtk == 1', {
+ 'dependencies': [
+ '../build/linux/system.gyp:gtk',
+ ],
+ 'sources': [
+ 'gfx/gtk_native_view_id_manager.cc',
+ 'gfx/gtk_native_view_id_manager.h',
+ 'gfx/gtk_preserve_window.cc',
+ 'gfx/gtk_preserve_window.h',
+ 'gfx/gdk_compat.h',
+ 'gfx/gtk_compat.h',
+ 'gfx/gtk_util.cc',
+ 'gfx/gtk_util.h',
+ 'gfx/image/cairo_cached_surface.cc',
+ 'gfx/image/cairo_cached_surface.h',
+ 'gfx/scoped_gobject.h',
+ ],
+ }],
['chromeos==1 or (use_aura==1 and OS=="linux" and use_x11==0)', {
'sources!': [
'base/clipboard/clipboard_aurax11.cc',
@@ -501,6 +781,12 @@
],
}],
['OS=="win"', {
+ 'sources': [
+ 'gfx/gdi_util.cc',
+ 'gfx/gdi_util.h',
+ 'gfx/icon_util.cc',
+ 'gfx/icon_util.h',
+ ],
'sources!': [
'base/touch/touch_device.cc',
],
@@ -634,6 +920,10 @@
'base/touch/touch_device.cc',
'base/touch/touch_editing_controller.cc',
'base/ui_base_types.cc',
+ 'gfx/animation/throb_animation.cc',
+ 'gfx/display_observer.cc',
+ 'gfx/path.cc',
+ 'gfx/selection_model.cc',
],
'dependencies': [
'ui_jni_headers',
@@ -652,6 +942,13 @@
'ui_java',
],
}],
+ ['OS=="android" or OS=="ios"', {
+ 'sources!': [
+ 'gfx/render_text.cc',
+ 'gfx/render_text.h',
+ 'gfx/text_utils_skia.cc',
+ ],
+ }],
['OS=="linux"', {
'libraries': [
'-ldl',
@@ -700,6 +997,8 @@
},
'sources': [
'android/java/src/org/chromium/ui/Clipboard.java',
+ 'android/java/src/org/chromium/ui/gfx/BitmapHelper.java',
+ 'android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java',
'android/java/src/org/chromium/ui/LocalizationUtils.java',
'android/java/src/org/chromium/ui/SelectFileDialog.java',
'android/java/src/org/chromium/ui/ViewAndroid.java',
diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi
index b096962..a419ea8 100644
--- a/ui/ui_unittests.gypi
+++ b/ui/ui_unittests.gypi
@@ -10,7 +10,6 @@
'../base/base.gyp:base',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
- 'gfx/gfx.gyp:gfx',
],
'sources': [
'base/test/cocoa_test_event_utils.h',
diff --git a/ui/v2/v2.gyp b/ui/v2/v2.gyp
index b9183f7..78dd01c 100644
--- a/ui/v2/v2.gyp
+++ b/ui/v2/v2.gyp
@@ -18,7 +18,6 @@
'../../gpu/gpu.gyp:gpu',
'../../skia/skia.gyp:skia',
'../compositor/compositor.gyp:compositor',
- '../gfx/gfx.gyp:gfx',
'../ui.gyp:ui',
'../ui.gyp:ui_resources',
],
diff --git a/ui/views/controls/webview/webview.gyp b/ui/views/controls/webview/webview.gyp
index 1977f48..1814d2f 100644
--- a/ui/views/controls/webview/webview.gyp
+++ b/ui/views/controls/webview/webview.gyp
@@ -17,7 +17,6 @@
'../../../../content/content.gyp:content_browser',
'../../../../skia/skia.gyp:skia',
'../../../../url/url.gyp:url_lib',
- '../../../gfx/gfx.gyp:gfx',
'../../../ui.gyp:ui',
'../../../web_dialogs/web_dialogs.gyp:web_dialogs',
'../../views.gyp:views',
diff --git a/ui/views/views.gyp b/ui/views/views.gyp
index e927f86..30dd637 100644
--- a/ui/views/views.gyp
+++ b/ui/views/views.gyp
@@ -30,7 +30,6 @@
'../../url/url.gyp:url_lib',
'../base/strings/ui_strings.gyp:ui_strings',
'../compositor/compositor.gyp:compositor',
- '../gfx/gfx.gyp:gfx',
'../native_theme/native_theme.gyp:native_theme',
'../ui.gyp:ui',
'../ui.gyp:ui_resources',
@@ -602,7 +601,6 @@
'../../ipc/ipc.gyp:test_support_ipc',
'../../skia/skia.gyp:skia',
'../../testing/gtest.gyp:gtest',
- '../gfx/gfx.gyp:gfx',
'../ui.gyp:ui',
'views',
],
@@ -656,7 +654,6 @@
'../../ipc/ipc.gyp:test_support_ipc',
'../../skia/skia.gyp:skia',
'../../testing/gtest.gyp:gtest',
- '../gfx/gfx.gyp:gfx',
'../ui.gyp:ui',
'controls/webview/webview.gyp:webview',
'views_test_support',
@@ -690,7 +687,6 @@
'../base/strings/ui_strings.gyp:ui_strings',
'../compositor/compositor.gyp:compositor',
'../compositor/compositor.gyp:compositor_test_support',
- '../gfx/gfx.gyp:gfx',
'../ui.gyp:ui',
'../ui.gyp:ui_resources',
'../ui.gyp:ui_test_support',
@@ -834,7 +830,6 @@
'../../skia/skia.gyp:skia',
'../../third_party/icu/icu.gyp:icui18n',
'../../third_party/icu/icu.gyp:icuuc',
- '../gfx/gfx.gyp:gfx',
'../ui.gyp:ui',
'../ui.gyp:ui_resources',
'views',
@@ -927,7 +922,6 @@
'../../third_party/icu/icu.gyp:icui18n',
'../../third_party/icu/icu.gyp:icuuc',
'../../url/url.gyp:url_lib',
- '../gfx/gfx.gyp:gfx',
'../ui.gyp:ui',
'../ui.gyp:ui_resources',
'controls/webview/webview.gyp:webview',
@@ -1017,7 +1011,6 @@
'../../skia/skia.gyp:skia',
'../../third_party/icu/icu.gyp:icui18n',
'../../third_party/icu/icu.gyp:icuuc',
- '../gfx/gfx.gyp:gfx',
'../ui.gyp:ui',
'../ui.gyp:ui_resources',
'views',
generated by cgit v1.1 at 2025-02-14 19:05:16 +0000