diff options
| author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-02 17:42:15 +0000 |
|---|---|---|
| committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-02 17:42:15 +0000 |
| commit | 62e3d636b9941ebf9aebde1acfb3e6bed9c45ecf (patch) | |
| tree | 2c03e715918b35e867fa639129204715686b090c | |
| parent | 08f6a95a4713ef1ac942c983d3af69427ad8db3a (diff) | |
| download | chromium_src-62e3d636b9941ebf9aebde1acfb3e6bed9c45ecf.zip chromium_src-62e3d636b9941ebf9aebde1acfb3e6bed9c45ecf.tar.gz chromium_src-62e3d636b9941ebf9aebde1acfb3e6bed9c45ecf.tar.bz2 | |
WebKit roll: 48994:49006
Handle name change (setExperimentalWebGLEnabled() => setWebGLEnabled())
Review URL: http://codereview.chromium.org/259014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27854 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/api/src/WebSettingsImpl.cpp | 2 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 7 |
3 files changed, 7 insertions, 4 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "48994", + "webkit_revision": "49006", "ffmpeg_revision": "27457", } diff --git a/webkit/api/src/WebSettingsImpl.cpp b/webkit/api/src/WebSettingsImpl.cpp index dc577e8..8c52ce0 100644 --- a/webkit/api/src/WebSettingsImpl.cpp +++ b/webkit/api/src/WebSettingsImpl.cpp @@ -246,7 +246,7 @@ void WebSettingsImpl::setOfflineWebApplicationCacheEnabled(bool enabled) void WebSettingsImpl::setExperimentalWebGLEnabled(bool enabled) { - m_settings->setExperimentalWebGLEnabled(enabled); + m_settings->setWebGLEnabled(enabled); } } // namespace WebKit diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 9028a4f..cdb1c86 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -3068,6 +3068,9 @@ BUG_ATWILSON : LayoutTests/fast/css/text-rendering.html = FAIL BUG_ATWILSON WIN LINUX: LayoutTests/svg/css/getComputedStyle-basic.xhtml = FAIL // This was happening previously - might be a flakey test? BUG_ATWILSON LINUX : LayoutTests/editing/selection/extend-selection.html = TIMEOUT PASS -// Just temporary - this will get fixed when we roll webkit r49000 -BUG_ATWILSON MAC : LayoutTests/svg/W3C-SVG-1.1/filters-conv-01-f.svg = FAIL BUG_ATWILSON MAC LINUX : LayoutTests/fast/css/last-of-type-pseudo-class.html = FAIL + +// WebKit update: 48994:49006 +BUG_ATWILSON LINUX : LayoutTests/animations/transform-origin-vs-functions.html = FAIL +BUG_ATWILSON WIN LINUX : LayoutTests/fast/box-shadow/inset.html = FAIL + |