Diff
Modified: trunk/LayoutTests/ChangeLog (97227 => 97228)
--- trunk/LayoutTests/ChangeLog 2011-10-12 04:36:07 UTC (rev 97227)
+++ trunk/LayoutTests/ChangeLog 2011-10-12 04:36:53 UTC (rev 97228)
@@ -1,3 +1,12 @@
+2011-10-11 Ryosuke Niwa <rn...@webkit.org>
+
+ Check in failing test expectation after r95897. The failure is tracked by the bug 69069.
+
+ * platform/mac/fast/frames/flattening/frameset-flattening-advanced-expected.png:
+ * platform/mac/fast/frames/flattening/frameset-flattening-advanced-expected.txt:
+ * platform/mac/fast/frames/flattening/frameset-flattening-subframesets-expected.png:
+ * platform/mac/fast/frames/flattening/frameset-flattening-subframesets-expected.txt:
+
2011-10-11 Kentaro Hara <hara...@chromium.org>
Implement a WebKitTransitionEvent constructor for JSC
Modified: trunk/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-advanced-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-advanced-expected.txt (97227 => 97228)
--- trunk/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-advanced-expected.txt 2011-10-12 04:36:07 UTC (rev 97227)
+++ trunk/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-advanced-expected.txt 2011-10-12 04:36:53 UTC (rev 97228)
@@ -1,30 +1,30 @@
-layer at (0,0) size 866x607
+layer at (0,0) size 866x602
RenderView at (0,0) size 785x585
-layer at (0,0) size 785x607
- RenderBlock {HTML} at (0,0) size 785x607
- RenderFrameSet {FRAMESET} at (0,0) size 866x607
- RenderFrameSet {FRAMESET} at (0,0) size 866x207
- RenderFrame {FRAME} at (0,0) size 350x207
- layer at (0,0) size 350x207
- RenderView at (0,0) size 350x207
- layer at (0,0) size 350x207
- RenderBlock {HTML} at (0,0) size 350x207
- RenderBody {BODY} at (8,8) size 334x183 [bgcolor=#008000]
+layer at (0,0) size 785x602
+ RenderBlock {HTML} at (0,0) size 785x602
+ RenderFrameSet {FRAMESET} at (0,0) size 866x602
+ RenderFrameSet {FRAMESET} at (0,0) size 866x202
+ RenderFrame {FRAME} at (0,0) size 350x202
+ layer at (0,0) size 350x202
+ RenderView at (0,0) size 350x202
+ layer at (0,0) size 350x202
+ RenderBlock {HTML} at (0,0) size 350x202
+ RenderBody {BODY} at (8,8) size 334x178 [bgcolor=#008000]
RenderBlock {P} at (0,0) size 334x36
RenderText {#text} at (0,0) size 297x36
text run at (0,0) width 297: "Test for frameset flattening. The flattening only"
text run at (0,18) width 144: "works inside the DRT."
layer at (0,0) size 350x50
RenderBlock (positioned) {DIV} at (0,0) size 350x50
- RenderFrame {FRAME} at (356,0) size 510x207
- layer at (0,0) size 510x207
- RenderView at (0,0) size 510x207
- layer at (0,0) size 510x207
- RenderBlock {HTML} at (0,0) size 510x207
- RenderBody {BODY} at (8,8) size 494x191 [bgcolor=#FF0000]
+ RenderFrame {FRAME} at (356,0) size 510x202
+ layer at (0,0) size 510x202
+ RenderView at (0,0) size 510x202
+ layer at (0,0) size 510x202
+ RenderBlock {HTML} at (0,0) size 510x202
+ RenderBody {BODY} at (8,8) size 494x186 [bgcolor=#FF0000]
layer at (0,0) size 300x100
RenderBlock (positioned) {DIV} at (0,0) size 300x100
- RenderFrameSet {FRAMESET} at (0,207) size 866x400
+ RenderFrameSet {FRAMESET} at (0,202) size 866x400
RenderFrame {FRAME} at (0,0) size 200x400
layer at (0,0) size 200x400
RenderView at (0,0) size 200x400
Modified: trunk/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-subframesets-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-subframesets-expected.txt (97227 => 97228)
--- trunk/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-subframesets-expected.txt 2011-10-12 04:36:07 UTC (rev 97227)
+++ trunk/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-subframesets-expected.txt 2011-10-12 04:36:53 UTC (rev 97228)
@@ -1,8 +1,8 @@
-layer at (0,0) size 900x630
+layer at (0,0) size 900x618
RenderView at (0,0) size 785x585
-layer at (0,0) size 785x630
- RenderBlock {HTML} at (0,0) size 785x630
- RenderFrameSet {FRAMESET} at (0,0) size 900x630
+layer at (0,0) size 785x618
+ RenderBlock {HTML} at (0,0) size 785x618
+ RenderFrameSet {FRAMESET} at (0,0) size 900x618
RenderFrameSet {FRAMESET} at (0,0) size 900x150
RenderFrame {FRAME} at (0,0) size 450x150
layer at (0,0) size 450x150
@@ -31,25 +31,25 @@
text run at (0,18) width 201: "150px tall and not be scrollable."
layer at (0,0) size 450x150
RenderBlock (positioned) {DIV} at (0,0) size 450x150
- RenderFrameSet {FRAMESET} at (0,150) size 900x480
- RenderFrame {FRAME} at (0,0) size 450x480
- layer at (0,0) size 450x480
- RenderView at (0,0) size 450x480
- layer at (0,0) size 450x480
- RenderBlock {HTML} at (0,0) size 450x480
- RenderBody {BODY} at (8,8) size 434x456 [bgcolor=#FFFF00]
+ RenderFrameSet {FRAMESET} at (0,150) size 900x468
+ RenderFrame {FRAME} at (0,0) size 450x468
+ layer at (0,0) size 450x468
+ RenderView at (0,0) size 450x468
+ layer at (0,0) size 450x468
+ RenderBlock {HTML} at (0,0) size 450x468
+ RenderBody {BODY} at (8,8) size 434x444 [bgcolor=#FFFF00]
RenderBlock {P} at (0,0) size 434x36
RenderText {#text} at (0,0) size 414x36
text run at (0,0) width 414: "This frame is inside frameset 2 and should be at least 450px wide,"
text run at (0,18) width 201: "400px tall and not be scrollable."
layer at (0,0) size 200x450
RenderBlock (positioned) {DIV} at (0,0) size 200x450
- RenderFrame {FRAME} at (450,0) size 450x480
- layer at (0,0) size 450x480
- RenderView at (0,0) size 450x480
- layer at (0,0) size 450x480
- RenderBlock {HTML} at (0,0) size 450x480
- RenderBody {BODY} at (8,8) size 434x456 [bgcolor=#0000FF]
+ RenderFrame {FRAME} at (450,0) size 450x468
+ layer at (0,0) size 450x468
+ RenderView at (0,0) size 450x468
+ layer at (0,0) size 450x468
+ RenderBlock {HTML} at (0,0) size 450x468
+ RenderBody {BODY} at (8,8) size 434x444 [bgcolor=#0000FF]
RenderBlock {P} at (0,0) size 434x36
RenderText {#text} at (0,0) size 414x36
text run at (0,0) width 414: "This frame is inside frameset 2 and should be at least 450px wide,"
