diff options
| author | sievers@chromium.org <sievers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-13 18:52:45 +0000 |
|---|---|---|
| committer | sievers@chromium.org <sievers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-13 18:52:45 +0000 |
| commit | 968facd0412c4a6a9692e06d107bc7716b5c619d (patch) | |
| tree | 1eea775a4167f5ded7264235ce147ed52275d345 /content | |
| parent | ad224623d95740ebd949447f5b5418009f3621f6 (diff) | |
| download | chromium_src-968facd0412c4a6a9692e06d107bc7716b5c619d.zip chromium_src-968facd0412c4a6a9692e06d107bc7716b5c619d.tar.gz chromium_src-968facd0412c4a6a9692e06d107bc7716b5c619d.tar.bz2 | |
Android: Use kUIPrioritizeInGpuProcess
R=piman@chromium.org
Review URL: https://codereview.chromium.org/60893003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234861 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
4 files changed, 13 insertions, 1 deletions
diff --git a/content/browser/android/content_startup_flags.cc b/content/browser/android/content_startup_flags.cc index 8f7e29c..636a198 100644 --- a/content/browser/android/content_startup_flags.cc +++ b/content/browser/android/content_startup_flags.cc @@ -81,6 +81,8 @@ void SetContentCommandLineFlags(int max_render_process_count, parsed_command_line->AppendSwitch( cc::switches::kDisableCompositedAntialiasing); + parsed_command_line->AppendSwitch(switches::kUIPrioritizeInGpuProcess); + if (!plugin_descriptor.empty()) { parsed_command_line->AppendSwitchNative( switches::kRegisterPepperPlugins, plugin_descriptor); diff --git a/content/browser/renderer_host/image_transport_factory_android.cc b/content/browser/renderer_host/image_transport_factory_android.cc index 80c5e84..a55b823 100644 --- a/content/browser/renderer_host/image_transport_factory_android.cc +++ b/content/browser/renderer_host/image_transport_factory_android.cc @@ -47,6 +47,9 @@ class CmdBufferImageTransportFactory : public ImageTransportFactoryAndroid { return context_.get(); } virtual GLHelper* GetGLHelper() OVERRIDE; + virtual uint32 GetChannelID() OVERRIDE { + return context_->GetChannelID(); + } private: scoped_ptr<WebGraphicsContext3DCommandBufferImpl> context_; diff --git a/content/browser/renderer_host/image_transport_factory_android.h b/content/browser/renderer_host/image_transport_factory_android.h index e6d5f9b..54434fc 100644 --- a/content/browser/renderer_host/image_transport_factory_android.h +++ b/content/browser/renderer_host/image_transport_factory_android.h @@ -41,6 +41,7 @@ class ImageTransportFactoryAndroid { virtual blink::WebGraphicsContext3D* GetContext3D() = 0; virtual GLHelper* GetGLHelper() = 0; + virtual uint32 GetChannelID() = 0; static void AddObserver(ImageTransportFactoryAndroidObserver* observer); static void RemoveObserver(ImageTransportFactoryAndroidObserver* observer); diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc index c32ed01..8382811 100644 --- a/content/browser/renderer_host/render_widget_host_view_android.cc +++ b/content/browser/renderer_host/render_widget_host_view_android.cc @@ -977,7 +977,13 @@ gfx::Rect RenderWidgetHostViewAndroid::GetBoundsInRootWindow() { } gfx::GLSurfaceHandle RenderWidgetHostViewAndroid::GetCompositingSurface() { - return gfx::GLSurfaceHandle(gfx::kNullPluginWindow, gfx::NATIVE_TRANSPORT); + gfx::GLSurfaceHandle handle = + gfx::GLSurfaceHandle(gfx::kNullPluginWindow, gfx::NATIVE_TRANSPORT); + if (CompositorImpl::IsInitialized()) { + handle.parent_client_id = + ImageTransportFactoryAndroid::GetInstance()->GetChannelID(); + } + return handle; } void RenderWidgetHostViewAndroid::ProcessAckedTouchEvent( |