diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-12-07 17:22:45 -0800 |
|---|---|---|
| committer | Shimeng (Simon) Wang <swang@google.com> | 2010-12-22 14:15:40 -0800 |
| commit | 4576aa36e9a9671459299c7963ac95aa94beaea9 (patch) | |
| tree | 3863574e050f168c0126ecb47c83319fab0972d8 /WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h | |
| parent | 55323ac613cc31553107b68603cb627264d22bb0 (diff) | |
| download | external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.zip external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.gz external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.bz2 | |
Merge WebKit at r73109: Initial merge by git.
Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
Diffstat (limited to 'WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h')
| -rw-r--r-- | WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h b/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h index cd6caaa..0b3593d 100644 --- a/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h +++ b/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h @@ -32,6 +32,7 @@ class TestObj; class WebDOMEventListener; class WebDOMIDBKey; +class WebDOMOptionsObject; class WebDOMString; class WebDOMTestObj; @@ -60,6 +61,10 @@ public: int readOnlyIntAttr() const; WebDOMString readOnlyStringAttr() const; WebDOMTestObj readOnlyTestObjAttr() const; + short shortAttr() const; + void setShortAttr(short); + unsigned short unsignedShortAttr() const; + void setUnsignedShortAttr(unsigned short); int intAttr() const; void setIntAttr(int); long long longLongAttr() const; @@ -132,6 +137,7 @@ public: WebDOMTestObj methodThatRequiresAllArgsAndThrows(const WebDOMString& strArg, const WebDOMTestObj& objArg); void serializedValue(const WebDOMString& serializedArg); void idbKey(const WebDOMIDBKey& key); + void optionsObject(const WebDOMOptionsObject& oo, const WebDOMOptionsObject& ooo); void methodWithException(); void customMethod(); void customMethodWithArgs(int intArg, const WebDOMString& strArg, const WebDOMTestObj& objArg); |