Chromium Code Reviews| 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..5f82ec189b5889ba4d9a02da3db3febc86a25b4f 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_) |
|
danakj
2014/05/14 15:03:34
Should we setRootLayer(NULL) if !layer_? Before we
enne (OOO)
2014/05/15 20:51:15
Sure. I think that seems reasonable, although I t
|
| + return; |
| + if (!layerTreeView()) |
| + initializeLayerTreeView(); |
| + if (!layerTreeView()) |
|
danakj
2014/05/14 15:03:34
Can this go away too?
enne (OOO)
2014/05/15 20:51:15
Done.
|
| + return; |
| + layer_->setBounds(blink::WebSize(size())); |
| + layer_->setDrawsContent(true); |
| + compositor_->setDeviceScaleFactor(device_scale_factor_); |
| + compositor_->setRootLayer(*layer_); |
| } |
| bool RenderWidgetFullscreenPepper::OnMessageReceived(const IPC::Message& msg) { |