From d441d6f39bb846989d95bcf5caf387b42414718d Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 13 Sep 2013 12:51:20 +0200 Subject: Import Qt5x2 branch of QtWebkit for Qt 5.2 Importing a new snapshot of webkit. Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c Reviewed-by: Allan Sandfeld Jensen --- Source/WebCore/rendering/RenderFieldset.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Source/WebCore/rendering/RenderFieldset.h') 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(object); } -- cgit v1.2.1