summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2009-10-12 11:48:48 +0100
committerSteve Block <steveblock@google.com>2009-10-20 00:45:06 +0100
commitf08b6f6172b9dd1defce51b868f951bcbf6c61c7 (patch)
tree54fa78b10f9be2e1b445022e3029a33b79088793
parent80754947fdaad5fb6800b937f01f8d9ad53b4559 (diff)
downloadexternal_webkit-f08b6f6172b9dd1defce51b868f951bcbf6c61c7.zip
external_webkit-f08b6f6172b9dd1defce51b868f951bcbf6c61c7.tar.gz
external_webkit-f08b6f6172b9dd1defce51b868f951bcbf6c61c7.tar.bz2
Merge webkit.org at R49305 : Add stub ChromeClient::scrollbarsModeDidChange method.
See http://trac.webkit.org/changeset/47866 Change-Id: I28b535b2c0202db2ec6d36791f67de4bbf24c3b4
-rw-r--r--WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp5
-rw-r--r--WebKit/android/WebCoreSupport/ChromeClientAndroid.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
index 109863d..17e3ff0 100644
--- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
@@ -286,6 +286,11 @@ void ChromeClientAndroid::formStateDidChange(const Node*)
notImplemented();
}
+void ChromeClientAndroid::scrollbarsModeDidChange() const
+{
+ notImplemented();
+}
+
void ChromeClientAndroid::mouseDidMoveOverElement(const HitTestResult&, unsigned int) {}
void ChromeClientAndroid::setToolTip(const String&, TextDirection) {}
void ChromeClientAndroid::print(Frame*) {}
diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
index 9976326..7421193 100644
--- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
+++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
@@ -109,6 +109,7 @@ namespace android {
virtual void scrollRectIntoView(const IntRect&, const ScrollView*) const;
// End methods used by HostWindow.
+ virtual void scrollbarsModeDidChange() const;
virtual void mouseDidMoveOverElement(const HitTestResult&, unsigned int);
virtual void setToolTip(const String&, TextDirection);