diff options
| author | Ben Murdoch <benm@google.com> | 2010-07-22 16:44:15 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-07-27 10:20:26 +0100 |
| commit | 6c58635db69329cd8c46dc17dd670bdcbf1a889a (patch) | |
| tree | d63c7e19a2a08cde712b953ec049b55148b19670 /WebKit/android | |
| parent | c697ccf5ef26f14b2ab9743e4e2f20e8ec046441 (diff) | |
| download | external_webkit-6c58635db69329cd8c46dc17dd670bdcbf1a889a.zip external_webkit-6c58635db69329cd8c46dc17dd670bdcbf1a889a.tar.gz external_webkit-6c58635db69329cd8c46dc17dd670bdcbf1a889a.tar.bz2 | |
Merge Webkit at r63859 : PlatformCursorHandle -> Cursor. See http://trac.webkit.org/changeset/63339
Change-Id: I26df53fba097893a5adee2a957a63a0f1720def8
Diffstat (limited to 'WebKit/android')
| -rw-r--r-- | WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp | 3 | ||||
| -rw-r--r-- | WebKit/android/WebCoreSupport/ChromeClientAndroid.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp index 6495bb4..2de83f6 100644 --- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp +++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp @@ -488,10 +488,9 @@ void ChromeClientAndroid::chooseIconForFiles(const Vector<WebCore::String>&, Fil notImplemented(); } -bool ChromeClientAndroid::setCursor(PlatformCursorHandle) +void ChromeClientAndroid::setCursor(const Cursor&) { notImplemented(); - return false; } void ChromeClientAndroid::wakeUpMainThreadWithNewQuota(long newQuota) { diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h index b3b9335..65dcd81 100644 --- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h +++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h @@ -147,7 +147,7 @@ namespace android { void onMainFrameLoadStarted(); virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>); - virtual bool setCursor(PlatformCursorHandle); + virtual void setCursor(const Cursor&); virtual void chooseIconForFiles(const WTF::Vector<WebCore::String>&, FileChooser*); // Notification that the given form element has changed. This function |