Title: [240271] trunk
- Revision
- 240271
- Author
- [email protected]
- Date
- 2019-01-22 11:55:00 -0800 (Tue, 22 Jan 2019)
Log Message
Fix the position of layers nested inside of composited overflow-scroll
https://bugs.webkit.org/show_bug.cgi?id=193642
Reviewed by Antti Koivisto and Sam Weinig.
Source/WebCore:
Remove an iOS #ifdef so that layers inside composited overflow gets the correct
positions on macOS too.
Test: compositing/geometry/fixed-inside-overflow-scroll.html
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::computeParentGraphicsLayerRect const):
LayoutTests:
Ref test. Black bar obscures the area that's different because of overlay/non-overlay
scrollbar differences between macOS and iOS.
* compositing/geometry/fixed-inside-overflow-scroll-expected.html: Added.
* compositing/geometry/fixed-inside-overflow-scroll.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (240270 => 240271)
--- trunk/LayoutTests/ChangeLog 2019-01-22 19:54:05 UTC (rev 240270)
+++ trunk/LayoutTests/ChangeLog 2019-01-22 19:55:00 UTC (rev 240271)
@@ -1,3 +1,16 @@
+2019-01-22 Simon Fraser <[email protected]>
+
+ Fix the position of layers nested inside of composited overflow-scroll
+ https://bugs.webkit.org/show_bug.cgi?id=193642
+
+ Reviewed by Antti Koivisto and Sam Weinig.
+
+ Ref test. Black bar obscures the area that's different because of overlay/non-overlay
+ scrollbar differences between macOS and iOS.
+
+ * compositing/geometry/fixed-inside-overflow-scroll-expected.html: Added.
+ * compositing/geometry/fixed-inside-overflow-scroll.html: Added.
+
2019-01-22 Oriol Brufau <[email protected]>
[css-logical] Implement flow-relative margin, padding and border shorthands
Added: trunk/LayoutTests/compositing/geometry/fixed-inside-overflow-scroll-expected.html (0 => 240271)
--- trunk/LayoutTests/compositing/geometry/fixed-inside-overflow-scroll-expected.html (rev 0)
+++ trunk/LayoutTests/compositing/geometry/fixed-inside-overflow-scroll-expected.html 2019-01-22 19:55:00 UTC (rev 240271)
@@ -0,0 +1,70 @@
+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ body {
+ margin: 0;
+ }
+ .container {
+ position: relative;
+ z-index: 0;
+ margin: 50px;
+ width: 400px;
+ height: 320px;
+ overflow-y: scroll;
+ border: 30px solid gray;
+ box-shadow: 0 0 10px transparent;
+ padding: 20px;
+ }
+
+ .inner {
+ position: relative;
+ height: 1000px;
+ width: 100%;
+ background-color: silver;
+ }
+
+ .inner-fixed {
+ position: absolute;
+ top: 50px;
+ left: 100px;
+ width: 200px;
+ height: 150px;
+ background-color: green;
+ box-shadow: 0 0 10px transparent;
+ will-change: transform;
+ }
+
+ .placeholder {
+ position: absolute;
+ background-color: red;
+ top: 50px;
+ left: 100px;
+ width: 200px;
+ height: 148px;
+ }
+
+ .scrollbar-hider {
+ position: absolute;
+ height: 380px;
+ width: 37px;
+ top: 70px;
+ left: 484px;
+ background-color: black;
+ }
+ </style>
+</head>
+<body>
+
+<div id="scroller" class="container">
+ <div class="inner">
+
+ <div class="placeholder"></div>
+ <div class="inner-fixed"></div>
+ </div>
+</div>
+<div class="scrollbar-hider"></div>
+
+</body>
+</html>
Added: trunk/LayoutTests/compositing/geometry/fixed-inside-overflow-scroll.html (0 => 240271)
--- trunk/LayoutTests/compositing/geometry/fixed-inside-overflow-scroll.html (rev 0)
+++ trunk/LayoutTests/compositing/geometry/fixed-inside-overflow-scroll.html 2019-01-22 19:55:00 UTC (rev 240271)
@@ -0,0 +1,70 @@
+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ body {
+ margin: 0;
+ }
+ .container {
+ position: relative;
+ z-index: 0;
+ margin: 50px;
+ width: 400px;
+ height: 320px;
+ overflow-y: scroll;
+ border: 30px solid gray;
+ box-shadow: 0 0 10px transparent;
+ padding: 20px;
+ }
+
+ .inner {
+ height: 1000px;
+ width: 100%;
+ background-color: silver;
+ }
+
+ .inner-fixed {
+ position: fixed;
+ top: 150px;
+ left: 200px;
+ width: 200px;
+ height: 150px;
+ background-color: green;
+ box-shadow: 0 0 10px transparent;
+ }
+
+ .placeholder {
+ background-color: red;
+ width: 200px;
+ height: 148px;
+ margin: 32px 100px;
+ }
+
+ .scrollbar-hider {
+ position: absolute;
+ height: 380px;
+ width: 37px;
+ top: 70px;
+ left: 484px;
+ background-color: black;
+ }
+ </style>
+ <script>
+ if (window.internals)
+ window.internals.settings.setAsyncOverflowScrollingEnabled(true);
+ </script>
+</head>
+<body>
+
+<div id="scroller" class="container">
+ <div class="inner">
+
+ <div class="placeholder"></div>
+ <div class="inner-fixed"></div>
+ </div>
+</div>
+<div class="scrollbar-hider"></div>
+
+</body>
+</html>
Modified: trunk/Source/WebCore/ChangeLog (240270 => 240271)
--- trunk/Source/WebCore/ChangeLog 2019-01-22 19:54:05 UTC (rev 240270)
+++ trunk/Source/WebCore/ChangeLog 2019-01-22 19:55:00 UTC (rev 240271)
@@ -1,3 +1,18 @@
+2019-01-22 Simon Fraser <[email protected]>
+
+ Fix the position of layers nested inside of composited overflow-scroll
+ https://bugs.webkit.org/show_bug.cgi?id=193642
+
+ Reviewed by Antti Koivisto and Sam Weinig.
+
+ Remove an iOS #ifdef so that layers inside composited overflow gets the correct
+ positions on macOS too.
+
+ Test: compositing/geometry/fixed-inside-overflow-scroll.html
+
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::computeParentGraphicsLayerRect const):
+
2019-01-22 Claudio Saavedra <[email protected]>
[GTK] Build fix for Ubuntu LTS 16.04
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (240270 => 240271)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2019-01-22 19:54:05 UTC (rev 240270)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2019-01-22 19:55:00 UTC (rev 240271)
@@ -946,7 +946,6 @@
parentGraphicsLayerRect = snappedGraphicsLayer(clippingBoxOffset, clippingBox.size(), deviceScaleFactor()).m_snappedRect;
}
-#if PLATFORM(IOS_FAMILY)
if (compositedAncestor->hasCompositedScrollableOverflow()) {
LayoutRect ancestorCompositedBounds = ancestorBackingLayer->compositedBounds();
auto& renderBox = downcast<RenderBox>(compositedAncestor->renderer());
@@ -954,7 +953,6 @@
ScrollOffset scrollOffset = compositedAncestor->scrollOffset();
parentGraphicsLayerRect = LayoutRect((paddingBoxIncludingScrollbar.location() - toLayoutSize(ancestorCompositedBounds.location()) - toLayoutSize(scrollOffset)), paddingBoxIncludingScrollbar.size());
}
-#endif
if (m_ancestorClippingLayer) {
// Call calculateRects to get the backgroundRect which is what is used to clip the contents of this
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
