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/RenderFieldset.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/RenderFieldset.h')
| -rw-r--r-- | Source/WebCore/rendering/RenderFieldset.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/WebCore/rendering/RenderFieldset.h b/Source/WebCore/rendering/RenderFieldset.h index 74ad92b6e..3481c87aa 100644 --- a/Source/WebCore/rendering/RenderFieldset.h +++ b/Source/WebCore/rendering/RenderFieldset.h @@ -30,7 +30,7 @@ namespace WebCore { class RenderFieldset : public RenderBlock { public: - explicit RenderFieldset(Node*); + explicit RenderFieldset(Element*); enum FindLegendOption { IgnoreFloatingOrOutOfFlow, IncludeFloatingOrOutOfFlow }; RenderBox* findLegend(FindLegendOption = IgnoreFloatingOrOutOfFlow) const; @@ -43,7 +43,6 @@ private: virtual void computePreferredLogicalWidths(); virtual bool avoidsFloats() const { return true; } - virtual bool stretchesToMinIntrinsicLogicalWidth() const OVERRIDE; virtual void paintBoxDecorations(PaintInfo&, const LayoutPoint&); virtual void paintMask(PaintInfo&, const LayoutPoint&); @@ -51,7 +50,7 @@ private: inline RenderFieldset* toRenderFieldset(RenderObject* object) { - ASSERT(!object || object->isFieldset()); + ASSERT_WITH_SECURITY_IMPLICATION(!object || object->isFieldset()); return static_cast<RenderFieldset*>(object); } |