| Index: content/browser/android/in_process/synchronous_compositor_impl.cc
|
| diff --git a/content/browser/android/in_process/synchronous_compositor_impl.cc b/content/browser/android/in_process/synchronous_compositor_impl.cc
|
| index c02aa8735ad53311dc2f31cafad0c00fadc22e38..d6c818daf675a5ac217afe5a6783199ec0c727f4 100644
|
| --- a/content/browser/android/in_process/synchronous_compositor_impl.cc
|
| +++ b/content/browser/android/in_process/synchronous_compositor_impl.cc
|
| @@ -59,7 +59,7 @@ class VideoContextProvider
|
| return gl_in_process_context_->GetSurfaceTexture(stream_id);
|
| }
|
|
|
| - virtual WebKit::WebGraphicsContext3D* Context3d() OVERRIDE {
|
| + virtual blink::WebGraphicsContext3D* Context3d() OVERRIDE {
|
| return context_provider_->Context3d();
|
| }
|
|
|
| @@ -109,7 +109,7 @@ class SynchronousCompositorFactoryImpl : public SynchronousCompositorFactory {
|
|
|
| const gfx::GpuPreference gpu_preference = gfx::PreferDiscreteGpu;
|
|
|
| - WebKit::WebGraphicsContext3D::Attributes attributes;
|
| + blink::WebGraphicsContext3D::Attributes attributes;
|
| attributes.antialias = false;
|
| attributes.shareResources = true;
|
| attributes.noAutomaticFlushes = true;
|
| @@ -409,7 +409,7 @@ void SynchronousCompositorImpl::SetContinuousInvalidate(bool enable) {
|
| }
|
|
|
| InputEventAckState SynchronousCompositorImpl::HandleInputEvent(
|
| - const WebKit::WebInputEvent& input_event) {
|
| + const blink::WebInputEvent& input_event) {
|
| DCHECK(CalledOnValidThread());
|
| return g_factory.Get().synchronous_input_event_filter()->HandleInputEvent(
|
| contents_->GetRoutingID(), input_event);
|
|
|