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

5 files changed, 26 insertions, 26 deletions

diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc
index f9f0e1c..f9e5e65 100644
--- a/cc/resources/resource_provider.cc
+++ b/cc/resources/resource_provider.cc
@@ -26,7 +26,7 @@
 #include "ui/gfx/rect.h"
 #include "ui/gfx/vector2d.h"
 
-using WebKit::WebGraphicsContext3D;
+using blink::WebGraphicsContext3D;
 
 namespace cc {
 
@@ -40,14 +40,14 @@ class IdAllocator {
   IdAllocator(WebGraphicsContext3D* context3d, size_t id_allocation_chunk_size)
       : context3d_(context3d),
         id_allocation_chunk_size_(id_allocation_chunk_size),
-        ids_(new WebKit::WebGLId[id_allocation_chunk_size]),
+        ids_(new blink::WebGLId[id_allocation_chunk_size]),
         next_id_index_(id_allocation_chunk_size) {
     DCHECK(id_allocation_chunk_size_);
   }
 
   WebGraphicsContext3D* context3d_;
   const size_t id_allocation_chunk_size_;
-  scoped_ptr<WebKit::WebGLId[]> ids_;
+  scoped_ptr<blink::WebGLId[]> ids_;
   size_t next_id_index_;
 };
 
@@ -1810,7 +1810,7 @@ GLint ResourceProvider::GetActiveTextureUnit(WebGraphicsContext3D* context) {
   return active_unit;
 }
 
-WebKit::WebGraphicsContext3D* ResourceProvider::Context3d() const {
+blink::WebGraphicsContext3D* ResourceProvider::Context3d() const {
   ContextProvider* context_provider = output_surface_->context_provider();
   return context_provider ? context_provider->Context3d() : NULL;
 }
diff --git a/cc/resources/resource_provider.h b/cc/resources/resource_provider.h
index 463391c..1c76ed3 100644
--- a/cc/resources/resource_provider.h
+++ b/cc/resources/resource_provider.h
@@ -31,7 +31,7 @@
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/gfx/size.h"
 
-namespace WebKit { class WebGraphicsContext3D; }
+namespace blink { class WebGraphicsContext3D; }
 
 namespace gfx {
 class Rect;
@@ -352,7 +352,7 @@ class CC_EXPORT ResourceProvider {
   // Indicates if we can currently lock this resource for write.
   bool CanLockForWrite(ResourceId id);
 
-  static GLint GetActiveTextureUnit(WebKit::WebGraphicsContext3D* context);
+  static GLint GetActiveTextureUnit(blink::WebGraphicsContext3D* context);
 
  private:
   struct Resource {
@@ -447,7 +447,7 @@ class CC_EXPORT ResourceProvider {
   static void PopulateSkBitmapWithResource(SkBitmap* sk_bitmap,
                                            const Resource* resource);
 
-  void TransferResource(WebKit::WebGraphicsContext3D* context,
+  void TransferResource(blink::WebGraphicsContext3D* context,
                         ResourceId id,
                         TransferableResource* resource);
   enum DeleteStyle {
@@ -470,7 +470,7 @@ class CC_EXPORT ResourceProvider {
                        GLenum filter);
 
   // Returns NULL if the output_surface_ does not have a ContextProvider.
-  WebKit::WebGraphicsContext3D* Context3d() const;
+  blink::WebGraphicsContext3D* Context3d() const;
 
   OutputSurface* output_surface_;
   SharedBitmapManager* shared_bitmap_manager_;
diff --git a/cc/resources/resource_provider_unittest.cc b/cc/resources/resource_provider_unittest.cc
index 8b2b01bd..fdf6ee1 100644
--- a/cc/resources/resource_provider_unittest.cc
+++ b/cc/resources/resource_provider_unittest.cc
@@ -34,12 +34,12 @@ using testing::Return;
 using testing::SetArgPointee;
 using testing::StrictMock;
 using testing::_;
-using WebKit::WGC3Dbyte;
-using WebKit::WGC3Denum;
-using WebKit::WGC3Dint;
-using WebKit::WGC3Dsizei;
-using WebKit::WGC3Duint;
-using WebKit::WebGLId;
+using blink::WGC3Dbyte;
+using blink::WGC3Denum;
+using blink::WGC3Dint;
+using blink::WGC3Dsizei;
+using blink::WGC3Duint;
+using blink::WebGLId;
 
 namespace cc {
 namespace {
@@ -95,11 +95,11 @@ class TextureStateTrackingContext : public TestWebGraphicsContext3D {
 
   // Force all textures to be consecutive numbers starting at "1",
   // so we easily can test for them.
-  virtual WebKit::WebGLId NextTextureId() OVERRIDE {
+  virtual blink::WebGLId NextTextureId() OVERRIDE {
     base::AutoLock lock(namespace_->lock);
     return namespace_->next_texture_id++;
   }
-  virtual void RetireTextureId(WebKit::WebGLId) OVERRIDE {
+  virtual void RetireTextureId(blink::WebGLId) OVERRIDE {
   }
 };
 
@@ -2944,13 +2944,13 @@ INSTANTIATE_TEST_CASE_P(
 
 class TextureIdAllocationTrackingContext : public TestWebGraphicsContext3D {
  public:
-  virtual WebKit::WebGLId NextTextureId() OVERRIDE {
+  virtual blink::WebGLId NextTextureId() OVERRIDE {
     base::AutoLock lock(namespace_->lock);
     return namespace_->next_texture_id++;
   }
-  virtual void RetireTextureId(WebKit::WebGLId) OVERRIDE {
+  virtual void RetireTextureId(blink::WebGLId) OVERRIDE {
   }
-  WebKit::WebGLId PeekTextureId() {
+  blink::WebGLId PeekTextureId() {
     base::AutoLock lock(namespace_->lock);
     return namespace_->next_texture_id;
   }
diff --git a/cc/resources/resource_update_controller_unittest.cc b/cc/resources/resource_update_controller_unittest.cc
index 98d2dd2..09d6d1a 100644
--- a/cc/resources/resource_update_controller_unittest.cc
+++ b/cc/resources/resource_update_controller_unittest.cc
@@ -17,12 +17,12 @@
 #include "third_party/khronos/GLES2/gl2ext.h"
 
 using testing::Test;
-using WebKit::WGC3Denum;
-using WebKit::WGC3Dint;
-using WebKit::WGC3Duint;
-using WebKit::WGC3Dsizei;
-using WebKit::WebGLId;
-using WebKit::WebString;
+using blink::WGC3Denum;
+using blink::WGC3Dint;
+using blink::WGC3Duint;
+using blink::WGC3Dsizei;
+using blink::WebGLId;
+using blink::WebString;
 
 namespace cc {
 namespace {
diff --git a/cc/resources/video_resource_updater.cc b/cc/resources/video_resource_updater.cc
index ebd23b1..6a0e15d 100644
--- a/cc/resources/video_resource_updater.cc
+++ b/cc/resources/video_resource_updater.cc
@@ -203,7 +203,7 @@ VideoFrameExternalResources VideoResourceUpdater::CreateForSoftwarePlanes(
       if (!software_compositor) {
         DCHECK(context_provider_);
 
-        WebKit::WebGraphicsContext3D* context =
+        blink::WebGraphicsContext3D* context =
             context_provider_->Context3d();
 
         GLC(context, context->genMailboxCHROMIUM(mailbox.name));