Title: [114813] trunk
- Revision
- 114813
- Author
- [email protected]
- Date
- 2012-04-20 17:58:49 -0700 (Fri, 20 Apr 2012)
Log Message
REGRESSION (r114784): svg/text/foreignObject-text-clipping-bug.xml failing on Mountain Lion Debug Tests
https://bugs.webkit.org/show_bug.cgi?id=84505
Reviewed by Anders Carlsson.
Source/WebCore:
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::blockBeforeWithinSelectionRoot): Changed to not assume that boxes only
have boxes as siblings.
LayoutTests:
* platform/mac/test_expectations.txt:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (114812 => 114813)
--- trunk/LayoutTests/ChangeLog 2012-04-21 00:56:15 UTC (rev 114812)
+++ trunk/LayoutTests/ChangeLog 2012-04-21 00:58:49 UTC (rev 114813)
@@ -1,3 +1,12 @@
+2012-04-20 Dan Bernstein <[email protected]>
+
+ REGRESSION (r114784): svg/text/foreignObject-text-clipping-bug.xml failing on Mountain Lion Debug Tests
+ https://bugs.webkit.org/show_bug.cgi?id=84505
+
+ Reviewed by Anders Carlsson.
+
+ * platform/mac/test_expectations.txt:
+
2012-04-20 Daniel Bates <[email protected]>
Rebaseline GTK CSS1 tests after <http://trac.webkit.org/changeset/114799>.
Modified: trunk/LayoutTests/platform/mac/test_expectations.txt (114812 => 114813)
--- trunk/LayoutTests/platform/mac/test_expectations.txt 2012-04-21 00:56:15 UTC (rev 114812)
+++ trunk/LayoutTests/platform/mac/test_expectations.txt 2012-04-21 00:58:49 UTC (rev 114813)
@@ -333,5 +333,3 @@
BUGWK83909 : ietestcenter/css3/grid/grid-column-003.htm = IMAGE
BUGWK83912 : ietestcenter/css3/grid/grid-items-002.htm = IMAGE
BUGWK83913 : ietestcenter/css3/grid/grid-items-003.htm = IMAGE
-
-BUGWK84505 DEBUG : svg/text/foreignObject-text-clipping-bug.xml = CRASH
Modified: trunk/Source/WebCore/ChangeLog (114812 => 114813)
--- trunk/Source/WebCore/ChangeLog 2012-04-21 00:56:15 UTC (rev 114812)
+++ trunk/Source/WebCore/ChangeLog 2012-04-21 00:58:49 UTC (rev 114813)
@@ -1,3 +1,14 @@
+2012-04-20 Dan Bernstein <[email protected]>
+
+ REGRESSION (r114784): svg/text/foreignObject-text-clipping-bug.xml failing on Mountain Lion Debug Tests
+ https://bugs.webkit.org/show_bug.cgi?id=84505
+
+ Reviewed by Anders Carlsson.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::blockBeforeWithinSelectionRoot): Changed to not assume that boxes only
+ have boxes as siblings.
+
2012-04-20 Dana Jansens <[email protected]>
[chromium] Remove special case for recreating layers during sync
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (114812 => 114813)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2012-04-21 00:56:15 UTC (rev 114812)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2012-04-21 00:58:49 UTC (rev 114813)
@@ -3412,11 +3412,11 @@
return 0;
const RenderBox* object = this;
- RenderBox* sibling;
+ RenderObject* sibling;
do {
- sibling = object->previousSiblingBox();
+ sibling = object->previousSibling();
while (sibling && (!sibling->isRenderBlock() || toRenderBlock(sibling)->isSelectionRoot()))
- sibling = sibling->previousSiblingBox();
+ sibling = sibling->previousSibling();
offset -= LayoutSize(object->logicalLeft(), object->logicalTop());
object = object->parentBox();
@@ -3425,15 +3425,17 @@
if (!sibling)
return 0;
- offset += LayoutSize(sibling->logicalLeft(), sibling->logicalTop());
+ RenderBlock* beforeBlock = toRenderBlock(sibling);
- RenderObject* child = sibling->lastChild();
+ offset += LayoutSize(beforeBlock->logicalLeft(), beforeBlock->logicalTop());
+
+ RenderObject* child = beforeBlock->lastChild();
while (child && child->isRenderBlock()) {
- sibling = toRenderBlock(child);
- offset += LayoutSize(sibling->logicalLeft(), sibling->logicalTop());
- child = sibling->lastChild();
+ beforeBlock = toRenderBlock(child);
+ offset += LayoutSize(beforeBlock->logicalLeft(), beforeBlock->logicalTop());
+ child = beforeBlock->lastChild();
}
- return toRenderBlock(sibling);
+ return beforeBlock;
}
void RenderBlock::insertPositionedObject(RenderBox* o)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
