Chrome side to pick up new WebKit API changes.

WebKit API now provides:
  - layoutTestMode
  - support for registering extra local URL schemes
  - access to the current WebKitClient

WebKitClient was extended to include:
  - access to the default locale
  - access to the current time
  - methods to start/stop the shared timer
  - method to get work scheduled on the main thread
  - methods to access cookies
  - method to prefetch hostnames

R=dglazkov

Review URL: http://codereview.chromium.org/27276

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

1 files changed, 25 insertions, 0 deletions

diff --git a/webkit/glue/webkitclient_impl.h b/webkit/glue/webkitclient_impl.h
index 481a5fe..4980685 100644
--- a/webkit/glue/webkitclient_impl.h
+++ b/webkit/glue/webkitclient_impl.h
@@ -8,18 +8,43 @@
 #include "WebKitClient.h"
 
 #include "base/scoped_ptr.h"
+#include "base/timer.h"
 #include "webkit/glue/webclipboard_impl.h"
 
+class MessageLoop;
+
 namespace webkit_glue {
 
 class WebKitClientImpl : public WebKit::WebKitClient {
  public:
+  WebKitClientImpl();
+
   // WebKitClient methods:
   virtual WebKit::WebClipboard* clipboard();
   virtual WebKit::WebMimeRegistry* mimeRegistry() = 0;
+  virtual void setCookies(
+      const WebKit::WebURL& url, const WebKit::WebURL& policy_url,
+      const WebKit::WebString&) = 0;
+  virtual WebKit::WebString cookies(
+      const WebKit::WebURL& url, const WebKit::WebURL& policy_url) = 0;
+  virtual void prefetchHostName(const WebKit::WebString&) = 0;
+  virtual WebKit::WebString defaultLocale() = 0;
+  virtual double currentTime();
+  virtual void setSharedTimerFiredFunction(void (*func)());
+  virtual void setSharedTimerFireTime(double fireTime);
+  virtual void stopSharedTimer();
+  virtual void callOnMainThread(void (*func)());
 
  private:
+  void DoTimeout() {
+    if (shared_timer_func_)
+      shared_timer_func_();
+  }
+
   WebClipboardImpl clipboard_;
+  MessageLoop* main_loop_;
+  base::OneShotTimer<WebKitClientImpl> shared_timer_;
+  void (*shared_timer_func_)();
 };
 
 }  // namespace webkit_glue