From c311cf639cc1d6570d67b0a80a8ba04dc992a658 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 22 Aug 2012 13:36:28 +0200 Subject: Imported WebKit commit 35255d8c2fd37ba4359e75fe0ebe6aec87687f9c (http://svn.webkit.org/repository/webkit/trunk@126284) New snapshot that includes MSVC 64-bit build fix --- Source/WebCore/rendering/RenderMultiColumnBlock.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/WebCore/rendering/RenderMultiColumnBlock.h') diff --git a/Source/WebCore/rendering/RenderMultiColumnBlock.h b/Source/WebCore/rendering/RenderMultiColumnBlock.h index bfbfb380b..bd9f12afe 100644 --- a/Source/WebCore/rendering/RenderMultiColumnBlock.h +++ b/Source/WebCore/rendering/RenderMultiColumnBlock.h @@ -43,6 +43,8 @@ public: LayoutUnit columnWidth() const { return m_columnWidth; } unsigned columnCount() const { return m_columnCount; } + RenderMultiColumnFlowThread* flowThread() const { return m_flowThread; } + private: virtual bool isRenderMultiColumnBlock() const { return true; } @@ -58,8 +60,6 @@ private: void ensureColumnSets(); - RenderMultiColumnFlowThread* flowThread() const { return m_flowThread; } - RenderMultiColumnFlowThread* m_flowThread; unsigned m_columnCount; // The default column count/width that are based off our containing block width. These values represent only the default, LayoutUnit m_columnWidth; // since a multi-column block that is split across variable width pages or regions will have different column counts and widths in each. -- cgit v1.2.1