diff options
| author | Steve Block <steveblock@google.com> | 2009-12-17 10:01:16 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-17 10:01:16 -0800 |
| commit | 8f75286f8f97df46e2fb2411460a5efb3fc9b083 (patch) | |
| tree | eca591661d5d9fc0fc58e2d2a2d11dfc8c406ccc /WebCore/platform/ScrollView.cpp | |
| parent | e4b2e0b8a34bdde6f219c2d755af174569fa728f (diff) | |
| parent | 4dd98cc27e25e6c3104672f50749132d2236461b (diff) | |
| download | external_webkit-8f75286f8f97df46e2fb2411460a5efb3fc9b083.zip external_webkit-8f75286f8f97df46e2fb2411460a5efb3fc9b083.tar.gz external_webkit-8f75286f8f97df46e2fb2411460a5efb3fc9b083.tar.bz2 | |
am 4dd98cc2: am aad6f24e: Merge webkit.org at r51976 : Fix general conflicts.
Merge commit '4dd98cc27e25e6c3104672f50749132d2236461b'
* commit '4dd98cc27e25e6c3104672f50749132d2236461b':
Merge webkit.org at r51976 : Fix general conflicts.
Diffstat (limited to 'WebCore/platform/ScrollView.cpp')
| -rw-r--r-- | WebCore/platform/ScrollView.cpp | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/WebCore/platform/ScrollView.cpp b/WebCore/platform/ScrollView.cpp index 6df462a..19a1dca 100644 --- a/WebCore/platform/ScrollView.cpp +++ b/WebCore/platform/ScrollView.cpp @@ -1,4 +1,3 @@ - /* * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. * @@ -718,23 +717,14 @@ void ScrollView::frameRectsChanged() void ScrollView::repaintContentRectangle(const IntRect& rect, bool now) { -<<<<<<< HEAD:WebCore/platform/ScrollView.cpp - IntRect visibleContent = visibleContentRect(); -#ifdef ANDROID_CAPTURE_OFFSCREEN_PAINTS - IntRect fullVis = visibleContent; -#endif - visibleContent.intersect(rect); -#ifdef ANDROID_CAPTURE_OFFSCREEN_PAINTS - if (rect != visibleContent) - platformOffscreenContentRectangle(fullVis, rect); -#endif - if (visibleContent.isEmpty()) -======= IntRect paintRect = rect; if (!paintsEntireContents()) paintRect.intersect(visibleContentRect()); +#ifdef ANDROID_CAPTURE_OFFSCREEN_PAINTS + if (rect != paintRect) + platformOffscreenContentRectangle(visibleContentRect(), rect); +#endif if (paintRect.isEmpty()) ->>>>>>> webkit.org at r51976:WebCore/platform/ScrollView.cpp return; if (platformWidget()) { platformRepaintContentRectangle(paintRect, now); @@ -1065,12 +1055,8 @@ bool ScrollView::platformScroll(ScrollDirection, ScrollGranularity) return true; } -<<<<<<< HEAD:WebCore/platform/ScrollView.cpp #if !PLATFORM(ANDROID) -void ScrollView::platformRepaintContentRectangle(const IntRect&, bool now) -======= void ScrollView::platformRepaintContentRectangle(const IntRect&, bool /*now*/) ->>>>>>> webkit.org at r51976:WebCore/platform/ScrollView.cpp { } |