Title: [169390] trunk
- Revision
- 169390
- Author
- hy...@apple.com
- Date
- 2014-05-27 10:59:25 -0700 (Tue, 27 May 2014)
Log Message
REGRESSION: Audio volume scrubber does not show volume level thumb
<rdar://problem/16902004>
https://bugs.webkit.org/show_bug.cgi?id=133310
Reviewed by Dean Jackson.
Source/WebCore:
This was just a silly mistake on my part with the setting of the pagination
layers. Layers inside transforms are supposed to clear out their pagination
status based off their ancestor containing block layers, and not off the
enclosing pagination layer.
Added fast/multicol/pagination/nested-transforms.html
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::updatePagination):
LayoutTests:
* fast/multicol/pagination/nested-transforms.html: Added.
* platform/mac/fast/multicol/pagination/nested-transforms-expected.png: Added.
* platform/mac/fast/multicol/pagination/nested-transforms-expected.txt: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (169389 => 169390)
--- trunk/LayoutTests/ChangeLog 2014-05-27 17:36:55 UTC (rev 169389)
+++ trunk/LayoutTests/ChangeLog 2014-05-27 17:59:25 UTC (rev 169390)
@@ -1,3 +1,15 @@
+2014-05-27 David Hyatt <hy...@apple.com>
+
+ REGRESSION: Audio volume scrubber does not show volume level thumb
+ <rdar://problem/16902004>
+ https://bugs.webkit.org/show_bug.cgi?id=133310
+
+ Reviewed by Dean Jackson.
+
+ * fast/multicol/pagination/nested-transforms.html: Added.
+ * platform/mac/fast/multicol/pagination/nested-transforms-expected.png: Added.
+ * platform/mac/fast/multicol/pagination/nested-transforms-expected.txt: Added.
+
2014-05-27 Eric Carlson <eric.carl...@apple.com>
[Mac] media controls should prevent 'click' events from reaching the page
Added: trunk/LayoutTests/fast/multicol/pagination/nested-transforms.html (0 => 169390)
--- trunk/LayoutTests/fast/multicol/pagination/nested-transforms.html (rev 0)
+++ trunk/LayoutTests/fast/multicol/pagination/nested-transforms.html 2014-05-27 17:59:25 UTC (rev 169390)
@@ -0,0 +1,27 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <script>
+ if (window.internals)
+ internals.setPagination("RightToLeftPaginated", 20, 180);
+ </script>
+<style>
+div {
+ height: 20px;
+ width: 80px;
+}
+
+.outer {
+ -webkit-transform: translateX(0);
+}
+
+.inner {
+ background-color: blue;
+ -webkit-transform: translateX(0);
+}
+</style>
+</head>
+ <body >
+ <br></br>
+ <div class="outer"><div id="foo" class="inner"></div></div>
+ </body>
+</html>
Added: trunk/LayoutTests/platform/mac/fast/multicol/pagination/nested-transforms-expected.png
(Binary files differ)
Added: svn:mime-type
Added: trunk/LayoutTests/platform/mac/fast/multicol/pagination/nested-transforms-expected.txt (0 => 169390)
--- trunk/LayoutTests/platform/mac/fast/multicol/pagination/nested-transforms-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/multicol/pagination/nested-transforms-expected.txt 2014-05-27 17:59:25 UTC (rev 169390)
@@ -0,0 +1,15 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+ RenderMultiColumnSet at (0,0) size 800x600
+layer at (0,0) size 180x600
+ RenderMultiColumnFlowThread at (0,0) size 180x600
+layer at (0,0) size 180x600
+ RenderBlock {HTML} at (0,0) size 180x600
+ RenderBody {BODY} at (8,8) size 164x584
+ RenderBlock (anonymous) at (0,0) size 164x36
+ RenderBR {BR} at (0,0) size 0x18
+ RenderBR {BR} at (0,18) size 0x18
+layer at (8,44) size 80x20
+ RenderBlock {DIV} at (0,36) size 80x20
+layer at (8,44) size 80x20
+ RenderBlock {DIV} at (0,0) size 80x20 [bgcolor=#0000FF]
Modified: trunk/Source/WebCore/ChangeLog (169389 => 169390)
--- trunk/Source/WebCore/ChangeLog 2014-05-27 17:36:55 UTC (rev 169389)
+++ trunk/Source/WebCore/ChangeLog 2014-05-27 17:59:25 UTC (rev 169390)
@@ -1,3 +1,21 @@
+2014-05-27 David Hyatt <hy...@apple.com>
+
+ REGRESSION: Audio volume scrubber does not show volume level thumb
+ <rdar://problem/16902004>
+ https://bugs.webkit.org/show_bug.cgi?id=133310
+
+ Reviewed by Dean Jackson.
+
+ This was just a silly mistake on my part with the setting of the pagination
+ layers. Layers inside transforms are supposed to clear out their pagination
+ status based off their ancestor containing block layers, and not off the
+ enclosing pagination layer.
+
+ Added fast/multicol/pagination/nested-transforms.html
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::updatePagination):
+
2014-05-27 Eric Carlson <eric.carl...@apple.com>
[Mac] media controls should prevent 'click' events from reaching the page
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (169389 => 169390)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-05-27 17:36:55 UTC (rev 169389)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-05-27 17:59:25 UTC (rev 169390)
@@ -957,7 +957,7 @@
// paint the transform multiple times in each column, so we don't have to use
// fragments for the transformed content.
m_enclosingPaginationLayer = parent()->enclosingPaginationLayer();
- if (m_enclosingPaginationLayer && m_enclosingPaginationLayer->hasTransform())
+ if (parent()->hasTransform())
m_enclosingPaginationLayer = 0;
return;
}
@@ -972,7 +972,7 @@
// paint the transform multiple times in each column, so we don't have to use
// fragments for the transformed content.
m_enclosingPaginationLayer = containingBlock->layer()->enclosingPaginationLayer();
- if (m_enclosingPaginationLayer && m_enclosingPaginationLayer->hasTransform())
+ if (containingBlock->layer()->hasTransform())
m_enclosingPaginationLayer = 0;
return;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
