Enable WebGL layout tests.

R=kbr
TEST=none
BUG=21852

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

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

2 files changed, 10 insertions, 5 deletions

diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index efe35ec..852c11f 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -173,9 +173,6 @@ WONTFIX SKIP BUG19635 : fast/events/pageshow-pagehide-on-back-cached-with-frames
 WONTFIX SKIP BUG19635 : media/restore-from-page-cache.html = TIMEOUT
 WONTFIX SKIP BUG19635 : loader/go-back-to-different-window-size.html = TIMEOUT TEXT
 
-// No support for WebGL yet
-BUG21852 SKIP : fast/canvas/webgl = FAIL
-
 // Tests that rely on cross-process MessagePorts.  No point in running them in
 // test_shell, since we'd have to use a completely different implementation from
 // what is used in the browser.
@@ -2915,3 +2912,9 @@ BUG33288 : fast/forms/input-valueasnumber-month.html = TEXT
 // Flaky storage tests
 BUG33343 LINUX MAC : storage/database-lock-after-reload.html = CRASH TEXT PASS
 BUG33343 DEBUG : storage/multiple-databases-garbage-collection.html = CRASH PASS
+
+// Rebaseline!
+BUG21852 : fast/canvas/webgl/gl-object-get-calls.html = TEXT
+BUG21852 : fast/canvas/webgl/null-object-behaviour.html = TEXT
+BUG21852 : fast/canvas/webgl/texImageTest.html = TEXT
+BUG21852 : fast/canvas/webgl/uniform-location.html = TEXT
diff --git a/webkit/tools/test_shell/layout_test_controller.cc b/webkit/tools/test_shell/layout_test_controller.cc
index 7dedc70..1b9c669 100644
--- a/webkit/tools/test_shell/layout_test_controller.cc
+++ b/webkit/tools/test_shell/layout_test_controller.cc
@@ -903,9 +903,9 @@ bool LayoutTestController::CppVariantToBool(const CppVariant& value) {
     return 0 != value.ToInt32();
   else if (value.isString()) {
     std::string valueString = value.ToString();
-    if (valueString == "true")
+    if (valueString == "true" || valueString == "1")
       return true;
-    if (valueString == "false")
+    if (valueString == "false" || valueString == "0")
       return false;
   }
   LogErrorToConsole("Invalid value. Expected boolean value.");
@@ -991,6 +991,8 @@ void LayoutTestController::overridePreference(
       preferences->application_cache_enabled = CppVariantToBool(value);
     else if (key == "WebKitTabToLinksPreferenceKey")
       preferences->tabs_to_links = CppVariantToBool(value);
+    else if (key == "WebKitWebGLEnabled")
+      preferences->experimental_webgl_enabled = CppVariantToBool(value);
     else {
       std::string message("Invalid name for preference: ");
       message.append(key);