diff options
| author | Steve Block <steveblock@google.com> | 2009-10-08 11:13:05 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-10-14 16:51:25 +0100 |
| commit | d19c83b203e72c34b78a731c61d73c77ad99794e (patch) | |
| tree | c6b214d4568504bbd761227647a64786a22635c2 /WebCore/rendering | |
| parent | a5f64bb29c5e0a6a5d59257da60d3bffba7819e7 (diff) | |
| download | external_webkit-d19c83b203e72c34b78a731c61d73c77ad99794e.zip external_webkit-d19c83b203e72c34b78a731c61d73c77ad99794e.tar.gz external_webkit-d19c83b203e72c34b78a731c61d73c77ad99794e.tar.bz2 | |
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.
Diffstat (limited to 'WebCore/rendering')
| -rw-r--r-- | WebCore/rendering/RenderFlexibleBox.cpp | 2 | ||||
| -rw-r--r-- | WebCore/rendering/RenderFrameSet.cpp | 2 | ||||
| -rw-r--r-- | WebCore/rendering/RenderView.h | 2 |
3 files changed, 3 insertions, 3 deletions
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 |