From d060767c4de6a275194ee9a58f151b82b17013bf Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Mon, 12 Oct 2009 11:52:54 +0100
Subject: [PATCH] Merge webkit.org at R49305 : ChromeClient::platformWindow
 renamed to platformPageClient.

See http://trac.webkit.org/changeset/48511

Change-Id: I18ba9b6baa000209a28b8f1d01046c1c0e86c026
---
 WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp | 4 +---
 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 17e3ff027..f9cd4d25e 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 7421193d5..154903312 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.
-- 
2.11.0