Clean up cc and webkit/compositor_bindings include path shenanigans

This removes various include issues in cc/ and webkit/compositor_bindings/ to
normalize this code to chromium standards and make webkit/compositor_bindings/
more easily usable.  Changes include:

1.) Removing dead stub / test headers and include paths
2.) Removing complex rules designed to make the incantation '#include <public/WebBlah.h>' work
since all chromium code can do '#include "third_party/WebKit/Source/Platform/chromium/public/WebBlah.h"'
3.) Expand out WebKit API includes and sort correctly

BUG=144577

Review URL: https://codereview.chromium.org/11615020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173799 0039d316-1c4b-4281-b951-d872f2087c98

49 files changed, 102 insertions, 235 deletions

diff --git a/cc/DEPS b/cc/DEPS
index 6e68172..180348c 100644
--- a/cc/DEPS
+++ b/cc/DEPS
@@ -7,11 +7,5 @@ include_rules = [
   "+ui/gfx",
   "+ui/gl",
   # TODO(danakj): Drop dependencies on WebKit Platform API from cc.
-  "+third_party/WebKit/Source/Platform/chromium/public/WebCompositorOutputSurface.h",
-  "+third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h",
-  "+third_party/WebKit/Source/Platform/chromium/public/WebGraphicsMemoryAllocation.h",
-  "+third_party/WebKit/Source/Platform/chromium/public/WebImage.h",
-  "+third_party/WebKit/Source/Platform/chromium/public/WebRect.h",
-  "+third_party/WebKit/Source/Platform/chromium/public/WebScrollbar.h",
-  "+third_party/WebKit/Source/Platform/chromium/public/WebScrollbarThemeGeometry.h",
+  "+third_party/WebKit/Source/Platform/chromium/public",
 ]
diff --git a/cc/animation_curve.h b/cc/animation_curve.h
index 0629dea..e9ddfd9 100644
--- a/cc/animation_curve.h
+++ b/cc/animation_curve.h
@@ -5,10 +5,9 @@
 #ifndef CC_ANIMATION_CURVE_H_
 #define CC_ANIMATION_CURVE_H_
 
-#include <public/WebTransformationMatrix.h>
-
 #include "base/memory/scoped_ptr.h"
 #include "cc/cc_export.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebTransformationMatrix.h"
 
 namespace cc {
 
diff --git a/cc/cc.gyp b/cc/cc.gyp
index 7caacff..4c3b540 100644
--- a/cc/cc.gyp
+++ b/cc/cc.gyp
@@ -286,14 +286,25 @@
       'yuv_video_draw_quad.cc',
       'yuv_video_draw_quad.h',
     ],
+    'conditions': [
+      ['inside_chromium_build==1', {
+        'webkit_src_dir': '<(DEPTH)/third_party/WebKit',
+      }, {
+        'webkit_src_dir': '<(DEPTH)/../../..',
+      }],
+    ],
   },
+  'conditions': [
+    ['inside_chromium_build==0', {
+      'defines': [
+        'INSIDE_WEBKIT_BUILD=1',
+      ],
+    }],
+  ],
   'targets': [
     {
       'target_name': 'cc',
       'type': '<(component)',
-      'includes': [
-        'cc.gypi',
-      ],
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
@@ -306,18 +317,14 @@
       'defines': [
         'CC_IMPLEMENTATION=1',
       ],
-      'include_dirs': [
-        '<(webkit_src_dir)/Source/Platform/chromium',
-        '<@(cc_stubs_dirs)',
-      ],
       'sources': [
         '<@(cc_source_files)',
       ],
       'all_dependent_settings': {
         'include_dirs': [
-          # Needed for <public/WebTransformationMatrix.h> in layer.h
-          '<(webkit_src_dir)/Source/Platform/chromium',
-        ],
+          # TODO(jamesr): Remove once https://webkit.org/b/105259 lands + rolls
+          '<(webkit_src_dir)/Source/Platform/chromium'
+        ]
       }
     },
   ],
diff --git a/cc/cc.gypi b/cc/cc.gypi
deleted file mode 100644
index 492c63b..0000000
--- a/cc/cc.gypi
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright (c) 2012 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': {
-    'variables': {
-      'conditions': [
-        ['inside_chromium_build==1', {
-          'webkit_src_dir': '<(DEPTH)/third_party/WebKit',
-        }, {
-          'webkit_src_dir': '<(DEPTH)/../../..',
-        }],
-      ],
-    },
-    'webkit_src_dir': '<(webkit_src_dir)',
-    'conditions': [
-      ['inside_chromium_build==1', {
-        'cc_stubs_dirs': [],
-      }, {
-        'cc_stubs_dirs': [
-          '<(SHARED_INTERMEDIATE_DIR)/webkit',
-          '<(webkit_src_dir)',
-          '<(webkit_src_dir)/Source/WebCore/platform',
-          '<(webkit_src_dir)/Source/WebCore/platform/animation',
-          '<(webkit_src_dir)/Source/WebCore/platform/chromium',
-          '<(webkit_src_dir)/Source/WebCore/platform/graphics',
-          '<(webkit_src_dir)/Source/WebCore/platform/graphics/chromium',
-          '<(webkit_src_dir)/Source/WebCore/platform/graphics/filters',
-          '<(webkit_src_dir)/Source/WebCore/platform/graphics/gpu',
-          '<(webkit_src_dir)/Source/WebCore/platform/graphics/skia',
-          '<(webkit_src_dir)/Source/WebCore/platform/graphics/transforms',
-          '<(webkit_src_dir)/Source/WebCore/rendering',
-          '<(webkit_src_dir)/Source/WebCore/rendering/style',
-        ],
-      }],
-    ],
-  },
-  'conditions': [
-    ['inside_chromium_build==0', {
-      'defines': [
-        'INSIDE_WEBKIT_BUILD=1',
-      ],
-    }],
-  ],
-}
diff --git a/cc/damage_tracker.cc b/cc/damage_tracker.cc
index 0a9e9c2..ad433e9 100644
--- a/cc/damage_tracker.cc
+++ b/cc/damage_tracker.cc
@@ -8,7 +8,7 @@
 #include "cc/layer_tree_host_common.h"
 #include "cc/math_util.h"
 #include "cc/render_surface_impl.h"
-#include <public/WebFilterOperations.h>
+#include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h"
 
 namespace cc {
 
diff --git a/cc/damage_tracker_unittest.cc b/cc/damage_tracker_unittest.cc
index cc7ee49..1d81e58 100644
--- a/cc/damage_tracker_unittest.cc
+++ b/cc/damage_tracker_unittest.cc
@@ -12,10 +12,10 @@
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "cc/test/geometry_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperation.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h"
 #include "third_party/skia/include/effects/SkBlurImageFilter.h"
 #include "ui/gfx/quad_f.h"
-#include <public/WebFilterOperation.h>
-#include <public/WebFilterOperations.h>
 
 using namespace WebKit;
 
diff --git a/cc/geometry_binding.cc b/cc/geometry_binding.cc
index e90fa52..e69e537 100644
--- a/cc/geometry_binding.cc
+++ b/cc/geometry_binding.cc
@@ -5,9 +5,9 @@
 #include "cc/geometry_binding.h"
 
 #include "cc/gl_renderer.h" // For the GLC() macro.
+#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "ui/gfx/rect_f.h"
-#include <public/WebGraphicsContext3D.h>
 
 namespace cc {
 
diff --git a/cc/gl_renderer.cc b/cc/gl_renderer.cc
index bb4ec4d..e9f8254 100644
--- a/cc/gl_renderer.cc
+++ b/cc/gl_renderer.cc
@@ -4,6 +4,10 @@
 
 #include "cc/gl_renderer.h"
 
+#include <set>
+#include <string>
+#include <vector>
+
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/string_split.h"
@@ -25,6 +29,8 @@
 #include "cc/stream_video_draw_quad.h"
 #include "cc/texture_draw_quad.h"
 #include "cc/video_layer_impl.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebSharedGraphicsContext3D.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ -35,11 +41,6 @@
 #include "third_party/skia/include/gpu/SkGrTexturePixelRef.h"
 #include "ui/gfx/quad_f.h"
 #include "ui/gfx/rect_conversions.h"
-#include <public/WebGraphicsContext3D.h>
-#include <public/WebSharedGraphicsContext3D.h>
-#include <set>
-#include <string>
-#include <vector>
 
 using namespace std;
 using WebKit::WebGraphicsContext3D;
diff --git a/cc/keyframed_animation_curve.h b/cc/keyframed_animation_curve.h
index 20ee626..5685eb8 100644
--- a/cc/keyframed_animation_curve.h
+++ b/cc/keyframed_animation_curve.h
@@ -9,7 +9,7 @@
 #include "cc/cc_export.h"
 #include "cc/scoped_ptr_vector.h"
 #include "cc/timing_function.h"
-#include <public/WebTransformOperations.h>
+#include "third_party/WebKit/Source/Platform/chromium/public/WebTransformOperations.h"
 
 namespace cc {
 
diff --git a/cc/keyframed_animation_curve_unittest.cc b/cc/keyframed_animation_curve_unittest.cc
index 6e6eea9..0a0efdd 100644
--- a/cc/keyframed_animation_curve_unittest.cc
+++ b/cc/keyframed_animation_curve_unittest.cc
@@ -6,8 +6,8 @@
 
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include <public/WebTransformOperations.h>
-#include <public/WebTransformationMatrix.h>
+#include "third_party/WebKit/Source/Platform/chromium/public/WebTransformOperations.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebTransformationMatrix.h"
 
 using WebKit::WebTransformationMatrix;
 
diff --git a/cc/layer.cc b/cc/layer.cc
index 51f4a59..b277735 100644
--- a/cc/layer.cc
+++ b/cc/layer.cc
@@ -9,11 +9,11 @@
 #include "cc/layer_animation_controller.h"
 #include "cc/layer_impl.h"
 #include "cc/layer_tree_host.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebAnimationDelegate.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebLayerScrollClient.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
 #include "third_party/skia/include/core/SkImageFilter.h"
 #include "ui/gfx/rect_conversions.h"
-#include <public/WebAnimationDelegate.h>
-#include <public/WebLayerScrollClient.h>
-#include <public/WebSize.h>
 
 using namespace std;
 
diff --git a/cc/layer.h b/cc/layer.h
index adca3b2..87839b4 100644
--- a/cc/layer.h
+++ b/cc/layer.h
@@ -5,7 +5,6 @@
 #ifndef CC_LAYER_H_
 #define CC_LAYER_H_
 
-#include <public/WebFilterOperations.h>
 #include <string>
 #include <vector>
 
@@ -19,6 +18,7 @@
 #include "cc/region.h"
 #include "cc/render_surface.h"
 #include "skia/ext/refptr.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkImageFilter.h"
 #include "ui/gfx/rect.h"
diff --git a/cc/layer_impl.h b/cc/layer_impl.h
index 3d7ab85..b767d9e 100644
--- a/cc/layer_impl.h
+++ b/cc/layer_impl.h
@@ -5,7 +5,6 @@
 #ifndef CC_LAYER_IMPL_H_
 #define CC_LAYER_IMPL_H_
 
-#include <public/WebFilterOperations.h>
 #include <string>
 
 #include "base/logging.h"
@@ -21,6 +20,7 @@
 #include "cc/scoped_ptr_vector.h"
 #include "cc/shared_quad_state.h"
 #include "skia/ext/refptr.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkImageFilter.h"
 #include "ui/gfx/rect.h"
diff --git a/cc/layer_impl_unittest.cc b/cc/layer_impl_unittest.cc
index 68a2fe0..8d7cd9a 100644
--- a/cc/layer_impl_unittest.cc
+++ b/cc/layer_impl_unittest.cc
@@ -9,9 +9,9 @@
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperation.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h"
 #include "third_party/skia/include/effects/SkBlurImageFilter.h"
-#include <public/WebFilterOperation.h>
-#include <public/WebFilterOperations.h>
 
 using namespace WebKit;
 
diff --git a/cc/layer_tree_host_impl_unittest.cc b/cc/layer_tree_host_impl_unittest.cc
index 3a60455..fe3e44b 100644
--- a/cc/layer_tree_host_impl_unittest.cc
+++ b/cc/layer_tree_host_impl_unittest.cc
@@ -41,10 +41,10 @@
 #include "media/base/video_frame.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebVideoFrame.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebVideoFrameProvider.h"
 #include "ui/gfx/size_conversions.h"
 #include "ui/gfx/vector2d_conversions.h"
-#include <public/WebVideoFrame.h>
-#include <public/WebVideoFrameProvider.h>
 
 using media::VideoFrame;
 using ::testing::Mock;
diff --git a/cc/layer_tree_host_unittest.cc b/cc/layer_tree_host_unittest.cc
index f2bf6dd..3d4f81b 100644
--- a/cc/layer_tree_host_unittest.cc
+++ b/cc/layer_tree_host_unittest.cc
@@ -18,17 +18,17 @@
 #include "cc/test/fake_proxy.h"
 #include "cc/test/geometry_test_utils.h"
 #include "cc/test/layer_tree_test_common.h"
-#include "cc/test/occlusion_tracker_test_common.h"
 #include "cc/resource_update_queue.h"
+#include "cc/test/occlusion_tracker_test_common.h"
 #include "cc/timing_function.h"
 #include "testing/gmock/include/gmock/gmock.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebLayerScrollClient.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
 #include "ui/gfx/point_conversions.h"
 #include "ui/gfx/size_conversions.h"
 #include "ui/gfx/vector2d_conversions.h"
-#include <public/WebLayerScrollClient.h>
-#include <public/WebSize.h>
 
 namespace cc {
 namespace {
diff --git a/cc/occlusion_tracker_unittest.cc b/cc/occlusion_tracker_unittest.cc
index 3aacde0..bc1b4cd 100644
--- a/cc/occlusion_tracker_unittest.cc
+++ b/cc/occlusion_tracker_unittest.cc
@@ -4,9 +4,6 @@
 
 #include "cc/occlusion_tracker.h"
 
-#include <public/WebFilterOperation.h>
-#include <public/WebFilterOperations.h>
-
 #include "cc/layer.h"
 #include "cc/layer_animation_controller.h"
 #include "cc/layer_impl.h"
@@ -21,6 +18,8 @@
 #include "cc/test/occlusion_tracker_test_common.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperation.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h"
 #include "ui/gfx/transform.h"
 
 namespace cc {
diff --git a/cc/platform_color.h b/cc/platform_color.h
index 0a75740..8706114 100644
--- a/cc/platform_color.h
+++ b/cc/platform_color.h
@@ -5,10 +5,10 @@
 #ifndef CC_PLATFORM_COLOR_H_
 #define CC_PLATFORM_COLOR_H_
 
+#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
 #include "third_party/skia/include/core/SkTypes.h"
-#include <public/WebGraphicsContext3D.h>
 
 namespace cc {
 
diff --git a/cc/program_binding.cc b/cc/program_binding.cc
index bf053c5..8e92e98 100644
--- a/cc/program_binding.cc
+++ b/cc/program_binding.cc
@@ -7,8 +7,8 @@
 #include "base/debug/trace_event.h"
 #include "cc/geometry_binding.h"
 #include "cc/gl_renderer.h" // For the GLC() macro.
+#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
 #include "third_party/khronos/GLES2/gl2.h"
-#include <public/WebGraphicsContext3D.h>
 
 using WebKit::WebGraphicsContext3D;
 
diff --git a/cc/rate_limiter.cc b/cc/rate_limiter.cc
index 7f40bb2..2c5cbab 100644
--- a/cc/rate_limiter.cc
+++ b/cc/rate_limiter.cc
@@ -6,7 +6,7 @@
 
 #include "base/debug/trace_event.h"
 #include "cc/thread.h"
-#include <public/WebGraphicsContext3D.h>
+#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
 
 namespace cc {
 
diff --git a/cc/render_pass.h b/cc/render_pass.h
index a7e685f..3d100d9 100644
--- a/cc/render_pass.h
+++ b/cc/render_pass.h
@@ -5,7 +5,6 @@
 #ifndef CC_RENDER_PASS_H_
 #define CC_RENDER_PASS_H_
 
-#include <public/WebFilterOperations.h>
 #include <vector>
 
 #include "base/basictypes.h"
@@ -16,6 +15,7 @@
 #include "cc/scoped_ptr_vector.h"
 #include "cc/shared_quad_state.h"
 #include "skia/ext/refptr.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkImageFilter.h"
 #include "ui/gfx/rect_f.h"
diff --git a/cc/render_pass_unittest.cc b/cc/render_pass_unittest.cc
index 2feaba8..56e99d1 100644
--- a/cc/render_pass_unittest.cc
+++ b/cc/render_pass_unittest.cc
@@ -4,13 +4,12 @@
 
 #include "cc/render_pass.h"
 
-#include <public/WebFilterOperations.h>
-
 #include "cc/checkerboard_draw_quad.h"
 #include "cc/math_util.h"
 #include "cc/test/geometry_test_utils.h"
 #include "cc/test/render_pass_test_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h"
 #include "third_party/skia/include/effects/SkBlurImageFilter.h"
 #include "ui/gfx/transform.h"
 
diff --git a/cc/render_surface_filters.cc b/cc/render_surface_filters.cc
index 9fdf727..fe4fac7 100644
--- a/cc/render_surface_filters.cc
+++ b/cc/render_surface_filters.cc
@@ -6,6 +6,9 @@
 
 #include "base/logging.h"
 #include "skia/ext/refptr.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperation.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/effects/SkBlurImageFilter.h"
 #include "third_party/skia/include/effects/SkColorMatrixFilter.h"
@@ -13,9 +16,6 @@
 #include "third_party/skia/include/gpu/SkGpuDevice.h"
 #include "third_party/skia/include/gpu/SkGrPixelRef.h"
 #include "ui/gfx/size_f.h"
-#include <public/WebFilterOperation.h>
-#include <public/WebFilterOperations.h>
-#include <public/WebGraphicsContext3D.h>
 
 namespace cc {
 
diff --git a/cc/render_surface_filters_unittest.cc b/cc/render_surface_filters_unittest.cc
index 17d3ab7..123b344 100644
--- a/cc/render_surface_filters_unittest.cc
+++ b/cc/render_surface_filters_unittest.cc
@@ -6,8 +6,8 @@
 
 #include "cc/test/compositor_fake_web_graphics_context_3d.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include <public/WebFilterOperation.h>
-#include <public/WebFilterOperations.h>
+#include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperation.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h"
 
 using namespace WebKit;
 
diff --git a/cc/resource_provider.cc b/cc/resource_provider.cc
index c2b44d2..2cbafae 100644
--- a/cc/resource_provider.cc
+++ b/cc/resource_provider.cc
@@ -15,13 +15,12 @@
 #include "cc/platform_color.h"
 #include "cc/texture_uploader.h"
 #include "cc/transferable_resource.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/vector2d.h"
 
-#include <public/WebGraphicsContext3D.h>
-
 using WebKit::WebGraphicsContext3D;
 
 namespace cc {
diff --git a/cc/resource_update_controller.cc b/cc/resource_update_controller.cc
index 44e8abe..d1ba4cf 100644
--- a/cc/resource_update_controller.cc
+++ b/cc/resource_update_controller.cc
@@ -4,17 +4,18 @@
 
 #include "cc/resource_update_controller.h"
 
+#include <limits>
+
 #include "base/debug/trace_event.h"
 #include "cc/prioritized_resource.h"
 #include "cc/resource_provider.h"
 #include "cc/texture_copier.h"
 #include "cc/thread.h"
 #include "skia/ext/refptr.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebSharedGraphicsContext3D.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/skia/include/gpu/SkGpuDevice.h"
-#include <limits>
-#include <public/WebGraphicsContext3D.h>
-#include <public/WebSharedGraphicsContext3D.h>
 
 using WebKit::WebGraphicsContext3D;
 using WebKit::WebSharedGraphicsContext3D;
diff --git a/cc/scrollbar_geometry_fixed_thumb.cc b/cc/scrollbar_geometry_fixed_thumb.cc
index 2c38049..4ca9f44 100644
--- a/cc/scrollbar_geometry_fixed_thumb.cc
+++ b/cc/scrollbar_geometry_fixed_thumb.cc
@@ -5,8 +5,9 @@
 #include "cc/scrollbar_geometry_fixed_thumb.h"
 
 #include <cmath>
-#include <public/WebRect.h>
-#include <public/WebScrollbar.h>
+
+#include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebScrollbar.h"
 
 using WebKit::WebRect;
 using WebKit::WebScrollbar;
diff --git a/cc/scrollbar_geometry_stub.h b/cc/scrollbar_geometry_stub.h
index 597883a..b5eba81 100644
--- a/cc/scrollbar_geometry_stub.h
+++ b/cc/scrollbar_geometry_stub.h
@@ -7,7 +7,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/cc_export.h"
-#include <public/WebScrollbarThemeGeometry.h>
+#include "third_party/WebKit/Source/Platform/chromium/public/WebScrollbarThemeGeometry.h"
 
 namespace cc {
 
diff --git a/cc/scrollbar_layer_impl.h b/cc/scrollbar_layer_impl.h
index e6c80db..116b24a 100644
--- a/cc/scrollbar_layer_impl.h
+++ b/cc/scrollbar_layer_impl.h
@@ -8,8 +8,8 @@
 #include "cc/cc_export.h"
 #include "cc/scrollbar_geometry_fixed_thumb.h"
 #include "cc/scrollbar_layer_impl_base.h"
-#include <public/WebRect.h>
-#include <public/WebVector.h>
+#include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h"
 
 namespace cc {
 
diff --git a/cc/scrollbar_layer_impl_base.h b/cc/scrollbar_layer_impl_base.h
index 4a0f54a..c28c570 100644
--- a/cc/scrollbar_layer_impl_base.h
+++ b/cc/scrollbar_layer_impl_base.h
@@ -7,7 +7,7 @@
 
 #include "cc/cc_export.h"
 #include "cc/layer_impl.h"
-#include <public/WebScrollbar.h>
+#include "third_party/WebKit/Source/Platform/chromium/public/WebScrollbar.h"
 
 namespace cc {
 
diff --git a/cc/scrollbar_layer_unittest.cc b/cc/scrollbar_layer_unittest.cc
index e32f5e7..02297e0 100644
--- a/cc/scrollbar_layer_unittest.cc
+++ b/cc/scrollbar_layer_unittest.cc
@@ -15,6 +15,7 @@
 #include "cc/test/layer_tree_test_common.h"
 #include "cc/tree_synchronizer.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebScrollbar.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebScrollbarThemeGeometry.h"
 
 namespace cc {
diff --git a/cc/shader.cc b/cc/shader.cc
index 1aa9a3e..c524231 100644
--- a/cc/shader.cc
+++ b/cc/shader.cc
@@ -6,7 +6,7 @@
 
 #include "base/basictypes.h"
 #include "base/logging.h"
-#include <public/WebGraphicsContext3D.h>
+#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
 
 #define SHADER0(Src) #Src
 #define SHADER(Src) SHADER0(Src)
diff --git a/cc/software_renderer.cc b/cc/software_renderer.cc
index 9ebd780..3aef949 100644
--- a/cc/software_renderer.cc
+++ b/cc/software_renderer.cc
@@ -4,8 +4,6 @@
 
 #include "cc/software_renderer.h"
 
-#include <public/WebImage.h>
-
 #include "base/debug/trace_event.h"
 #include "cc/debug_border_draw_quad.h"
 #include "cc/math_util.h"
@@ -14,6 +12,7 @@
 #include "cc/solid_color_draw_quad.h"
 #include "cc/texture_draw_quad.h"
 #include "cc/tile_draw_quad.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebImage.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkMatrix.h"
diff --git a/cc/test/animation_test_common.cc b/cc/test/animation_test_common.cc
index 62b0de8..9920751 100644
--- a/cc/test/animation_test_common.cc
+++ b/cc/test/animation_test_common.cc
@@ -8,7 +8,7 @@
 #include "cc/layer.h"
 #include "cc/layer_animation_controller.h"
 #include "cc/layer_impl.h"
-#include <public/WebTransformOperations.h>
+#include "third_party/WebKit/Source/Platform/chromium/public/WebTransformOperations.h"
 
 using cc::ActiveAnimation;
 using cc::AnimationCurve;
diff --git a/cc/test/fake_web_graphics_context_3d.h b/cc/test/fake_web_graphics_context_3d.h
index 8ef6cb97..936edad 100644
--- a/cc/test/fake_web_graphics_context_3d.h
+++ b/cc/test/fake_web_graphics_context_3d.h
@@ -5,8 +5,8 @@
 #ifndef CC_TEST_FAKE_WEB_GRAPHICS_CONTEXT_3D_H_
 #define CC_TEST_FAKE_WEB_GRAPHICS_CONTEXT_3D_H_
 
+#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
 #include "third_party/khronos/GLES2/gl2.h"
-#include <public/WebGraphicsContext3D.h>
 
 namespace cc {
 
diff --git a/cc/test/fake_web_scrollbar_theme_geometry.h b/cc/test/fake_web_scrollbar_theme_geometry.h
index 2138bff..45bd1b7 100644
--- a/cc/test/fake_web_scrollbar_theme_geometry.h
+++ b/cc/test/fake_web_scrollbar_theme_geometry.h
@@ -6,7 +6,7 @@
 #define CC_TEST_FAKE_WEB_SCROLLBAR_THEME_GEOMETRY_H_
 
 #include "base/memory/scoped_ptr.h"
-#include <public/WebScrollbarThemeGeometry.h>
+#include "third_party/WebKit/Source/Platform/chromium/public/WebScrollbarThemeGeometry.h"
 
 namespace cc {
 
diff --git a/cc/test/geometry_test_utils.cc b/cc/test/geometry_test_utils.cc
index 35cd0dd..bed04c4 100644
--- a/cc/test/geometry_test_utils.cc
+++ b/cc/test/geometry_test_utils.cc
@@ -4,9 +4,8 @@
 
 #include "cc/test/geometry_test_utils.h"
 
-#include <public/WebTransformationMatrix.h>
-
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebTransformationMatrix.h"
 #include "ui/gfx/transform.h"
 
 namespace cc {
diff --git a/cc/test/layer_tree_test_common.cc b/cc/test/layer_tree_test_common.cc
index e889f64..df413e8 100644
--- a/cc/test/layer_tree_test_common.cc
+++ b/cc/test/layer_tree_test_common.cc
@@ -23,8 +23,8 @@
 #include "cc/test/tiled_layer_test_common.h"
 #include "cc/timing_function.h"
 #include "testing/gmock/include/gmock/gmock.h"
-#include <public/WebFilterOperation.h>
-#include <public/WebFilterOperations.h>
+#include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperation.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h"
 
 using namespace WebKit;
 
diff --git a/cc/test/layer_tree_test_common.h b/cc/test/layer_tree_test_common.h
index a8bab9d..0de3449 100644
--- a/cc/test/layer_tree_test_common.h
+++ b/cc/test/layer_tree_test_common.h
@@ -13,7 +13,7 @@
 #include "cc/scoped_thread_proxy.h"
 #include "cc/test/compositor_fake_web_graphics_context_3d.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include <public/WebAnimationDelegate.h>
+#include "third_party/WebKit/Source/Platform/chromium/public/WebAnimationDelegate.h"
 
 namespace cc {
 class LayerImpl;
diff --git a/cc/texture_copier.cc b/cc/texture_copier.cc
index 5bb4e1b..0b45798 100644
--- a/cc/texture_copier.cc
+++ b/cc/texture_copier.cc
@@ -7,8 +7,8 @@
 #include "base/debug/trace_event.h"
 #include "build/build_config.h"
 #include "cc/gl_renderer.h" // For the GLC() macro.
+#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
 #include "third_party/khronos/GLES2/gl2.h"
-#include <public/WebGraphicsContext3D.h>
 
 namespace cc {
 
diff --git a/cc/texture_uploader.cc b/cc/texture_uploader.cc
index bac2871..0dbeb7c 100644
--- a/cc/texture_uploader.cc
+++ b/cc/texture_uploader.cc
@@ -13,11 +13,11 @@
 #include "cc/prioritized_resource.h"
 #include "cc/resource.h"
 #include "cc/util.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/vector2d.h"
-#include <public/WebGraphicsContext3D.h>
 
 namespace {
 
diff --git a/cc/thread_proxy.cc b/cc/thread_proxy.cc
index f45c090..1717502 100644
--- a/cc/thread_proxy.cc
+++ b/cc/thread_proxy.cc
@@ -15,7 +15,7 @@
 #include "cc/scheduler.h"
 #include "cc/scoped_thread_proxy.h"
 #include "cc/thread.h"
-#include <public/WebSharedGraphicsContext3D.h>
+#include "third_party/WebKit/Source/Platform/chromium/public/WebSharedGraphicsContext3D.h"
 
 using WebKit::WebSharedGraphicsContext3D;
 
diff --git a/cc/video_layer_impl.h b/cc/video_layer_impl.h
index 9c9605e..06c0263 100644
--- a/cc/video_layer_impl.h
+++ b/cc/video_layer_impl.h
@@ -5,13 +5,12 @@
 #ifndef CC_VIDEO_LAYER_IMPL_H_
 #define CC_VIDEO_LAYER_IMPL_H_
 
-#include <public/WebVideoFrameProvider.h>
-
 #include "base/callback.h"
 #include "base/synchronization/lock.h"
 #include "cc/cc_export.h"
 #include "cc/layer_impl.h"
 #include "media/base/video_frame.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebVideoFrameProvider.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/transform.h"
diff --git a/webkit/compositor_bindings/compositor_bindings.gyp b/webkit/compositor_bindings/compositor_bindings.gyp
index 67c3f03..e9fae16 100644
--- a/webkit/compositor_bindings/compositor_bindings.gyp
+++ b/webkit/compositor_bindings/compositor_bindings.gyp
@@ -59,34 +59,20 @@
         'web_compositor_support_impl.cc',
         'web_compositor_support_impl.h',
       ],
-      'includes': [
-        '../../cc/cc.gypi',
-      ],
       'include_dirs': [
         '../..',
-        '../../cc',
         '<(SHARED_INTERMEDIATE_DIR)/webkit',
-        '<(webkit_src_dir)/Source/Platform/chromium',
-        '<@(cc_stubs_dirs)',
       ],
     },
     {
       'target_name': 'webkit_compositor_bindings',
       'type': 'static_library',
-      'includes': [
-        '../../cc/cc.gypi',
-      ],
       'dependencies': [
         '../../base/base.gyp:base',
         '../../cc/cc.gyp:cc',
         '../../skia/skia.gyp:skia',
         '../../ui/ui.gyp:ui',
       ],
-      'include_dirs': [
-        '../../cc',
-        '<@(cc_stubs_dirs)',
-        '<(webkit_src_dir)/Source/Platform/chromium',
-      ],
       'sources': [
         '<@(webkit_compositor_bindings_sources)',
       ],
diff --git a/webkit/compositor_bindings/compositor_bindings_tests.gyp b/webkit/compositor_bindings/compositor_bindings_tests.gyp
index b716729..e26474d 100644
--- a/webkit/compositor_bindings/compositor_bindings_tests.gyp
+++ b/webkit/compositor_bindings/compositor_bindings_tests.gyp
@@ -13,7 +13,6 @@
       'web_transform_animation_curve_unittest.cc',
       'web_transform_operations_unittest.cc',
       'web_transformation_matrix_unittest.cc',
-      'test/fake_web_scrollbar_theme_geometry.h',
       'test/web_layer_tree_view_test_common.h',
     ],
   },
@@ -35,12 +34,7 @@
         'test/run_all_unittests.cc',
       ],
       'include_dirs': [
-        '.',
-        'test',
-        '<(DEPTH)/cc',
-        '<(DEPTH)/cc/stubs',
-        '<(DEPTH)/cc/test',
-        '../../third_party/WebKit/Source/Platform/chromium'
+        '../..'
       ],
       'conditions': [
         ['OS == "android" and gtest_target_type == "shared_library"', {
diff --git a/webkit/compositor_bindings/stubs/public/WebTransformationMatrix.h b/webkit/compositor_bindings/stubs/public/WebTransformationMatrix.h
deleted file mode 100644
index 7ad4a30..0000000
--- a/webkit/compositor_bindings/stubs/public/WebTransformationMatrix.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2012 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_COMPOSITOR_STUBS_WEBTRANSFORMATIONMATRIX_H_
-#define WEBKIT_COMPOSITOR_STUBS_WEBTRANSFORMATIONMATRIX_H_
-
-#include <public/WebCommon.h>
-
-#undef WEBKIT_IMPLEMENTATION
-#include "third_party/WebKit/Source/Platform/chromium/public/WebTransformationMatrix.h"
-#undef WEBKIT_IMPLEMENTATION
-#define WEBKIT_IMPLEMENTATION 1
-
-#endif // WEBKIT_COMPOSITOR_STUBS_WEBTRANSFORMATIONMATRIX_H_
diff --git a/webkit/compositor_bindings/test/fake_web_scrollbar_theme_geometry.h b/webkit/compositor_bindings/test/fake_web_scrollbar_theme_geometry.h
deleted file mode 100644
index 640da26..0000000
--- a/webkit/compositor_bindings/test/fake_web_scrollbar_theme_geometry.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2012 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 FakeWebScrollbarThemeGeometry_h
-#define FakeWebScrollbarThemeGeometry_h
-
-#include <public/WebScrollbarThemeGeometry.h>
-#include <wtf/PassOwnPtr.h>
-
-namespace WebKit {
-
-class FakeWebScrollbarThemeGeometry : public WebKit::WebScrollbarThemeGeometry {
-public:
-    static PassOwnPtr<WebKit::WebScrollbarThemeGeometry> create() { return adoptPtr(new WebKit::FakeWebScrollbarThemeGeometry()); }
-
-    virtual WebKit::WebScrollbarThemeGeometry* clone() const OVERRIDE
-    {
-        return new FakeWebScrollbarThemeGeometry();
-    }
-
-    virtual int thumbPosition(WebScrollbar*) OVERRIDE { return 0; }
-    virtual int thumbLength(WebScrollbar*) OVERRIDE { return 0; }
-    virtual int trackPosition(WebScrollbar*) OVERRIDE { return 0; }
-    virtual int trackLength(WebScrollbar*) OVERRIDE { return 0; }
-    virtual bool hasButtons(WebScrollbar*) OVERRIDE { return false; }
-    virtual bool hasThumb(WebScrollbar*) OVERRIDE { return false; }
-    virtual WebRect trackRect(WebScrollbar*) OVERRIDE { return WebRect(); }
-    virtual WebRect thumbRect(WebScrollbar*) OVERRIDE { return WebRect(); }
-    virtual int minimumThumbLength(WebScrollbar*) OVERRIDE { return 0; }
-    virtual int scrollbarThickness(WebScrollbar*) OVERRIDE { return 0; }
-    virtual WebRect backButtonStartRect(WebScrollbar*) OVERRIDE { return WebRect(); }
-    virtual WebRect backButtonEndRect(WebScrollbar*) OVERRIDE { return WebRect(); }
-    virtual WebRect forwardButtonStartRect(WebScrollbar*) OVERRIDE { return WebRect(); }
-    virtual WebRect forwardButtonEndRect(WebScrollbar*) OVERRIDE { return WebRect(); }
-    virtual WebRect constrainTrackRectToTrackPieces(WebScrollbar*, const WebRect&) OVERRIDE { return WebRect(); }
-
-    virtual void splitTrack(WebScrollbar*, const WebRect& track, WebRect& startTrack, WebRect& thumb, WebRect& endTrack) OVERRIDE
-    {
-        startTrack = WebRect();
-        thumb = WebRect();
-        endTrack = WebRect();
-    }
-};
-
-} // namespace WebKit
-
-#endif // FakeWebScrollbarThemeGeometry_h
diff --git a/webkit/compositor_bindings/test/web_layer_tree_view_test_common.h b/webkit/compositor_bindings/test/web_layer_tree_view_test_common.h
index 276534c..b000155 100644
--- a/webkit/compositor_bindings/test/web_layer_tree_view_test_common.h
+++ b/webkit/compositor_bindings/test/web_layer_tree_view_test_common.h
@@ -7,8 +7,8 @@
 
 #include "cc/test/compositor_fake_web_graphics_context_3d.h"
 #include "cc/test/fake_output_surface.h"
-#include <gmock/gmock.h>
-#include <public/WebLayerTreeViewClient.h>
+#include "testing/gmock/include/gmock/gmock.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeViewClient.h"
 
 namespace WebKit {
 
diff --git a/webkit/compositor_bindings/web_layer_unittest.cc b/webkit/compositor_bindings/web_layer_unittest.cc
index 04ae172..b323392 100644
--- a/webkit/compositor_bindings/web_layer_unittest.cc
+++ b/webkit/compositor_bindings/web_layer_unittest.cc
@@ -2,26 +2,24 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <public/WebLayer.h>
-
-#include "cc/thread.h"
 #include "cc/test/compositor_fake_web_graphics_context_3d.h"
-#include "web_layer_impl.h"
-#include "web_layer_tree_view_impl.h"
-#include "web_layer_tree_view_test_common.h"
-#include <public/WebContentLayer.h>
-#include <public/WebContentLayerClient.h>
-#include <public/WebExternalTextureLayer.h>
-#include <public/WebFloatPoint.h>
-#include <public/WebFloatRect.h>
-#include <public/WebLayerScrollClient.h>
-#include <public/WebLayerTreeView.h>
-#include <public/WebLayerTreeViewClient.h>
-#include <public/WebRect.h>
-#include <public/WebSize.h>
-#include <public/WebSolidColorLayer.h>
-
-#include <gmock/gmock.h>
+#include "cc/thread.h"
+#include "testing/gmock/include/gmock/gmock.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebContentLayer.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebContentLayerClient.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebExternalTextureLayer.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebLayer.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebLayerScrollClient.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeView.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeViewClient.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebSolidColorLayer.h"
+#include "webkit/compositor_bindings/test/web_layer_tree_view_test_common.h"
+#include "webkit/compositor_bindings/web_layer_impl.h"
+#include "webkit/compositor_bindings/web_layer_tree_view_impl.h"
 
 using namespace WebKit;
 using testing::AnyNumber;