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

[jeremy at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 37ff49e3f348c9d85cdc1c61feba11866ee30f92
Author: jeremy at chromium.org <jeremy at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 29 15:51:51 2010 +0000

    2010-11-29  Jeremy Moskovich  <jeremy at chromium.org>
    
            Reviewed by Eric Seidel.
    
            https://bugs.webkit.org/show_bug.cgi?id=24346
    
            Remove temporary workaround to load Gears plugin.
    
            * html/HTMLObjectElement.cpp:
            (WebCore::HTMLObjectElement::rendererIsNeeded):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72799 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 251c5c3..3eaf376 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-29  Jeremy Moskovich  <jeremy at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        https://bugs.webkit.org/show_bug.cgi?id=24346
+
+        Remove temporary workaround to load Gears plugin.
+
+        * html/HTMLObjectElement.cpp:
+        (WebCore::HTMLObjectElement::rendererIsNeeded):
+
 2010-11-29  Yael Aharon  <yael.aharon at nokia.com>
 
         Reviewed by Antonio Gomes.
diff --git a/WebCore/html/HTMLObjectElement.cpp b/WebCore/html/HTMLObjectElement.cpp
index c07d050..69974a8 100644
--- a/WebCore/html/HTMLObjectElement.cpp
+++ b/WebCore/html/HTMLObjectElement.cpp
@@ -287,12 +287,8 @@ bool HTMLObjectElement::rendererIsNeeded(RenderStyle* style)
     Frame* frame = document()->frame();
     if (!frame)
         return false;
-    
-    // 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.
-    bool isGearsPlugin = equalIgnoringCase(getAttribute(typeAttr), "application/x-googlegears");
-    return isGearsPlugin || HTMLPlugInImageElement::rendererIsNeeded(style);
+
+    return HTMLPlugInImageElement::rendererIsNeeded(style);
 }
 
 void HTMLObjectElement::insertedIntoDocument()

-- 
WebKit Debian packaging