From d19c83b203e72c34b78a731c61d73c77ad99794e Mon Sep 17 00:00:00 2001 From: Steve Block Date: Thu, 8 Oct 2009 11:13:05 +0100 Subject: Fixes a bunch of WebKit whitespace discrepancies between Android and webkit.org. Do not merge. This will avoid noise in the diffs when upstreaming Android-specific changes to webkit.org. This has already been submitted to master branch. --- WebCore/rendering/RenderFlexibleBox.cpp | 2 +- WebCore/rendering/RenderFrameSet.cpp | 2 +- WebCore/rendering/RenderView.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'WebCore/rendering') diff --git a/WebCore/rendering/RenderFlexibleBox.cpp b/WebCore/rendering/RenderFlexibleBox.cpp index 6bbcc43..84c94e4 100644 --- a/WebCore/rendering/RenderFlexibleBox.cpp +++ b/WebCore/rendering/RenderFlexibleBox.cpp @@ -218,7 +218,7 @@ void RenderFlexibleBox::layoutBlock(bool relayoutChildren) int previousWidth = width(); int previousHeight = height(); - + #ifdef ANDROID_LAYOUT int previousVisibleWidth = m_visibleWidth; #endif diff --git a/WebCore/rendering/RenderFrameSet.cpp b/WebCore/rendering/RenderFrameSet.cpp index 0838798..041a025 100644 --- a/WebCore/rendering/RenderFrameSet.cpp +++ b/WebCore/rendering/RenderFrameSet.cpp @@ -520,7 +520,7 @@ void RenderFrameSet::positionFrames() int rows = frameSet()->totalRows(); int cols = frameSet()->totalCols(); - + int yPos = 0; int borderThickness = frameSet()->border(); #ifdef FLATTEN_FRAMESET diff --git a/WebCore/rendering/RenderView.h b/WebCore/rendering/RenderView.h index 089fe85..a486b34 100644 --- a/WebCore/rendering/RenderView.h +++ b/WebCore/rendering/RenderView.h @@ -169,7 +169,7 @@ protected: private: bool shouldRepaint(const IntRect& r) const; - + #ifdef FLATTEN_FRAMESET public: // used by layout function #endif -- cgit v1.1