diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/api/src/GraphicsContext3D.cpp | 7 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 9 |
3 files changed, 15 insertions, 3 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "50180", + "webkit_revision": "50186", "ffmpeg_revision": "28488", } diff --git a/webkit/api/src/GraphicsContext3D.cpp b/webkit/api/src/GraphicsContext3D.cpp index 1afe4f9..459a17e 100644 --- a/webkit/api/src/GraphicsContext3D.cpp +++ b/webkit/api/src/GraphicsContext3D.cpp @@ -947,6 +947,13 @@ void GraphicsContext3D::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5, t6 a6, t7 a7, t8 makeContextCurrent(); gl##glname(a1,a2,a3,a4,a5,a6,a7,a8); \ } +PassOwnPtr<GraphicsContext3D> GraphicsContext3D::create() +{ + PassOwnPtr<GraphicsContext3D> context = new GraphicsContext3D(); + // FIXME: add error checking + return context; +} + GraphicsContext3D::GraphicsContext3D() : m_currentWidth(0) , m_currentHeight(0) diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index ab59928..f73c86c 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2676,7 +2676,7 @@ BUG10760 LINUX MAC : LayoutTests/svg/custom/marker-viewBox-changes.svg = PASS FA // New failures from WebKit Merge 42671:42725 BUG10861 WIN : LayoutTests/http/tests/plugins/post-url-file.html = PASS -BUG10861 MAC : LayoutTests/http/tests/plugins/post-url-file.html = TIMEOUT +BUG10861 MAC : LayoutTests/http/tests/plugins/post-url-file.html = TIMEOUT FAIL // New failures from WebKit merge 42725:42805 // WebKit change http://trac.webkit.org/changeset/42785 @@ -3291,5 +3291,10 @@ BUG_JORLOW LINUX : LayoutTests/fast/multicol/column-rules-stacking.html = PASS F // BUG24182 WIN LINUX DEBUG SLOW : LayoutTests/svg/css/getComputedStyle-basic.xhtml = PASS BUG_JORLOW WIN LINUX DEBUG SLOW: LayoutTests/svg/css/getComputedStyle-basic.xhtml = CRASH FAIL PASS -// WebKit 50158:10171 +// WebKit 50158:50171 BUG_JORLOW : LayoutTests/fast/dom/error-to-string-stack-overflow.html = FAIL + +// WebKit roll 50180:50186 +BUG_JORLOW LINUX WIN : LayoutTests/fast/repaint/inline-relative-positioned.html = FAIL +BUG_JORLOW LINUX : LayoutTests/svg/custom/marker-default-width-height.svg = FAIL +BUG_JORLOW MAC : LayoutTests/http/tests/security/frameNavigation/xss-DENIED-plugin-navigation.html = FAIL |