diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-11-25 08:34:23 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-11-25 08:34:23 -0800 |
| commit | d789cf5eaa873bbf5b3e643fb26747ac441ee682 (patch) | |
| tree | bbe5648beec67625309eee08ebd191ab0811f7ca /WebCore | |
| parent | 3c1ede0435c25d0d2138cfc0211708c01266430e (diff) | |
| parent | 42f22cd136c151b3728c1052cf8fc760e6034ff8 (diff) | |
| download | external_webkit-d789cf5eaa873bbf5b3e643fb26747ac441ee682.zip external_webkit-d789cf5eaa873bbf5b3e643fb26747ac441ee682.tar.gz external_webkit-d789cf5eaa873bbf5b3e643fb26747ac441ee682.tar.bz2 | |
Merge change I4b0151ad into eclair-mr2
* changes:
Fixes a PLATFORM(ANDROID) guard in RenderBlock.h which causes problems when building on Mac.
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/rendering/RenderBlock.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/WebCore/rendering/RenderBlock.h b/WebCore/rendering/RenderBlock.h index 09e76ee..1628701 100644 --- a/WebCore/rendering/RenderBlock.h +++ b/WebCore/rendering/RenderBlock.h @@ -342,13 +342,17 @@ private: unsigned desiredColumnCount() const; #if PLATFORM(ANDROID) public: +#endif Vector<IntRect>* columnRects() const; +#if PLATFORM(ANDROID) private: #endif void setDesiredColumnCountAndWidth(int count, int width); #if PLATFORM(ANDROID) public: +#endif int columnGap() const; +#if PLATFORM(ANDROID) private: #endif |