cc: Fix the include paths to skia header files.
BUG=155413
TEST=cc_unittests
[email protected],[email protected]
Review URL: https://chromiumcodereview.appspot.com/11146031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162088 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/cc/bitmap_skpicture_canvas_layer_texture_updater.cc b/cc/bitmap_skpicture_canvas_layer_texture_updater.cc
index 4469380f..762814e6 100644
--- a/cc/bitmap_skpicture_canvas_layer_texture_updater.cc
+++ b/cc/bitmap_skpicture_canvas_layer_texture_updater.cc
@@ -11,8 +11,8 @@
#include "CCTextureUpdateQueue.h"
#include "LayerPainterChromium.h"
#include "PlatformColor.h"
-#include "SkCanvas.h"
-#include "SkDevice.h"
+#include "third_party/skia/include/core/SkCanvas.h"
+#include "third_party/skia/include/core/SkDevice.h"
#include <wtf/CurrentTime.h>
namespace cc {
diff --git a/cc/bitmap_skpicture_canvas_layer_texture_updater.h b/cc/bitmap_skpicture_canvas_layer_texture_updater.h
index aaa187b07..29d59517 100644
--- a/cc/bitmap_skpicture_canvas_layer_texture_updater.h
+++ b/cc/bitmap_skpicture_canvas_layer_texture_updater.h
@@ -6,7 +6,7 @@
#ifndef BitmapSkPictureCanvasLayerTextureUpdater_h
#define BitmapSkPictureCanvasLayerTextureUpdater_h
-#include "SkBitmap.h"
+#include "third_party/skia/include/core/SkBitmap.h"
#include "SkPictureCanvasLayerTextureUpdater.h"
namespace cc {
diff --git a/cc/canvas_layer_texture_updater.cc b/cc/canvas_layer_texture_updater.cc
index 46e5843d..0f2f3a07 100644
--- a/cc/canvas_layer_texture_updater.cc
+++ b/cc/canvas_layer_texture_updater.cc
@@ -10,11 +10,11 @@
#include "CCRenderingStats.h"
#include "FloatRect.h"
#include "LayerPainterChromium.h"
-#include "SkCanvas.h"
-#include "SkPaint.h"
-#include "SkRect.h"
#include "SkiaUtils.h"
#include "TraceEvent.h"
+#include "third_party/skia/include/core/SkCanvas.h"
+#include "third_party/skia/include/core/SkPaint.h"
+#include "third_party/skia/include/core/SkRect.h"
#include <wtf/CurrentTime.h>
namespace cc {
diff --git a/cc/checkerboard_draw_quad.h b/cc/checkerboard_draw_quad.h
index 1ef147f..c36bab0 100644
--- a/cc/checkerboard_draw_quad.h
+++ b/cc/checkerboard_draw_quad.h
@@ -7,7 +7,7 @@
#include "CCDrawQuad.h"
#include "base/memory/scoped_ptr.h"
-#include "SkColor.h"
+#include "third_party/skia/include/core/SkColor.h"
namespace cc {
diff --git a/cc/debug_border_draw_quad.h b/cc/debug_border_draw_quad.h
index fbba1c6b..32c228e 100644
--- a/cc/debug_border_draw_quad.h
+++ b/cc/debug_border_draw_quad.h
@@ -6,8 +6,8 @@
#define CCDebugBorderDrawQuad_h
#include "CCDrawQuad.h"
-#include "SkColor.h"
#include "base/memory/scoped_ptr.h"
+#include "third_party/skia/include/core/SkColor.h"
namespace cc {
diff --git a/cc/font_atlas.cc b/cc/font_atlas.cc
index 4681374a..20ed9df7 100644
--- a/cc/font_atlas.cc
+++ b/cc/font_atlas.cc
@@ -6,11 +6,12 @@
#include "CCFontAtlas.h"
+#include <vector>
+
#include "base/string_split.h"
#include "ui/gfx/point.h"
#include "CCProxy.h"
-#include "SkCanvas.h"
-#include <vector>
+#include "third_party/skia/include/core/SkCanvas.h"
namespace cc {
diff --git a/cc/font_atlas.h b/cc/font_atlas.h
index d86ff8e..c9914e09 100644
--- a/cc/font_atlas.h
+++ b/cc/font_atlas.h
@@ -10,7 +10,7 @@
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
#include "IntRect.h"
-#include "SkBitmap.h"
+#include "third_party/skia/include/core/SkBitmap.h"
class SkCanvas;
diff --git a/cc/gl_renderer.cc b/cc/gl_renderer.cc
index 9e994b7..f5736071 100644
--- a/cc/gl_renderer.cc
+++ b/cc/gl_renderer.cc
@@ -2,7 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-
#include "config.h"
#include "CCRendererGL.h"
@@ -23,14 +22,14 @@
#include "GrTexture.h"
#include "NotImplemented.h"
#include "PlatformColor.h"
-#include "SkBitmap.h"
-#include "SkColor.h"
#include "TraceEvent.h"
#ifdef LOG
#undef LOG
#endif
#include "base/string_split.h"
#include "base/string_util.h"
+#include "third_party/skia/include/core/SkBitmap.h"
+#include "third_party/skia/include/core/SkColor.h"
#include <public/WebGraphicsContext3D.h>
#include <public/WebSharedGraphicsContext3D.h>
#include <public/WebVideoFrame.h>
diff --git a/cc/heads_up_display_layer_impl.cc b/cc/heads_up_display_layer_impl.cc
index c7e9edb..4b64b1a 100644
--- a/cc/heads_up_display_layer_impl.cc
+++ b/cc/heads_up_display_layer_impl.cc
@@ -16,10 +16,10 @@
#include "CCTextureDrawQuad.h"
#include "Extensions3DChromium.h"
#include "GraphicsContext3D.h"
-#include "SkBitmap.h"
-#include "SkColorMatrixFilter.h"
-#include "SkPaint.h"
#include "skia/ext/platform_canvas.h"
+#include "third_party/skia/include/core/SkBitmap.h"
+#include "third_party/skia/include/core/SkPaint.h"
+#include "third_party/skia/include/effects/SkColorMatrixFilter.h"
namespace cc {
diff --git a/cc/image_layer.h b/cc/image_layer.h
index 79e6da7..204db64 100644
--- a/cc/image_layer.h
+++ b/cc/image_layer.h
@@ -2,12 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-
#ifndef ImageLayerChromium_h
#define ImageLayerChromium_h
#include "ContentLayerChromium.h"
-#include "SkBitmap.h"
+#include "third_party/skia/include/core/SkBitmap.h"
namespace cc {
@@ -40,5 +39,6 @@
RefPtr<ImageLayerTextureUpdater> m_textureUpdater;
};
-}
+} // namespace cc
+
#endif
diff --git a/cc/layer.h b/cc/layer.h
index 7d1e484e..f16fbe7 100644
--- a/cc/layer.h
+++ b/cc/layer.h
@@ -2,7 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-
#ifndef LayerChromium_h
#define LayerChromium_h
@@ -12,7 +11,7 @@
#include "FloatPoint.h"
#include "Region.h"
#include "RenderSurfaceChromium.h"
-#include "SkColor.h"
+#include "third_party/skia/include/core/SkColor.h"
#include <public/WebFilterOperations.h>
#include <public/WebTransformationMatrix.h>
#include <string>
@@ -382,5 +381,6 @@
void sortLayers(std::vector<scoped_refptr<LayerChromium> >::iterator, std::vector<scoped_refptr<LayerChromium> >::iterator, void*);
-}
+} // namespace cc
+
#endif
diff --git a/cc/layer_impl.h b/cc/layer_impl.h
index 6ffbbc3ac..01ab13a 100644
--- a/cc/layer_impl.h
+++ b/cc/layer_impl.h
@@ -16,7 +16,7 @@
#include "FloatRect.h"
#include "IntRect.h"
#include "Region.h"
-#include "SkColor.h"
+#include "third_party/skia/include/core/SkColor.h"
#include <public/WebFilterOperations.h>
#include <public/WebTransformationMatrix.h>
#include <string>
diff --git a/cc/layer_tree_host.h b/cc/layer_tree_host.h
index f9a6343..7cb63f8 100644
--- a/cc/layer_tree_host.h
+++ b/cc/layer_tree_host.h
@@ -20,7 +20,7 @@
#include "IntRect.h"
#include "RateLimiter.h"
#include "scoped_ptr_vector.h"
-#include "SkColor.h"
+#include "third_party/skia/include/core/SkColor.h"
#include <limits>
#if defined(COMPILER_GCC)
diff --git a/cc/layer_tree_host_impl.h b/cc/layer_tree_host_impl.h
index e961340..be31eb90 100644
--- a/cc/layer_tree_host_impl.h
+++ b/cc/layer_tree_host_impl.h
@@ -14,7 +14,7 @@
#include "CCRenderer.h"
#include "CCRenderPass.h"
#include "CCRenderPassSink.h"
-#include "SkColor.h"
+#include "third_party/skia/include/core/SkColor.h"
#include <public/WebCompositorOutputSurfaceClient.h>
#include <wtf/PassOwnPtr.h>
#include <wtf/RefPtr.h>
diff --git a/cc/platform_color.h b/cc/platform_color.h
index 61ffd31..2149d1c 100644
--- a/cc/platform_color.h
+++ b/cc/platform_color.h
@@ -7,7 +7,7 @@
#include "Extensions3D.h"
#include "GraphicsContext3D.h"
-#include "SkTypes.h"
+#include "third_party/skia/include/core/SkTypes.h"
#include <public/WebGraphicsContext3D.h>
namespace cc {
diff --git a/cc/quad_culler.cc b/cc/quad_culler.cc
index bb854ba6..3a7c96cd 100644
--- a/cc/quad_culler.cc
+++ b/cc/quad_culler.cc
@@ -13,7 +13,7 @@
#include "CCOverdrawMetrics.h"
#include "CCRenderPass.h"
#include "Region.h"
-#include "SkColor.h"
+#include "third_party/skia/include/core/SkColor.h"
#include <public/WebTransformationMatrix.h>
using namespace std;
diff --git a/cc/render_pass.h b/cc/render_pass.h
index cdfa958..7a15df1 100644
--- a/cc/render_pass.h
+++ b/cc/render_pass.h
@@ -12,7 +12,7 @@
#include "CCDrawQuad.h"
#include "CCSharedQuadState.h"
#include "FloatRect.h"
-#include "SkColor.h"
+#include "third_party/skia/include/core/SkColor.h"
#include <public/WebFilterOperations.h>
#include <public/WebTransformationMatrix.h>
#include <vector>
diff --git a/cc/render_surface_filters.cc b/cc/render_surface_filters.cc
index afe55d0..7f1d3c62 100644
--- a/cc/render_surface_filters.cc
+++ b/cc/render_surface_filters.cc
@@ -7,12 +7,12 @@
#include "CCRenderSurfaceFilters.h"
#include "FloatSize.h"
-#include "SkBlurImageFilter.h"
-#include "SkCanvas.h"
-#include "SkColorMatrixFilter.h"
-#include "SkGpuDevice.h"
-#include "SkGrPixelRef.h"
-#include "SkMagnifierImageFilter.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"
+#include "third_party/skia/include/effects/SkMagnifierImageFilter.h"
+#include "third_party/skia/include/gpu/SkGpuDevice.h"
+#include "third_party/skia/include/gpu/SkGrPixelRef.h"
#include <public/WebFilterOperation.h>
#include <public/WebFilterOperations.h>
#include <public/WebGraphicsContext3D.h>
diff --git a/cc/resource_provider.h b/cc/resource_provider.h
index 37587640..b359528 100644
--- a/cc/resource_provider.h
+++ b/cc/resource_provider.h
@@ -10,8 +10,8 @@
#include "CCGraphicsContext.h"
#include "GraphicsContext3D.h"
#include "IntSize.h"
-#include "SkBitmap.h"
-#include "SkCanvas.h"
+#include "third_party/skia/include/core/SkBitmap.h"
+#include "third_party/skia/include/core/SkCanvas.h"
#include "TextureCopier.h"
#include <wtf/Deque.h>
#include <wtf/OwnPtr.h>
diff --git a/cc/shader.h b/cc/shader.h
index 8408da20..fa87b68 100644
--- a/cc/shader.h
+++ b/cc/shader.h
@@ -5,7 +5,7 @@
#ifndef ShaderChromium_h
#define ShaderChromium_h
-#include "SkColorPriv.h"
+#include "third_party/skia/include/core/SkColorPriv.h"
#include <string>
namespace WebKit {
diff --git a/cc/skpicture_canvas_layer_texture_updater.cc b/cc/skpicture_canvas_layer_texture_updater.cc
index 7dd1bf2..290c40b 100644
--- a/cc/skpicture_canvas_layer_texture_updater.cc
+++ b/cc/skpicture_canvas_layer_texture_updater.cc
@@ -9,8 +9,8 @@
#include "CCTextureUpdateQueue.h"
#include "LayerPainterChromium.h"
-#include "SkCanvas.h"
#include "TraceEvent.h"
+#include "third_party/skia/include/core/SkCanvas.h"
namespace cc {
diff --git a/cc/skpicture_canvas_layer_texture_updater.h b/cc/skpicture_canvas_layer_texture_updater.h
index 78a5d02..c5b0ac6 100644
--- a/cc/skpicture_canvas_layer_texture_updater.h
+++ b/cc/skpicture_canvas_layer_texture_updater.h
@@ -7,7 +7,7 @@
#define SkPictureCanvasLayerTextureUpdater_h
#include "CanvasLayerTextureUpdater.h"
-#include "SkPicture.h"
+#include "third_party/skia/include/core/SkPicture.h"
class SkCanvas;
diff --git a/cc/solid_color_draw_quad.h b/cc/solid_color_draw_quad.h
index 6825612..cd0619e6 100644
--- a/cc/solid_color_draw_quad.h
+++ b/cc/solid_color_draw_quad.h
@@ -6,7 +6,7 @@
#define CCSolidColorDrawQuad_h
#include "CCDrawQuad.h"
-#include "SkColor.h"
+#include "third_party/skia/include/core/SkColor.h"
#include "base/memory/scoped_ptr.h"
namespace cc {
diff --git a/cc/test/fake_web_compositor_software_output_device.h b/cc/test/fake_web_compositor_software_output_device.h
index 6a17e687..356833b 100644
--- a/cc/test/fake_web_compositor_software_output_device.h
+++ b/cc/test/fake_web_compositor_software_output_device.h
@@ -6,7 +6,7 @@
#define FakeWebCompositorSoftwareOutputDevice_h
#include "base/memory/scoped_ptr.h"
-#include "SkDevice.h"
+#include "third_party/skia/include/core/SkDevice.h"
#include <public/WebCompositorSoftwareOutputDevice.h>
#include <public/WebImage.h>
#include <public/WebSize.h>
diff --git a/cc/throttled_texture_uploader.cc b/cc/throttled_texture_uploader.cc
index 0e3f8291..2d4dbbf 100644
--- a/cc/throttled_texture_uploader.cc
+++ b/cc/throttled_texture_uploader.cc
@@ -8,7 +8,7 @@
#include "CCPrioritizedTexture.h"
#include "CCProxy.h"
#include "Extensions3DChromium.h"
-#include "SkGpuDevice.h"
+#include "third_party/skia/include/gpu/SkGpuDevice.h"
#include "TraceEvent.h"
#include <algorithm>
#include <public/Platform.h>
diff --git a/cc/tiled_layer_impl.cc b/cc/tiled_layer_impl.cc
index 511ca95..84af8bc 100644
--- a/cc/tiled_layer_impl.cc
+++ b/cc/tiled_layer_impl.cc
@@ -18,7 +18,7 @@
#include "CCTileDrawQuad.h"
#include "FloatQuad.h"
#include "GraphicsContext3D.h"
-#include "SkColor.h"
+#include "third_party/skia/include/core/SkColor.h"
using namespace std;
using WebKit::WebTransformationMatrix;
