Title: [255006] branches/safari-609-branch
- Revision
- 255006
- Author
- [email protected]
- Date
- 2020-01-23 13:43:22 -0800 (Thu, 23 Jan 2020)
Log Message
Cherry-pick r254492. rdar://problem/58606251
Scrollbar hiding on iOS via ::-webkit-scrollbar { display: none } doesn't work
https://bugs.webkit.org/show_bug.cgi?id=206197
Reviewed by Tim Horton.
Source/WebCore:
The logic added in r251369 was reversed, causing scrollbar hiding to not work correctly.
Tested by fast/scrolling/ios/scrollbar-hiding.html
* rendering/RenderScrollbar.cpp:
(WebCore::RenderScrollbar::isHiddenByStyle const):
LayoutTests:
The logic added in r251369 was reversed, causing scrollbar hiding to not work correctly.
* fast/scrolling/ios/scrollbar-hiding-expected.txt:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254492 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-609-branch/LayoutTests/ChangeLog (255005 => 255006)
--- branches/safari-609-branch/LayoutTests/ChangeLog 2020-01-23 21:43:18 UTC (rev 255005)
+++ branches/safari-609-branch/LayoutTests/ChangeLog 2020-01-23 21:43:22 UTC (rev 255006)
@@ -1,5 +1,42 @@
2020-01-23 Russell Epstein <[email protected]>
+ Cherry-pick r254492. rdar://problem/58606251
+
+ Scrollbar hiding on iOS via ::-webkit-scrollbar { display: none } doesn't work
+ https://bugs.webkit.org/show_bug.cgi?id=206197
+
+ Reviewed by Tim Horton.
+ Source/WebCore:
+
+ The logic added in r251369 was reversed, causing scrollbar hiding to not work correctly.
+
+ Tested by fast/scrolling/ios/scrollbar-hiding.html
+
+ * rendering/RenderScrollbar.cpp:
+ (WebCore::RenderScrollbar::isHiddenByStyle const):
+
+ LayoutTests:
+
+ The logic added in r251369 was reversed, causing scrollbar hiding to not work correctly.
+
+ * fast/scrolling/ios/scrollbar-hiding-expected.txt:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254492 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-01-13 Simon Fraser <[email protected]>
+
+ Scrollbar hiding on iOS via ::-webkit-scrollbar { display: none } doesn't work
+ https://bugs.webkit.org/show_bug.cgi?id=206197
+
+ Reviewed by Tim Horton.
+
+ The logic added in r251369 was reversed, causing scrollbar hiding to not work correctly.
+
+ * fast/scrolling/ios/scrollbar-hiding-expected.txt:
+
+2020-01-23 Russell Epstein <[email protected]>
+
Cherry-pick r254484. rdar://problem/58606285
RenderTreeBuilder::Block::attachIgnoringContinuation should handle inline-block anonymous containers.
Modified: branches/safari-609-branch/LayoutTests/fast/scrolling/ios/scrollbar-hiding-expected.txt (255005 => 255006)
--- branches/safari-609-branch/LayoutTests/fast/scrolling/ios/scrollbar-hiding-expected.txt 2020-01-23 21:43:18 UTC (rev 255005)
+++ branches/safari-609-branch/LayoutTests/fast/scrolling/ios/scrollbar-hiding-expected.txt 2020-01-23 21:43:22 UTC (rev 255006)
@@ -35,9 +35,7 @@
(horizontal scrollbar mode 0)
(vertical scrollbar mode 0)
(has enabled horizontal scrollbar 1)
- (has enabled vertical scrollbar 1)
- (horizontal scrollbar hidden by style 1)
- (vertical scrollbar hidden by style 1)))
+ (has enabled vertical scrollbar 1)))
(overflow scrolling node
(scrollable area size width=200 height=100)
(total content size width=400 height=200)
@@ -49,7 +47,7 @@
(vertical scrollbar mode 0)
(has enabled horizontal scrollbar 1)
(has enabled vertical scrollbar 1)
- (horizontal scrollbar hidden by style 1)))
+ (vertical scrollbar hidden by style 1)))
(overflow scrolling node
(scrollable area size width=200 height=100)
(total content size width=400 height=200)
@@ -61,7 +59,7 @@
(vertical scrollbar mode 0)
(has enabled horizontal scrollbar 1)
(has enabled vertical scrollbar 1)
- (vertical scrollbar hidden by style 1)))
+ (horizontal scrollbar hidden by style 1)))
(overflow scrolling node
(scrollable area size width=200 height=100)
(total content size width=400 height=200)
@@ -72,4 +70,6 @@
(horizontal scrollbar mode 0)
(vertical scrollbar mode 0)
(has enabled horizontal scrollbar 1)
- (has enabled vertical scrollbar 1)))))
+ (has enabled vertical scrollbar 1)
+ (horizontal scrollbar hidden by style 1)
+ (vertical scrollbar hidden by style 1)))))
Modified: branches/safari-609-branch/Source/WebCore/ChangeLog (255005 => 255006)
--- branches/safari-609-branch/Source/WebCore/ChangeLog 2020-01-23 21:43:18 UTC (rev 255005)
+++ branches/safari-609-branch/Source/WebCore/ChangeLog 2020-01-23 21:43:22 UTC (rev 255006)
@@ -1,5 +1,45 @@
2020-01-23 Russell Epstein <[email protected]>
+ Cherry-pick r254492. rdar://problem/58606251
+
+ Scrollbar hiding on iOS via ::-webkit-scrollbar { display: none } doesn't work
+ https://bugs.webkit.org/show_bug.cgi?id=206197
+
+ Reviewed by Tim Horton.
+ Source/WebCore:
+
+ The logic added in r251369 was reversed, causing scrollbar hiding to not work correctly.
+
+ Tested by fast/scrolling/ios/scrollbar-hiding.html
+
+ * rendering/RenderScrollbar.cpp:
+ (WebCore::RenderScrollbar::isHiddenByStyle const):
+
+ LayoutTests:
+
+ The logic added in r251369 was reversed, causing scrollbar hiding to not work correctly.
+
+ * fast/scrolling/ios/scrollbar-hiding-expected.txt:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254492 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-01-13 Simon Fraser <[email protected]>
+
+ Scrollbar hiding on iOS via ::-webkit-scrollbar { display: none } doesn't work
+ https://bugs.webkit.org/show_bug.cgi?id=206197
+
+ Reviewed by Tim Horton.
+
+ The logic added in r251369 was reversed, causing scrollbar hiding to not work correctly.
+
+ Tested by fast/scrolling/ios/scrollbar-hiding.html
+
+ * rendering/RenderScrollbar.cpp:
+ (WebCore::RenderScrollbar::isHiddenByStyle const):
+
+2020-01-23 Russell Epstein <[email protected]>
+
Cherry-pick r254490. rdar://problem/58605943
[WK1][iOS] VideoFullscreenControllerContext uses UIKit on the WebThread
Modified: branches/safari-609-branch/Source/WebCore/rendering/RenderScrollbar.cpp (255005 => 255006)
--- branches/safari-609-branch/Source/WebCore/rendering/RenderScrollbar.cpp 2020-01-23 21:43:18 UTC (rev 255005)
+++ branches/safari-609-branch/Source/WebCore/rendering/RenderScrollbar.cpp 2020-01-23 21:43:22 UTC (rev 255006)
@@ -363,7 +363,7 @@
bool RenderScrollbar::isHiddenByStyle() const
{
std::unique_ptr<RenderStyle> partStyle = getScrollbarPseudoStyle(ScrollbarBGPart, pseudoForScrollbarPart(ScrollbarBGPart));
- return partStyle && partStyle->display() != DisplayType::None;
+ return partStyle && partStyle->display() == DisplayType::None;
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
