Moving compositor_bindings from webkit to content

- All files from webkit/renderer/compositor_bindings have been moved to content/renderer/compositor_bindings - Webkit_compositor_support is moved in content_renderer - Webkit_compositor_bindings_unittests is moved in content_unittests - A dummy target has been left for webkit_compositor_bindings_unittests so as to not break the build. TBR=nduca BUG=265753 Review URL: https://codereview.chromium.org/317163002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277988 0039d316-1c4b-4281-b951-d872f2087c98
hylschwy · Jun 18, 2014 · e1c5295 · e1c5295
1 parent 293d43a
commit e1c5295
Show file tree

Hide file tree

Showing 79 changed files with 689 additions and 634 deletions.
diff --git a/build/all.gyp b/build/all.gyp
@@ -778,7 +778,7 @@
             '../ui/events/events.gyp:events_unittests_apk',
             '../ui/gfx/gfx_tests.gyp:gfx_unittests_apk',
             '../ui/ui_unittests.gyp:ui_unittests_apk',
-            '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests_apk'
+            '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests_apk',
           ],
         },
         {
@@ -861,7 +861,6 @@
             '../ui/gfx/gfx_tests.gyp:gfx_unittests',
             '../ui/ui_unittests.gyp:ui_unittests',
             '../url/url.gyp:url_unittests',
-            '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests',
           ],
         },
         {

diff --git a/...nt/public/common/assert_matching_enums.cc → content/child/assert_matching_enums.cc b/...nt/public/common/assert_matching_enums.cc → content/child/assert_matching_enums.cc
@@ -6,8 +6,10 @@
 // from Blink are valid.
 
 #include "base/macros.h"
+#include "cc/animation/animation.h"
 #include "content/public/common/screen_orientation_values.h"
 #include "net/base/mime_util.h"
+#include "third_party/WebKit/public/platform/WebAnimation.h"
 #include "third_party/WebKit/public/platform/WebMimeRegistry.h"
 #include "third_party/WebKit/public/platform/WebScreenOrientationLockType.h"
 
@@ -42,4 +44,16 @@ COMPILE_ASSERT_MATCHING_ENUM(blink::WebMimeRegistry::IsSupported,
 COMPILE_ASSERT_MATCHING_ENUM(blink::WebMimeRegistry::MayBeSupported,
     net::MayBeSupported);
 
+// TargetProperty
+COMPILE_ASSERT_MATCHING_ENUM(blink::WebAnimation::TargetPropertyTransform,
+    cc::Animation::Transform);
+COMPILE_ASSERT_MATCHING_ENUM(blink::WebAnimation::TargetPropertyOpacity,
+    cc::Animation::Opacity);
+COMPILE_ASSERT_MATCHING_ENUM(blink::WebAnimation::TargetPropertyFilter,
+    cc::Animation::Filter);
+#if WEB_SCROLL_OFFSET_ANIMATION_CURVE_IS_DEFINED
+COMPILE_ASSERT_MATCHING_ENUM(blink::WebAnimation::TargetPropertyScrollOffset,
+    cc::Animation::ScrollOffset);
+#endif
+
 } // namespace content
diff --git a/content/content_child.gypi b/content/content_child.gypi
@@ -35,6 +35,7 @@
       'child/appcache/appcache_frontend_impl.h',
       'child/appcache/web_application_cache_host_impl.cc',
       'child/appcache/web_application_cache_host_impl.h',
+      'child/assert_matching_enums.cc',
       'child/blink_glue.cc',
       'child/blink_glue.h',
       'child/blink_platform_impl.cc',

diff --git a/content/content_common.gypi b/content/content_common.gypi
@@ -32,7 +32,6 @@
   ],
   'variables': {
     'public_common_sources': [
-      'public/common/assert_matching_enums.cc',
       'public/common/bindings_policy.h',
       'public/common/child_process_host.h',
       'public/common/child_process_host_delegate.cc',

diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
@@ -5,7 +5,11 @@
 {
   'dependencies': [
     'content_common_mojo_bindings',
+    '../base/base.gyp:base',
+    '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+    '../cc/cc.gyp:cc',
     '../gin/gin.gyp:gin',
+    '../gpu/gpu.gyp:gpu',
     '../jingle/jingle.gyp:jingle_glue',
     '../media/media.gyp:media',
     '../mojo/mojo.gyp:mojo_environment_chromium',
@@ -21,14 +25,14 @@
     '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
     '../ui/accessibility/accessibility.gyp:accessibility',
     '../ui/events/events.gyp:dom4_keycode_converter',
+    '../ui/gfx/gfx.gyp:gfx',
+    '../ui/gfx/gfx.gyp:gfx_geometry',
     '../ui/native_theme/native_theme.gyp:native_theme',
     '../ui/surface/surface.gyp:surface',
     '../v8/tools/gyp/v8.gyp:v8',
     '../webkit/child/webkit_child.gyp:webkit_child',
     '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
     '../webkit/common/webkit_common.gyp:webkit_common',
-    '../webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_bindings',
-    '../webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support',
     '../webkit/storage_common.gyp:webkit_storage_common',
   ],
   'include_dirs': [
@@ -111,6 +115,46 @@
       'renderer/clipboard_utils.h',
       'renderer/child_frame_compositing_helper.cc',
       'renderer/child_frame_compositing_helper.h',
+      'renderer/compositor_bindings/scrollbar_impl.cc',
+      'renderer/compositor_bindings/scrollbar_impl.h',
+      'renderer/compositor_bindings/web_animation_curve_common.cc',
+      'renderer/compositor_bindings/web_animation_curve_common.h',
+      'renderer/compositor_bindings/web_animation_impl.cc',
+      'renderer/compositor_bindings/web_animation_impl.h',
+      'renderer/compositor_bindings/web_compositor_support_impl.cc',
+      'renderer/compositor_bindings/web_compositor_support_impl.h',
+      'renderer/compositor_bindings/web_content_layer_impl.cc',
+      'renderer/compositor_bindings/web_content_layer_impl.h',
+      'renderer/compositor_bindings/web_external_bitmap_impl.cc',
+      'renderer/compositor_bindings/web_external_bitmap_impl.h',
+      'renderer/compositor_bindings/web_external_texture_layer_impl.cc',
+      'renderer/compositor_bindings/web_external_texture_layer_impl.h',
+      'renderer/compositor_bindings/web_filter_animation_curve_impl.cc',
+      'renderer/compositor_bindings/web_filter_animation_curve_impl.h',
+      'renderer/compositor_bindings/web_filter_operations_impl.cc',
+      'renderer/compositor_bindings/web_filter_operations_impl.h',
+      'renderer/compositor_bindings/web_float_animation_curve_impl.cc',
+      'renderer/compositor_bindings/web_float_animation_curve_impl.h',
+      'renderer/compositor_bindings/web_image_layer_impl.cc',
+      'renderer/compositor_bindings/web_image_layer_impl.h',
+      'renderer/compositor_bindings/web_layer_impl.cc',
+      'renderer/compositor_bindings/web_layer_impl.h',
+      'renderer/compositor_bindings/web_layer_impl_fixed_bounds.cc',
+      'renderer/compositor_bindings/web_layer_impl_fixed_bounds.h',
+      'renderer/compositor_bindings/web_nine_patch_layer_impl.cc',
+      'renderer/compositor_bindings/web_nine_patch_layer_impl.h',
+      'renderer/compositor_bindings/web_scroll_offset_animation_curve_impl.cc',
+      'renderer/compositor_bindings/web_scroll_offset_animation_curve_impl.h',
+      'renderer/compositor_bindings/web_scrollbar_layer_impl.cc',
+      'renderer/compositor_bindings/web_scrollbar_layer_impl.h',
+      'renderer/compositor_bindings/web_solid_color_layer_impl.cc',
+      'renderer/compositor_bindings/web_solid_color_layer_impl.h',
+      'renderer/compositor_bindings/web_to_cc_animation_delegate_adapter.cc',
+      'renderer/compositor_bindings/web_to_cc_animation_delegate_adapter.h',
+      'renderer/compositor_bindings/web_transform_animation_curve_impl.cc',
+      'renderer/compositor_bindings/web_transform_animation_curve_impl.h',
+      'renderer/compositor_bindings/web_transform_operations_impl.cc',
+      'renderer/compositor_bindings/web_transform_operations_impl.h',
       'renderer/context_menu_params_builder.cc',
       'renderer/context_menu_params_builder.h',
       'renderer/cursor_utils.cc',

diff --git a/content/content_shell.gypi b/content/content_shell.gypi
@@ -61,7 +61,6 @@
         '../url/url.gyp:url_lib',
         '../v8/tools/gyp/v8.gyp:v8',
         '../webkit/common/webkit_common.gyp:webkit_common',
-        '../webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_bindings',
         '../webkit/storage_browser.gyp:webkit_storage_browser',
         '../webkit/webkit_resources.gyp:webkit_resources',
       ],

diff --git a/content/content_tests.gypi b/content/content_tests.gypi
@@ -53,8 +53,6 @@
         '../ui/events/events.gyp:events_base',
         '../ui/events/events.gyp:events_test_support',
         '../ui/events/events.gyp:gesture_detection',
-        '../ui/gfx/gfx.gyp:gfx',
-        '../ui/gfx/gfx.gyp:gfx_geometry',
         '../ui/gfx/gfx.gyp:gfx_test_support',
         '../ui/resources/ui_resources.gyp:ui_resources',
         '../url/url.gyp:url_lib',
@@ -268,6 +266,7 @@
             'content.gyp:content_renderer',
             'content.gyp:content_utility',
             'content.gyp:content_worker',
+            '../cc/cc.gyp:cc',
             '../cc/cc_tests.gyp:cc_test_support',
             '../media/media.gyp:media',
             '../ppapi/ppapi_internal.gyp:ppapi_host',
@@ -279,7 +278,6 @@
             '../v8/tools/gyp/v8.gyp:v8',
             '../webkit/child/webkit_child.gyp:webkit_child',
             '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
-            '../webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support',
             '../webkit/storage_browser.gyp:webkit_storage_browser',
             '../webkit/storage_common.gyp:webkit_storage_common',
           ],
@@ -655,6 +653,9 @@
         'renderer/android/phone_number_detector_unittest.cc',
         'renderer/battery_status/battery_status_dispatcher_unittest.cc',
         'renderer/bmp_image_decoder_unittest.cc',
+        'renderer/compositor_bindings/web_animation_unittest.cc',
+        'renderer/compositor_bindings/web_float_animation_curve_unittest.cc',
+        'renderer/compositor_bindings/web_layer_impl_fixed_bounds_unittest.cc',
         'renderer/device_sensors/device_motion_event_pump_unittest.cc',
         'renderer/device_sensors/device_orientation_event_pump_unittest.cc',
         'renderer/disambiguation_popup_helper_unittest.cc',
@@ -716,6 +717,8 @@
             'content.gyp:content_renderer',
             'content_resources.gyp:content_resources',
             '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+            '../cc/cc.gyp:cc',
+            '../cc/cc_tests.gyp:cc_test_support',
             '../gpu/gpu.gyp:gpu',
             '../gpu/gpu.gyp:gpu_unittest_utils',
             '../ipc/ipc.gyp:test_support_ipc',

diff --git a/content/public/test/layouttest_support.h b/content/public/test/layouttest_support.h
@@ -9,6 +9,7 @@
 #include <vector>
 
 #include "base/callback_forward.h"
+#include "cc/layers/texture_layer.h"
 #include "third_party/WebKit/public/platform/WebScreenOrientationType.h"
 
 namespace blink {
@@ -17,6 +18,7 @@ class WebDeviceMotionData;
 class WebDeviceOrientationData;
 class WebGamepad;
 class WebGamepads;
+class WebLayer;
 struct WebSize;
 }
 
@@ -110,6 +112,9 @@ void DisableAutoResizeMode(RenderView* render_view,
 std::string DumpBackForwardList(std::vector<PageState>& page_state,
                                 size_t current_index);
 
+// Instantiates WebLayerImpl for TestPlugin.
+blink::WebLayer* InstantiateWebLayer(scoped_refptr<cc::TextureLayer> layer);
+
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_TEST_LAYOUTTEST_SUPPORT_H_
diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn
@@ -51,8 +51,6 @@ source_set("renderer") {
     #'../third_party/WebKit/public/blink.gyp:blink',
     #'../third_party/libjingle/libjingle.gyp:libjingle',
     #'../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
-    #'../webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_bindings',
-    #'../webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support',
   ]
 
   if (!enable_notifications) {

diff --git a/content/renderer/child_frame_compositing_helper.cc b/content/renderer/child_frame_compositing_helper.cc
@@ -18,6 +18,7 @@
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "content/renderer/browser_plugin/browser_plugin.h"
 #include "content/renderer/browser_plugin/browser_plugin_manager.h"
+#include "content/renderer/compositor_bindings/web_layer_impl.h"
 #include "content/renderer/render_frame_impl.h"
 #include "content/renderer/render_thread_impl.h"
 #include "skia/ext/image_operations.h"
@@ -27,7 +28,6 @@
 #include "third_party/khronos/GLES2/gl2.h"
 #include "ui/gfx/size_conversions.h"
 #include "ui/gfx/skia_util.h"
-#include "webkit/renderer/compositor_bindings/web_layer_impl.h"
 
 namespace content {
 
@@ -186,7 +186,7 @@ void ChildFrameCompositingHelper::EnableCompositing(bool enable) {
     background_layer_->SetMasksToBounds(true);
     background_layer_->SetBackgroundColor(
         SkColorSetARGBInline(255, 255, 255, 255));
-    web_layer_.reset(new webkit::WebLayerImpl(background_layer_));
+    web_layer_.reset(new WebLayerImpl(background_layer_));
   }
 
   if (GetContainer()) {

diff --git a/webkit/renderer/compositor_bindings/OWNERS → content/renderer/compositor_bindings/OWNERS b/webkit/renderer/compositor_bindings/OWNERS → content/renderer/compositor_bindings/OWNERS
diff --git a/...renderer/compositor_bindings/PRESUBMIT.py → ...renderer/compositor_bindings/PRESUBMIT.py b/...renderer/compositor_bindings/PRESUBMIT.py → ...renderer/compositor_bindings/PRESUBMIT.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2013 The Chromium Authors. All rights reserved.
+# Copyright 2014 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.
 

diff --git a/...rer/compositor_bindings/scrollbar_impl.cc → ...rer/compositor_bindings/scrollbar_impl.cc b/...rer/compositor_bindings/scrollbar_impl.cc → ...rer/compositor_bindings/scrollbar_impl.cc
@@ -1,26 +1,28 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 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 "webkit/renderer/compositor_bindings/scrollbar_impl.h"
+#include "content/renderer/compositor_bindings/scrollbar_impl.h"
 
 #include "base/logging.h"
 #include "third_party/WebKit/public/platform/WebScrollbar.h"
 #include "third_party/WebKit/public/platform/WebScrollbarThemeGeometry.h"
 
 using blink::WebScrollbar;
 
-namespace webkit {
+namespace content {
 
 ScrollbarImpl::ScrollbarImpl(
     scoped_ptr<WebScrollbar> scrollbar,
     blink::WebScrollbarThemePainter painter,
     scoped_ptr<blink::WebScrollbarThemeGeometry> geometry)
     : scrollbar_(scrollbar.Pass()),
       painter_(painter),
-      geometry_(geometry.Pass()) {}
+      geometry_(geometry.Pass()) {
+}
 
-ScrollbarImpl::~ScrollbarImpl() {}
+ScrollbarImpl::~ScrollbarImpl() {
+}
 
 cc::ScrollbarOrientation ScrollbarImpl::Orientation() const {
   if (scrollbar_->orientation() == WebScrollbar::Horizontal)
@@ -62,9 +64,9 @@ gfx::Rect ScrollbarImpl::TrackRect() const {
   return geometry_->trackRect(scrollbar_.get());
 }
 
-void ScrollbarImpl::PaintPart(
-    SkCanvas* canvas, cc::ScrollbarPart part,
-    const gfx::Rect& content_rect) {
+void ScrollbarImpl::PaintPart(SkCanvas* canvas,
+                              cc::ScrollbarPart part,
+                              const gfx::Rect& content_rect) {
   if (part == cc::THUMB) {
     painter_.paintThumb(canvas, content_rect);
     return;
@@ -84,8 +86,7 @@ void ScrollbarImpl::PaintPart(
 
     gfx::Rect forward_button_start_paint_rect =
         geometry_->forwardButtonStartRect(scrollbar_.get());
-    painter_.paintForwardButtonStart(canvas,
-                                      forward_button_start_paint_rect);
+    painter_.paintForwardButtonStart(canvas, forward_button_start_paint_rect);
 
     gfx::Rect forward_button_end_paint_rect =
         geometry_->forwardButtonEndRect(scrollbar_.get());
@@ -104,4 +105,5 @@ void ScrollbarImpl::PaintPart(
   painter_.paintTickmarks(canvas, track_paint_rect);
 }
 
-}  // namespace webkit
+}  // namespace content
+
diff --git a/...erer/compositor_bindings/scrollbar_impl.h → ...erer/compositor_bindings/scrollbar_impl.h b/...erer/compositor_bindings/scrollbar_impl.h → ...erer/compositor_bindings/scrollbar_impl.h
@@ -1,9 +1,9 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 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 WEBKIT_RENDERER_COMPOSITOR_BINDINGS_SCROLLBAR_IMPL_H_
-#define WEBKIT_RENDERER_COMPOSITOR_BINDINGS_SCROLLBAR_IMPL_H_
+#ifndef CONTENT_RENDERER_COMPOSITOR_BINDINGS_SCROLLBAR_IMPL_H_
+#define CONTENT_RENDERER_COMPOSITOR_BINDINGS_SCROLLBAR_IMPL_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
@@ -15,7 +15,7 @@ class WebScrollbar;
 class WebScrollbarThemeGeometry;
 }
 
-namespace webkit {
+namespace content {
 
 class ScrollbarImpl : public cc::Scrollbar {
  public:
@@ -45,6 +45,7 @@ class ScrollbarImpl : public cc::Scrollbar {
   DISALLOW_COPY_AND_ASSIGN(ScrollbarImpl);
 };
 
-}  // namespace webkit
+}  // namespace content
+
+#endif  // CONTENT_RENDERER_COMPOSITOR_BINDINGS_SCROLLBAR_IMPL_H_
 
-#endif  // WEBKIT_RENDERER_COMPOSITOR_BINDINGS_SCROLLBAR_IMPL_H_
diff --git a/...or_bindings/web_animation_curve_common.cc → ...or_bindings/web_animation_curve_common.cc b/...or_bindings/web_animation_curve_common.cc → ...or_bindings/web_animation_curve_common.cc
@@ -1,12 +1,12 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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 "webkit/renderer/compositor_bindings/web_animation_curve_common.h"
+#include "content/renderer/compositor_bindings/web_animation_curve_common.h"
 
 #include "cc/animation/timing_function.h"
 
-namespace webkit {
+namespace content {
 
 scoped_ptr<cc::TimingFunction> CreateTimingFunction(
     blink::WebAnimationCurve::TimingFunctionType type) {
@@ -25,4 +25,5 @@ scoped_ptr<cc::TimingFunction> CreateTimingFunction(
   return scoped_ptr<cc::TimingFunction>();
 }
 
-}  // namespace webkit
+}  // namespace content
+
diff --git a/content/renderer/compositor_bindings/web_animation_curve_common.h b/content/renderer/compositor_bindings/web_animation_curve_common.h
@@ -0,0 +1,21 @@
+// Copyright 2014 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 CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_ANIMATION_CURVE_COMMON_H_
+#define CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_ANIMATION_CURVE_COMMON_H_
+
+#include "base/memory/scoped_ptr.h"
+#include "third_party/WebKit/public/platform/WebAnimationCurve.h"
+
+namespace cc {
+class TimingFunction;
+}
+
+namespace content {
+scoped_ptr<cc::TimingFunction> CreateTimingFunction(
+    blink::WebAnimationCurve::TimingFunctionType);
+}  // namespace content
+
+#endif  // CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_ANIMATION_CURVE_COMMON_H_
+