Diff
Modified: trunk/LayoutTests/ChangeLog (99755 => 99756)
--- trunk/LayoutTests/ChangeLog 2011-11-09 21:18:44 UTC (rev 99755)
+++ trunk/LayoutTests/ChangeLog 2011-11-09 21:25:05 UTC (rev 99756)
@@ -1,3 +1,15 @@
+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-11-09 Xiaomei Ji <[email protected]>
Rebaseline after r99616 and r99736.
Modified: trunk/LayoutTests/platform/gtk/svg/overflow/overflow-on-foreignObject-expected.txt (99755 => 99756)
--- trunk/LayoutTests/platform/gtk/svg/overflow/overflow-on-foreignObject-expected.txt 2011-11-09 21:18:44 UTC (rev 99755)
+++ trunk/LayoutTests/platform/gtk/svg/overflow/overflow-on-foreignObject-expected.txt 2011-11-09 21:25:05 UTC (rev 99756)
@@ -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: trunk/LayoutTests/platform/gtk/svg/overflow/overflow-on-foreignObject-expected.txt
___________________________________________________________________
Added: svn:executable
Modified: trunk/LayoutTests/platform/qt/svg/overflow/overflow-on-foreignObject-expected.txt (99755 => 99756)
--- trunk/LayoutTests/platform/qt/svg/overflow/overflow-on-foreignObject-expected.txt 2011-11-09 21:18:44 UTC (rev 99755)
+++ trunk/LayoutTests/platform/qt/svg/overflow/overflow-on-foreignObject-expected.txt 2011-11-09 21:25:05 UTC (rev 99756)
@@ -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: trunk/LayoutTests/platform/qt/svg/overflow/overflow-on-foreignObject-expected.txt
___________________________________________________________________
Added: svn:executable
Modified: trunk/Source/WebCore/ChangeLog (99755 => 99756)
--- trunk/Source/WebCore/ChangeLog 2011-11-09 21:18:44 UTC (rev 99755)
+++ trunk/Source/WebCore/ChangeLog 2011-11-09 21:25:05 UTC (rev 99756)
@@ -1,3 +1,15 @@
+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-11-09 Anders Carlsson <[email protected]>
Use contentsToRootView/rootViewToContents when converting between frame coordinate systems
Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (99755 => 99756)
--- trunk/Source/WebCore/rendering/RenderObject.cpp 2011-11-09 21:18:44 UTC (rev 99755)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2011-11-09 21:25:05 UTC (rev 99756)
@@ -2168,8 +2168,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();
}
