diff options
Diffstat (limited to 'WebCore/bindings/scripts/test/CPP')
6 files changed, 35 insertions, 5 deletions
diff --git a/WebCore/bindings/scripts/test/CPP/WebDOMTestCallback.cpp b/WebCore/bindings/scripts/test/CPP/WebDOMTestCallback.cpp index 7235793..a58da40 100644 --- a/WebCore/bindings/scripts/test/CPP/WebDOMTestCallback.cpp +++ b/WebCore/bindings/scripts/test/CPP/WebDOMTestCallback.cpp @@ -24,7 +24,6 @@ #include "WebDOMTestCallback.h" -#include "AtomicString.h" #include "Class1.h" #include "Class2.h" #include "Class3.h" @@ -35,6 +34,7 @@ #include "WebDOMClass3.h" #include "WebDOMString.h" #include "WebExceptionHandler.h" +#include "wtf/text/AtomicString.h" #include <wtf/GetPtr.h> #include <wtf/RefPtr.h> @@ -65,6 +65,13 @@ WebDOMTestCallback::WebDOMTestCallback(const WebDOMTestCallback& copy) m_impl = copy.impl() ? new WebDOMTestCallbackPrivate(copy.impl()) : 0; } +WebDOMTestCallback& WebDOMTestCallback::operator=(const WebDOMTestCallback& copy) +{ + delete m_impl; + m_impl = copy.impl() ? new WebDOMTestCallbackPrivate(copy.impl()) : 0; + return *this; +} + WebCore::TestCallback* WebDOMTestCallback::impl() const { return m_impl ? m_impl->impl.get() : 0; @@ -81,7 +88,7 @@ bool WebDOMTestCallback::callbackWithClass1Param(const WebDOMClass1& class1Param if (!impl()) return false; - return impl()->callbackWithClass1Param(0, toWebCore(class1Param)); + return impl()->callbackWithClass1Param(toWebCore(class1Param)); } bool WebDOMTestCallback::callbackWithClass2Param(const WebDOMClass2& class2Param, const WebDOMString& strArg) @@ -89,7 +96,7 @@ bool WebDOMTestCallback::callbackWithClass2Param(const WebDOMClass2& class2Param if (!impl()) return false; - return impl()->callbackWithClass2Param(0, toWebCore(class2Param), strArg); + return impl()->callbackWithClass2Param(toWebCore(class2Param), strArg); } int WebDOMTestCallback::callbackWithNonBoolReturnType(const WebDOMClass3& class3Param) @@ -97,7 +104,7 @@ int WebDOMTestCallback::callbackWithNonBoolReturnType(const WebDOMClass3& class3 if (!impl()) return 0; - return impl()->callbackWithNonBoolReturnType(0, toWebCore(class3Param)); + return impl()->callbackWithNonBoolReturnType(toWebCore(class3Param)); } WebCore::TestCallback* toWebCore(const WebDOMTestCallback& wrapper) diff --git a/WebCore/bindings/scripts/test/CPP/WebDOMTestCallback.h b/WebCore/bindings/scripts/test/CPP/WebDOMTestCallback.h index 3fe6837..a4d130e 100644 --- a/WebCore/bindings/scripts/test/CPP/WebDOMTestCallback.h +++ b/WebCore/bindings/scripts/test/CPP/WebDOMTestCallback.h @@ -43,6 +43,7 @@ public: WebDOMTestCallback(); explicit WebDOMTestCallback(WebCore::TestCallback*); WebDOMTestCallback(const WebDOMTestCallback&); + WebDOMTestCallback& operator=(const WebDOMTestCallback&); ~WebDOMTestCallback(); bool callbackWithClass1Param(const WebDOMClass1& class1Param); diff --git a/WebCore/bindings/scripts/test/CPP/WebDOMTestInterface.cpp b/WebCore/bindings/scripts/test/CPP/WebDOMTestInterface.cpp index 0436e13..7fa4af3 100644 --- a/WebCore/bindings/scripts/test/CPP/WebDOMTestInterface.cpp +++ b/WebCore/bindings/scripts/test/CPP/WebDOMTestInterface.cpp @@ -56,6 +56,13 @@ WebDOMTestInterface::WebDOMTestInterface(const WebDOMTestInterface& copy) m_impl = copy.impl() ? new WebDOMTestInterfacePrivate(copy.impl()) : 0; } +WebDOMTestInterface& WebDOMTestInterface::operator=(const WebDOMTestInterface& copy) +{ + delete m_impl; + m_impl = copy.impl() ? new WebDOMTestInterfacePrivate(copy.impl()) : 0; + return *this; +} + WebCore::TestInterface* WebDOMTestInterface::impl() const { return m_impl ? m_impl->impl.get() : 0; diff --git a/WebCore/bindings/scripts/test/CPP/WebDOMTestInterface.h b/WebCore/bindings/scripts/test/CPP/WebDOMTestInterface.h index 4e7af6d..ca20c4e 100644 --- a/WebCore/bindings/scripts/test/CPP/WebDOMTestInterface.h +++ b/WebCore/bindings/scripts/test/CPP/WebDOMTestInterface.h @@ -38,6 +38,7 @@ public: WebDOMTestInterface(); explicit WebDOMTestInterface(WebCore::TestInterface*); WebDOMTestInterface(const WebDOMTestInterface&); + WebDOMTestInterface& operator=(const WebDOMTestInterface&); ~WebDOMTestInterface(); diff --git a/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.cpp b/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.cpp index 20de4fc..882e633 100644 --- a/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.cpp +++ b/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.cpp @@ -21,7 +21,6 @@ #include "config.h" #include "WebDOMTestObj.h" -#include "AtomicString.h" #include "HTMLNames.h" #include "IDBKey.h" #include "KURL.h" @@ -31,6 +30,7 @@ #include "WebDOMString.h" #include "WebExceptionHandler.h" #include "WebNativeEventListener.h" +#include "wtf/text/AtomicString.h" #include <wtf/GetPtr.h> #include <wtf/RefPtr.h> @@ -61,6 +61,13 @@ WebDOMTestObj::WebDOMTestObj(const WebDOMTestObj& copy) m_impl = copy.impl() ? new WebDOMTestObjPrivate(copy.impl()) : 0; } +WebDOMTestObj& WebDOMTestObj::operator=(const WebDOMTestObj& copy) +{ + delete m_impl; + m_impl = copy.impl() ? new WebDOMTestObjPrivate(copy.impl()) : 0; + return *this; +} + WebCore::TestObj* WebDOMTestObj::impl() const { return m_impl ? m_impl->impl.get() : 0; diff --git a/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h b/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h index c3b65ca..2fedf41 100644 --- a/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h +++ b/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h @@ -40,6 +40,7 @@ public: WebDOMTestObj(); explicit WebDOMTestObj(WebCore::TestObj*); WebDOMTestObj(const WebDOMTestObj&); + WebDOMTestObj& operator=(const WebDOMTestObj&); ~WebDOMTestObj(); enum { @@ -104,12 +105,18 @@ public: int customAttr() const; void setCustomAttr(int); WebDOMString scriptStringAttr() const; +#if ENABLE(Condition1) int conditionalAttr1() const; void setConditionalAttr1(int); +#endif +#if ENABLE(Condition1) && ENABLE(Condition2) int conditionalAttr2() const; void setConditionalAttr2(int); +#endif +#if ENABLE(Condition1) || ENABLE(Condition2) int conditionalAttr3() const; void setConditionalAttr3(int); +#endif int description() const; int id() const; void setId(int); |