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

Unified Diff: content/renderer/render_view_impl.cc

Issue 1472063007: mustash: enable GPU Compositing in renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update Created 5 years, 1 month 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
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 8bb66f17ae1b3486bd1dbb52df9164a85e8d85e4..765f8267aec496581abda938b90970bdefc8e120 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -210,6 +210,11 @@
#include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"
#endif
+#if defined(MOJO_SHELL_CLIENT)
+#include "content/public/common/mojo_shell_connection.h"
+#include "content/renderer/render_widget_mus_connection.h"
+#endif
+
using blink::WebAXObject;
using blink::WebApplicationCacheHost;
using blink::WebApplicationCacheHostClient;
@@ -1711,6 +1716,16 @@ void RenderViewImpl::AttachWebFrameWidget(blink::WebWidget* frame_widget) {
frame_widget_ = frame_widget;
}
+scoped_ptr<cc::OutputSurface> RenderViewImpl::CreateOutputSurface(
+ bool fallback) {
+ if (MojoShellConnection::Get()->GetApplication()) {
Fady Samuel 2015/11/30 23:06:54 I would also put this whole block around #if defi
Peng 2015/12/01 15:22:46 Done.
+ RenderWidgetMusConnection* connection =
+ RenderWidgetMusConnection::Get(routing_id());
+ return connection->CreateOutputSurface();
+ }
+ return RenderWidget::CreateOutputSurface(fallback);
+}
+
void RenderViewImpl::SetZoomLevel(double zoom_level) {
webview()->setZoomLevel(zoom_level);
FOR_EACH_OBSERVER(RenderViewObserver, observers_, OnZoomLevelChanged());

Powered by Google App Engine
This is Rietveld 408576698