Changeset 87244 in webkit

Timestamp:

May 24, 2011 5:48:00 PM (13 years ago)

Author:

aestes@apple.com

Message:

2011-05-24 Andy Estes <​aestes@apple.com>

Reviewed by Geoffrey Garen.

REGRESSION (r70748): WebKit cannot play QuickTime movies on Mac OS X Wiki Server pages
​https://bugs.webkit.org/show_bug.cgi?id=61229

This site-specific hack maintains compatibility with Mac OS X Wiki Server,
which embeds QuickTime movies using an object tag containing QuickTime's
ActiveX classid. Treat this classid as valid only if OS X Server's unique
'generator' meta tag is present. Only apply this quirk if there is no
fallback content, which ensures the quirk will disable itself if Wiki
Server is updated to generate an alternate embed tag as fallback content.

• html/HTMLObjectElement.cpp: (WebCore::HTMLObjectElement::shouldAllowQuickTimeClassIdQuirk): Return true if site-specific quirks are enabled, the object element has no fallback content, the classid attribute matches QuickTime's classid and the document has a 'generator' meta tag matching Mac OS X Web Services Server's unique generator string. (WebCore::HTMLObjectElement::hasValidClassId): Call shouldAllowQuickTimeClassIdQuirk()
• html/HTMLObjectElement.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-24  Andy Estes  <aestes@apple.com>
+
+        Reviewed by Geoffrey Garen.
+
+        REGRESSION (r70748): WebKit cannot play QuickTime movies on Mac OS X Wiki Server pages
+        https://bugs.webkit.org/show_bug.cgi?id=61229
+
+        This site-specific hack maintains compatibility with Mac OS X Wiki Server,
+        which embeds QuickTime movies using an object tag containing QuickTime's
+        ActiveX classid. Treat this classid as valid only if OS X Server's unique
+        'generator' meta tag is present. Only apply this quirk if there is no
+        fallback content, which ensures the quirk will disable itself if Wiki
+        Server is updated to generate an alternate embed tag as fallback content.
+
+        * html/HTMLObjectElement.cpp:
+        (WebCore::HTMLObjectElement::shouldAllowQuickTimeClassIdQuirk): Return
+        true if site-specific quirks are enabled, the object element has no
+        fallback content, the classid attribute matches QuickTime's classid and
+        the document has a 'generator' meta tag matching Mac OS X Web Services
+        Server's unique generator string.
+        (WebCore::HTMLObjectElement::hasValidClassId): Call
+        shouldAllowQuickTimeClassIdQuirk()
+        * html/HTMLObjectElement.h:
+
 2011-05-24  Nate Chapin  <japhet@chromium.org>
 

trunk/Source/WebCore/html/HTMLObjectElement.cpp

@@ -33 +33 @@
 #include "HTMLFormElement.h"
 #include "HTMLImageLoader.h"
+#include "HTMLMetaElement.h"
 #include "HTMLNames.h"
 #include "HTMLParamElement.h"
 #include "HTMLParserIdioms.h"
 #include "MIMETypeRegistry.h"
+#include "NodeList.h"
+#include "Page.h"
 #include "RenderEmbeddedObject.h"
 #include "RenderImage.h"
 #include "RenderWidget.h"
 #include "ScriptEventListener.h"
+#include "Settings.h"
 #include "Text.h"
 
@@ -236 +240 @@
 }
     
+bool HTMLObjectElement::shouldAllowQuickTimeClassIdQuirk()
+{
+    // This site-specific hack maintains compatibility with Mac OS X Wiki Server,
+    // which embeds QuickTime movies using an object tag containing QuickTime's
+    // ActiveX classid. Treat this classid as valid only if OS X Server's unique
+    // 'generator' meta tag is present. Only apply this quirk if there is no
+    // fallback content, which ensures the quirk will disable itself if Wiki
+    // Server is updated to generate an alternate embed tag as fallback content.
+    if (!document()->page()
+        || !document()->page()->settings()->needsSiteSpecificQuirks()
+        || hasFallbackContent()
+        || !equalIgnoringCase(classId(), "clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B"))
+        return false;
+
+    RefPtr<NodeList> metaElements = document()->getElementsByTagName(HTMLNames::metaTag.localName());
+    unsigned length = metaElements->length();
+    for (unsigned i = 0; i < length; ++i) {
+        ASSERT(metaElements->item(i)->isHTMLElement());
+        HTMLMetaElement* metaElement = static_cast<HTMLMetaElement*>(metaElements->item(i));
+        if (equalIgnoringCase(metaElement->name(), "generator") && metaElement->content().startsWith("Mac OS X Server Web Services Server", false))
+            return true;
+    }
+    
+    return false;
+}
+    
 bool HTMLObjectElement::hasValidClassId()
 {
@@ -244 +274 @@
 
     if (MIMETypeRegistry::isJavaAppletMIMEType(serviceType()) && classId().startsWith("java:", false))
+        return true;
+    
+    if (shouldAllowQuickTimeClassIdQuirk())
         return true;
 

trunk/Source/WebCore/html/HTMLObjectElement.h

@@ -96 +96 @@
     void parametersForPlugin(Vector<String>& paramNames, Vector<String>& paramValues, String& url, String& serviceType);
     
+    bool shouldAllowQuickTimeClassIdQuirk();
     bool hasValidClassId();