diff options
| author | Steve Block <steveblock@google.com> | 2010-05-26 11:48:42 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-27 11:16:17 +0100 |
| commit | 2ed19bf34c42971099d247a777a38932da0278e9 (patch) | |
| tree | c54778886be06547fbcbb6b808afffd9c22530da /WebKit/android | |
| parent | 605e3841dfeddd1eeaa36441c6bd4ec4667b89e8 (diff) | |
| download | external_webkit-2ed19bf34c42971099d247a777a38932da0278e9.zip external_webkit-2ed19bf34c42971099d247a777a38932da0278e9.tar.gz external_webkit-2ed19bf34c42971099d247a777a38932da0278e9.tar.bz2 | |
Merge WebKit at r60074: Remove ANDROID_EXPOSE_COLUMN_GAP as RenderBlock::columnGap() is now public
See http://trac.webkit.org/changeset/59784
Change-Id: I06ab20401e79c8b9c8104bb6a81c5891ef36d717
Diffstat (limited to 'WebKit/android')
| -rw-r--r-- | WebKit/android/nav/CacheBuilder.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/WebKit/android/nav/CacheBuilder.cpp b/WebKit/android/nav/CacheBuilder.cpp index 9f9a5f1..9ad9b71 100644 --- a/WebKit/android/nav/CacheBuilder.cpp +++ b/WebKit/android/nav/CacheBuilder.cpp @@ -1152,9 +1152,7 @@ void CacheBuilder::BuildFrame(Frame* root, Frame* frame, RenderBlock* renderBlock = (RenderBlock*) nodeRenderer; if (renderBlock->hasColumns()) { columns = renderBlock->columnRects(); -#ifdef ANDROID_EXPOSE_COLUMN_GAP columnGap = renderBlock->columnGap(); -#endif direction = renderBlock->style()->direction(); } } |