Add a flag for enabling the threaded parser

Review URL: https://codereview.chromium.org/12223082

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182284 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 10 insertions, 0 deletions

diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index b1328e8..a11aa65 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -532,6 +532,8 @@ WebPreferences WebContentsImpl::GetWebkitPrefs(RenderViewHost* rvh,
       command_line.HasSwitch(switches::kEnableExperimentalWebKitFeatures);
   prefs.record_rendering_stats =
       command_line.HasSwitch(switches::kEnableGpuBenchmarking);
+  prefs.threaded_html_parser =
+      command_line.HasSwitch(switches::kEnableThreadedHTMLParser);
 
   bool touch_device_present = false;
   touch_device_present = ui::IsTouchDevicePresent();
diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc
index d3f9366..461d7b0 100644
--- a/content/public/common/content_switches.cc
+++ b/content/public/common/content_switches.cc
@@ -298,6 +298,9 @@ const char kEnableDownloadResumption[]      = "enable-download-resumption";
 const char kEnableExperimentalWebKitFeatures[] =
     "enable-experimental-webkit-features";
 
+// Enables the threaded HTML parser in WebKit
+const char kEnableThreadedHTMLParser[]      = "enable-threaded-html-parser";
+
 // Enables the fastback page cache.
 const char kEnableFastback[]                = "enable-fastback";
 
diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h
index fb6126d..bd017fa 100644
--- a/content/public/common/content_switches.h
+++ b/content/public/common/content_switches.h
@@ -103,6 +103,7 @@ CONTENT_EXPORT extern const char kEnableCssShaders[];
 CONTENT_EXPORT extern const char kEnableDeviceMotion[];
 CONTENT_EXPORT extern const char kEnableDownloadResumption[];
 CONTENT_EXPORT extern const char kEnableExperimentalWebKitFeatures[];
+CONTENT_EXPORT extern const char kEnableThreadedHTMLParser[];
 extern const char kEnableFastback[];
 CONTENT_EXPORT extern const char kEnableFixedLayout[];
 CONTENT_EXPORT extern const char kDisableFullScreen[];
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc
index 3b5ba70..d84bb31 100644
--- a/webkit/glue/webpreferences.cc
+++ b/webkit/glue/webpreferences.cc
@@ -88,6 +88,7 @@ WebPreferences::WebPreferences()
       accelerated_compositing_for_scrollable_frames_enabled(false),
       composited_scrolling_for_frames_enabled(false),
       mock_scrollbars_enabled(false),
+      threaded_html_parser(false),
       show_paint_rects(false),
       render_vsync_enabled(true),
       asynchronous_spell_checking_enabled(true),
@@ -377,6 +378,8 @@ void WebPreferences::Apply(WebView* web_view) const {
   // Uses the mock theme engine for scrollbars.
   settings->setMockScrollbarsEnabled(mock_scrollbars_enabled);
 
+  settings->setThreadedHTMLParser(threaded_html_parser);
+
   // Display the current compositor tree as overlay if requested on
   // the command line
   settings->setShowPlatformLayerTree(show_composited_layer_tree);
diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h
index 6dda7f6..fba0ef5 100644
--- a/webkit/glue/webpreferences.h
+++ b/webkit/glue/webpreferences.h
@@ -112,6 +112,7 @@ struct WEBKIT_GLUE_EXPORT WebPreferences {
   bool accelerated_compositing_for_scrollable_frames_enabled;
   bool composited_scrolling_for_frames_enabled;
   bool mock_scrollbars_enabled;
+  bool threaded_html_parser;
   bool show_paint_rects;
   bool render_vsync_enabled;
   bool asynchronous_spell_checking_enabled;