Attachment 6508 Details for Bug 7265 – Treat these as inline elements (except non-skipped noscript)

[patch] Treat these as inline elements (except non-skipped noscript)

7265_r1.patch (text/plain), 6.20 KB, created by mitz on 2006-02-15 12:31:27 PST

(hide)

Description:

Filename:

MIME Type:

Creator: mitz

Created: 2006-02-15 12:31:27 PST

Size: 6.20 KB

patch

obsolete

>Index: LayoutTests/ChangeLog
>===================================================================
>--- LayoutTests/ChangeLog	(revision 12821)
>+++ LayoutTests/ChangeLog	(working copy)
>@@ -1,3 +1,15 @@
>+2006-02-##  David Kilzer  <ddkilzer@kilzer.net>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        - test for http://bugzilla.opendarwin.org/show_bug.cgi?id=7265
>+          REGRESSION: noscript, noframes, nolayer, noembed tags insert break inside paragraph tag
>+
>+        * fast/parser/nofoo-tags-inside-paragraph-expected.checksum: Added.
>+        * fast/parser/nofoo-tags-inside-paragraph-expected.png: Added.
>+        * fast/parser/nofoo-tags-inside-paragraph-expected.txt: Added.
>+        * fast/parser/nofoo-tags-inside-paragraph.html: Added.
>+
> 2006-02-15  Oliver Hunt  <ojh16@student.canterbury.ac.nz>
> 
>         Reviewed by eseidel.  Landed by eseidel.
>Index: LayoutTests/fast/parser/nofoo-tags-inside-paragraph-expected.checksum
>===================================================================
>--- LayoutTests/fast/parser/nofoo-tags-inside-paragraph-expected.checksum	(revision 0)
>+++ LayoutTests/fast/parser/nofoo-tags-inside-paragraph-expected.checksum	(revision 0)
>@@ -0,0 +1 @@
>+c4339677a8dcdf2dbe6894b6776e5643
>\ No newline at end of file
>Index: LayoutTests/fast/parser/nofoo-tags-inside-paragraph-expected.png
>===================================================================
>Cannot display: file marked as a binary type.
>svn:mime-type = application/octet-stream
>
>Property changes on: nofoo-tags-inside-paragraph-expected.png
>___________________________________________________________________
>Name: svn:mime-type
>   + application/octet-stream
>
>Index: LayoutTests/fast/parser/nofoo-tags-inside-paragraph-expected.txt
>===================================================================
>--- LayoutTests/fast/parser/nofoo-tags-inside-paragraph-expected.txt	(revision 0)
>+++ LayoutTests/fast/parser/nofoo-tags-inside-paragraph-expected.txt	(revision 0)
>@@ -0,0 +1,33 @@
>+layer at (0,0) size 800x600
>+  RenderCanvas at (0,0) size 800x600
>+layer at (0,0) size 800x600
>+  RenderBlock {HTML} at (0,0) size 800x600
>+    RenderBody {BODY} at (8,8) size 784x576
>+      RenderBlock {DIV} at (0,0) size 784x18
>+        RenderText {TEXT} at (0,0) size 84x18
>+          text run at (0,0) width 84: "Test case for "
>+        RenderInline {A} at (0,0) size 63x18 [color=#0000EE]
>+          RenderText {TEXT} at (84,0) size 63x18
>+            text run at (84,0) width 63: "Bug 7265"
>+        RenderText {TEXT} at (147,0) size 587x18
>+          text run at (147,0) width 587: " REGRESSION: noscript, noframes, nolayer, noembed tags insert break inside paragraph tag"
>+      RenderBlock {P} at (0,34) size 784x18
>+        RenderText {TEXT} at (0,0) size 321x18
>+          text run at (0,0) width 321: "This sentence contains noscript tags and should be "
>+        RenderText {TEXT} at (321,0) size 74x18
>+          text run at (321,0) width 74: "on one line."
>+      RenderBlock {P} at (0,68) size 784x18
>+        RenderText {TEXT} at (0,0) size 329x18
>+          text run at (0,0) width 329: "This sentence contains noframes tags and should be "
>+        RenderText {TEXT} at (329,0) size 74x18
>+          text run at (329,0) width 74: "on one line."
>+      RenderBlock {P} at (0,102) size 784x18
>+        RenderText {TEXT} at (0,0) size 318x18
>+          text run at (0,0) width 318: "This sentence contains nolayer tags and should be "
>+        RenderText {TEXT} at (318,0) size 74x18
>+          text run at (318,0) width 74: "on one line."
>+      RenderBlock {P} at (0,136) size 784x18
>+        RenderText {TEXT} at (0,0) size 329x18
>+          text run at (0,0) width 329: "This sentence contains noembed tags and should be "
>+        RenderText {TEXT} at (329,0) size 74x18
>+          text run at (329,0) width 74: "on one line."
>Index: LayoutTests/fast/parser/nofoo-tags-inside-paragraph.html
>===================================================================
>--- LayoutTests/fast/parser/nofoo-tags-inside-paragraph.html	(revision 0)
>+++ LayoutTests/fast/parser/nofoo-tags-inside-paragraph.html	(revision 0)
>@@ -0,0 +1,6 @@
>+<div>Test case for <a href="http://bugzilla.opendarwin.org/show_bug.cgi?id=7265">Bug 7265</a>
>+REGRESSION: noscript, noframes, nolayer, noembed tags insert break inside paragraph tag</div>
>+<p>This sentence contains noscript tags and should be <noscript></noscript> on one line.</p>
>+<p>This sentence contains noframes tags and should be <noframes></noframes> on one line.</p>
>+<p>This sentence contains nolayer tags and should be <nolayer></nolayer> on one line.</p>
>+<p>This sentence contains noembed tags and should be <noembed></noembed> on one line.</p>
>Index: WebCore/ChangeLog
>===================================================================
>--- WebCore/ChangeLog	(revision 12821)
>+++ WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,16 @@
>+2006-02-##  Mitz Pettel  <opendarwin.org@mitzpettel.com>
>+
>+        Test: fast/parser/nofoo-tags-inside-paragraph.html
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=7265
>+          REGRESSION: noscript, noframes, nolayer, noembed tags insert break inside paragraph tag
>+
>+        * khtml/html/htmlparser.cpp:
>+        (HTMLParser::isInline): Treat noframes, nolayer, noembed and skipped noscript
>+        as inline elements.
>+
> 2006-02-15  Oliver Hunt  <ojh16@student.canterbury.ac.nz>
> 
>         Reviewed by eseidel.  Landed by eseidel.
>Index: WebCore/khtml/html/htmlparser.cpp
>===================================================================
>--- WebCore/khtml/html/htmlparser.cpp	(revision 12819)
>+++ WebCore/khtml/html/htmlparser.cpp	(working copy)
>@@ -880,7 +880,8 @@ bool HTMLParser::isInline(DOM::NodeImpl*
>             e->hasLocalName(kbdTag) || e->hasLocalName(varTag) || e->hasLocalName(citeTag) ||
>             e->hasLocalName(abbrTag) || e->hasLocalName(acronymTag) || e->hasLocalName(subTag) ||
>             e->hasLocalName(supTag) || e->hasLocalName(spanTag) || e->hasLocalName(nobrTag) ||
>-            e->hasLocalName(wbrTag))
>+            e->hasLocalName(wbrTag) || e->hasLocalName(noframesTag) || e->hasLocalName(nolayerTag) ||
>+            e->hasLocalName(noembedTag) || (e->hasLocalName(noscriptTag) && HTMLWidget && HTMLWidget->frame()->jScriptEnabled()))
>             return true;
>     }
>

Flags:

andersca: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 7265: 6498 | 6499 | 6500 | 6508