diff options
author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
tree | e367e64a75991c554930278175d403c072de6bb8 /Source/WebCore/rendering/RenderRubyRun.h | |
parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
download | qtwebkit-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/rendering/RenderRubyRun.h')
-rw-r--r-- | Source/WebCore/rendering/RenderRubyRun.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/WebCore/rendering/RenderRubyRun.h b/Source/WebCore/rendering/RenderRubyRun.h index f65ad86c6..1e553a6a0 100644 --- a/Source/WebCore/rendering/RenderRubyRun.h +++ b/Source/WebCore/rendering/RenderRubyRun.h @@ -43,7 +43,6 @@ class RenderRubyText; class RenderRubyRun : public RenderBlock { public: - RenderRubyRun(Node*); virtual ~RenderRubyRun(); bool hasRubyText() const; @@ -71,6 +70,8 @@ protected: RenderRubyBase* createRubyBase() const; private: + RenderRubyRun(); + virtual bool isRubyRun() const { return true; } virtual const char* renderName() const { return "RenderRubyRun (anonymous)"; } virtual bool createsAnonymousWrapper() const { return true; } @@ -79,13 +80,13 @@ private: inline RenderRubyRun* toRenderRubyRun(RenderObject* object) { - ASSERT(!object || object->isRubyRun()); + ASSERT_WITH_SECURITY_IMPLICATION(!object || object->isRubyRun()); return static_cast<RenderRubyRun*>(object); } inline const RenderRubyRun* toRenderRubyRun(const RenderObject* object) { - ASSERT(!object || object->isBox()); + ASSERT_WITH_SECURITY_IMPLICATION(!object || object->isBox()); return static_cast<const RenderRubyRun*>(object); } |