Diff
Modified: trunk/Source/WebCore/ChangeLog (108274 => 108275)
--- trunk/Source/WebCore/ChangeLog 2012-02-21 01:20:20 UTC (rev 108274)
+++ trunk/Source/WebCore/ChangeLog 2012-02-21 01:27:27 UTC (rev 108275)
@@ -1,3 +1,12 @@
+2012-02-20 Kentaro Hara <[email protected]>
+
+ 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 <[email protected]>
[Qt][WK2] Clipping is broken
Modified: trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestInterface.cpp (108274 => 108275)
--- trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestInterface.cpp 2012-02-21 01:20:20 UTC (rev 108274)
+++ trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestInterface.cpp 2012-02-21 01:27:27 UTC (rev 108275)
@@ -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 <wtf/GetPtr.h>
@@ -120,21 +118,6 @@
#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<WebDOMExceptionCode>(ec));
- return result;
-}
-
-#endif
-
WebCore::TestInterface* toWebCore(const WebDOMTestInterface& wrapper)
{
return wrapper.impl();
Modified: trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestInterface.h (108274 => 108275)
--- trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestInterface.h 2012-02-21 01:20:20 UTC (rev 108274)
+++ trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestInterface.h 2012-02-21 01:27:27 UTC (rev 108275)
@@ -32,7 +32,6 @@
class TestInterface;
};
-class WebDOMTestObj;
class WebDOMTestInterface : public WebDOMObject {
public:
@@ -61,7 +60,6 @@
#endif
void supplementalMethod1();
- WebDOMTestObj supplementalMethod2(const WebDOMString& strArg, const WebDOMTestObj& objArg);
WebCore::TestInterface* impl() const;
Modified: trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.cpp (108274 => 108275)
--- trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.cpp 2012-02-21 01:20:20 UTC (rev 108274)
+++ trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.cpp 2012-02-21 01:27:27 UTC (rev 108275)
@@ -487,149 +487,6 @@
webDOMRaiseError(static_cast<WebDOMExceptionCode>(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<WebDOMExceptionCode>(ec));
- return result;
-}
-
-void WebDOMTestObj::setWithScriptStateAttributeRaises(const WebDOMTestObj& newWithScriptStateAttributeRaises)
-{
- if (!impl())
- return;
-
- WebCore::ExceptionCode ec = 0;
- impl()->setWithScriptStateAttributeRaises(toWebCore(newWithScriptStateAttributeRaises), ec);
- webDOMRaiseError(static_cast<WebDOMExceptionCode>(ec));
-}
-
-WebDOMTestObj WebDOMTestObj::withScriptExecutionContextAttributeRaises() const
-{
- if (!impl())
- return WebDOMTestObj();
-
- WebCore::ExceptionCode ec = 0;
- WebDOMTestObj result = toWebKit(WTF::getPtr(impl()->withScriptExecutionContextAttributeRaises(ec)));
- webDOMRaiseError(static_cast<WebDOMExceptionCode>(ec));
- return result;
-}
-
-void WebDOMTestObj::setWithScriptExecutionContextAttributeRaises(const WebDOMTestObj& newWithScriptExecutionContextAttributeRaises)
-{
- if (!impl())
- return;
-
- WebCore::ExceptionCode ec = 0;
- impl()->setWithScriptExecutionContextAttributeRaises(toWebCore(newWithScriptExecutionContextAttributeRaises), ec);
- webDOMRaiseError(static_cast<WebDOMExceptionCode>(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<WebDOMExceptionCode>(ec));
- return result;
-}
-
-void WebDOMTestObj::setWithScriptExecutionContextAndScriptStateAttributeRaises(const WebDOMTestObj& newWithScriptExecutionContextAndScriptStateAttributeRaises)
-{
- if (!impl())
- return;
-
- WebCore::ExceptionCode ec = 0;
- impl()->setWithScriptExecutionContextAndScriptStateAttributeRaises(toWebCore(newWithScriptExecutionContextAndScriptStateAttributeRaises), ec);
- webDOMRaiseError(static_cast<WebDOMExceptionCode>(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 @@
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<WebDOMExceptionCode>(ec));
-}
-
-WebDOMTestObj WebDOMTestObj::withScriptStateObjException()
-{
- if (!impl())
- return WebDOMTestObj();
-
- WebCore::ExceptionCode ec = 0;
- WebDOMTestObj result = toWebKit(WTF::getPtr(impl()->withScriptStateObjException(ec)));
- webDOMRaiseError(static_cast<WebDOMExceptionCode>(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<WebDOMExceptionCode>(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())
Modified: trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h (108274 => 108275)
--- trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h 2012-02-21 01:20:20 UTC (rev 108274)
+++ trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h 2012-02-21 01:27:27 UTC (rev 108275)
@@ -120,22 +120,6 @@
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 @@
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 @@
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;
