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

Unified Diff: content/renderer/gpu/render_widget_compositor.cc

Issue 2785533003: Animated scroll shouldn't consume unhandled scrolls for OOPIFs. (Closed)
Patch Set: Fix Android compile. Created 3 years, 8 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
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 ab08fe1fb51b0b75488bd1e6b19ecbb09db03296..c9591a7ee9597247f18f644d86b98695d275084a 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;
@@ -1117,6 +1120,10 @@ void RenderWidgetCompositor::DidCompletePageScaleAnimation() {
delegate_->DidCompletePageScaleAnimation();
}
+bool RenderWidgetCompositor::IsForSubframe() {
+ return is_for_oopif_;
+}
+
void RenderWidgetCompositor::RequestScheduleAnimation() {
delegate_->RequestScheduleAnimation();
}

Powered by Google App Engine
This is Rietveld 408576698