Index: Source/core/html/HTMLObjectElement.cpp |
diff --git a/Source/core/html/HTMLObjectElement.cpp b/Source/core/html/HTMLObjectElement.cpp |
index 8851b3db148b36890bff94889a1109cb4473c85e..99ea75ce194eec406f9265f038699b4bdb937d8d 100644 |
--- a/Source/core/html/HTMLObjectElement.cpp |
+++ b/Source/core/html/HTMLObjectElement.cpp |
@@ -228,40 +228,11 @@ bool HTMLObjectElement::hasFallbackContent() const |
return false; |
} |
-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().settings() |
- || !document().settings()->needsSiteSpecificQuirks() |
- || hasFallbackContent() |
- || !equalIgnoringCase(classId(), "clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B")) |
- return false; |
- |
- RefPtrWillBeRawPtr<TagCollection> metaElements = document().getElementsByTagName(HTMLNames::metaTag.localName()); |
- unsigned length = metaElements->length(); |
- for (unsigned i = 0; i < length; ++i) { |
- ASSERT(metaElements->item(i)->isHTMLElement()); |
- HTMLMetaElement* metaElement = toHTMLMetaElement(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() |
{ |
if (MIMETypeRegistry::isJavaAppletMIMEType(m_serviceType) && classId().startsWith("java:", false)) |
return true; |
- if (shouldAllowQuickTimeClassIdQuirk()) |
- return true; |
- |
// 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. |
return classId().isEmpty(); |