Title: [152558] branches/safari-537-branch
- Revision
- 152558
- Author
- [email protected]
- Date
- 2013-07-10 17:46:10 -0700 (Wed, 10 Jul 2013)
Log Message
Rollout of r152556. <rdar://problem/14305675>
Modified Paths
Removed Paths
Diff
Modified: branches/safari-537-branch/LayoutTests/ChangeLog (152557 => 152558)
--- branches/safari-537-branch/LayoutTests/ChangeLog 2013-07-11 00:31:35 UTC (rev 152557)
+++ branches/safari-537-branch/LayoutTests/ChangeLog 2013-07-11 00:46:10 UTC (rev 152558)
@@ -1,5 +1,9 @@
2013-07-10 Lucas Forschler <[email protected]>
+ Rollout r152556. <rdar://problem/14305675>
+
+2013-07-10 Lucas Forschler <[email protected]>
+
Merge r152554
2013-07-10 Sam Weinig <[email protected]>
Deleted: branches/safari-537-branch/LayoutTests/fast/dom/Range/getClientRects-vertical-expected.txt (152557 => 152558)
--- branches/safari-537-branch/LayoutTests/fast/dom/Range/getClientRects-vertical-expected.txt 2013-07-11 00:31:35 UTC (rev 152557)
+++ branches/safari-537-branch/LayoutTests/fast/dom/Range/getClientRects-vertical-expected.txt 2013-07-11 00:46:10 UTC (rev 152558)
@@ -1,10 +0,0 @@
-This tests that Range.getClientRects() work correctly for partially selected vertical text.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS range1.getClientRects()[0].width is range2.getClientRects()[0].width
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: branches/safari-537-branch/LayoutTests/fast/dom/Range/getClientRects-vertical.html (152557 => 152558)
--- branches/safari-537-branch/LayoutTests/fast/dom/Range/getClientRects-vertical.html 2013-07-11 00:31:35 UTC (rev 152557)
+++ branches/safari-537-branch/LayoutTests/fast/dom/Range/getClientRects-vertical.html 2013-07-11 00:46:10 UTC (rev 152558)
@@ -1,41 +0,0 @@
-<html>
- <head>
- <script src=""
- <style>
- .test { -webkit-writing-mode: vertical-lr; }
- </style>
- </script>
- </head>
- <body>
- <div id="testarea">
- <p>
- <div class="test" id="test1">Hello</div>
- </p>
- <p>
- <div class="test" id="test2">Hello</div>
- </p>
- </div>
- <script>
- description("This tests that Range.getClientRects() work correctly for partially selected vertical text.")
-
- // Select a whole element's worth of text.
- var range1 = document.createRange();
- range1.selectNodeContents(document.getElementById("test1").firstChild);
-
-
- // Select slightly less than a whole elements worth of text.
- var range2 = document.createRange();
- range2.selectNodeContents(document.getElementById("test2").firstChild);
- range2.setEnd(range2.endContainer, range2.endOffset - 1);
-
- // They should have the same width.
- shouldBe("range1.getClientRects()[0].width", "range2.getClientRects()[0].width");
-
-
- // Cleanup
- var testarea = document.getElementById("testarea");
- testarea.parentNode.removeChild(testarea);
- </script>
- <script src=""
- </body>
-</html>
Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (152557 => 152558)
--- branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-11 00:31:35 UTC (rev 152557)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-11 00:46:10 UTC (rev 152558)
@@ -1,5 +1,9 @@
2013-07-10 Lucas Forschler <[email protected]>
+ Rollout r152556. <rdar://problem/14305675>
+
+2013-07-10 Lucas Forschler <[email protected]>
+
Merge r152554
2013-07-10 Sam Weinig <[email protected]>
Modified: branches/safari-537-branch/Source/WebCore/rendering/RenderText.cpp (152557 => 152558)
--- branches/safari-537-branch/Source/WebCore/rendering/RenderText.cpp 2013-07-11 00:31:35 UTC (rev 152557)
+++ branches/safari-537-branch/Source/WebCore/rendering/RenderText.cpp 2013-07-11 00:46:10 UTC (rev 152558)
@@ -331,10 +331,10 @@
// Change the height and y position (or width and x for vertical text)
// because selectionRect uses selection-specific values.
if (box->isHorizontal()) {
- r.setHeight(box->height());
+ r.setHeight(box->logicalHeight());
r.setY(box->y());
} else {
- r.setWidth(box->width());
+ r.setWidth(box->logicalWidth());
r.setX(box->x());
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
