diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-30 02:47:48 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-30 02:47:48 +0000 |
| commit | 529a3cf4d14eb7bd230c5edec0a2e90314e4abd8 (patch) | |
| tree | 08cf308ed5574d29345c3d05888305e0bbd5c0f4 /webkit | |
| parent | b2b8caae5779d58a4b57c111c93fe11dd447a2b8 (diff) | |
| download | chromium_src-529a3cf4d14eb7bd230c5edec0a2e90314e4abd8.zip chromium_src-529a3cf4d14eb7bd230c5edec0a2e90314e4abd8.tar.gz chromium_src-529a3cf4d14eb7bd230c5edec0a2e90314e4abd8.tar.bz2 | |
gfx: Create a separate gfx component out of ui.
Landed previously in r225857, which was reverted in r225859 because it broke android tests.
BUG=103304
R=ben@chromium.org
Review URL: https://codereview.chromium.org/25015003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225909 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/common/gpu/webkit_gpu.gyp | 1 | ||||
| -rw-r--r-- | webkit/common/webkit_common.gyp | 1 | ||||
| -rw-r--r-- | webkit/glue/webkit_glue.gypi | 2 | ||||
| -rw-r--r-- | webkit/renderer/compositor_bindings/compositor_bindings.gyp | 1 | ||||
| -rw-r--r-- | webkit/renderer/webkit_renderer.gyp | 1 |
5 files changed, 6 insertions, 0 deletions
diff --git a/webkit/common/gpu/webkit_gpu.gyp b/webkit/common/gpu/webkit_gpu.gyp index 2831446..460d486 100644 --- a/webkit/common/gpu/webkit_gpu.gyp +++ b/webkit/common/gpu/webkit_gpu.gyp @@ -25,6 +25,7 @@ '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink_minimal', '<(DEPTH)/third_party/angle_dx11/src/build_angle.gyp:translator_glsl', '<(DEPTH)/ui/gl/gl.gyp:gl', + '<(DEPTH)/ui/gfx/gfx.gyp:gfx', '<(DEPTH)/ui/ui.gyp:ui', ], 'sources': [ diff --git a/webkit/common/webkit_common.gyp b/webkit/common/webkit_common.gyp index 2957aab..508c1e4 100644 --- a/webkit/common/webkit_common.gyp +++ b/webkit/common/webkit_common.gyp @@ -20,6 +20,7 @@ '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '<(DEPTH)/net/net.gyp:net', '<(DEPTH)/skia/skia.gyp:skia', + '<(DEPTH)/ui/gfx/gfx.gyp:gfx', '<(DEPTH)/ui/ui.gyp:ui', '<(DEPTH)/ui/ui.gyp:ui_resources', '<(DEPTH)/url/url.gyp:url_lib', diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi index c2c3fed..bfff4bd 100644 --- a/webkit/glue/webkit_glue.gypi +++ b/webkit/glue/webkit_glue.gypi @@ -28,6 +28,7 @@ '<(DEPTH)/net/net.gyp:net', '<(DEPTH)/skia/skia.gyp:skia', '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink', + '<(DEPTH)/ui/gfx/gfx.gyp:gfx', '<(DEPTH)/ui/native_theme/native_theme.gyp:native_theme', '<(DEPTH)/ui/ui.gyp:ui', '<(DEPTH)/url/url.gyp:url_lib', @@ -137,6 +138,7 @@ '<(DEPTH)/third_party/icu/icu.gyp:icui18n', '<(DEPTH)/third_party/icu/icu.gyp:icuuc', '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', + '<(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/webkit/renderer/compositor_bindings/compositor_bindings.gyp b/webkit/renderer/compositor_bindings/compositor_bindings.gyp index abd2db1..b8c1d41 100644 --- a/webkit/renderer/compositor_bindings/compositor_bindings.gyp +++ b/webkit/renderer/compositor_bindings/compositor_bindings.gyp @@ -34,6 +34,7 @@ '<(DEPTH)/media/media.gyp:media', '<(DEPTH)/skia/skia.gyp:skia', '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink', + '<(DEPTH)/ui/gfx/gfx.gyp:gfx', '<(DEPTH)/ui/ui.gyp:ui', '<(DEPTH)/webkit/common/gpu/webkit_gpu.gyp:webkit_gpu', ], diff --git a/webkit/renderer/webkit_renderer.gyp b/webkit/renderer/webkit_renderer.gyp index 2e85bf9..64e42d2 100644 --- a/webkit/renderer/webkit_renderer.gyp +++ b/webkit/renderer/webkit_renderer.gyp @@ -18,6 +18,7 @@ '<(DEPTH)/skia/skia.gyp:skia', '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink', '<(DEPTH)/third_party/icu/icu.gyp:icuuc', + '<(DEPTH)/ui/gfx/gfx.gyp:gfx', '<(DEPTH)/ui/ui.gyp:ui', '<(DEPTH)/url/url.gyp:url_lib', '<(DEPTH)/webkit/common/webkit_common.gyp:webkit_common', |