diff options
| -rw-r--r-- | DEPS | 8 | ||||
| -rw-r--r-- | webkit/port/bindings/v8/V8XMLHttpRequestCustom.cpp | 10 | ||||
| -rw-r--r-- | webkit/port/bindings/v8/v8_custom.h | 1 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_lists/win/tests_fixable.txt | 15 |
4 files changed, 30 insertions, 4 deletions
@@ -12,7 +12,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@63", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@6022", + "/trunk/deps/third_party/WebKit@6051", "src/third_party/icu38": "/trunk/deps/third_party/icu38@5827", @@ -21,13 +21,13 @@ deps = { "http://v8.googlecode.com/svn/trunk@768", "src/webkit/data/layout_tests/LayoutTests": - "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@38625", + "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@38653", "src/third_party/WebKit/WebKit": - "http://svn.webkit.org/repository/webkit/trunk/WebKit@38625", + "http://svn.webkit.org/repository/webkit/trunk/WebKit@38653", "src/third_party/WebKit/WebKitLibraries": - "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@38625", + "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@38653", } diff --git a/webkit/port/bindings/v8/V8XMLHttpRequestCustom.cpp b/webkit/port/bindings/v8/V8XMLHttpRequestCustom.cpp index b40d659..91b048bd 100644 --- a/webkit/port/bindings/v8/V8XMLHttpRequestCustom.cpp +++ b/webkit/port/bindings/v8/V8XMLHttpRequestCustom.cpp @@ -350,6 +350,16 @@ ACCESSOR_SETTER(XMLHttpRequestOnreadystatechange) } } +ACCESSOR_GETTER(XMLHttpRequestResponseText) +{ + // This is only needed because webkit set this getter as custom. + // So we need a custom method to avoid forking the IDL file. + INC_STATS("DOM.XMLHttpRequest.responsetext._get"); + XMLHttpRequest* imp = V8Proxy::ToNativeObject<XMLHttpRequest>( + V8ClassIndex::XMLHTTPREQUEST, info.Holder()); + return v8StringOrNull(imp->responseText()); +} + CALLBACK_FUNC_DECL(XMLHttpRequestAddEventListener) { INC_STATS("DOM.XMLHttpRequest.addEventListener()"); diff --git a/webkit/port/bindings/v8/v8_custom.h b/webkit/port/bindings/v8/v8_custom.h index de64bd7..8199fe9 100644 --- a/webkit/port/bindings/v8/v8_custom.h +++ b/webkit/port/bindings/v8/v8_custom.h @@ -316,6 +316,7 @@ DECLARE_PROPERTY_ACCESSOR(XMLHttpRequestOnload) DECLARE_PROPERTY_ACCESSOR(XMLHttpRequestOnloadstart) DECLARE_PROPERTY_ACCESSOR(XMLHttpRequestOnprogress) DECLARE_PROPERTY_ACCESSOR(XMLHttpRequestOnreadystatechange) +DECLARE_PROPERTY_ACCESSOR(XMLHttpRequestResponseText) DECLARE_CALLBACK(XMLHttpRequestAddEventListener) DECLARE_CALLBACK(XMLHttpRequestRemoveEventListener) DECLARE_CALLBACK(XMLHttpRequestOpen) diff --git a/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt index 2fb39f4..4438ea6 100644 --- a/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt @@ -1153,3 +1153,18 @@ LayoutTests/fast/frames/iframe-option-crash.xhtml = FAIL // MERGE 38600:38625: Expectations changed upstream LayoutTests/fast/js/deep-recursion-test.html = FAIL + +// MERGE 38625:38653: Expectations changed upstream +LayoutTests/editing/deleting/delete-by-word-001.html = FAIL +LayoutTests/editing/deleting/delete-by-word-002.html = FAIL +LayoutTests/editing/deleting/delete-to-end-of-paragraph.html = FAIL +LayoutTests/fast/css/computed-style-without-renderer.html = FAIL + +// MERGE 38625:38653: Regression +LayoutTests/fast/events/key-events-in-input-button.html = FAIL + +// MERGE 38625:38653: New tests +LayoutTests/fast/css/computed-style.html = FAIL +LayoutTests/fast/repaint/change-transform.html = FAIL +LayoutTests/transitions/transition-drt-api-delay.html = TIMEOUT +LayoutTests/transitions/transition-shorthand-delay.html = TIMEOUT |