From 081d19189faf6e619a5b222f4b179316d5e5132d Mon Sep 17 00:00:00 2001 From: "haraken@chromium.org" Date: Tue, 21 Feb 2012 01:27:27 +0000 Subject: [PATCH] Unreviewed. Rebaselined run-bindings-tests results. * bindings/scripts/test/CPP/WebDOMTestInterface.cpp: * bindings/scripts/test/CPP/WebDOMTestInterface.h: * bindings/scripts/test/CPP/WebDOMTestObj.cpp: * bindings/scripts/test/CPP/WebDOMTestObj.h: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108275 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 9 + .../scripts/test/CPP/WebDOMTestInterface.cpp | 17 -- .../scripts/test/CPP/WebDOMTestInterface.h | 2 - .../bindings/scripts/test/CPP/WebDOMTestObj.cpp | 223 --------------------- .../bindings/scripts/test/CPP/WebDOMTestObj.h | 27 +-- 5 files changed, 10 insertions(+), 268 deletions(-) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index a351f94..f55ffa8 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,12 @@ +2012-02-20 Kentaro Hara + + Unreviewed. Rebaselined run-bindings-tests results. + + * bindings/scripts/test/CPP/WebDOMTestInterface.cpp: + * bindings/scripts/test/CPP/WebDOMTestInterface.h: + * bindings/scripts/test/CPP/WebDOMTestObj.cpp: + * bindings/scripts/test/CPP/WebDOMTestObj.h: + 2012-02-20 No'am Rosenthal [Qt][WK2] Clipping is broken diff --git a/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestInterface.cpp b/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestInterface.cpp index a909910..2508b22 100644 --- a/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestInterface.cpp +++ b/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestInterface.cpp @@ -26,10 +26,8 @@ #include "KURL.h" #include "TestInterface.h" -#include "TestObj.h" #include "TestSupplemental.h" #include "WebDOMString.h" -#include "WebDOMTestObj.h" #include "WebExceptionHandler.h" #include "wtf/text/AtomicString.h" #include @@ -120,21 +118,6 @@ void WebDOMTestInterface::supplementalMethod1() #endif - -#if ENABLE(Condition11) || ENABLE(Condition12) -WebDOMTestObj WebDOMTestInterface::supplementalMethod2(const WebDOMString& strArg, const WebDOMTestObj& objArg) -{ - if (!impl()) - return WebDOMTestObj(); - - WebCore::ExceptionCode ec = 0; - WebDOMTestObj result = toWebKit(WTF::getPtr(WebCore::TestSupplemental::supplementalMethod2(impl(), strArg, toWebCore(objArg), ec))); - webDOMRaiseError(static_cast(ec)); - return result; -} - -#endif - WebCore::TestInterface* toWebCore(const WebDOMTestInterface& wrapper) { return wrapper.impl(); diff --git a/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestInterface.h b/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestInterface.h index 4c7f666..66512c4 100644 --- a/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestInterface.h +++ b/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestInterface.h @@ -32,7 +32,6 @@ namespace WebCore { class TestInterface; }; -class WebDOMTestObj; class WebDOMTestInterface : public WebDOMObject { public: @@ -61,7 +60,6 @@ public: #endif void supplementalMethod1(); - WebDOMTestObj supplementalMethod2(const WebDOMString& strArg, const WebDOMTestObj& objArg); WebCore::TestInterface* impl() const; diff --git a/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.cpp b/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.cpp index 9c1540a..ac07648 100644 --- a/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.cpp +++ b/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.cpp @@ -487,149 +487,6 @@ void WebDOMTestObj::setStringAttrWithSetterException(const WebDOMString& newStri webDOMRaiseError(static_cast(ec)); } -int WebDOMTestObj::withScriptStateAttribute() const -{ - if (!impl()) - return 0; - - return impl()->withScriptStateAttribute(); -} - -void WebDOMTestObj::setWithScriptStateAttribute(int newWithScriptStateAttribute) -{ - if (!impl()) - return; - - impl()->setWithScriptStateAttribute(newWithScriptStateAttribute); -} - -WebDOMTestObj WebDOMTestObj::withScriptExecutionContextAttribute() const -{ - if (!impl()) - return WebDOMTestObj(); - - return toWebKit(WTF::getPtr(impl()->withScriptExecutionContextAttribute())); -} - -void WebDOMTestObj::setWithScriptExecutionContextAttribute(const WebDOMTestObj& newWithScriptExecutionContextAttribute) -{ - if (!impl()) - return; - - impl()->setWithScriptExecutionContextAttribute(toWebCore(newWithScriptExecutionContextAttribute)); -} - -WebDOMTestObj WebDOMTestObj::withScriptStateAttributeRaises() const -{ - if (!impl()) - return WebDOMTestObj(); - - WebCore::ExceptionCode ec = 0; - WebDOMTestObj result = toWebKit(WTF::getPtr(impl()->withScriptStateAttributeRaises(ec))); - webDOMRaiseError(static_cast(ec)); - return result; -} - -void WebDOMTestObj::setWithScriptStateAttributeRaises(const WebDOMTestObj& newWithScriptStateAttributeRaises) -{ - if (!impl()) - return; - - WebCore::ExceptionCode ec = 0; - impl()->setWithScriptStateAttributeRaises(toWebCore(newWithScriptStateAttributeRaises), ec); - webDOMRaiseError(static_cast(ec)); -} - -WebDOMTestObj WebDOMTestObj::withScriptExecutionContextAttributeRaises() const -{ - if (!impl()) - return WebDOMTestObj(); - - WebCore::ExceptionCode ec = 0; - WebDOMTestObj result = toWebKit(WTF::getPtr(impl()->withScriptExecutionContextAttributeRaises(ec))); - webDOMRaiseError(static_cast(ec)); - return result; -} - -void WebDOMTestObj::setWithScriptExecutionContextAttributeRaises(const WebDOMTestObj& newWithScriptExecutionContextAttributeRaises) -{ - if (!impl()) - return; - - WebCore::ExceptionCode ec = 0; - impl()->setWithScriptExecutionContextAttributeRaises(toWebCore(newWithScriptExecutionContextAttributeRaises), ec); - webDOMRaiseError(static_cast(ec)); -} - -WebDOMTestObj WebDOMTestObj::withScriptExecutionContextAndScriptStateAttribute() const -{ - if (!impl()) - return WebDOMTestObj(); - - return toWebKit(WTF::getPtr(impl()->withScriptExecutionContextAndScriptStateAttribute())); -} - -void WebDOMTestObj::setWithScriptExecutionContextAndScriptStateAttribute(const WebDOMTestObj& newWithScriptExecutionContextAndScriptStateAttribute) -{ - if (!impl()) - return; - - impl()->setWithScriptExecutionContextAndScriptStateAttribute(toWebCore(newWithScriptExecutionContextAndScriptStateAttribute)); -} - -WebDOMTestObj WebDOMTestObj::withScriptExecutionContextAndScriptStateAttributeRaises() const -{ - if (!impl()) - return WebDOMTestObj(); - - WebCore::ExceptionCode ec = 0; - WebDOMTestObj result = toWebKit(WTF::getPtr(impl()->withScriptExecutionContextAndScriptStateAttributeRaises(ec))); - webDOMRaiseError(static_cast(ec)); - return result; -} - -void WebDOMTestObj::setWithScriptExecutionContextAndScriptStateAttributeRaises(const WebDOMTestObj& newWithScriptExecutionContextAndScriptStateAttributeRaises) -{ - if (!impl()) - return; - - WebCore::ExceptionCode ec = 0; - impl()->setWithScriptExecutionContextAndScriptStateAttributeRaises(toWebCore(newWithScriptExecutionContextAndScriptStateAttributeRaises), ec); - webDOMRaiseError(static_cast(ec)); -} - -WebDOMTestObj WebDOMTestObj::withScriptExecutionContextAndScriptStateWithSpacesAttribute() const -{ - if (!impl()) - return WebDOMTestObj(); - - return toWebKit(WTF::getPtr(impl()->withScriptExecutionContextAndScriptStateWithSpacesAttribute())); -} - -void WebDOMTestObj::setWithScriptExecutionContextAndScriptStateWithSpacesAttribute(const WebDOMTestObj& newWithScriptExecutionContextAndScriptStateWithSpacesAttribute) -{ - if (!impl()) - return; - - impl()->setWithScriptExecutionContextAndScriptStateWithSpacesAttribute(toWebCore(newWithScriptExecutionContextAndScriptStateWithSpacesAttribute)); -} - -WebDOMTestObj WebDOMTestObj::withScriptArgumentsAndCallStackAttribute() const -{ - if (!impl()) - return WebDOMTestObj(); - - return toWebKit(WTF::getPtr(impl()->withScriptArgumentsAndCallStackAttribute())); -} - -void WebDOMTestObj::setWithScriptArgumentsAndCallStackAttribute(const WebDOMTestObj& newWithScriptArgumentsAndCallStackAttribute) -{ - if (!impl()) - return; - - impl()->setWithScriptArgumentsAndCallStackAttribute(toWebCore(newWithScriptArgumentsAndCallStackAttribute)); -} - #if ENABLE(Condition1) int WebDOMTestObj::conditionalAttr1() const { @@ -935,86 +792,6 @@ void WebDOMTestObj::removeEventListener(const WebDOMString& type, const WebDOMEv impl()->removeEventListener(type, toWebCore(listener), useCapture); } -void WebDOMTestObj::withScriptStateVoid() -{ - if (!impl()) - return; - - impl()->withScriptStateVoid(); -} - -WebDOMTestObj WebDOMTestObj::withScriptStateObj() -{ - if (!impl()) - return WebDOMTestObj(); - - return toWebKit(WTF::getPtr(impl()->withScriptStateObj())); -} - -void WebDOMTestObj::withScriptStateVoidException() -{ - if (!impl()) - return; - - WebCore::ExceptionCode ec = 0; - impl()->withScriptStateVoidException(ec); - webDOMRaiseError(static_cast(ec)); -} - -WebDOMTestObj WebDOMTestObj::withScriptStateObjException() -{ - if (!impl()) - return WebDOMTestObj(); - - WebCore::ExceptionCode ec = 0; - WebDOMTestObj result = toWebKit(WTF::getPtr(impl()->withScriptStateObjException(ec))); - webDOMRaiseError(static_cast(ec)); - return result; -} - -void WebDOMTestObj::withScriptExecutionContext() -{ - if (!impl()) - return; - - impl()->withScriptExecutionContext(); -} - -void WebDOMTestObj::withScriptExecutionContextAndScriptState() -{ - if (!impl()) - return; - - impl()->withScriptExecutionContextAndScriptState(); -} - -WebDOMTestObj WebDOMTestObj::withScriptExecutionContextAndScriptStateObjException() -{ - if (!impl()) - return WebDOMTestObj(); - - WebCore::ExceptionCode ec = 0; - WebDOMTestObj result = toWebKit(WTF::getPtr(impl()->withScriptExecutionContextAndScriptStateObjException(ec))); - webDOMRaiseError(static_cast(ec)); - return result; -} - -WebDOMTestObj WebDOMTestObj::withScriptExecutionContextAndScriptStateWithSpaces() -{ - if (!impl()) - return WebDOMTestObj(); - - return toWebKit(WTF::getPtr(impl()->withScriptExecutionContextAndScriptStateWithSpaces())); -} - -void WebDOMTestObj::withScriptArgumentsAndCallStack() -{ - if (!impl()) - return; - - impl()->withScriptArgumentsAndCallStack(); -} - void WebDOMTestObj::methodWithOptionalArg(int opt) { if (!impl()) diff --git a/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h b/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h index b357185..5d90fd2 100644 --- a/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h +++ b/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h @@ -120,22 +120,6 @@ public: void setStringAttrWithGetterException(const WebDOMString&); WebDOMString stringAttrWithSetterException() const; void setStringAttrWithSetterException(const WebDOMString&); - int withScriptStateAttribute() const; - void setWithScriptStateAttribute(int); - WebDOMTestObj withScriptExecutionContextAttribute() const; - void setWithScriptExecutionContextAttribute(const WebDOMTestObj&); - WebDOMTestObj withScriptStateAttributeRaises() const; - void setWithScriptStateAttributeRaises(const WebDOMTestObj&); - WebDOMTestObj withScriptExecutionContextAttributeRaises() const; - void setWithScriptExecutionContextAttributeRaises(const WebDOMTestObj&); - WebDOMTestObj withScriptExecutionContextAndScriptStateAttribute() const; - void setWithScriptExecutionContextAndScriptStateAttribute(const WebDOMTestObj&); - WebDOMTestObj withScriptExecutionContextAndScriptStateAttributeRaises() const; - void setWithScriptExecutionContextAndScriptStateAttributeRaises(const WebDOMTestObj&); - WebDOMTestObj withScriptExecutionContextAndScriptStateWithSpacesAttribute() const; - void setWithScriptExecutionContextAndScriptStateWithSpacesAttribute(const WebDOMTestObj&); - WebDOMTestObj withScriptArgumentsAndCallStackAttribute() const; - void setWithScriptArgumentsAndCallStackAttribute(const WebDOMTestObj&); #if ENABLE(Condition1) int conditionalAttr1() const; void setConditionalAttr1(int); @@ -185,15 +169,6 @@ public: void methodWithException(); void addEventListener(const WebDOMString& type, const WebDOMEventListener& listener, bool useCapture); void removeEventListener(const WebDOMString& type, const WebDOMEventListener& listener, bool useCapture); - void withScriptStateVoid(); - WebDOMTestObj withScriptStateObj(); - void withScriptStateVoidException(); - WebDOMTestObj withScriptStateObjException(); - void withScriptExecutionContext(); - void withScriptExecutionContextAndScriptState(); - WebDOMTestObj withScriptExecutionContextAndScriptStateObjException(); - WebDOMTestObj withScriptExecutionContextAndScriptStateWithSpaces(); - void withScriptArgumentsAndCallStack(); void methodWithOptionalArg(int opt); void methodWithNonOptionalArgAndOptionalArg(int nonOpt, int opt); void methodWithNonOptionalArgAndTwoOptionalArgs(int nonOpt, int opt1, int opt2); @@ -214,7 +189,7 @@ public: void convert5(const WebDOMe& ); WebDOMSVGPoint mutablePointFunction(); WebDOMSVGPoint immutablePointFunction(); - void orange(); + void banana(); WebDOMbool strictFunction(const WebDOMString& str, float a, int b); WebCore::TestObj* impl() const; -- 2.7.4