2009-04-27 Simon Fraser <simon.fraser@apple.com>

        Reviewed by Darin Adler

        <rdar://problem/6642221> REGRESSION: With the Movie widget, movie trailer fails to
        load if movie had been previously viewed

        Fix the Dashboard quirk for display:none plug-ins by moving the code from HTMLObjectElement
        to HTMLEmebedElement. It has to be in HTMLEmbedElement because the content we care about uses <embed>.

        * html/HTMLEmbedElement.cpp:
        (WebCore::HTMLEmbedElement::rendererIsNeeded):
        * html/HTMLObjectElement.cpp:
        (WebCore::HTMLObjectElement::rendererIsNeeded):

git-svn-id: svn://svn.chromium.org/blink/trunk@42913 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/WebCore/ChangeLog

+2009-04-27  Simon Fraser  <simon.fraser@apple.com>
+
+        Reviewed by Darin Adler
+
+        <rdar://problem/6642221> REGRESSION: With the Movie widget, movie trailer fails to
+        load if movie had been previously viewed
+        
+        Fix the Dashboard quirk for display:none plug-ins by moving the code from HTMLObjectElement
+        to HTMLEmebedElement. It has to be in HTMLEmbedElement because the content we care about uses <embed>.
+
+        * html/HTMLEmbedElement.cpp:
+        (WebCore::HTMLEmbedElement::rendererIsNeeded):
+        * html/HTMLObjectElement.cpp:
+        (WebCore::HTMLObjectElement::rendererIsNeeded):
+
 2009-04-27  Sam Weinig  <sam@webkit.org>
 
         Reviewed by Geoffrey Garen.

third_party/WebKit/WebCore/html/HTMLEmbedElement.cpp

@@ -35,6 +35,7 @@
 #include "RenderPartObject.h"
 #include "RenderWidget.h"
 #include "ScriptController.h"
+#include "Settings.h"
 
 namespace WebCore {
 
@@ -137,6 +138,14 @@ bool HTMLEmbedElement::rendererIsNeeded(RenderStyle* style)
         return false;
     }
 
+#if ENABLE(DASHBOARD_SUPPORT)
+    // Workaround for <rdar://problem/6642221>. 
+    if (Settings* settings = frame->settings()) {
+        if (settings->usesDashboardBackwardCompatibilityMode())
+            return true;
+    }
+#endif
+
     return HTMLPlugInElement::rendererIsNeeded(style);
 }
 

third_party/WebKit/WebCore/html/HTMLObjectElement.cpp

@@ -38,7 +38,6 @@
 #include "RenderPartObject.h"
 #include "RenderWidget.h"
 #include "ScriptController.h"
-#include "Settings.h"
 #include "Text.h"
 
 namespace WebCore {
@@ -124,14 +123,6 @@ bool HTMLObjectElement::rendererIsNeeded(RenderStyle* style)
     if (!frame)
         return false;
     
-#if ENABLE(DASHBOARD_SUPPORT)
-    // Workaround for <rdar://problem/6642221>. 
-    if (Settings* settings = frame->settings()) {
-        if (settings->usesDashboardBackwardCompatibilityMode())
-            return true;
-    }
-#endif
-    
     // Temporary Workaround for Gears plugin - see bug 24215 for details and bug 24346 to track removal.
     // Gears expects the plugin to be instantiated even if display:none is set
     // for the object element.