[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[abarth at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit bb9d1af414779d1364cdfe2da64c15ad1e145a4e
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Aug 7 01:56:07 2010 +0000

    2010-08-06  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            REGRESSION (r64712): YouTube video pages have contents of <noembed> elements overlapping the video description
            https://bugs.webkit.org/show_bug.cgi?id=43605
    
            Show test progression.  We missed this regression when analyzing the
            expectation diffs because the DOM was correct and was a progression.
    
            * fast/dom/no-elements-expected.txt:
            * platform/mac/fast/parser/nofoo-tags-inside-paragraph-expected.txt:
    2010-08-06  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            REGRESSION (r64712): YouTube video pages have contents of <noembed> elements overlapping the video description
            https://bugs.webkit.org/show_bug.cgi?id=43605
    
            The old parser used to drop <noembed> on the floor.  We're supposed to
            add it to the DOM, but we don't want to create a renderer for it.
    
            * html/HTMLElement.cpp:
            (WebCore::HTMLElement::rendererIsNeeded):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64890 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 0bf975e..e64e10c 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-06  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        REGRESSION (r64712): YouTube video pages have contents of <noembed> elements overlapping the video description
+        https://bugs.webkit.org/show_bug.cgi?id=43605
+
+        Show test progression.  We missed this regression when analyzing the
+        expectation diffs because the DOM was correct and was a progression.
+
+        * fast/dom/no-elements-expected.txt:
+        * platform/mac/fast/parser/nofoo-tags-inside-paragraph-expected.txt:
+
 2010-08-06  Dimitri Glazkov  <dglazkov at chromium.org>
 
         [Chromium/DRT] Adjust expectations after my unexpectedly awful search-and-replace performance.
diff --git a/LayoutTests/fast/dom/no-elements-expected.txt b/LayoutTests/fast/dom/no-elements-expected.txt
index c19598a..0e66cb7 100644
--- a/LayoutTests/fast/dom/no-elements-expected.txt
+++ b/LayoutTests/fast/dom/no-elements-expected.txt
@@ -1,6 +1,6 @@
 This tests that the elements noframes, nolayer, noscript and noembed are created as elements and put in the DOM tree. The elements other than <nolayer> should not contain any children. If the test is successful, the four messages below will list 0, 0, 0, and 1 child.
 
-This is noembed. This is nolayer.
+This is nolayer.
 noframes has 1 children.
 noscript has 1 children.
 noembed has 1 children.
diff --git a/LayoutTests/platform/mac/fast/parser/nofoo-tags-inside-paragraph-expected.txt b/LayoutTests/platform/mac/fast/parser/nofoo-tags-inside-paragraph-expected.txt
index d244f32..c253e9f 100644
--- a/LayoutTests/platform/mac/fast/parser/nofoo-tags-inside-paragraph-expected.txt
+++ b/LayoutTests/platform/mac/fast/parser/nofoo-tags-inside-paragraph-expected.txt
@@ -30,6 +30,5 @@ layer at (0,0) size 800x600
       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 "
-        RenderInline {NOEMBED} at (0,0) size 0x0
         RenderText {#text} at (329,0) size 74x18
           text run at (329,0) width 74: "on one line."
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 76c14ad..bc40eed 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-06  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        REGRESSION (r64712): YouTube video pages have contents of <noembed> elements overlapping the video description
+        https://bugs.webkit.org/show_bug.cgi?id=43605
+
+        The old parser used to drop <noembed> on the floor.  We're supposed to
+        add it to the DOM, but we don't want to create a renderer for it.
+
+        * html/HTMLElement.cpp:
+        (WebCore::HTMLElement::rendererIsNeeded):
+
 2010-08-06  Tony Gentilcore  <tonyg at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/WebCore/html/HTMLElement.cpp b/WebCore/html/HTMLElement.cpp
index fb1bcc2..0198901 100644
--- a/WebCore/html/HTMLElement.cpp
+++ b/WebCore/html/HTMLElement.cpp
@@ -986,7 +986,7 @@ bool HTMLElement::checkDTD(const Node* newChild)
         return true;
     return inEitherTagList(newChild);
 }
-    
+
 bool HTMLElement::rendererIsNeeded(RenderStyle *style)
 {
 #if !ENABLE(XHTMLMP)
@@ -994,11 +994,16 @@ bool HTMLElement::rendererIsNeeded(RenderStyle *style)
         Frame* frame = document()->frame();
         if (frame && frame->script()->canExecuteScripts(NotAboutToExecuteScript))
             return false;
-    }
+    } else
 #endif
+    if (hasLocalName(noembedTag)) {
+        Frame* frame = document()->frame();
+        if (frame && frame->loader()->subframeLoader()->allowPlugins(NotAboutToInstantiatePlugin))
+            return false;
+    }
     return StyledElement::rendererIsNeeded(style);
 }
-    
+
 RenderObject* HTMLElement::createRenderer(RenderArena* arena, RenderStyle* style)
 {
     if (hasLocalName(wbrTag))

-- 
WebKit Debian packaging