diff options
| -rw-r--r-- | DEPS | 4 | ||||
| -rw-r--r-- | WEBKIT_MERGE_REVISION | 2 | ||||
| -rw-r--r-- | webkit/build/WebCore/WebCore.vcproj | 8 | ||||
| -rw-r--r-- | webkit/port/bindings/v8/ScriptController.cpp | 10 | ||||
| -rw-r--r-- | webkit/port/bindings/v8/ScriptController.h | 5 | ||||
| -rw-r--r-- | webkit/port/bindings/v8/v8_proxy.cpp | 8 | ||||
| -rw-r--r-- | webkit/port/bindings/v8/v8_proxy.h | 3 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 5 | ||||
| -rw-r--r-- | webkit/webkit.gyp | 2 |
9 files changed, 20 insertions, 27 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "42547", + "webkit_revision": "42580", } @@ -19,7 +19,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@214", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@13842", + "/trunk/deps/third_party/WebKit@13883", "src/third_party/icu38": "/trunk/deps/third_party/icu38@13472", diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION index 83afda9..730c607 100644 --- a/WEBKIT_MERGE_REVISION +++ b/WEBKIT_MERGE_REVISION @@ -1 +1 @@ -http://svn.webkit.org/repository/webkit/trunk@42547
\ No newline at end of file +http://svn.webkit.org/repository/webkit/trunk@42580
\ No newline at end of file diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj index d10862c..5da7bea 100644 --- a/webkit/build/WebCore/WebCore.vcproj +++ b/webkit/build/WebCore/WebCore.vcproj @@ -3573,6 +3573,14 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderSVGModelObject.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderSVGModelObject.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderSVGRoot.cpp" > </File> diff --git a/webkit/port/bindings/v8/ScriptController.cpp b/webkit/port/bindings/v8/ScriptController.cpp index 84ad8b4..d6be744 100644 --- a/webkit/port/bindings/v8/ScriptController.cpp +++ b/webkit/port/bindings/v8/ScriptController.cpp @@ -236,19 +236,11 @@ void ScriptController::disposeJSResult(v8::Persistent<v8::Value> result) } PassRefPtr<EventListener> ScriptController::createInlineEventListener( - const String& functionName, const String& code, Node* node) + const String& functionName, const String& eventParameterName, const String& code, Node* node) { return m_proxy->createInlineEventListener(functionName, code, node); } -#if ENABLE(SVG) -PassRefPtr<EventListener> ScriptController::createSVGEventHandler( - const String& functionName, const String& code, Node* node) -{ - return m_proxy->createSVGEventHandler(functionName, code, node); -} -#endif - void ScriptController::setEventHandlerLineno(int lineno) { m_proxy->setEventHandlerLineno(lineno); diff --git a/webkit/port/bindings/v8/ScriptController.h b/webkit/port/bindings/v8/ScriptController.h index e1e9e25..70994c5 100644 --- a/webkit/port/bindings/v8/ScriptController.h +++ b/webkit/port/bindings/v8/ScriptController.h @@ -170,10 +170,7 @@ public: void disposeJSResult(JSResult result); void collectGarbage(); - PassRefPtr<EventListener> createInlineEventListener(const String& functionName, const String& code, Node*); -#if ENABLE(SVG) - PassRefPtr<EventListener> createSVGEventHandler(const String& functionName, const String& code, Node*); -#endif + PassRefPtr<EventListener> createInlineEventListener(const String& functionName, const String& eventParameterName, const String& code, Node*); // Creates a property of the global object of a frame. void BindToWindowObject(Frame*, const String& key, NPObject*); diff --git a/webkit/port/bindings/v8/v8_proxy.cpp b/webkit/port/bindings/v8/v8_proxy.cpp index f7af9db..bee868a 100644 --- a/webkit/port/bindings/v8/v8_proxy.cpp +++ b/webkit/port/bindings/v8/v8_proxy.cpp @@ -816,14 +816,6 @@ PassRefPtr<EventListener> V8Proxy::createInlineEventListener( return V8LazyEventListener::create(m_frame, code, functionName); } -#if ENABLE(SVG) -PassRefPtr<EventListener> V8Proxy::createSVGEventHandler(const String& functionName, - const String& code, Node* node) -{ - return V8LazyEventListener::create(m_frame, code, functionName); -} -#endif - // Event listeners diff --git a/webkit/port/bindings/v8/v8_proxy.h b/webkit/port/bindings/v8/v8_proxy.h index 3c4e833..f34ccaa 100644 --- a/webkit/port/bindings/v8/v8_proxy.h +++ b/webkit/port/bindings/v8/v8_proxy.h @@ -233,9 +233,6 @@ class V8Proxy { PassRefPtr<EventListener> createInlineEventListener( const String& functionName, const String& code, Node* node); #if ENABLE(SVG) - PassRefPtr<EventListener> createSVGEventHandler( - const String& functionName, const String& code, Node* node); - static void SetSVGContext(void* object, SVGElement* context); static SVGElement* GetSVGContext(void* object); #endif diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index bda2dc8..d6d6209 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2467,3 +2467,8 @@ BUG10529 LINUX : LayoutTests/editing/inserting/6703873.html = FAIL // This test was changed upstream in http://trac.webkit.org/changeset/42447 // to include window.showModalDialog, which we give as undefined. BUG10530 : LayoutTests/fast/dom/Window/window-function-frame-getter-precedence.html = FAIL + +// New tests from webkit merge 42547:42580 +DEFER BUG10621 : LayoutTests/fast/js/array-reduce.html = FAIL +DEFER BUG10621 : LayoutTests/fast/js/array-reduceRight.html = FAIL +DEFER BUG10622 : LayoutTests/fast/js/array-enumerators-functions.html = FAIL diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index fae18c9..123ce36 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -3188,6 +3188,8 @@ '../third_party/WebKit/WebCore/rendering/RenderSVGInline.h', '../third_party/WebKit/WebCore/rendering/RenderSVGInlineText.cpp', '../third_party/WebKit/WebCore/rendering/RenderSVGInlineText.h', + '../third_party/WebKit/WebCore/rendering/RenderSVGModelObject.cpp', + '../third_party/WebKit/WebCore/rendering/RenderSVGModelObject.h', '../third_party/WebKit/WebCore/rendering/RenderSVGRoot.cpp', '../third_party/WebKit/WebCore/rendering/RenderSVGRoot.h', '../third_party/WebKit/WebCore/rendering/RenderSVGTSpan.cpp', |