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

Unified Diff: content/renderer/render_widget_fullscreen_pepper.cc

Issue 288633002: Remove renderer-side tracking of accelerated compositing (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase on piman;danakj review Created 6 years, 7 months 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/renderer/render_widget.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_widget_fullscreen_pepper.cc
diff --git a/content/renderer/render_widget_fullscreen_pepper.cc b/content/renderer/render_widget_fullscreen_pepper.cc
index bf85de27f9d193efffcf76aee8f2e521d36e2a5e..0fd430eb79f9dc73b43395c8e06061340ca1d14c 100644
--- a/content/renderer/render_widget_fullscreen_pepper.cc
+++ b/content/renderer/render_widget_fullscreen_pepper.cc
@@ -324,22 +324,16 @@ void RenderWidgetFullscreenPepper::DidChangeCursor(
void RenderWidgetFullscreenPepper::SetLayer(blink::WebLayer* layer) {
layer_ = layer;
- bool compositing = !!layer_;
- if (compositing != is_accelerated_compositing_active_) {
- if (compositing) {
- if (!layerTreeView())
- initializeLayerTreeView();
- if (!layerTreeView())
- return;
- layer_->setBounds(blink::WebSize(size()));
- layer_->setDrawsContent(true);
- compositor_->setDeviceScaleFactor(device_scale_factor_);
- compositor_->setRootLayer(*layer_);
- didActivateCompositor();
- } else {
- didDeactivateCompositor();
- }
+ if (!layer_) {
+ compositor_->clearRootLayer();
+ return;
}
+ if (!layerTreeView())
+ initializeLayerTreeView();
+ layer_->setBounds(blink::WebSize(size()));
+ layer_->setDrawsContent(true);
+ compositor_->setDeviceScaleFactor(device_scale_factor_);
+ compositor_->setRootLayer(*layer_);
}
bool RenderWidgetFullscreenPepper::OnMessageReceived(const IPC::Message& msg) {
« no previous file with comments | « content/renderer/render_widget.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698