Landing 36102:37604 merge on trunk

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4222 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 22 insertions, 12 deletions

diff --git a/webkit/glue/webwidget_impl.h b/webkit/glue/webwidget_impl.h
index 32bcbde..288485f 100644
--- a/webkit/glue/webwidget_impl.h
+++ b/webkit/glue/webwidget_impl.h
@@ -12,9 +12,7 @@
 #include "base/gfx/size.h"
 #include "webkit/glue/webwidget.h"
 
-MSVC_PUSH_WARNING_LEVEL(0);
-#include "WidgetClientChromium.h"
-MSVC_POP_WARNING();
+#include "FramelessScrollViewClient.h"
 
 namespace WebCore {
   class Frame;
@@ -31,7 +29,8 @@ class WebMouseEvent;
 class WebMouseWheelEvent;
 class WebWidgetDelegate;
 
-class WebWidgetImpl : public WebWidget, public WebCore::WidgetClientChromium {
+class WebWidgetImpl : public WebWidget,
+                      public WebCore::FramelessScrollViewClient {
  public:
   // WebWidget
   virtual void Close();
@@ -50,7 +49,7 @@ class WebWidgetImpl : public WebWidget, public WebCore::WidgetClientChromium {
                                int* x, int* y);
 
   // WebWidgetImpl
-  void Init(WebCore::Widget* widget, const gfx::Rect& bounds);
+  void Init(WebCore::FramelessScrollView* widget, const gfx::Rect& bounds);
 
   const gfx::Size& size() const { return size_; }
 
@@ -72,21 +71,32 @@ class WebWidgetImpl : public WebWidget, public WebCore::WidgetClientChromium {
   WebWidgetImpl(WebWidgetDelegate* delegate);
   ~WebWidgetImpl();
 
+  // WebCore::HostWindow methods:
+  virtual void repaint(const WebCore::IntRect&,
+                       bool content_changed,
+                       bool immediate = false,
+                       bool repaint_content_only = false);
+  virtual void scroll(const WebCore::IntSize& scroll_delta,
+                      const WebCore::IntRect& scroll_rect,
+                      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;
+
+  // WebCore::FramelessScrollViewClient methods:
+  virtual void popupClosed(WebCore::FramelessScrollView* popup_view);
+
+  // TODO(darin): Figure out what happens to these methods.
+#if 0
   // WebCore::WidgetClientWin
   virtual gfx::ViewHandle containingWindow();
-  virtual void invalidateRect(const WebCore::IntRect& damaged_rect);
-  virtual void scrollRect(int dx, int dy, const WebCore::IntRect& clip_rect);
-  virtual void popupOpened(WebCore::Widget* widget,
-                           const WebCore::IntRect& bounds);
-  virtual void popupClosed(WebCore::Widget* widget);
-  virtual void setCursor(const WebCore::Cursor& cursor);
-  virtual void setFocus();
   virtual const SkBitmap* getPreloadedResourceBitmap(int resource_id);
   virtual void onScrollPositionChanged(WebCore::Widget* widget);
   virtual const WTF::Vector<RefPtr<WebCore::Range> >* getTickmarks(
       WebCore::Frame* frame);
   virtual size_t getActiveTickmarkIndex(WebCore::Frame* frame);
   virtual bool isHidden();
+#endif
 
   WebWidgetDelegate* delegate_;
   gfx::Size size_;