Use WebWidget from the WebKit API. This change also makes...

webkit/glue/webwidget_impl.h

Index: webkit/glue/webwidget_impl.h
===================================================================
--- webkit/glue/webwidget_impl.h	(revision 20851)
+++ webkit/glue/webwidget_impl.h	(working copy)
@@ -1,114 +0,0 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef WEBKIT_GLUE_WEBWIDGET_IMPL_H__
-#define WEBKIT_GLUE_WEBWIDGET_IMPL_H__
-
-#include "base/basictypes.h"
-#include "base/ref_counted.h"
-#include "webkit/api/public/WebPoint.h"
-#include "webkit/api/public/WebSize.h"
-#include "webkit/glue/webwidget.h"
-
-#include "FramelessScrollViewClient.h"
-
-namespace WebCore {
-class Frame;
-class FramelessScrollView;
-class KeyboardEvent;
-class Page;
-class PlatformKeyboardEvent;
-class Range;
-class Widget;
-}
-
-namespace WebKit {
-class WebKeyboardEvent;
-class WebMouseEvent;
-class WebMouseWheelEvent;
-struct WebRect;
-}
-
-struct MenuItem;
-class WebWidgetDelegate;
-
-class WebWidgetImpl : public WebWidget,
-                      public WebCore::FramelessScrollViewClient,
-                      public base::RefCounted<WebWidgetImpl> {
- public:
-  // WebWidget
-  virtual void Close();
-  virtual void Resize(const WebKit::WebSize& new_size);
-  virtual WebKit::WebSize GetSize() { return size(); }
-  virtual void Layout();
-  virtual void Paint(skia::PlatformCanvas* canvas,
-                     const WebKit::WebRect& rect);
-  virtual bool HandleInputEvent(const WebKit::WebInputEvent* input_event);
-  virtual void MouseCaptureLost();
-  virtual void SetFocus(bool enable);
-  virtual bool ImeSetComposition(int string_type,
-                                 int cursor_position,
-                                 int target_start,
-                                 int target_end,
-                                 const std::wstring& ime_string);
-  virtual bool ImeUpdateStatus(bool* enable_ime,
-                               WebKit::WebRect* caret_rect);
-  virtual void SetTextDirection(WebTextDirection direction);
-
-  // WebWidgetImpl
-  void Init(WebCore::FramelessScrollView* widget,
-            const WebKit::WebRect& bounds);
-
-  const WebKit::WebSize& size() const { return size_; }
-
-  WebWidgetDelegate* delegate() {
-    return delegate_;
-  }
-
-  void MouseMove(const WebKit::WebMouseEvent& mouse_event);
-  void MouseLeave(const WebKit::WebMouseEvent& mouse_event);
-  void MouseDown(const WebKit::WebMouseEvent& mouse_event);
-  void MouseUp(const WebKit::WebMouseEvent& mouse_event);
-  void MouseDoubleClick(const WebKit::WebMouseEvent& mouse_event);
-  void MouseWheel(const WebKit::WebMouseWheelEvent& wheel_event);
-  bool KeyEvent(const WebKit::WebKeyboardEvent& key_event);
-
- protected:
-  friend class WebWidget;  // So WebWidget::Create can call our constructor
-  friend class base::RefCounted<WebWidgetImpl>;
-
-  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;
-  virtual void scrollRectIntoView(const WebCore::IntRect&,
-                                  const WebCore::ScrollView*) const;
-
-  // WebCore::FramelessScrollViewClient methods:
-  virtual void popupClosed(WebCore::FramelessScrollView* popup_view);
-
-  WebWidgetDelegate* delegate_;
-  WebKit::WebSize size_;
-
-  WebKit::WebPoint last_mouse_position_;
-
-  // This is a non-owning ref.  The popup will notify us via popupClosed()
-  // before it is destroyed.
-  WebCore::FramelessScrollView* widget_;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(WebWidgetImpl);
-};
-
-#endif  // WEBKIT_GLUE_WEBWIDGET_IMPL_H__