From 4b80d9479160d35420cb9195d6287ae436fbf4ef Mon Sep 17 00:00:00 2001
From: "bulach@chromium.org"
 <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 16 Jun 2010 13:51:39 +0000
Subject: Rolls WebKit 61233:61234 Switches over to the new HTML5 Parser,
 originally in http://codereview.chromium.org/2809011.

Review URL: http://codereview.chromium.org/2843005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49936 0039d316-1c4b-4281-b951-d872f2087c98
---
 DEPS                                           | 2 +-
 webkit/glue/webpreferences.h                   | 2 +-
 webkit/tools/test_shell/test_shell.cc          | 2 +-
 webkit/tools/test_shell/test_shell.h           | 2 +-
 webkit/tools/test_shell/test_shell_main.cc     | 4 ++--
 webkit/tools/test_shell/test_shell_switches.cc | 2 +-
 webkit/tools/test_shell/test_shell_switches.h  | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/DEPS b/DEPS
index 0bdc12c0..c6163af 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
 vars = {
   "webkit_trunk":
   "http://svn.webkit.org/repository/webkit/trunk",
-  "webkit_revision": "61233",
+  "webkit_revision": "61234",
   "ffmpeg_revision": "49485",
   "skia_revision": "576",
   "chromium_git": "http://src.chromium.org/git",
diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h
index 09e9222..b86a051 100755
--- a/webkit/glue/webpreferences.h
+++ b/webkit/glue/webpreferences.h
@@ -109,7 +109,7 @@ struct WebPreferences {
         experimental_webgl_enabled(false),
         show_composited_layer_borders(false),
         accelerated_compositing_enabled(false),
-        enable_html5_parser(false) {
+        enable_html5_parser(true) {
   }
 
   void Apply(WebKit::WebView* web_view) const;
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index 14e092a..90c8abc 100755
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -105,7 +105,7 @@ class URLRequestTestShellFileJob : public URLRequestFileJob {
 WindowList* TestShell::window_list_;
 WebPreferences* TestShell::web_prefs_ = NULL;
 bool TestShell::developer_extras_enabled_ = false;
-bool TestShell::enable_html5_parser_ = false;
+bool TestShell::enable_html5_parser_ = true;
 bool TestShell::inspector_test_mode_ = false;
 bool TestShell::layout_test_mode_ = false;
 bool TestShell::allow_external_pages_ = false;
diff --git a/webkit/tools/test_shell/test_shell.h b/webkit/tools/test_shell/test_shell.h
index 9e457c4..21d8856 100644
--- a/webkit/tools/test_shell/test_shell.h
+++ b/webkit/tools/test_shell/test_shell.h
@@ -324,7 +324,7 @@ public:
       return dev_tools_agent_.get();
     }
 
-    static void enable_html5_parser() { enable_html5_parser_ = true; }
+    static void disable_html5_parser() { enable_html5_parser_ = false; }
 
 protected:
     void CreateDevToolsClient(TestShellDevToolsAgent* agent);
diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc
index dc46850..41de061 100644
--- a/webkit/tools/test_shell/test_shell_main.cc
+++ b/webkit/tools/test_shell/test_shell_main.cc
@@ -178,8 +178,8 @@ int main(int argc, char* argv[]) {
 
   platform.InitializeGUI();
 
-  if (parsed_command_line.HasSwitch(test_shell::kEnableHtml5Parser)) {
-    TestShell::enable_html5_parser();
+  if (parsed_command_line.HasSwitch(test_shell::kEnableLegacyParser)) {
+    TestShell::disable_html5_parser();
   }
 
   TestShell::InitializeTestShell(layout_test_mode, allow_external_pages);
diff --git a/webkit/tools/test_shell/test_shell_switches.cc b/webkit/tools/test_shell/test_shell_switches.cc
index 050e89d..bd544d1 100644
--- a/webkit/tools/test_shell/test_shell_switches.cc
+++ b/webkit/tools/test_shell/test_shell_switches.cc
@@ -86,6 +86,6 @@ const char kHeapProfiler[] = "heap-profiler";
 
 const char kAllowExternalPages[] = "allow-external-pages";    
 
-const char kEnableHtml5Parser[] = "html5-parser";
+const char kEnableLegacyParser[] = "legacy-parser";
 
 }  // namespace test_shell
diff --git a/webkit/tools/test_shell/test_shell_switches.h b/webkit/tools/test_shell/test_shell_switches.h
index 11782ad..80780d8 100644
--- a/webkit/tools/test_shell/test_shell_switches.h
+++ b/webkit/tools/test_shell/test_shell_switches.h
@@ -35,7 +35,7 @@ extern const char kGDB[];
 extern const char kProfiler[];
 extern const char kHeapProfiler[];
 extern const char kAllowExternalPages[];
-extern const char kEnableHtml5Parser[];
+extern const char kEnableLegacyParser[];
 
 }  // namespace test_shell
 
-- 
cgit v1.1