Changeset 70754 in webkit

Timestamp:

Oct 28, 2010 12:47:56 AM (14 years ago)

Author:

aestes@apple.com

Message:

2010-10-28 Andy Estes <​aestes@apple.com>

Reviewed by Adam Barth.

Fix a test failure introduced in r70748 by supporting Qt's non-standard
use of classid.
​https://bugs.webkit.org/show_bug.cgi?id=45679

• html/HTMLObjectElement.cpp: (WebCore::objectHasSupportedClassId): Return true if the object's serviceType is 'application/x-qt-plugin'. (WebCore::HTMLObjectElement::updateWidget): Do not render fallback content if a non-empty classid is specified for a Qt plugin object.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLObjectElement.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-28  Andy Estes  <aestes@apple.com>
+
+        Reviewed by Adam Barth.
+
+        Fix a test failure introduced in r70748 by supporting Qt's non-standard
+        use of classid.
+        https://bugs.webkit.org/show_bug.cgi?id=45679
+
+        * html/HTMLObjectElement.cpp:
+        (WebCore::objectHasSupportedClassId): Return true if the object's
+        serviceType is 'application/x-qt-plugin'.
+        (WebCore::HTMLObjectElement::updateWidget): Do not render fallback
+        content if a non-empty classid is specified for a Qt plugin object.
+
 2010-10-28  Ivan Krstić  <ike@apple.com>
 

trunk/WebCore/html/HTMLObjectElement.cpp

@@ -218 +218 @@
     return false;
 }
+    
+static bool objectHasSupportedClassId(HTMLObjectElement* object)
+{
+#if PLATFORM(QT)
+    // Qt plug-ins use classid to specify which QObject to load.
+    ASSERT(object);
+    return equalsIgnoringCase(object->serviceType(), "application/x-qt-plugin");
+#else
+    ASSERT_UNUSED(object, object);
+    return false;
+#endif
+}
 
 // FIXME: This should be unified with HTMLEmbedElement::updateWidget and
@@ -264 +276 @@
     // 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 hasEmptyClassId = classId().isEmpty();
+    bool hasValidClassId = classId().isEmpty() || objectHasSupportedClassId(this);
 
     SubframeLoader* loader = document()->frame()->loader()->subframeLoader();
-    bool success = beforeLoadAllowedLoad && hasEmptyClassId && 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)