Title: [277696] branches/safari-612.1.15.1-branch/Source/WebCore
- Revision
- 277696
- Author
- rubent...@apple.com
- Date
- 2021-05-18 16:55:54 -0700 (Tue, 18 May 2021)
Log Message
Revert "Cherry-pick r277459. rdar://problem/78110796"
This reverts commit r277597.
Modified Paths
Diff
Modified: branches/safari-612.1.15.1-branch/Source/WebCore/ChangeLog (277695 => 277696)
--- branches/safari-612.1.15.1-branch/Source/WebCore/ChangeLog 2021-05-18 23:55:52 UTC (rev 277695)
+++ branches/safari-612.1.15.1-branch/Source/WebCore/ChangeLog 2021-05-18 23:55:54 UTC (rev 277696)
@@ -45,41 +45,6 @@
2021-05-17 Russell Epstein <repst...@apple.com>
- Cherry-pick r277459. rdar://problem/78110796
-
- [macOS] experimental "Use theme color for scroll area background" isn't working
- https://bugs.webkit.org/show_bug.cgi?id=225726
- <rdar://problem/77933000>
-
- Reviewed by Tim Horton.
-
- * rendering/RenderLayerCompositor.cpp:
- (WebCore::RenderLayerCompositor::updateLayerForOverhangAreasBackgroundColor):
- (WebCore::RenderLayerCompositor::updateOverflowControlsLayers):
- Fix last remaining `m_layerForOverhangAreas->setBackgroundColor` to use the helper function
- `RenderLayerCompositor::updateLayerForOverhangAreasBackgroundColor` instead so that all
- paths that update the overscroll area color check the experimental settings too.
-
-
- git-svn-id: https://svn.webkit.org/repository/webkit/trunk@277459 268f45cc-cd09-0410-ab3c-d52691b4dbfc
-
- 2021-05-13 Devin Rousso <drou...@apple.com>
-
- [macOS] experimental "Use theme color for scroll area background" isn't working
- https://bugs.webkit.org/show_bug.cgi?id=225726
- <rdar://problem/77933000>
-
- Reviewed by Tim Horton.
-
- * rendering/RenderLayerCompositor.cpp:
- (WebCore::RenderLayerCompositor::updateLayerForOverhangAreasBackgroundColor):
- (WebCore::RenderLayerCompositor::updateOverflowControlsLayers):
- Fix last remaining `m_layerForOverhangAreas->setBackgroundColor` to use the helper function
- `RenderLayerCompositor::updateLayerForOverhangAreasBackgroundColor` instead so that all
- paths that update the overscroll area color check the experimental settings too.
-
-2021-05-17 Russell Epstein <repst...@apple.com>
-
Cherry-pick r277453. rdar://problem/78108967
Add textIndicator bounce for AppHighlights on scroll.
Modified: branches/safari-612.1.15.1-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp (277695 => 277696)
--- branches/safari-612.1.15.1-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2021-05-18 23:55:52 UTC (rev 277695)
+++ branches/safari-612.1.15.1-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2021-05-18 23:55:54 UTC (rev 277696)
@@ -3879,24 +3879,15 @@
return;
Color backgroundColor;
+ if (page().settings().useThemeColorForScrollAreaBackgroundColor())
+ backgroundColor = page().themeColor();
+ if (page().settings().useSampledPageTopColorForScrollAreaBackgroundColor() && !backgroundColor.isValid())
+ backgroundColor = page().sampledPageTopColor();
+ if (!backgroundColor.isValid())
+ backgroundColor = m_rootExtendedBackgroundColor;
- if (m_renderView.settings().backgroundShouldExtendBeyondPage()) {
- backgroundColor = ([&] {
- if (page().settings().useThemeColorForScrollAreaBackgroundColor()) {
- if (auto themeColor = page().themeColor(); themeColor.isValid())
- return themeColor;
- }
+ m_layerForOverhangAreas->setBackgroundColor(backgroundColor);
- if (page().settings().useSampledPageTopColorForScrollAreaBackgroundColor()) {
- if (auto sampledPageTopColor = page().sampledPageTopColor(); sampledPageTopColor.isValid())
- return sampledPageTopColor;
- }
-
- return m_rootExtendedBackgroundColor;
- })();
- m_layerForOverhangAreas->setBackgroundColor(backgroundColor);
- }
-
if (!backgroundColor.isValid())
m_layerForOverhangAreas->setCustomAppearance(GraphicsLayer::CustomAppearance::ScrollingOverhang);
}
@@ -3999,8 +3990,12 @@
m_layerForOverhangAreas->setSize(overhangAreaSize);
m_layerForOverhangAreas->setPosition(FloatPoint(0, topContentInset));
m_layerForOverhangAreas->setAnchorPoint(FloatPoint3D());
- updateLayerForOverhangAreasBackgroundColor();
+ if (m_renderView.settings().backgroundShouldExtendBeyondPage())
+ m_layerForOverhangAreas->setBackgroundColor(m_renderView.frameView().documentBackgroundColor());
+ else
+ m_layerForOverhangAreas->setCustomAppearance(GraphicsLayer::CustomAppearance::ScrollingOverhang);
+
// We want the overhang areas layer to be positioned below the frame contents,
// so insert it below the clip layer.
m_overflowControlsHostLayer->addChildBelow(*m_layerForOverhangAreas, layerForClipping());
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes