Commit 38f783ea authored by Steve Kobes's avatar Steve Kobes Committed by Commit Bot

Remove RootLayerScrolling REF.

This removes the entry in runtime_enabled_features.json5 along with the
two remaining uses of it in LocalFrameView.

Bug: 823365
Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2
Change-Id: Ic220dc9dc67c658900619f7f89f83ffce226e4dd
Reviewed-on: https://chromium-review.googlesource.com/1073387
Commit-Queue: Steve Kobes <skobes@chromium.org>
Reviewed-by: default avatarPhilip Rogers <pdr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#561882}
parent 69141da0
...@@ -607,8 +607,6 @@ void LocalFrameView::SetFrameRect(const IntRect& unclamped_frame_rect) { ...@@ -607,8 +607,6 @@ void LocalFrameView::SetFrameRect(const IntRect& unclamped_frame_rect) {
FrameRectsChanged(); FrameRectsChanged();
UpdateParentScrollableAreaSet();
if (auto* layout_view = GetLayoutView()) if (auto* layout_view = GetLayoutView())
layout_view->SetMayNeedPaintInvalidation(); layout_view->SetMayNeedPaintInvalidation();
...@@ -788,17 +786,7 @@ void LocalFrameView::AdjustViewSize() { ...@@ -788,17 +786,7 @@ void LocalFrameView::AdjustViewSize() {
return; return;
DCHECK_EQ(frame_->View(), this); DCHECK_EQ(frame_->View(), this);
SetLayoutOverflowSize(layout_view->DocumentRect().Size());
const IntRect rect = layout_view->DocumentRect();
const IntSize& size = rect.Size();
if (!RuntimeEnabledFeatures::RootLayerScrollingEnabled()) {
const IntPoint origin(-rect.X(), -rect.Y());
if (ScrollOrigin() != origin)
SetScrollOrigin(origin);
}
SetLayoutOverflowSize(size);
} }
void LocalFrameView::AdjustViewSizeAndLayout() { void LocalFrameView::AdjustViewSizeAndLayout() {
...@@ -1242,8 +1230,6 @@ void LocalFrameView::UpdateLayout() { ...@@ -1242,8 +1230,6 @@ void LocalFrameView::UpdateLayout() {
PerformLayout(in_subtree_layout); PerformLayout(in_subtree_layout);
UpdateParentScrollableAreaSet();
IntSize new_size(Size()); IntSize new_size(Size());
if (old_size != new_size) { if (old_size != new_size) {
SetNeedsLayout(); SetNeedsLayout();
...@@ -2699,23 +2685,6 @@ LocalFrameView::ScrollingReasons LocalFrameView::GetScrollingReasons() const { ...@@ -2699,23 +2685,6 @@ LocalFrameView::ScrollingReasons LocalFrameView::GetScrollingReasons() const {
return kScrollable; return kScrollable;
} }
void LocalFrameView::UpdateParentScrollableAreaSet() {
if (RuntimeEnabledFeatures::RootLayerScrollingEnabled())
return;
// That ensures that only inner frames are cached.
LocalFrameView* parent_frame_view = ParentFrameView();
if (!parent_frame_view)
return;
if (!IsScrollable()) {
parent_frame_view->RemoveScrollableArea(this);
return;
}
parent_frame_view->AddScrollableArea(this);
}
bool LocalFrameView::ShouldSuspendScrollAnimations() const { bool LocalFrameView::ShouldSuspendScrollAnimations() const {
return !frame_->GetDocument()->LoadEventFinished(); return !frame_->GetDocument()->LoadEventFinished();
} }
...@@ -4123,7 +4092,6 @@ void LocalFrameView::AttachToLayout() { ...@@ -4123,7 +4092,6 @@ void LocalFrameView::AttachToLayout() {
CHECK(parent_); CHECK(parent_);
if (parent_->IsVisible()) if (parent_->IsVisible())
SetParentVisible(true); SetParentVisible(true);
UpdateParentScrollableAreaSet();
SetupRenderThrottling(); SetupRenderThrottling();
subtree_throttled_ = ParentFrameView()->CanThrottleRendering(); subtree_throttled_ = ParentFrameView()->CanThrottleRendering();
...@@ -5048,7 +5016,6 @@ void LocalFrameView::Show() { ...@@ -5048,7 +5016,6 @@ void LocalFrameView::Show() {
GetScrollingContext()->SetScrollGestureRegionIsDirty(true); GetScrollingContext()->SetScrollGestureRegionIsDirty(true);
} }
SetNeedsCompositingUpdate(kCompositingUpdateRebuildTree); SetNeedsCompositingUpdate(kCompositingUpdateRebuildTree);
UpdateParentScrollableAreaSet();
if (IsParentVisible()) { if (IsParentVisible()) {
ForAllChildViewsAndPlugins( ForAllChildViewsAndPlugins(
[](EmbeddedContentView& embedded_content_view) { [](EmbeddedContentView& embedded_content_view) {
...@@ -5072,7 +5039,6 @@ void LocalFrameView::Hide() { ...@@ -5072,7 +5039,6 @@ void LocalFrameView::Hide() {
GetScrollingContext()->SetScrollGestureRegionIsDirty(true); GetScrollingContext()->SetScrollGestureRegionIsDirty(true);
} }
SetNeedsCompositingUpdate(kCompositingUpdateRebuildTree); SetNeedsCompositingUpdate(kCompositingUpdateRebuildTree);
UpdateParentScrollableAreaSet();
} }
} }
......
...@@ -1040,8 +1040,6 @@ class CORE_EXPORT LocalFrameView final ...@@ -1040,8 +1040,6 @@ class CORE_EXPORT LocalFrameView final
bool WasViewportResized(); bool WasViewportResized();
void SendResizeEventIfNeeded(); void SendResizeEventIfNeeded();
void UpdateParentScrollableAreaSet();
void ScheduleUpdatePluginsIfNecessary(); void ScheduleUpdatePluginsIfNecessary();
void UpdatePluginsTimerFired(TimerBase*); void UpdatePluginsTimerFired(TimerBase*);
bool UpdatePlugins(); bool UpdatePlugins();
......
...@@ -207,8 +207,7 @@ bool BoxPaintInvalidator::ShouldFullyInvalidateBackgroundOnLayoutOverflowChange( ...@@ -207,8 +207,7 @@ bool BoxPaintInvalidator::ShouldFullyInvalidateBackgroundOnLayoutOverflowChange(
bool BoxPaintInvalidator::ViewBackgroundShouldFullyInvalidate() const { bool BoxPaintInvalidator::ViewBackgroundShouldFullyInvalidate() const {
DCHECK(box_.IsLayoutView()); DCHECK(box_.IsLayoutView());
// Fixed attachment background is handled in LayoutView::layout(). // Fixed attachment background is handled in LayoutView::layout().
// TODO(wangxianzhu): Combine code for fixed-attachment background when we // TODO(wangxianzhu): Combine code for fixed-attachment background.
// enable rootLayerScrolling permanently.
if (box_.StyleRef().HasEntirelyFixedBackground()) if (box_.StyleRef().HasEntirelyFixedBackground())
return false; return false;
......
...@@ -1071,12 +1071,6 @@ ...@@ -1071,12 +1071,6 @@
name: "RestrictCanRequestURLCharacterSet", name: "RestrictCanRequestURLCharacterSet",
status: "stable", status: "stable",
}, },
// Handles frame scrolling via the root PaintLayer instead of the FrameView.
// The master bug for the root layer scrolling project is crbug.com/417782.
{
name: "RootLayerScrolling",
status: "stable",
},
{ {
name: "RtcPeerConnectionId", name: "RtcPeerConnectionId",
origin_trial_feature_name: "RtcPeerConnectionId", origin_trial_feature_name: "RtcPeerConnectionId",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment