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

[aestes at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 9339cb01e3054c4e1a7f0aa4fc566d39e6e76bfc
Author: aestes at apple.com <aestes at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 28 08:16:33 2010 +0000

    Fix the Qt build after r70754.
    
    * html/HTMLObjectElement.cpp:
    (WebCore::HTMLObjectElement::hasValidClassId):
    (WebCore::HTMLObjectElement::updateWidget):
    * html/HTMLObjectElement.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70757 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e41bdc7..5cfe6e6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,14 @@
 2010-10-28  Andy Estes  <aestes at apple.com>
 
+        Fix the Qt build after r70754.
+
+        * html/HTMLObjectElement.cpp:
+        (WebCore::HTMLObjectElement::hasValidClassId):
+        (WebCore::HTMLObjectElement::updateWidget):
+        * html/HTMLObjectElement.h:
+
+2010-10-28  Andy Estes  <aestes at apple.com>
+
         Reviewed by Adam Barth.
 
         Fix a test failure introduced in r70748 by supporting Qt's non-standard
diff --git a/WebCore/html/HTMLObjectElement.cpp b/WebCore/html/HTMLObjectElement.cpp
index b47bd64..f6ff443 100644
--- a/WebCore/html/HTMLObjectElement.cpp
+++ b/WebCore/html/HTMLObjectElement.cpp
@@ -218,15 +218,16 @@ bool HTMLObjectElement::hasFallbackContent() const
     return false;
 }
     
-static bool objectHasSupportedClassId(HTMLObjectElement* object)
+bool HTMLObjectElement::hasValidClassId()
 {
+    // HTML5 says that fallback content should be rendered if a non-empty
+    // classid is specified for which the UA can't find a suitable plug-in.
+    // WebKit supports no classids, with the exception of Qt plug-ins, which use
+    // classid to specify which QObject to load.
 #if PLATFORM(QT)
-    // Qt plug-ins use classid to specify which QObject to load.
-    ASSERT(object);
-    return equalsIgnoringCase(object->serviceType(), "application/x-qt-plugin");
+    return equalIgnoringCase(serviceType(), "application/x-qt-plugin");
 #else
-    ASSERT_UNUSED(object, object);
-    return false;
+    return classId().isEmpty();
 #endif
 }
 
@@ -273,12 +274,8 @@ void HTMLObjectElement::updateWidget(bool onlyCreateNonNetscapePlugins)
     if (!renderer())
         return;
 
-    // HTML5 says that fallback content should be rendered if a non-empty
-    // classid is specified for which the UA can't find a suitable plug-in.
-    bool hasValidClassId = classId().isEmpty() || objectHasSupportedClassId(this);
-
     SubframeLoader* loader = document()->frame()->loader()->subframeLoader();
-    bool success = beforeLoadAllowedLoad && hasValidClassId && loader->requestObject(this, url, getAttribute(nameAttr), serviceType, paramNames, paramValues);
+    bool success = beforeLoadAllowedLoad && hasValidClassId() && loader->requestObject(this, url, getAttribute(nameAttr), serviceType, paramNames, paramValues);
 
     if (!success && fallbackContent)
         renderFallbackContent();
diff --git a/WebCore/html/HTMLObjectElement.h b/WebCore/html/HTMLObjectElement.h
index 2d416c3..a4609cb 100644
--- a/WebCore/html/HTMLObjectElement.h
+++ b/WebCore/html/HTMLObjectElement.h
@@ -66,6 +66,8 @@ private:
     // FIXME: This function should not deal with url or serviceType
     // so that we can better share code between <object> and <embed>.
     void parametersForPlugin(Vector<String>& paramNames, Vector<String>& paramValues, String& url, String& serviceType);
+    
+    bool hasValidClassId();
 
     AtomicString m_id;
     String m_classId;

-- 
WebKit Debian packaging