Chrome changes to support WebKit API changes.

Also, I removed the GetWebFrame method on WebDataSource since it is not
actually needed.

Removed some dead-code from webframe_impl.cc.

Removed some bogus null-checking of WebCore::Frame::loader().

R=dglazkov

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

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

4 files changed, 15 insertions, 11 deletions

diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc
index f35e9d1..3a02adb 100644
--- a/chrome/renderer/renderer_webkitclient_impl.cc
+++ b/chrome/renderer/renderer_webkitclient_impl.cc
@@ -23,7 +23,7 @@ using WebKit::WebURL;
 
 WebKit::WebClipboard* RendererWebKitClientImpl::clipboard() {
   return &clipboard_;
-} 
+}
 
 WebKit::WebMimeRegistry* RendererWebKitClientImpl::mimeRegistry() {
   return &mime_registry_;
@@ -37,13 +37,14 @@ WebKit::WebSandboxSupport* RendererWebKitClientImpl::sandboxSupport() {
 #endif
 }
 
-uint64_t RendererWebKitClientImpl::visitedLinkHash(const char* canonical_url,
-                                                   size_t length) {
+unsigned long long RendererWebKitClientImpl::visitedLinkHash(
+    const char* canonical_url,
+    size_t length) {
   return RenderThread::current()->visited_link_slave()->ComputeURLFingerprint(
       canonical_url, length);
 }
 
-bool RendererWebKitClientImpl::isLinkVisited(uint64_t link_hash) {
+bool RendererWebKitClientImpl::isLinkVisited(unsigned long long link_hash) {
   return RenderThread::current()->visited_link_slave()->IsVisited(link_hash);
 }
 
diff --git a/chrome/renderer/renderer_webkitclient_impl.h b/chrome/renderer/renderer_webkitclient_impl.h
index 2efdf66..3c4cb48 100644
--- a/chrome/renderer/renderer_webkitclient_impl.h
+++ b/chrome/renderer/renderer_webkitclient_impl.h
@@ -19,8 +19,9 @@ class RendererWebKitClientImpl : public webkit_glue::WebKitClientImpl {
   virtual WebKit::WebClipboard* clipboard();
   virtual WebKit::WebMimeRegistry* mimeRegistry();
   virtual WebKit::WebSandboxSupport* sandboxSupport();
-  virtual uint64_t visitedLinkHash(const char* canonicalURL, size_t length);
-  virtual bool isLinkVisited(uint64_t linkHash);
+  virtual unsigned long long visitedLinkHash(
+      const char* canonicalURL, size_t length);
+  virtual bool isLinkVisited(unsigned long long linkHash);
   virtual void setCookies(
       const WebKit::WebURL& url, const WebKit::WebURL& policy_url,
       const WebKit::WebString&);
diff --git a/chrome/worker/worker_webkitclient_impl.cc b/chrome/worker/worker_webkitclient_impl.cc
index 96fc6ed..45a13e8 100644
--- a/chrome/worker/worker_webkitclient_impl.cc
+++ b/chrome/worker/worker_webkitclient_impl.cc
@@ -23,13 +23,14 @@ WebKit::WebSandboxSupport* WorkerWebKitClientImpl::sandboxSupport() {
   return NULL;
 }
 
-uint64_t WorkerWebKitClientImpl::visitedLinkHash(const char* canonical_url,
-                                                 size_t length) {
+unsigned long long WorkerWebKitClientImpl::visitedLinkHash(
+    const char* canonical_url,
+    size_t length) {
   NOTREACHED();
   return 0;
 }
 
-bool WorkerWebKitClientImpl::isLinkVisited(uint64_t link_hash) {
+bool WorkerWebKitClientImpl::isLinkVisited(unsigned long long link_hash) {
   NOTREACHED();
   return false;
 }
diff --git a/chrome/worker/worker_webkitclient_impl.h b/chrome/worker/worker_webkitclient_impl.h
index e507cc0..474e1b2 100644
--- a/chrome/worker/worker_webkitclient_impl.h
+++ b/chrome/worker/worker_webkitclient_impl.h
@@ -13,8 +13,9 @@ class WorkerWebKitClientImpl : public webkit_glue::WebKitClientImpl {
   virtual WebKit::WebClipboard* clipboard();
   virtual WebKit::WebMimeRegistry* mimeRegistry();
   virtual WebKit::WebSandboxSupport* sandboxSupport();
-  virtual uint64_t visitedLinkHash(const char* canonicalURL, size_t length);
-  virtual bool isLinkVisited(uint64_t linkHash);
+  virtual unsigned long long visitedLinkHash(const char* canonicalURL,
+                                             size_t length);
+  virtual bool isLinkVisited(unsigned long long linkHash);
   virtual void setCookies(const WebKit::WebURL& url,
                           const WebKit::WebURL& policy_url,
                           const WebKit::WebString& value);