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/RenderFrameSet.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/RenderFrameSet.h')
| -rw-r--r-- | Source/WebCore/rendering/RenderFrameSet.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/rendering/RenderFrameSet.h b/Source/WebCore/rendering/RenderFrameSet.h index edab2d98c..0cfce5290 100644 --- a/Source/WebCore/rendering/RenderFrameSet.h +++ b/Source/WebCore/rendering/RenderFrameSet.h @@ -84,6 +84,7 @@ private: public: GridAxis(); void resize(int); + Vector<int> m_sizes; Vector<int> m_deltas; Vector<bool> m_preventResize; @@ -99,7 +100,6 @@ private: virtual bool isFrameSet() const { return true; } virtual void layout(); - virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) OVERRIDE; virtual void paint(PaintInfo&, const LayoutPoint&); virtual bool isChildAllowed(RenderObject*, RenderStyle*) const; virtual CursorDirective getCursor(const LayoutPoint&, Cursor&) const; @@ -137,7 +137,7 @@ private: inline RenderFrameSet* toRenderFrameSet(RenderObject* object) { - ASSERT(!object || object->isFrameSet()); + ASSERT_WITH_SECURITY_IMPLICATION(!object || object->isFrameSet()); return static_cast<RenderFrameSet*>(object); } |