diff options
author | Steve Block <steveblock@google.com> | 2009-10-12 11:52:54 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2009-10-20 00:45:07 +0100 |
commit | d060767c4de6a275194ee9a58f151b82b17013bf (patch) | |
tree | c56870c2ef640af796a0a3fd12d4df1d185c0084 /WebKit/android | |
parent | f08b6f6172b9dd1defce51b868f951bcbf6c61c7 (diff) | |
download | external_webkit-d060767c4de6a275194ee9a58f151b82b17013bf.zip external_webkit-d060767c4de6a275194ee9a58f151b82b17013bf.tar.gz external_webkit-d060767c4de6a275194ee9a58f151b82b17013bf.tar.bz2 |
Merge webkit.org at R49305 : ChromeClient::platformWindow renamed to platformPageClient.
See http://trac.webkit.org/changeset/48511
Change-Id: I18ba9b6baa000209a28b8f1d01046c1c0e86c026
Diffstat (limited to 'WebKit/android')
-rw-r--r-- | WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp | 4 | ||||
-rw-r--r-- | WebKit/android/WebCoreSupport/ChromeClientAndroid.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp index 17e3ff0..f9cd4d2 100644 --- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp +++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp @@ -261,9 +261,7 @@ IntRect ChromeClientAndroid::windowToScreen(const IntRect&) const { return IntRect(); } -// new to change 38068 (Nov 6, 2008) -// in place of view()->containingWindow(), webkit now uses view()->hostWindow()->platformWindow() -PlatformWidget ChromeClientAndroid::platformWindow() const { +PlatformPageClient ChromeClientAndroid::platformPageClient() const { Page* page = m_webFrame->page(); Frame* mainFrame = page->mainFrame(); FrameView* view = mainFrame->view(); diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h index 7421193..1549033 100644 --- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h +++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h @@ -104,7 +104,7 @@ namespace android { virtual void scroll(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect); virtual IntPoint screenToWindow(const IntPoint&) const; virtual IntRect windowToScreen(const IntRect&) const; - virtual PlatformWidget platformWindow() const; + virtual PlatformPageClient platformPageClient() const; virtual void contentsSizeChanged(Frame*, const IntSize&) const; virtual void scrollRectIntoView(const IntRect&, const ScrollView*) const; // End methods used by HostWindow. |