Title: [117852] branches/safari-536-branch
Diff
Modified: branches/safari-536-branch/LayoutTests/ChangeLog (117851 => 117852)
--- branches/safari-536-branch/LayoutTests/ChangeLog 2012-05-22 00:16:57 UTC (rev 117851)
+++ branches/safari-536-branch/LayoutTests/ChangeLog 2012-05-22 00:18:55 UTC (rev 117852)
@@ -1,5 +1,19 @@
2012-05-21 Lucas Forschler <[email protected]>
+ Merge 117537
+
+ 2012-05-17 Dan Bernstein <[email protected]>
+
+ <rdar://problem/11419933> Problems with flipped writing modes and compositing
+ https://bugs.webkit.org/show_bug.cgi?id=86032
+
+ Reviewed by Anders Carlsson.
+
+ * compositing/bounds-in-flipped-writing-mode-expected.txt: Added.
+ * compositing/bounds-in-flipped-writing-mode.html: Added.
+
+2012-05-21 Lucas Forschler <[email protected]>
+
Merge 117523
2012-05-17 Filip Pizlo <[email protected]>
Copied: branches/safari-536-branch/LayoutTests/compositing/bounds-in-flipped-writing-mode-expected.txt (from rev 117537, trunk/LayoutTests/compositing/bounds-in-flipped-writing-mode-expected.txt) (0 => 117852)
--- branches/safari-536-branch/LayoutTests/compositing/bounds-in-flipped-writing-mode-expected.txt (rev 0)
+++ branches/safari-536-branch/LayoutTests/compositing/bounds-in-flipped-writing-mode-expected.txt 2012-05-22 00:18:55 UTC (rev 117852)
@@ -0,0 +1,17 @@
+(GraphicsLayer
+ (bounds 800.00 600.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 800.00 600.00)
+ (children 1
+ (GraphicsLayer
+ (position 100.00 100.00)
+ (anchor 0.50 0.75)
+ (bounds 100.00 200.00)
+ (drawsContent 1)
+ )
+ )
+ )
+ )
+)
+
Copied: branches/safari-536-branch/LayoutTests/compositing/bounds-in-flipped-writing-mode.html (from rev 117537, trunk/LayoutTests/compositing/bounds-in-flipped-writing-mode.html) (0 => 117852)
--- branches/safari-536-branch/LayoutTests/compositing/bounds-in-flipped-writing-mode.html (rev 0)
+++ branches/safari-536-branch/LayoutTests/compositing/bounds-in-flipped-writing-mode.html 2012-05-22 00:18:55 UTC (rev 117852)
@@ -0,0 +1,13 @@
+<body style="margin: 0; padding: 100px;">
+ <div style="width: 100px; height: 100px; background-color: red;"></div>
+ <div style="width: 100px; height: 100px; -webkit-writing-mode: horizontal-bt; -webkit-transform: translatez(0)">
+ <div style="-webkit-margin-before: 100px; height: 100px; background-color: green;"></div>
+ </div>
+ <pre id="console"></pre>
+ <script>
+ if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ document.getElementById("console").appendChild(document.createTextNode(layoutTestController.layerTreeAsText()));
+ }
+ </script>
+</body>
Modified: branches/safari-536-branch/Source/WebCore/ChangeLog (117851 => 117852)
--- branches/safari-536-branch/Source/WebCore/ChangeLog 2012-05-22 00:16:57 UTC (rev 117851)
+++ branches/safari-536-branch/Source/WebCore/ChangeLog 2012-05-22 00:18:55 UTC (rev 117852)
@@ -1,5 +1,22 @@
2012-05-21 Lucas Forschler <[email protected]>
+ Merge 117537
+
+ 2012-05-17 Dan Bernstein <[email protected]>
+
+ <rdar://problem/11419933> Problems with flipped writing modes and compositing
+ https://bugs.webkit.org/show_bug.cgi?id=86032
+
+ Reviewed by Anders Carlsson.
+
+ Test: compositing/bounds-in-flipped-writing-mode.html
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::calculateLayerBounds): Apply a writing-mode flip to the bounding box
+ if needed.
+
+2012-05-21 Lucas Forschler <[email protected]>
+
Merge 117502
2012-05-17 Beth Dakin <[email protected]>
Modified: branches/safari-536-branch/Source/WebCore/rendering/RenderLayer.cpp (117851 => 117852)
--- branches/safari-536-branch/Source/WebCore/rendering/RenderLayer.cpp 2012-05-22 00:16:57 UTC (rev 117851)
+++ branches/safari-536-branch/Source/WebCore/rendering/RenderLayer.cpp 2012-05-22 00:18:55 UTC (rev 117852)
@@ -4149,8 +4149,13 @@
{
if (!layer->isSelfPaintingLayer())
return IntRect();
-
+
LayoutRect boundingBoxRect = layer->localBoundingBox();
+ if (layer->renderer()->isBox())
+ layer->renderBox()->flipForWritingMode(boundingBoxRect);
+ else
+ layer->renderer()->containingBlock()->flipForWritingMode(boundingBoxRect);
+
if (layer->renderer()->isRoot()) {
// If the root layer becomes composited (e.g. because some descendant with negative z-index is composited),
// then it has to be big enough to cover the viewport in order to display the background. This is akin
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
