diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-09-29 12:22:10 -0700 |
|---|---|---|
| committer | Shimeng (Simon) Wang <swang@google.com> | 2010-09-30 10:49:52 -0700 |
| commit | 08ef6dc844161417a99f45546abb6e798410d0de (patch) | |
| tree | b7ffe2bb80f0cb00628e94180a5d4c758b720ad4 | |
| parent | 988d4e4a2e8c42c0eee458235cd576c37dce1cff (diff) | |
| download | external_webkit-08ef6dc844161417a99f45546abb6e798410d0de.zip external_webkit-08ef6dc844161417a99f45546abb6e798410d0de.tar.gz external_webkit-08ef6dc844161417a99f45546abb6e798410d0de.tar.bz2 | |
Fix the compiler error while disabling overflow scroll.
Change-Id: I4d74ac00a6d348ce00b551572da6ceb5f2793b1f
| -rw-r--r-- | WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp b/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp index 618b1d2..25d55ce 100644 --- a/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp +++ b/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp @@ -476,6 +476,7 @@ bool GraphicsLayerAndroid::repaint() FloatRect clip = layer->renderer()->absoluteBoundingBoxRect(); // Move the clip local to the layer position. clip.move(-m_position.x(), -m_position.y()); +#if ENABLE(ANDROID_OVERFLOW_SCROLL) if (layer->hasOverflowScroll()) { // If this is a scrollable layer, inset the clip by the border. RenderBox* box = layer->renderBox(); @@ -483,6 +484,7 @@ bool GraphicsLayerAndroid::repaint() clip.setWidth(clip.width() - box->borderLeft() - box->borderRight()); clip.setHeight(clip.height() - box->borderTop() - box->borderBottom()); } +#endif m_contentLayer->setForegroundClip(clip); return true; |