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

webkit/glue/webworker_impl.cc

 // Copyright (c) 2009 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.
 
 #include "config.h"
 
 #include "base/compiler_specific.h"
 
 #include "GenericWorkerTask.h"
 #include "KURL.h"
@@ skipping 16 matching lines @@
 #include "webkit/api/public/WebWorkerClient.h"
 #include "webkit/glue/glue_util.h"
 #include "webkit/glue/webdatasource_impl.h"
 #include "webkit/glue/webframe_impl.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/glue/webview.h"
 #include "webkit/glue/webview_delegate.h"
 #include "webkit/glue/webworker_impl.h"
 
 using WebKit::WebCursorInfo;
+using WebKit::WebNavigationPolicy;
+using WebKit::WebRect;
+using WebKit::WebScreenInfo;
 using WebKit::WebString;
 using WebKit::WebURL;
 using WebKit::WebWorker;
 using WebKit::WebWorkerClient;
 
 #if ENABLE(WORKERS)
 
 // Dummy WebViewDelegate - we only need it in Worker process to load a
 // 'shadow page' which will initialize WebCore loader.
 class WorkerWebViewDelegate : public WebViewDelegate {
  public:
   WorkerWebViewDelegate() {}
-  virtual void Blur(WebWidget *webwidget) { }
-  virtual void CloseWidgetSoon(WebWidget *webwidget) { }
-  virtual void DidInvalidateRect(WebWidget *webwidget,
-                                 const WebKit::WebRect &rect) { }
-  virtual void DidMove(WebWidget *webwidget, const WebPluginGeometry &move) { }
-  virtual void DidScrollRect(WebWidget *webwidget, int dx, int dy,
-                             const WebKit::WebRect &clip_rect) { }
-  virtual void Focus(WebWidget *webwidget) { }
-  virtual void GetRootWindowRect(WebWidget *webwidget,
-                                 WebKit::WebRect *rect) { }
-  virtual void GetRootWindowResizerRect(WebWidget *webwidget,
-                                        WebKit::WebRect *rect) { }
-  virtual WebKit::WebScreenInfo GetScreenInfo(WebWidget *webwidget) {
-    WebKit::WebScreenInfo info;
-    return info;
-  }
-  virtual void GetWindowRect(WebWidget *webwidget, WebKit::WebRect *rect) { }
-  virtual bool IsHidden(WebWidget *webwidget) { return true; }
-  virtual void RunModal(WebWidget *webwidget) { }
-  virtual void SetCursor(WebWidget *webwidget, const WebCursorInfo &cursor) { }
-  virtual void SetWindowRect(WebWidget *webwidget,
-                             const WebKit::WebRect &rect) { }
-  virtual void Show(WebWidget *webwidget, WindowOpenDisposition disposition) { }
+
+  virtual void didInvalidateRect(const WebRect&) {}
+  virtual void didScrollRect(int dx, int dy, const WebRect& clipRect) {}
+  virtual void didFocus() {}
+  virtual void didBlur() {}
+  virtual void didChangeCursor(const WebCursorInfo&) {}
+  virtual void closeWidgetSoon() {}
+  virtual void show(WebNavigationPolicy) {}
+  virtual void runModal() {}
+  virtual WebRect windowRect() { return WebRect(); }
+  virtual void setWindowRect(const WebRect&) {}
+  virtual WebRect windowResizerRect() { return WebRect(); }
+  virtual WebRect rootWindowRect() { return WebRect(); }
+  virtual WebScreenInfo screenInfo() { return WebScreenInfo(); }
+
   // Tell the loader to load the data into the 'shadow page' synchronously,
   // so we can grab the resulting Document right after load.
   virtual void DidCreateDataSource(WebFrame* frame, WebKit::WebDataSource* ds) {
     static_cast<WebDataSourceImpl*>(ds)->setDeferMainResourceDataLoad(false);
   }
+
   // Lazy allocate and leak this instance.
   static WorkerWebViewDelegate* worker_delegate() {
     static WorkerWebViewDelegate* worker_delegate = new WorkerWebViewDelegate();
     return worker_delegate;
   }
+
  private:
   DISALLOW_COPY_AND_ASSIGN(WorkerWebViewDelegate);
 };
 
 namespace WebKit {
 
 WebWorker* WebWorker::create(WebWorkerClient* client) {
   return new WebWorkerImpl(client);
 }
 
@@ skipping 17 matching lines @@
 }
 
 WebWorkerImpl::WebWorkerImpl(WebWorkerClient* client)
  : client_(client),
    web_view_(NULL),
    asked_to_terminate_(false) {
   InitializeWebKitStaticValues();
 }
 
 WebWorkerImpl::~WebWorkerImpl() {
-  web_view_->Close();
+  web_view_->close();
 }
 
 void WebWorkerImpl::PostMessageToWorkerContextTask(
     WebCore::ScriptExecutionContext* context,
     WebWorkerImpl* this_ptr,
     const WebCore::String& message,
     WTF::PassOwnPtr<WebCore::MessagePortChannel> channel) {
   DCHECK(context->isWorkerContext());
   WebCore::WorkerContext* worker_context =
       static_cast<WebCore::WorkerContext*>(context);
@@ skipping 240 matching lines @@
 
 namespace WebKit {
 
 WebWorker* WebWorker::create(WebWorkerClient* client) {
   return NULL;
 }
 
 }
 
 #endif