Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(986)

Unified Diff: content/renderer/render_widget.cc

Issue 1472063007: mustash: enable GPU Compositing in renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/mojo/mojo_shell_connection_impl.cc ('k') | content/renderer/render_widget_mus_connection.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_widget.cc
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 3f4c190c2c644a4e696b0d75070ebeee702ca03c..e581f616d1a359c6469abfbfea0e15467e359f50 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -94,6 +94,11 @@
#include "third_party/skia/include/core/SkPixelRef.h"
#endif // defined(OS_POSIX)
+#if defined(MOJO_SHELL_CLIENT)
+#include "content/public/common/mojo_shell_connection.h"
+#include "content/renderer/render_widget_mus_connection.h"
+#endif
+
#include "third_party/WebKit/public/web/WebWidget.h"
using blink::WebCompositionUnderline;
@@ -1013,6 +1018,14 @@ scoped_ptr<cc::OutputSurface> RenderWidget::CreateOutputSurface(bool fallback) {
if (command_line.HasSwitch(switches::kDisableGpuCompositing))
use_software = true;
+#if defined(MOJO_SHELL_CLIENT)
+ if (MojoShellConnection::Get()->GetApplication() && !use_software) {
Ben Goodger (Google) 2015/12/01 22:46:57 you should null check Get() before dereferencing.
+ RenderWidgetMusConnection* connection =
+ RenderWidgetMusConnection::GetOrCreate(routing_id());
+ return connection->CreateOutputSurface();
+ }
+#endif
+
scoped_refptr<ContextProviderCommandBuffer> context_provider;
scoped_refptr<ContextProviderCommandBuffer> worker_context_provider;
if (!use_software) {
« no previous file with comments | « content/common/mojo/mojo_shell_connection_impl.cc ('k') | content/renderer/render_widget_mus_connection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698