[webkit-changes] cvs commit: WebCore/layout-tests/fast/frames
001-expected.txt 002-expected.txt contentWindow_Frame-expected.txt
contentWindow_iFrame-expected.txt empty-frame-src-expected.txt
Adele
adele at opensource.apple.com
Tue Jul 26 13:44:06 PDT 2005
adele 05/07/26 13:44:06
Modified: . Tag: Safari-2-0-branch ChangeLog
khtml/html Tag: Safari-2-0-branch htmlparser.cpp
layout-tests/fast/flexbox Tag: Safari-2-0-branch
016-expected.txt
layout-tests/fast/frames Tag: Safari-2-0-branch
001-expected.txt 002-expected.txt
contentWindow_Frame-expected.txt
contentWindow_iFrame-expected.txt
empty-frame-src-expected.txt
Log:
Merged fix from TOT to Safari-2-0-branch
2005-04-26 Adele Peterson <adele at apple.com>
Fixed by Darin, reviewed by me.
Fix for <rdar://problem/4084029> designMode doesn't allow editing when iframe src = "" or = about:blank
This change will add an HTML element for empty documents. Now that there will be an HTMLDocument in this case,
a body will also be created (see rdar://problem/3758785). This was preventing frames with empty documents from
being editable.
* khtml/html/htmlparser.cpp: (KHTMLParser::finished):
Updated these tests to expect the HTML and BODY elements
* layout-tests/fast/flexbox/016-expected.txt:
* layout-tests/fast/frames/001-expected.txt:
* layout-tests/fast/frames/002-expected.txt:
* layout-tests/fast/frames/contentWindow_Frame-expected.txt:
* layout-tests/fast/frames/contentWindow_iFrame-expected.txt:
* layout-tests/fast/frames/empty-frame-src-expected.txt:
Revision Changes Path
No revision
No revision
1.4104.2.72 +24 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.4104.2.71
retrieving revision 1.4104.2.72
diff -u -r1.4104.2.71 -r1.4104.2.72
--- ChangeLog 26 Jul 2005 00:52:03 -0000 1.4104.2.71
+++ ChangeLog 26 Jul 2005 20:43:57 -0000 1.4104.2.72
@@ -1,3 +1,27 @@
+2005-07-26 Adele Peterson <adele at apple.com>
+
+ Merged fix from TOT to Safari-2-0-branch
+
+ 2005-04-26 Adele Peterson <adele at apple.com>
+
+ Fixed by Darin, reviewed by me.
+
+ Fix for <rdar://problem/4084029> designMode doesn't allow editing when iframe src = "" or = about:blank
+
+ This change will add an HTML element for empty documents. Now that there will be an HTMLDocument in this case,
+ a body will also be created (see rdar://problem/3758785). This was preventing frames with empty documents from
+ being editable.
+
+ * khtml/html/htmlparser.cpp: (KHTMLParser::finished):
+
+ Updated these tests to expect the HTML and BODY elements
+ * layout-tests/fast/flexbox/016-expected.txt:
+ * layout-tests/fast/frames/001-expected.txt:
+ * layout-tests/fast/frames/002-expected.txt:
+ * layout-tests/fast/frames/contentWindow_Frame-expected.txt:
+ * layout-tests/fast/frames/contentWindow_iFrame-expected.txt:
+ * layout-tests/fast/frames/empty-frame-src-expected.txt:
+
=== WebCore-415.15 ===
2005-07-21 Adele Peterson <adele at apple.com>
No revision
No revision
1.92.6.2 +5 -0 WebCore/khtml/html/htmlparser.cpp
Index: htmlparser.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/htmlparser.cpp,v
retrieving revision 1.92.6.1
retrieving revision 1.92.6.2
diff -u -r1.92.6.1 -r1.92.6.2
--- htmlparser.cpp 1 Jul 2005 22:46:57 -0000 1.92.6.1
+++ htmlparser.cpp 26 Jul 2005 20:44:04 -0000 1.92.6.2
@@ -1518,6 +1518,11 @@
void KHTMLParser::finished()
{
+ // In the case of a completely empty document, here's the place to create the HTML element.
+ if (current->isDocumentNode() && current->firstChild() == 0) {
+ insertNode(new HTMLHtmlElementImpl(document));
+ }
+
// This ensures that "current" is not left pointing to a node when the document is destroyed.
freeBlock();
setCurrent(0);
No revision
No revision
1.7.18.1 +3 -0 WebCore/layout-tests/fast/flexbox/016-expected.txt
Index: 016-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/flexbox/016-expected.txt,v
retrieving revision 1.7
retrieving revision 1.7.18.1
diff -u -r1.7 -r1.7.18.1
--- 016-expected.txt 20 Apr 2004 23:36:59 -0000 1.7
+++ 016-expected.txt 26 Jul 2005 20:44:04 -0000 1.7.18.1
@@ -15,6 +15,9 @@
RenderPartObject {IFRAME} at (0,54) size 812x513 [bgcolor=#008000] [border: (10px solid #808000)]
layer at (0,0) size 777x493
RenderCanvas at (0,0) size 777x493
+ layer at (0,0) size 777x8
+ RenderBlock {HTML} at (0,0) size 777x8
+ RenderBody {BODY} at (8,8) size 761x0
RenderBlock {DIV} at (0,567) size 800x18
RenderText {TEXT} at (0,0) size 664x18
text run at (0,0) width 407: "This footer should remain at the bottom of the browser window. "
No revision
No revision
1.9.10.1 +9 -0 WebCore/layout-tests/fast/frames/001-expected.txt
Index: 001-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/frames/001-expected.txt,v
retrieving revision 1.9
retrieving revision 1.9.10.1
diff -u -r1.9 -r1.9.10.1
--- 001-expected.txt 29 Sep 2004 18:07:43 -0000 1.9
+++ 001-expected.txt 26 Jul 2005 20:44:05 -0000 1.9.10.1
@@ -9,14 +9,23 @@
RenderPartObject {IFRAME} at (0,18) size 170x170 [border: (10px solid #FF0000)]
layer at (0,0) size 85x100
RenderCanvas at (0,0) size 85x100
+ layer at (0,0) size 85x8
+ RenderBlock {HTML} at (0,0) size 85x8
+ RenderBody {BODY} at (8,8) size 69x0
RenderText {TEXT} at (170,174) size 4x18
text run at (170,174) width 4: " "
RenderPartObject {OBJECT} at (174,18) size 170x170 [border: (10px solid #FF0000)]
layer at (0,0) size 85x100
RenderCanvas at (0,0) size 85x100
+ layer at (0,0) size 85x8
+ RenderBlock {HTML} at (0,0) size 85x8
+ RenderBody {BODY} at (8,8) size 69x0
RenderText {TEXT} at (344,174) size 4x18
text run at (344,174) width 4: " "
RenderPartObject {OBJECT} at (348,18) size 170x170 [border: (10px solid #FF0000)]
layer at (0,0) size 85x100
RenderCanvas at (0,0) size 85x100
+ layer at (0,0) size 85x8
+ RenderBlock {HTML} at (0,0) size 85x8
+ RenderBody {BODY} at (8,8) size 69x0
RenderText {TEXT} at (0,0) size 0x0
1.1.10.1 +9 -0 WebCore/layout-tests/fast/frames/002-expected.txt
Index: 002-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/frames/002-expected.txt,v
retrieving revision 1.1
retrieving revision 1.1.10.1
diff -u -r1.1 -r1.1.10.1
--- 002-expected.txt 19 Oct 2004 23:04:29 -0000 1.1
+++ 002-expected.txt 26 Jul 2005 20:44:05 -0000 1.1.10.1
@@ -6,10 +6,19 @@
RenderFrame {FRAME} at (0,0) size 398x600
layer at (0,0) size 381x596
RenderCanvas at (0,0) size 381x596
+ layer at (0,0) size 381x8
+ RenderBlock {HTML} at (0,0) size 381x8
+ RenderBody {BODY} at (8,8) size 365x0
RenderFrameSet {FRAMESET} at (402,0) size 398x600
RenderFrame {FRAME} at (0,0) size 398x298
layer at (0,0) size 381x294
RenderCanvas at (0,0) size 381x294
+ layer at (0,0) size 381x8
+ RenderBlock {HTML} at (0,0) size 381x8
+ RenderBody {BODY} at (8,8) size 365x0
RenderFrame {FRAME} at (0,302) size 398x298
layer at (0,0) size 381x294
RenderCanvas at (0,0) size 381x294
+ layer at (0,0) size 381x8
+ RenderBlock {HTML} at (0,0) size 381x8
+ RenderBody {BODY} at (8,8) size 365x0
1.2.10.1 +3 -0 WebCore/layout-tests/fast/frames/contentWindow_Frame-expected.txt
Index: contentWindow_Frame-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/frames/contentWindow_Frame-expected.txt,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -r1.2 -r1.2.10.1
--- contentWindow_Frame-expected.txt 27 Sep 2004 18:39:02 -0000 1.2
+++ contentWindow_Frame-expected.txt 26 Jul 2005 20:44:05 -0000 1.2.10.1
@@ -15,3 +15,6 @@
RenderFrame {FRAME} at (0,182) size 800x418
layer at (0,0) size 783x414
RenderCanvas at (0,0) size 783x414
+ layer at (0,0) size 783x8
+ RenderBlock {HTML} at (0,0) size 783x8
+ RenderBody {BODY} at (8,8) size 767x0
1.1.10.1 +3 -0 WebCore/layout-tests/fast/frames/contentWindow_iFrame-expected.txt
Index: contentWindow_iFrame-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/frames/contentWindow_iFrame-expected.txt,v
retrieving revision 1.1
retrieving revision 1.1.10.1
diff -u -r1.1 -r1.1.10.1
--- contentWindow_iFrame-expected.txt 27 Aug 2004 22:03:51 -0000 1.1
+++ contentWindow_iFrame-expected.txt 26 Jul 2005 20:44:05 -0000 1.1.10.1
@@ -9,6 +9,9 @@
RenderPartObject {IFRAME} at (124,0) size 200x200
layer at (0,0) size 183x196
RenderCanvas at (0,0) size 183x196
+ layer at (0,0) size 183x8
+ RenderBlock {HTML} at (0,0) size 183x8
+ RenderBody {BODY} at (8,8) size 167x0
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {DIV} at (0,204) size 784x18
RenderText {TEXT} at (0,0) size 74x18
1.11.18.1 +3 -0 WebCore/layout-tests/fast/frames/empty-frame-src-expected.txt
Index: empty-frame-src-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/frames/empty-frame-src-expected.txt,v
retrieving revision 1.11
retrieving revision 1.11.18.1
diff -u -r1.11 -r1.11.18.1
--- empty-frame-src-expected.txt 26 Apr 2004 21:19:02 -0000 1.11
+++ empty-frame-src-expected.txt 26 Jul 2005 20:44:05 -0000 1.11.18.1
@@ -18,3 +18,6 @@
RenderFrame {FRAME} at (0,402) size 800x197
layer at (0,0) size 783x193
RenderCanvas at (0,0) size 783x193
+ layer at (0,0) size 783x8
+ RenderBlock {HTML} at (0,0) size 783x8
+ RenderBody {BODY} at (8,8) size 767x0
More information about the webkit-changes
mailing list