diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-09-16 16:19:10 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-25 19:54:56 +0200 |
| commit | b7dc59562ccd44c57114415b6a121f04f84a40a3 (patch) | |
| tree | adb35ff0e9d25b0a628bd17ef5d322c385d0c04d /lib/web_contents_view_qt.cpp | |
| parent | 57f8c26c77095d2dc7c5b67f33444add7e7d181a (diff) | |
Use an enum at creation to initialize the compositing mode.
This value won't change and this will force us to avoid
spreading runtime checks.
Change-Id: I7928cbe12d75bacddb5ad5c0578ae9a25d7c138e
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'lib/web_contents_view_qt.cpp')
| -rw-r--r-- | lib/web_contents_view_qt.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/web_contents_view_qt.cpp b/lib/web_contents_view_qt.cpp index b74b7325a..340075c9a 100644 --- a/lib/web_contents_view_qt.cpp +++ b/lib/web_contents_view_qt.cpp @@ -45,7 +45,9 @@ #include "content_browser_client_qt.h" #include "render_widget_host_view_qt_delegate.h" +#include "base/command_line.h" #include "content/browser/renderer_host/render_view_host_impl.h" +#include "content/public/common/content_switches.h" void WebContentsViewQt::initialize(WebContentsAdapterClient* client) { @@ -60,8 +62,12 @@ content::RenderWidgetHostView* WebContentsViewQt::CreateViewForWidget(content::R { RenderWidgetHostViewQt *view = new RenderWidgetHostViewQt(render_widget_host); + WebContentsAdapterClient::CompositingMode compositingMode = WebContentsAdapterClient::NoCompositing; + if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kForceCompositingMode)) + compositingMode = WebContentsAdapterClient::ForcedGpuProcessCompositing; + Q_ASSERT(m_factoryClient); - RenderWidgetHostViewQtDelegate* viewDelegate = m_factoryClient->CreateRenderWidgetHostViewQtDelegate(); + RenderWidgetHostViewQtDelegate* viewDelegate = m_factoryClient->CreateRenderWidgetHostViewQtDelegate(compositingMode); view->setDelegate(viewDelegate); if (m_client) view->setAdapterClient(m_client); |