Chromium Code Reviews| Index: content/renderer/gpu/render_widget_compositor.cc |
| diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc |
| index 1cf1b5318b176cbb1eefc8fa28e5b2f7fe536704..9ada1963ec6f6745c7a0175ec564ac1cd7e2ded9 100644 |
| --- a/content/renderer/gpu/render_widget_compositor.cc |
| +++ b/content/renderer/gpu/render_widget_compositor.cc |
| @@ -229,8 +229,8 @@ std::unique_ptr<cc::LayerTreeHost> RenderWidgetCompositor::CreateLayerTreeHost( |
| float device_scale_factor, |
| const ScreenInfo& screen_info) { |
| base::CommandLine* cmd = base::CommandLine::ForCurrentProcess(); |
| - cc::LayerTreeSettings settings = |
| - GenerateLayerTreeSettings(*cmd, deps, device_scale_factor, screen_info); |
| + cc::LayerTreeSettings settings = GenerateLayerTreeSettings( |
| + *cmd, deps, device_scale_factor, client->IsForSubframe(), screen_info); |
| const bool is_threaded = !!deps->GetCompositorImplThreadTaskRunner(); |
| @@ -270,9 +270,12 @@ cc::LayerTreeSettings RenderWidgetCompositor::GenerateLayerTreeSettings( |
| const base::CommandLine& cmd, |
| CompositorDependencies* compositor_deps, |
| float device_scale_factor, |
| + bool is_for_subframe, |
| const ScreenInfo& screen_info) { |
| cc::LayerTreeSettings settings; |
| + settings.is_layer_tree_for_subframe = is_for_subframe; |
| + |
| // For web contents, layer transforms should scale up the contents of layers |
| // to keep content always crisp when possible. |
| settings.layer_transforms_should_scale_layer_contents = true; |
| @@ -1120,6 +1123,10 @@ void RenderWidgetCompositor::DidCompletePageScaleAnimation() { |
| delegate_->DidCompletePageScaleAnimation(); |
| } |
| +bool RenderWidgetCompositor::IsForSubframe() { |
| + return is_for_oopif_; |
|
Charlie Reis
2017/04/18 21:59:03
Yeah, this is where my confusion comes from, since
wjmaclean
2017/04/18 23:26:49
Acknowledged.
|
| +} |
| + |
| void RenderWidgetCompositor::RequestScheduleAnimation() { |
| delegate_->RequestScheduleAnimation(); |
| } |