Diff
Modified: branches/safari-534.54-branch/LayoutTests/ChangeLog (104242 => 104243)
--- branches/safari-534.54-branch/LayoutTests/ChangeLog 2012-01-06 00:33:53 UTC (rev 104242)
+++ branches/safari-534.54-branch/LayoutTests/ChangeLog 2012-01-06 00:36:16 UTC (rev 104243)
@@ -1,5 +1,21 @@
2011-1-5 Lucas Forschler <[email protected]>
+ Merge 99756
+
+ 2011-11-09 Ken Buchanan <[email protected]>
+
+ Rebaselining gtk and qt results for foreign object overflow
+ https://bugs.webkit.org/show_bug.cgi?id=64780
+
+ Reviewed by Eric Seidel.
+
+ Fix for 64780 changed results for one layoutTest. This is the rebaseline for gtk and qt platforms.
+
+ * platform/gtk/svg/overflow/overflow-on-foreignObject-expected.txt: Rebaseline
+ * platform/qt/svg/overflow/overflow-on-foreignObject-expected.txt: Rebaseline
+
+2011-1-5 Lucas Forschler <[email protected]>
+
Merge 99731
2011-11-09 Ken Buchanan <[email protected]>
Modified: branches/safari-534.54-branch/LayoutTests/platform/gtk/svg/overflow/overflow-on-foreignObject-expected.txt (104242 => 104243)
--- branches/safari-534.54-branch/LayoutTests/platform/gtk/svg/overflow/overflow-on-foreignObject-expected.txt 2012-01-06 00:33:53 UTC (rev 104242)
+++ branches/safari-534.54-branch/LayoutTests/platform/gtk/svg/overflow/overflow-on-foreignObject-expected.txt 2012-01-06 00:36:16 UTC (rev 104243)
@@ -3,5 +3,5 @@
layer at (0,0) size 500x500
RenderSVGRoot {svg} at (200,200) size 300x300
RenderSVGForeignObject {foreignObject} at (100,100) size 300x300
-layer at (100,100) size 6006x6006 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 outlineClip at (0,0) size 800x600
- RenderBlock (positioned) {html:div} at (100,100) size 6006x6006 [bgcolor=#008000] [border: (3px solid #000000)]
+layer at (0,0) size 6006x6006 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 outlineClip at (0,0) size 800x600
+ RenderBlock (positioned) {html:div} at (0,0) size 6006x6006 [bgcolor=#008000] [border: (3px solid #000000)]
Property changes on: branches/safari-534.54-branch/LayoutTests/platform/gtk/svg/overflow/overflow-on-foreignObject-expected.txt
___________________________________________________________________
Added: svn:executable
Modified: branches/safari-534.54-branch/LayoutTests/platform/qt/svg/overflow/overflow-on-foreignObject-expected.txt (104242 => 104243)
--- branches/safari-534.54-branch/LayoutTests/platform/qt/svg/overflow/overflow-on-foreignObject-expected.txt 2012-01-06 00:33:53 UTC (rev 104242)
+++ branches/safari-534.54-branch/LayoutTests/platform/qt/svg/overflow/overflow-on-foreignObject-expected.txt 2012-01-06 00:36:16 UTC (rev 104243)
@@ -3,5 +3,5 @@
layer at (0,0) size 500x500
RenderSVGRoot {svg} at (200,200) size 300x300
RenderSVGForeignObject {foreignObject} at (100,100) size 300x300
-layer at (100,100) size 6006x6006 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 outlineClip at (0,0) size 800x600
- RenderBlock (positioned) {html:div} at (100,100) size 6006x6006 [bgcolor=#008000] [border: (3px solid #000000)]
+layer at (0,0) size 6006x6006 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 outlineClip at (0,0) size 800x600
+ RenderBlock (positioned) {html:div} at (0,0) size 6006x6006 [bgcolor=#008000] [border: (3px solid #000000)]
Property changes on: branches/safari-534.54-branch/LayoutTests/platform/qt/svg/overflow/overflow-on-foreignObject-expected.txt
___________________________________________________________________
Added: svn:executable
Modified: branches/safari-534.54-branch/Source/WebCore/ChangeLog (104242 => 104243)
--- branches/safari-534.54-branch/Source/WebCore/ChangeLog 2012-01-06 00:33:53 UTC (rev 104242)
+++ branches/safari-534.54-branch/Source/WebCore/ChangeLog 2012-01-06 00:36:16 UTC (rev 104243)
@@ -1,5 +1,21 @@
2011-1-5 Lucas Forschler <[email protected]>
+ Merge 99756
+
+ 2011-11-09 Ken Buchanan <[email protected]>
+
+ Indentation error in RenderObject::container
+ https://bugs.webkit.org/show_bug.cgi?id=64780
+
+ Reviewed by Eric Seidel.
+
+ A conditional block was indented too far; correcting.
+
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::container):
+
+2011-1-5 Lucas Forschler <[email protected]>
+
Merge 99731
2011-11-09 Ken Buchanan <[email protected]>
Modified: branches/safari-534.54-branch/Source/WebCore/rendering/RenderObject.cpp (104242 => 104243)
--- branches/safari-534.54-branch/Source/WebCore/rendering/RenderObject.cpp 2012-01-06 00:33:53 UTC (rev 104242)
+++ branches/safari-534.54-branch/Source/WebCore/rendering/RenderObject.cpp 2012-01-06 00:36:16 UTC (rev 104243)
@@ -2062,8 +2062,8 @@
if (repaintContainerSkipped && o == repaintContainer)
*repaintContainerSkipped = true;
#if ENABLE(SVG)
- if (o->isSVGForeignObject()) // foreignObject is the containing block for contents inside it
- break;
+ if (o->isSVGForeignObject()) // foreignObject is the containing block for contents inside it
+ break;
#endif
o = o->parent();
}
