diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-20 13:01:08 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-20 13:01:08 +0200 |
| commit | 49233e234e5c787396cadb2cea33b31ae0cd65c1 (patch) | |
| tree | 5410cb9a8fd53168bb60d62c54b654d86f03c38d /Source/WebCore/html/HTMLObjectElement.h | |
| parent | b211c645d8ab690f713515dfdc84d80b11c27d2c (diff) | |
| download | qtwebkit-49233e234e5c787396cadb2cea33b31ae0cd65c1.tar.gz | |
Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327 (http://svn.webkit.org/repository/webkit/trunk@120813)
New snapshot with Windows build fixes
Diffstat (limited to 'Source/WebCore/html/HTMLObjectElement.h')
| -rw-r--r-- | Source/WebCore/html/HTMLObjectElement.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/WebCore/html/HTMLObjectElement.h b/Source/WebCore/html/HTMLObjectElement.h index c44da021d..932e5bccd 100644 --- a/Source/WebCore/html/HTMLObjectElement.h +++ b/Source/WebCore/html/HTMLObjectElement.h @@ -58,8 +58,8 @@ public: bool checkValidity() { return true; } virtual void setCustomValidity(const String&) OVERRIDE { } - using TreeShared<ContainerNode>::ref; - using TreeShared<ContainerNode>::deref; + using Node::ref; + using Node::deref; virtual bool canContainRangeEndPoint() const { return useFallbackContent(); } @@ -101,8 +101,6 @@ private: virtual void derefFormAssociatedElement() { deref(); } virtual HTMLFormElement* virtualForm() const; - virtual const AtomicString& formControlName() const; - #if ENABLE(MICRODATA) virtual String itemValueText() const OVERRIDE; virtual void setItemValueText(const String&, ExceptionCode&) OVERRIDE; |