4 files changed, 12 insertions, 10 deletions
diff --git a/webkit/glue/chrome_client_impl.cc b/webkit/glue/chrome_client_impl.cc
index 4da7d47..fcf902ef6 100644
--- a/webkit/glue/chrome_client_impl.cc
+++ b/webkit/glue/chrome_client_impl.cc
@@ -468,10 +468,6 @@ WebCore::IntRect ChromeClientImpl::windowToScreen(
   return screen_rect;
 }
 
-PlatformWidget ChromeClientImpl::platformWindow() const {
-  return NULL;
-}
-
 void ChromeClientImpl::contentsSizeChanged(WebCore::Frame* frame, const
     WebCore::IntSize& size) const {
   WebFrameImpl* webframe = WebFrameImpl::FromFrame(frame);
diff --git a/webkit/glue/chrome_client_impl.h b/webkit/glue/chrome_client_impl.h
index d95483d..5108278 100644
--- a/webkit/glue/chrome_client_impl.h
+++ b/webkit/glue/chrome_client_impl.h
@@ -14,6 +14,9 @@ MSVC_POP_WARNING();
 
 class WebViewImpl;
 
+// TODO(darin): remove this typedef once we roll webkit past r48511
+typedef PlatformWidget PlatformPageClient;
+
 namespace WebCore {
 class HTMLParserQuirks;
 class PopupContainer;
@@ -110,7 +113,9 @@ class ChromeClientImpl : public WebCore::ChromeClientChromium {
                       const WebCore::IntRect& clipRect);
   virtual WebCore::IntPoint screenToWindow(const WebCore::IntPoint&) const;
   virtual WebCore::IntRect windowToScreen(const WebCore::IntRect&) const;
-  virtual PlatformWidget platformWindow() const;
+  // TODO(darin): remove platformWindow method once we roll webkit past r48511
+  virtual PlatformWidget platformWindow() const { return NULL; }
+  virtual PlatformPageClient platformPageClient() const { return NULL; }
   virtual void contentsSizeChanged(WebCore::Frame*,
                                    const WebCore::IntSize&) const;
   virtual void scrollRectIntoView(const WebCore::IntRect&, const WebCore::ScrollView*) const { }
diff --git a/webkit/glue/webpopupmenu_impl.cc b/webkit/glue/webpopupmenu_impl.cc
index ce7f2ad..0c4c437 100644
--- a/webkit/glue/webpopupmenu_impl.cc
+++ b/webkit/glue/webpopupmenu_impl.cc
@@ -264,10 +264,6 @@ WebCore::IntRect WebPopupMenuImpl::windowToScreen(
   return WebCore::IntRect();
 }
 
-PlatformWidget WebPopupMenuImpl::platformWindow() const {
-  return NULL;
-}
-
 void WebPopupMenuImpl::scrollRectIntoView(
     const WebCore::IntRect&, const WebCore::ScrollView*) const {
   // Nothing to be done here since we do not have the concept of a container
diff --git a/webkit/glue/webpopupmenu_impl.h b/webkit/glue/webpopupmenu_impl.h
index 2fa56e5..e729310 100644
--- a/webkit/glue/webpopupmenu_impl.h
+++ b/webkit/glue/webpopupmenu_impl.h
@@ -13,6 +13,9 @@
 
 #include "FramelessScrollViewClient.h"
 
+// TODO(darin): remove this typedef once we roll webkit past r48511
+typedef PlatformWidget PlatformPageClient;
+
 namespace WebCore {
 class Frame;
 class FramelessScrollView;
@@ -88,7 +91,9 @@ class WebPopupMenuImpl : public WebKit::WebPopupMenu,
                       const WebCore::IntRect& clip_rect);
   virtual WebCore::IntPoint screenToWindow(const WebCore::IntPoint&) const;
   virtual WebCore::IntRect windowToScreen(const WebCore::IntRect&) const;
-  virtual PlatformWidget platformWindow() const;
+  // TODO(darin): remove platformWindow method once we roll webkit past r48511
+  virtual PlatformWidget platformWindow() const { return NULL; }
+  virtual PlatformPageClient platformPageClient() const { return NULL; }
   virtual void scrollRectIntoView(const WebCore::IntRect&,
                                   const WebCore::ScrollView*) const;
   virtual void scrollbarsModeDidChange() const;