From 407dfa63ec09c5110ad778386c7808b7b5d0cb4f Mon Sep 17 00:00:00 2001
From: "podivilov@chromium.org"
 <podivilov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 23 Dec 2011 11:59:35 +0000
Subject: Add --dart-flags and --disable-dart command line switches.

R=darin@chromium.org

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

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

(limited to 'webkit')

diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc
index cf4f452..e16b617 100644
--- a/webkit/glue/webkit_glue.cc
+++ b/webkit/glue/webkit_glue.cc
@@ -85,6 +85,12 @@ void SetJavaScriptFlags(const std::string& str) {
 #endif
 }
 
+void SetDartFlags(const std::string& str) {
+#if WEBKIT_USING_DART
+  WebKit::setDartFlags(str.data(), static_cast<int>(str.size()));
+#endif
+}
+
 void EnableWebCoreLogChannels(const std::string& channels) {
   if (channels.empty())
     return;
diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h
index 611436fb..e58fb38 100644
--- a/webkit/glue/webkit_glue.h
+++ b/webkit/glue/webkit_glue.h
@@ -37,6 +37,8 @@ namespace webkit_glue {
 
 WEBKIT_GLUE_EXPORT void SetJavaScriptFlags(const std::string& flags);
 
+WEBKIT_GLUE_EXPORT void SetDartFlags(const std::string& flags);
+
 // Turn on logging for flags in the provided comma delimited list.
 WEBKIT_GLUE_EXPORT void EnableWebCoreLogChannels(const std::string& channels);
 
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc
index b3dbd80..5d067de 100644
--- a/webkit/glue/webpreferences.cc
+++ b/webkit/glue/webpreferences.cc
@@ -38,6 +38,7 @@ WebPreferences::WebPreferences()
       minimum_logical_font_size(6),
       default_encoding("ISO-8859-1"),
       javascript_enabled(true),
+      dart_enabled(true),
       web_security_enabled(true),
       javascript_can_open_windows_automatically(true),
       loads_images_automatically(true),
@@ -182,6 +183,9 @@ void WebPreferences::Apply(WebView* web_view) const {
   settings->setMinimumLogicalFontSize(minimum_logical_font_size);
   settings->setDefaultTextEncodingName(ASCIIToUTF16(default_encoding));
   settings->setJavaScriptEnabled(javascript_enabled);
+#if WEBKIT_USING_DART
+  settings->setDartEnabled(dart_enabled);
+#endif
   settings->setWebSecurityEnabled(web_security_enabled);
   settings->setJavaScriptCanOpenWindowsAutomatically(
       javascript_can_open_windows_automatically);
diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h
index 32bc721..48fb8d9 100644
--- a/webkit/glue/webpreferences.h
+++ b/webkit/glue/webpreferences.h
@@ -45,6 +45,7 @@ struct WEBKIT_GLUE_EXPORT WebPreferences {
   int minimum_logical_font_size;
   std::string default_encoding;
   bool javascript_enabled;
+  bool dart_enabled;
   bool web_security_enabled;
   bool javascript_can_open_windows_automatically;
   bool loads_images_automatically;
diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc
index cc2341e..53c1792 100644
--- a/webkit/tools/test_shell/test_shell_main.cc
+++ b/webkit/tools/test_shell/test_shell_main.cc
@@ -286,6 +286,11 @@ int main(int argc, char* argv[]) {
         extensions_v8::HeapProfilerExtension::Get());
   }
 
+  if (parsed_command_line.HasSwitch(test_shell::kDartFlags)) {
+    webkit_glue::SetDartFlags(
+        parsed_command_line.GetSwitchValueASCII(test_shell::kDartFlags));
+  }
+
   // Load and initialize the stats table.  Attempt to construct a somewhat
   // unique name to isolate separate instances from each other.
 
diff --git a/webkit/tools/test_shell/test_shell_switches.cc b/webkit/tools/test_shell/test_shell_switches.cc
index 087b791..3143ec1 100644
--- a/webkit/tools/test_shell/test_shell_switches.cc
+++ b/webkit/tools/test_shell/test_shell_switches.cc
@@ -85,4 +85,7 @@ const char kEnableAccel2DCanvas[] = "enable-accelerated-2d-canvas";
 
 const char kEnableAccelCompositing[] = "enable-accelerated-compositing";
 
+// Options to pass to the Dart VM.
+const char kDartFlags[] = "dart-flags";
+
 }  // namespace test_shell
diff --git a/webkit/tools/test_shell/test_shell_switches.h b/webkit/tools/test_shell/test_shell_switches.h
index 53408dc..c5d4255 100644
--- a/webkit/tools/test_shell/test_shell_switches.h
+++ b/webkit/tools/test_shell/test_shell_switches.h
@@ -34,6 +34,7 @@ extern const char kHeapProfiler[];
 extern const char kAllowExternalPages[];
 extern const char kEnableAccel2DCanvas[];
 extern const char kEnableAccelCompositing[];
+extern const char kDartFlags[];
 
 }  // namespace test_shell
 
-- 
cgit v1.1