diff options
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/api/src/WebSettingsImpl.cpp | 2 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 7 |
2 files changed, 6 insertions, 3 deletions
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 + |