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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit f26c5555444beb0940ef5639b55f48f74ca0df4f
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 14 21:52:35 2010 +0000

    2010-12-14  Kyounga Ra  <kyounga.ra at gmail.com>
    
            Reviewed by Adam Barth.
    
            <noscript> is rendered with enabled XHTMLMP.
            https://bugs.webkit.org/show_bug.cgi?id=48493
    
            * html/HTMLElement.cpp:
            (WebCore::HTMLElement::rendererIsNeeded):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74059 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e9da393..32e5c0c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-14  Kyounga Ra  <kyounga.ra at gmail.com>
+
+        Reviewed by Adam Barth.
+
+        <noscript> is rendered with enabled XHTMLMP.
+        https://bugs.webkit.org/show_bug.cgi?id=48493
+
+        * html/HTMLElement.cpp:
+        (WebCore::HTMLElement::rendererIsNeeded):
+
 2010-12-14  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/html/HTMLElement.cpp b/WebCore/html/HTMLElement.cpp
index d01a240..a504f75 100644
--- a/WebCore/html/HTMLElement.cpp
+++ b/WebCore/html/HTMLElement.cpp
@@ -781,14 +781,16 @@ PassRefPtr<HTMLCollection> HTMLElement::children()
 
 bool HTMLElement::rendererIsNeeded(RenderStyle *style)
 {
-#if !ENABLE(XHTMLMP)
     if (hasLocalName(noscriptTag)) {
         Frame* frame = document()->frame();
+#if ENABLE(XHTMLMP)
+        if (!document()->shouldProcessNoscriptElement())
+            return false;
+#else
         if (frame && frame->script()->canExecuteScripts(NotAboutToExecuteScript))
             return false;
-    } else
-#endif
-    if (hasLocalName(noembedTag)) {
+#endif        
+    } else if (hasLocalName(noembedTag)) {
         Frame* frame = document()->frame();
         if (frame && frame->loader()->subframeLoader()->allowPlugins(NotAboutToInstantiatePlugin))
             return false;

-- 
WebKit Debian packaging