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/InlineBox.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/InlineBox.h')
| -rw-r--r-- | Source/WebCore/rendering/InlineBox.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/WebCore/rendering/InlineBox.h b/Source/WebCore/rendering/InlineBox.h index e2cf85fdc..2f480c8a9 100644 --- a/Source/WebCore/rendering/InlineBox.h +++ b/Source/WebCore/rendering/InlineBox.h @@ -40,7 +40,7 @@ public: , m_parent(0) , m_renderer(obj) , m_logicalWidth(0) -#ifndef NDEBUG +#if !ASSERT_DISABLED , m_hasBadParent(false) #endif { @@ -55,7 +55,7 @@ public: , m_topLeft(topLeft) , m_logicalWidth(logicalWidth) , m_bitfields(firstLine, constructed, dirty, extracted, isHorizontal) -#ifndef NDEBUG +#if !ASSERT_DISABLED , m_hasBadParent(false) #endif { @@ -272,7 +272,7 @@ public: // visibleLeftEdge, visibleRightEdge are in the parent's coordinate system. virtual float placeEllipsisBox(bool ltr, float visibleLeftEdge, float visibleRightEdge, float ellipsisWidth, float &truncatedWidth, bool&); -#ifndef NDEBUG +#if !ASSERT_DISABLED void setHasBadParent(); #endif @@ -415,19 +415,19 @@ protected: // For InlineFlowBox and InlineTextBox bool extracted() const { return m_bitfields.extracted(); } -#ifndef NDEBUG +#if !ASSERT_DISABLED private: bool m_hasBadParent; #endif }; -#ifdef NDEBUG +#if ASSERT_DISABLED inline InlineBox::~InlineBox() { } #endif -#ifndef NDEBUG +#if !ASSERT_DISABLED inline void InlineBox::setHasBadParent() { m_hasBadParent = true; |