diff options
6 files changed, 14 insertions, 5 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "55415", + "webkit_revision": "55424", "ffmpeg_revision": "40324", "skia_revision": "504", "chromium_git": "http://src.chromium.org/git", diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc index 5230bab..9547e1f 100644 --- a/chrome/browser/renderer_host/browser_render_process_host.cc +++ b/chrome/browser/renderer_host/browser_render_process_host.cc @@ -541,6 +541,11 @@ void BrowserRenderProcessHost::PropagateBrowserCommandLineToRenderer( // We propagate the Chrome Frame command line here as well in case the // renderer is not run in the sandbox. switches::kChromeFrame, + // We need to propagate this flag to determine whether to make the + // WebGLArray constructors on the DOMWindow visible. This + // information is needed very early during bringup. We prefer to + // use the WebPreferences to set this flag on a page-by-page basis. + switches::kEnableExperimentalWebGL, #if defined(OS_MACOSX) // Allow this to be set when invoking the browser and relayed along. switches::kEnableSandboxLogging, diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc index 047dbff..2e85097 100644 --- a/chrome/renderer/render_thread.cc +++ b/chrome/renderer/render_thread.cc @@ -777,6 +777,9 @@ void RenderThread::EnsureWebKitInitialized() { WebRuntimeFeatures::enableGeolocation( command_line.HasSwitch(switches::kEnableGeolocation)); + + WebRuntimeFeatures::enableWebGL( + command_line.HasSwitch(switches::kEnableExperimentalWebGL)); } void RenderThread::IdleHandler() { diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/dom/DOMException/prototype-object-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/dom/DOMException/prototype-object-expected.txt index 3afbba2..64c6046 100644 --- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/dom/DOMException/prototype-object-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/dom/DOMException/prototype-object-expected.txt @@ -4,9 +4,9 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE PASS e.toString() is "Error: HIERARCHY_REQUEST_ERR: DOM Exception 3" -FAIL Object.prototype.toString.call(e) should be [object DOMException]. Was [object DOMCoreException]. +PASS Object.prototype.toString.call(e) is "[object DOMException]" FAIL Object.prototype.toString.call(e.__proto__) should be [object DOMExceptionPrototype]. Was [object Object]. -FAIL e.constructor.toString() should be [object DOMExceptionConstructor]. Was function DOMCoreException() { [native code] }. +FAIL e.constructor.toString() should be [object DOMExceptionConstructor]. Was function DOMException() { [native code] }. PASS e.constructor is window.DOMException PASS e.HIERARCHY_REQUEST_ERR is e.constructor.HIERARCHY_REQUEST_ERR PASS e.HIERARCHY_REQUEST_ERR is 3 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/DOMException/prototype-object-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/DOMException/prototype-object-expected.txt index 3afbba2..64c6046 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/DOMException/prototype-object-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/DOMException/prototype-object-expected.txt @@ -4,9 +4,9 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE PASS e.toString() is "Error: HIERARCHY_REQUEST_ERR: DOM Exception 3" -FAIL Object.prototype.toString.call(e) should be [object DOMException]. Was [object DOMCoreException]. +PASS Object.prototype.toString.call(e) is "[object DOMException]" FAIL Object.prototype.toString.call(e.__proto__) should be [object DOMExceptionPrototype]. Was [object Object]. -FAIL e.constructor.toString() should be [object DOMExceptionConstructor]. Was function DOMCoreException() { [native code] }. +FAIL e.constructor.toString() should be [object DOMExceptionConstructor]. Was function DOMException() { [native code] }. PASS e.constructor is window.DOMException PASS e.HIERARCHY_REQUEST_ERR is e.constructor.HIERARCHY_REQUEST_ERR PASS e.HIERARCHY_REQUEST_ERR is 3 diff --git a/webkit/tools/test_shell/test_shell_webkit_init.h b/webkit/tools/test_shell/test_shell_webkit_init.h index 95608ae..afff8ca 100644 --- a/webkit/tools/test_shell/test_shell_webkit_init.h +++ b/webkit/tools/test_shell/test_shell_webkit_init.h @@ -61,6 +61,7 @@ class TestShellWebKitInit : public webkit_glue::WebKitClientImpl { WebKit::WebRuntimeFeatures::enableSockets(true); WebKit::WebRuntimeFeatures::enableApplicationCache(true); WebKit::WebRuntimeFeatures::enableDatabase(true); + WebKit::WebRuntimeFeatures::enableWebGL(true); // Load libraries for media and enable the media player. FilePath module_path; |