summaryrefslogtreecommitdiffstats
path: root/cc/output
diff options
context:
space:
mode:
authorabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-29 22:05:27 +0000
committerabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-29 22:05:27 +0000
commit674de992203708b7e06158af4a67b0fe94a7230b (patch)
tree9b965807e3a651840c99aba8460e85b4c89c5cd4 /cc/output
parentef0a1b06ea55ec7d2e375ba4333ab8be048a7e21 (diff)
downloadchromium_src-674de992203708b7e06158af4a67b0fe94a7230b.zip
chromium_src-674de992203708b7e06158af4a67b0fe94a7230b.tar.gz
chromium_src-674de992203708b7e06158af4a67b0fe94a7230b.tar.bz2
Update refernces to Blink's Platform API (cc)
These headers have moved from Source/Platform/chromium/public to public/platform. This CL updates CC's references to the old location to point to the new location. After this CL lands, I'll remove the forwarding headers that are letting these references still work. TBR=jamesr@chromium.org BUG=239545 Review URL: https://chromiumcodereview.appspot.com/16085003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202990 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/output')
-rw-r--r--cc/output/delegating_renderer.h2
-rw-r--r--cc/output/geometry_binding.cc2
-rw-r--r--cc/output/gl_renderer.cc2
-rw-r--r--cc/output/gl_renderer.h4
-rw-r--r--cc/output/output_surface.cc2
-rw-r--r--cc/output/output_surface.h2
-rw-r--r--cc/output/program_binding.cc2
-rw-r--r--cc/output/render_surface_filters.cc4
-rw-r--r--cc/output/render_surface_filters_unittest.cc4
-rw-r--r--cc/output/shader.cc2
-rw-r--r--cc/output/texture_copier.cc2
11 files changed, 14 insertions, 14 deletions
diff --git a/cc/output/delegating_renderer.h b/cc/output/delegating_renderer.h
index ef44f79..20aa3f6 100644
--- a/cc/output/delegating_renderer.h
+++ b/cc/output/delegating_renderer.h
@@ -9,7 +9,7 @@
#include "cc/base/cc_export.h"
#include "cc/output/compositor_frame.h"
#include "cc/output/renderer.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
+#include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
namespace cc {
diff --git a/cc/output/geometry_binding.cc b/cc/output/geometry_binding.cc
index e3bf590..3b177c2 100644
--- a/cc/output/geometry_binding.cc
+++ b/cc/output/geometry_binding.cc
@@ -5,7 +5,7 @@
#include "cc/output/geometry_binding.h"
#include "cc/output/gl_renderer.h" // For the GLC() macro.
-#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
+#include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
#include "third_party/khronos/GLES2/gl2.h"
#include "ui/gfx/rect_f.h"
diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc
index b89c91a..436a9008 100644
--- a/cc/output/gl_renderer.cc
+++ b/cc/output/gl_renderer.cc
@@ -37,7 +37,7 @@
#include "cc/trees/proxy.h"
#include "cc/trees/single_thread_proxy.h"
#include "gpu/GLES2/gl2extchromium.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
+#include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
#include "third_party/khronos/GLES2/gl2.h"
#include "third_party/khronos/GLES2/gl2ext.h"
#include "third_party/skia/include/core/SkBitmap.h"
diff --git a/cc/output/gl_renderer.h b/cc/output/gl_renderer.h
index d4b7e1a..1c30d34 100644
--- a/cc/output/gl_renderer.h
+++ b/cc/output/gl_renderer.h
@@ -18,8 +18,8 @@
#include "cc/quads/solid_color_draw_quad.h"
#include "cc/quads/tile_draw_quad.h"
#include "cc/quads/yuv_video_draw_quad.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsMemoryAllocation.h"
+#include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
+#include "third_party/WebKit/public/platform/WebGraphicsMemoryAllocation.h"
#include "ui/gfx/quad_f.h"
class SkBitmap;
diff --git a/cc/output/output_surface.cc b/cc/output/output_surface.cc
index 6c46769..fe2b074 100644
--- a/cc/output/output_surface.cc
+++ b/cc/output/output_surface.cc
@@ -12,7 +12,7 @@
#include "base/string_util.h"
#include "base/strings/string_split.h"
#include "cc/output/output_surface_client.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
+#include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
#include "third_party/khronos/GLES2/gl2.h"
#include "third_party/khronos/GLES2/gl2ext.h"
#include "ui/gfx/rect.h"
diff --git a/cc/output/output_surface.h b/cc/output/output_surface.h
index a021ebf..d6f4b82 100644
--- a/cc/output/output_surface.h
+++ b/cc/output/output_surface.h
@@ -9,7 +9,7 @@
#include "base/memory/scoped_ptr.h"
#include "cc/base/cc_export.h"
#include "cc/output/software_output_device.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
+#include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
namespace ui { struct LatencyInfo; }
diff --git a/cc/output/program_binding.cc b/cc/output/program_binding.cc
index c9c5e15..5b7b13e 100644
--- a/cc/output/program_binding.cc
+++ b/cc/output/program_binding.cc
@@ -7,7 +7,7 @@
#include "base/debug/trace_event.h"
#include "cc/output/geometry_binding.h"
#include "cc/output/gl_renderer.h" // For the GLC() macro.
-#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
+#include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
#include "third_party/khronos/GLES2/gl2.h"
using WebKit::WebGraphicsContext3D;
diff --git a/cc/output/render_surface_filters.cc b/cc/output/render_surface_filters.cc
index 03e38d2..22bf013 100644
--- a/cc/output/render_surface_filters.cc
+++ b/cc/output/render_surface_filters.cc
@@ -8,8 +8,8 @@
#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/public/platform/WebFilterOperation.h"
+#include "third_party/WebKit/public/platform/WebFilterOperations.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"
diff --git a/cc/output/render_surface_filters_unittest.cc b/cc/output/render_surface_filters_unittest.cc
index b99f70c..571e864 100644
--- a/cc/output/render_surface_filters_unittest.cc
+++ b/cc/output/render_surface_filters_unittest.cc
@@ -5,8 +5,8 @@
#include "cc/output/render_surface_filters.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/WebKit/public/platform/WebFilterOperation.h"
+#include "third_party/WebKit/public/platform/WebFilterOperations.h"
using WebKit::WebFilterOperation;
using WebKit::WebFilterOperations;
diff --git a/cc/output/shader.cc b/cc/output/shader.cc
index cee3474..4a97a8e 100644
--- a/cc/output/shader.cc
+++ b/cc/output/shader.cc
@@ -9,7 +9,7 @@
#include "base/basictypes.h"
#include "base/logging.h"
#include "cc/output/gl_renderer.h" // For the GLC() macro.
-#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
+#include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
#include "third_party/khronos/GLES2/gl2.h"
#define SHADER0(Src) #Src
diff --git a/cc/output/texture_copier.cc b/cc/output/texture_copier.cc
index 585e8ba..33f2054 100644
--- a/cc/output/texture_copier.cc
+++ b/cc/output/texture_copier.cc
@@ -7,7 +7,7 @@
#include "base/debug/trace_event.h"
#include "build/build_config.h"
#include "cc/output/gl_renderer.h" // For the GLC() macro.
-#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
+#include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
#include "third_party/khronos/GLES2/gl2.h"
namespace cc {