summaryrefslogtreecommitdiffstats
path: root/ui/compositor
diff options
context:
space:
mode:
authorabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-07 06:58:20 +0000
committerabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-07 06:58:20 +0000
commitc32e27083ff530651d7e03cff7e7bc05bac55359 (patch)
treeca25d186ec5e30b1c908369fc6d2951bfb2a45f5 /ui/compositor
parentbb2999f3c773c9a04201b88b823f93c6de8b117f (diff)
downloadchromium_src-c32e27083ff530651d7e03cff7e7bc05bac55359.zip
chromium_src-c32e27083ff530651d7e03cff7e7bc05bac55359.tar.gz
chromium_src-c32e27083ff530651d7e03cff7e7bc05bac55359.tar.bz2
Rename WebKit namespace to blink (part 5)
This CL updates all references to the WebKit namespace outside of content, chrome, and components. TBR=darin@chromium.org BUG=295096 Review URL: https://codereview.chromium.org/61553006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233518 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/compositor')
-rw-r--r--ui/compositor/compositor.h4
-rw-r--r--ui/compositor/layer_unittest.cc2
-rw-r--r--ui/compositor/test/default_context_factory.cc2
3 files changed, 4 insertions, 4 deletions
diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h
index 348c022..afc68eb 100644
--- a/ui/compositor/compositor.h
+++ b/ui/compositor/compositor.h
@@ -46,7 +46,7 @@ class Rect;
class Size;
}
-namespace WebKit {
+namespace blink {
class WebGraphicsContext3D;
}
@@ -128,7 +128,7 @@ class COMPOSITOR_EXPORT Texture : public base::RefCounted<Texture> {
float device_scale_factor() const { return device_scale_factor_; }
virtual unsigned int PrepareTexture() = 0;
- virtual WebKit::WebGraphicsContext3D* HostContext3D() = 0;
+ virtual blink::WebGraphicsContext3D* HostContext3D() = 0;
// Replaces the texture with the texture from the specified mailbox.
virtual void Consume(const std::string& mailbox_name,
diff --git a/ui/compositor/layer_unittest.cc b/ui/compositor/layer_unittest.cc
index 350b40f..d23fd69 100644
--- a/ui/compositor/layer_unittest.cc
+++ b/ui/compositor/layer_unittest.cc
@@ -600,7 +600,7 @@ class FakeTexture : public Texture {
: Texture(flipped, size, device_scale_factor) {}
virtual unsigned int PrepareTexture() OVERRIDE { return 0; }
- virtual WebKit::WebGraphicsContext3D* HostContext3D() OVERRIDE {
+ virtual blink::WebGraphicsContext3D* HostContext3D() OVERRIDE {
return NULL;
}
diff --git a/ui/compositor/test/default_context_factory.cc b/ui/compositor/test/default_context_factory.cc
index c1700fe..f5601c9 100644
--- a/ui/compositor/test/default_context_factory.cc
+++ b/ui/compositor/test/default_context_factory.cc
@@ -31,7 +31,7 @@ bool DefaultContextFactory::Initialize() {
scoped_ptr<cc::OutputSurface> DefaultContextFactory::CreateOutputSurface(
Compositor* compositor) {
- WebKit::WebGraphicsContext3D::Attributes attrs;
+ blink::WebGraphicsContext3D::Attributes attrs;
attrs.depth = false;
attrs.stencil = false;
attrs.antialias = false;