summaryrefslogtreecommitdiff
path: root/Source/WebCore/html/HTMLFrameElementBase.h
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@digia.com>2013-09-13 12:51:20 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-19 20:50:05 +0200
commitd441d6f39bb846989d95bcf5caf387b42414718d (patch)
treee367e64a75991c554930278175d403c072de6bb8 /Source/WebCore/html/HTMLFrameElementBase.h
parent0060b2994c07842f4c59de64b5e3e430525c4b90 (diff)
downloadqtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit. Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/WebCore/html/HTMLFrameElementBase.h')
-rw-r--r--Source/WebCore/html/HTMLFrameElementBase.h17
1 files changed, 13 insertions, 4 deletions
diff --git a/Source/WebCore/html/HTMLFrameElementBase.h b/Source/WebCore/html/HTMLFrameElementBase.h
index 7af948532..c094f1210 100644
--- a/Source/WebCore/html/HTMLFrameElementBase.h
+++ b/Source/WebCore/html/HTMLFrameElementBase.h
@@ -52,16 +52,19 @@ protected:
virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
virtual InsertionNotificationRequest insertedInto(ContainerNode*) OVERRIDE;
virtual void didNotifySubtreeInsertions(ContainerNode*) OVERRIDE;
- virtual void attach();
- virtual bool areAuthorShadowsAllowed() const OVERRIDE { return false; }
+ virtual void attach(const AttachContext& = AttachContext()) OVERRIDE;
private:
- virtual bool supportsFocus() const;
- virtual void setFocus(bool);
+ virtual bool supportsFocus() const OVERRIDE;
+ virtual void setFocus(bool) OVERRIDE;
virtual bool isURLAttribute(const Attribute&) const OVERRIDE;
+ virtual bool isHTMLContentAttribute(const Attribute&) const OVERRIDE;
+
virtual bool isFrameElementBase() const { return true; }
+ virtual bool areAuthorShadowsAllowed() const OVERRIDE { return false; }
+
bool viewSourceMode() const { return m_viewSource; }
void setNameAndOpenURL();
@@ -78,6 +81,12 @@ private:
bool m_viewSource;
};
+inline HTMLFrameElementBase* toHTMLFrameElementBase(Node* node)
+{
+ ASSERT_WITH_SECURITY_IMPLICATION(!node || node->hasTagName(HTMLNames::frameTag) || node->hasTagName(HTMLNames::iframeTag));
+ return static_cast<HTMLFrameElementBase*>(node);
+}
+
} // namespace WebCore
#endif // HTMLFrameElementBase_h