Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / html / parser / HTMLParserOptions.cpp

diff --git a/src/third_party/WebKit/Source/core/html/parser/HTMLParserOptions.cpp b/src/third_party/WebKit/Source/core/html/parser/HTMLParserOptions.cpp
index 150eed2..8aabcd1 100644 (file)
--- a/src/third_party/WebKit/Source/core/html/parser/HTMLParserOptions.cpp
+++ b/src/third_party/WebKit/Source/core/html/parser/HTMLParserOptions.cpp
@@ -40,10 +40,17 @@ HTMLParserOptions::HTMLParserOptions(Document* document)
     scriptEnabled = frame && frame->script().canExecuteScripts(NotAboutToExecuteScript);
     pluginsEnabled = frame && frame->loader().allowPlugins(NotAboutToInstantiatePlugin);
 
+    // We force the main-thread parser for about:blank and javascript:
+    // (which uses about:blank urls) and data: urls for compatibility
+    // with historical synchronous loading/parsing behavior.
+    // FIXME: Gecko does not load javascript: urls synchronously, why do we?
+    // See LayoutTests/loader/iframe-sync-loads.html
+    // FIXME: threadedHTMLParser() setting should be removed but currently many
+    // webkit_unit_tests depend on parsing being synchronous. crbug.com/366354
+    // FIXME: useThreadedHTMLParserForDataURLs() setting should be removed but
+    // currently many browser_tests depend on data: urls being synchronous! crbug.com/308321
     Settings* settings = document ? document->settings() : 0;
-    // We force the main-thread parser for about:blank, javascript: and data: urls for compatibility
-    // with historical synchronous loading/parsing behavior of those schemes.
-    useThreading = settings && settings->threadedHTMLParser() && !document->url().isBlankURL()
+    useThreading = settings && settings->threadedHTMLParser() && !document->url().isAboutBlankURL()
         && (settings->useThreadedHTMLParserForDataURLs() || !document->url().protocolIsData());
 }