Merge webkit.org at r58033 : Update ChromeClientAndroid with refactoring of ChromeClient::repaint()

See http://trac.webkit.org/changeset/55675 and http://trac.webkit.org/changeset/55864

Change-Id: I8bf64fa0315877f8fafabe2a9e3c5ca8cc1e362c

2 files changed, 16 insertions, 7 deletions

diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
index 0d5fb09..b59689d 100644
--- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
@@ -277,12 +277,19 @@ bool ChromeClientAndroid::tabsToLinks() const { return false; }
 
 IntRect ChromeClientAndroid::windowResizerRect() const { return IntRect(0, 0, 0, 0); }
 
-// new to change 38068 (Nov 6, 2008)
-void ChromeClientAndroid::repaint(const IntRect& rect, bool contentChanged, 
-        bool immediate, bool repaintContentOnly) { 
-    notImplemented(); 
-// was in ScrollViewAndroid::update() : needs to be something like:
-//    android::WebViewCore::getWebViewCore(this)->contentInvalidate(rect);
+void ChromeClientAndroid::invalidateWindow(const IntRect&, bool)
+{
+    notImplemented();
+}
+
+void ChromeClientAndroid::invalidateContentsAndWindow(const IntRect& updateRect, bool /*immediate*/)
+{
+    notImplemented();
+}
+
+void ChromeClientAndroid::invalidateContentsForSlowScroll(const IntRect& updateRect, bool immediate)
+{
+    notImplemented();
 }
 
 // new to change 38068 (Nov 6, 2008)
diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
index 22901f9..902d84c 100644
--- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
+++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
@@ -113,7 +113,9 @@ namespace android {
         virtual IntRect windowResizerRect() const;
 
         // Methods used by HostWindow.
-        virtual void repaint(const IntRect&, bool contentChanged, bool immediate = false, bool repaintContentOnly = false);
+        virtual void invalidateWindow(const WebCore::IntRect&, bool);
+        virtual void invalidateContentsAndWindow(const WebCore::IntRect&, bool);
+        virtual void invalidateContentsForSlowScroll(const WebCore::IntRect&, bool);
         virtual void scroll(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect);
         virtual IntPoint screenToWindow(const IntPoint&) const;
         virtual IntRect windowToScreen(const IntRect&) const;