Merge WebKit at branches/chromium/742 r88085: Initial merge by git.

Change-Id: I0501b484b9528e31b0026e5ad64416dd6541cdde

1 files changed, 26 insertions, 0 deletions

diff --git a/Source/WebCore/html/HTMLScriptElement.cpp b/Source/WebCore/html/HTMLScriptElement.cpp
index b56b375..f49038b 100644
--- a/Source/WebCore/html/HTMLScriptElement.cpp
+++ b/Source/WebCore/html/HTMLScriptElement.cpp
@@ -29,6 +29,7 @@
 #include "EventNames.h"
 #include "HTMLNames.h"
 #include "ScriptEventListener.h"
+#include "Settings.h"
 #include "Text.h"
 
 namespace WebCore {
@@ -81,8 +82,33 @@ void HTMLScriptElement::parseMappedAttribute(Attribute* attr)
         HTMLElement::parseMappedAttribute(attr);
 }
 
+static bool needsOldRequirejsQuirk(HTMLScriptElement* element)
+{
+    if (element->fastGetAttribute(typeAttr) != "script/cache")
+        return false;
+
+    Document* document = element->document();
+
+    const KURL& url = document->url();
+    if (!equalIgnoringCase(url.host(), "www.zipcar.com"))
+        return false;
+
+    Settings* settings = document->settings();
+    if (!settings)
+        return false;
+    if (!settings->needsSiteSpecificQuirks())
+        return false;
+
+    return true;
+}
+
 void HTMLScriptElement::insertedIntoDocument()
 {
+    if (needsOldRequirejsQuirk(this)) {
+        if (!asyncAttributeValue())
+            handleAsyncAttribute(); // Clear forceAsync, so this script loads in parallel, but executes in order.
+        setAttribute(typeAttr, "text/javascript");
+    }
     HTMLElement::insertedIntoDocument();
     ScriptElement::insertedIntoDocument();
 }