| Index: content/browser/renderer_host/image_transport_factory_android.cc
|
| diff --git a/content/browser/renderer_host/image_transport_factory_android.cc b/content/browser/renderer_host/image_transport_factory_android.cc
|
| index 9b3de30361b89e26b425dcad7611f12e22990910..455e0eb6298be396decd7365c0c4d860d1ac8321 100644
|
| --- a/content/browser/renderer_host/image_transport_factory_android.cc
|
| +++ b/content/browser/renderer_host/image_transport_factory_android.cc
|
| @@ -20,7 +20,7 @@ base::LazyInstance<ObserverList<ImageTransportFactoryAndroidObserver> >::Leaky
|
| g_factory_observers = LAZY_INSTANCE_INITIALIZER;
|
|
|
| class GLContextLostListener
|
| - : public WebKit::WebGraphicsContext3D::WebGraphicsContextLostCallback {
|
| + : public blink::WebGraphicsContext3D::WebGraphicsContextLostCallback {
|
| public:
|
| // WebGraphicsContextLostCallback implementation.
|
| virtual void onContextLost() OVERRIDE;
|
| @@ -43,7 +43,7 @@ class CmdBufferImageTransportFactory : public ImageTransportFactoryAndroid {
|
| virtual void DeleteTexture(uint32_t id) OVERRIDE;
|
| virtual void AcquireTexture(
|
| uint32 texture_id, const signed char* mailbox_name) OVERRIDE;
|
| - virtual WebKit::WebGraphicsContext3D* GetContext3D() OVERRIDE {
|
| + virtual blink::WebGraphicsContext3D* GetContext3D() OVERRIDE {
|
| return context_.get();
|
| }
|
| virtual GLHelper* GetGLHelper() OVERRIDE;
|
| @@ -62,7 +62,7 @@ CmdBufferImageTransportFactory::CmdBufferImageTransportFactory() {
|
| CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE));
|
| DCHECK(gpu_channel_host);
|
|
|
| - WebKit::WebGraphicsContext3D::Attributes attrs;
|
| + blink::WebGraphicsContext3D::Attributes attrs;
|
| attrs.shareResources = true;
|
| GURL url("chrome://gpu/ImageTransportFactoryAndroid");
|
| base::WeakPtr<WebGraphicsContext3DSwapBuffersClient> swap_client;
|
|
|