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

webkit/tools/test_shell/mac/webwidget_host.mm

 // Copyright (c) 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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "webkit/tools/test_shell/webwidget_host.h"
 
 #include "base/gfx/platform_canvas.h"
 #include "base/gfx/rect.h"
 #include "base/gfx/size.h"
 #include "base/logging.h"
 #include "webkit/api/public/mac/WebInputEventFactory.h"
 #include "webkit/api/public/mac/WebScreenInfoFactory.h"
 #include "webkit/api/public/WebInputEvent.h"
+#include "webkit/api/public/WebPopupMenu.h"
 #include "webkit/api/public/WebScreenInfo.h"
 #include "webkit/api/public/WebSize.h"
-#include "webkit/glue/webwidget.h"
 #include "webkit/tools/test_shell/test_shell.h"
 
 using WebKit::WebInputEvent;
 using WebKit::WebInputEventFactory;
 using WebKit::WebKeyboardEvent;
 using WebKit::WebMouseEvent;
 using WebKit::WebMouseWheelEvent;
+using WebKit::WebPopupMenu;
 using WebKit::WebScreenInfo;
 using WebKit::WebScreenInfoFactory;
 using WebKit::WebSize;
+using WebKit::WebWidgetClient;
 
 /*static*/
 WebWidgetHost* WebWidgetHost::Create(NSView* parent_view,
-                                     WebWidgetDelegate* delegate) {
+                                     WebWidgetClient* client) {
   WebWidgetHost* host = new WebWidgetHost();
 
   NSRect content_rect = [parent_view frame];
   content_rect.origin.y += 64;
   content_rect.size.height -= 64;
   host->view_ = [[NSView alloc] initWithFrame:content_rect];
   [parent_view addSubview:host->view_];
 
   // win_util::SetWindowUserData(host->hwnd_, host);
 
-  host->webwidget_ = WebWidget::Create(delegate);
-  host->webwidget_->Resize(WebSize(content_rect.size.width,
+  host->webwidget_ = WebPopupMenu::create(client);
+  host->webwidget_->resize(WebSize(content_rect.size.width,
                                    content_rect.size.height));
   return host;
 }
 
 /*static*/
 void WebWidgetHost::HandleEvent(NSView* view, NSEvent* event) {
   /* TODO(port): rig up a way to get to the host */
   WebWidgetHost* host = NULL;
   if (host) {
     switch ([event type]) {
@@ skipping 87 matching lines @@
       track_mouse_leave_(false)
 {
   set_painting(false);
 }
 
 WebWidgetHost::~WebWidgetHost() {
   // win_util::SetWindowUserData(hwnd_, 0);
 
   TrackMouseLeave(false);
 
-  webwidget_->Close();
+  webwidget_->close();
 }
 
 void WebWidgetHost::UpdatePaintRect(const gfx::Rect& rect) {
   paint_rect_ = paint_rect_.Union(rect);
 }
 
 void WebWidgetHost::Paint() {
   NSRect r = [view_ frame];
   gfx::Rect client_rect(NSRectToCGRect(r));
   NSGraphicsContext* view_context = [NSGraphicsContext currentContext];
   CGContextRef context = static_cast<CGContextRef>([view_context graphicsPort]);
 
   // Allocate a canvas if necessary
   if (!canvas_.get()) {
     ResetScrollRect();
     paint_rect_ = client_rect;
     canvas_.reset(new skia::PlatformCanvas(
         paint_rect_.width(), paint_rect_.height(), true));
   }
 
   // make sure webkit draws into our bitmap, not the window
   CGContextRef bitmap_context =
       canvas_->getTopPlatformDevice().GetBitmapContext();
   [NSGraphicsContext setCurrentContext:
       [NSGraphicsContext graphicsContextWithGraphicsPort:bitmap_context
                                                  flipped:NO]];
 
   // This may result in more invalidation
-  webwidget_->Layout();
+  webwidget_->layout();
 
   // Scroll the canvas if necessary
   scroll_rect_ = client_rect.Intersect(scroll_rect_);
   if (!scroll_rect_.IsEmpty()) {
     // add to invalidate rect, since there's no equivalent of ScrollDC.
     paint_rect_ = paint_rect_.Union(scroll_rect_);
   }
   ResetScrollRect();
 
   // Paint the canvas if necessary.  Allow painting to generate extra rects the
@@ skipping 28 matching lines @@
   }
 }
 
 WebScreenInfo WebWidgetHost::GetScreenInfo() {
   return WebScreenInfoFactory::screenInfo(view_);
 }
 
 void WebWidgetHost::Resize(const gfx::Rect& rect) {
   // Force an entire re-paint.  TODO(darin): Maybe reuse this memory buffer.
   DiscardBackingStore();
-  webwidget_->Resize(WebSize(rect.width(), rect.height()));
+  webwidget_->resize(WebSize(rect.width(), rect.height()));
 }
 
 void WebWidgetHost::MouseEvent(NSEvent *event) {
   const WebMouseEvent& web_event = WebInputEventFactory::mouseEvent(
       event, view_);
   switch (web_event.type) {
     case WebInputEvent::MouseMove:
       TrackMouseLeave(true);
       break;
     case WebInputEvent::MouseLeave:
       TrackMouseLeave(false);
       break;
     default:
       break;
   }
-  webwidget_->HandleInputEvent(&web_event);
+  webwidget_->handleInputEvent(web_event);
 }
 
 void WebWidgetHost::WheelEvent(NSEvent *event) {
-  const WebMouseWheelEvent& web_event = WebInputEventFactory::mouseWheelEvent(
-      event, view_);
-  webwidget_->HandleInputEvent(&web_event);
+  webwidget_->handleInputEvent(
+      WebInputEventFactory::mouseWheelEvent(event, view_));
 }
 
 void WebWidgetHost::KeyEvent(NSEvent *event) {
-  const WebKeyboardEvent& web_event = WebInputEventFactory::keyboardEvent(
-      event);
-  webwidget_->HandleInputEvent(&web_event);
+  webwidget_->handleInputEvent(WebInputEventFactory::keyboardEvent(event));
 }
 
 void WebWidgetHost::SetFocus(bool enable) {
   // Ignore focus calls in layout test mode so that tests don't mess with each
   // other's focus when running in parallel.
   if (!TestShell::layout_test_mode())
-    webwidget_->SetFocus(enable);
+    webwidget_->setFocus(enable);
 }
 
 void WebWidgetHost::TrackMouseLeave(bool track) {
 }
 
 void WebWidgetHost::ResetScrollRect() {
   scroll_rect_ = gfx::Rect();
   scroll_dx_ = 0;
   scroll_dy_ = 0;
 }
 
 void WebWidgetHost::PaintRect(const gfx::Rect& rect) {
 #ifndef NDEBUG
   DCHECK(!painting_);
 #endif
   DCHECK(canvas_.get());
 
   set_painting(true);
-  webwidget_->Paint(canvas_.get(), rect);
+  webwidget_->paint(canvas_.get(), rect);
   set_painting(false);
 }