diff options
| author | Steve Block <steveblock@google.com> | 2009-11-25 15:02:57 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-11-25 15:02:57 +0000 |
| commit | 42f22cd136c151b3728c1052cf8fc760e6034ff8 (patch) | |
| tree | 4fb5c977df8e4eed0d620e97b84bce12034016ea /WebCore/rendering | |
| parent | 5b4f81709e8df8d953e2ad8496996fb0112b6186 (diff) | |
| download | external_webkit-42f22cd136c151b3728c1052cf8fc760e6034ff8.zip external_webkit-42f22cd136c151b3728c1052cf8fc760e6034ff8.tar.gz external_webkit-42f22cd136c151b3728c1052cf8fc760e6034ff8.tar.bz2 | |
Fixes a PLATFORM(ANDROID) guard in RenderBlock.h which causes problems when building on Mac.
This code was modified recently to aid upstreaming by wrapping all Android changes in PLATFORM(ANDROID).
To allow the build to succeed on other paltforms, we need to be more careful with our use of the guards.
See https://android-git.corp.google.com/w/?p=platform/external/webkit.git;a=commitdiff;h=bc7b84de3fd863c500a8169fd00dca3811cadbb3#patch28
Change-Id: I4b0151ad62023821171742c5dfbba1dd7b39d8ed
Diffstat (limited to 'WebCore/rendering')
| -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 |