summaryrefslogtreecommitdiffstats
path: root/chrome/renderer
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-06 16:32:23 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-06 16:32:23 +0000
commit2ec901008f1e38e1c12aa8a955a722adde8d4fc0 (patch)
tree4848de7dff9de5d8d8f35ee79db5860cbd958870 /chrome/renderer
parent43f91a4f2a51cb808d4ba8c5975b83aba3b55c7e (diff)
downloadchromium_src-2ec901008f1e38e1c12aa8a955a722adde8d4fc0.zip
chromium_src-2ec901008f1e38e1c12aa8a955a722adde8d4fc0.tar.gz
chromium_src-2ec901008f1e38e1c12aa8a955a722adde8d4fc0.tar.bz2
More WebKit API action (chromium side)
R=dglazkov Review URL: http://codereview.chromium.org/39240 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11118 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
-rw-r--r--chrome/renderer/renderer_glue.cc14
-rw-r--r--chrome/renderer/renderer_webkitclient_impl.cc13
-rw-r--r--chrome/renderer/renderer_webkitclient_impl.h2
3 files changed, 15 insertions, 14 deletions
diff --git a/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc
index 9508c50..22b2775 100644
--- a/chrome/renderer/renderer_glue.cc
+++ b/chrome/renderer/renderer_glue.cc
@@ -22,7 +22,6 @@
#include "chrome/renderer/render_process.h"
#include "chrome/renderer/render_thread.h"
#include "chrome/renderer/render_view.h"
-#include "chrome/renderer/visitedlink_slave.h"
#include "googleurl/src/url_util.h"
#include "webkit/glue/scoped_clipboard_writer_glue.h"
#include "webkit/glue/webframe.h"
@@ -178,10 +177,6 @@ std::string GetDataResource(int resource_id) {
return ResourceBundle::GetSharedInstance().GetDataResource(resource_id);
}
-SkBitmap* GetBitmapResource(int resource_id) {
- return ResourceBundle::GetSharedInstance().GetBitmapNamed(resource_id);
-}
-
#if defined(OS_WIN)
HCURSOR LoadCursor(int cursor_id) {
return ResourceBundle::GetSharedInstance().LoadCursor(cursor_id);
@@ -251,15 +246,6 @@ webkit_glue::ScreenInfo GetScreenInfo(gfx::NativeViewId window) {
return results;
}
-uint64 VisitedLinkHash(const char* canonical_url, size_t length) {
- return RenderThread::current()->visited_link_slave()->ComputeURLFingerprint(
- canonical_url, length);
-}
-
-bool IsLinkVisited(uint64 link_hash) {
- return RenderThread::current()->visited_link_slave()->IsVisited(link_hash);
-}
-
#ifndef USING_SIMPLE_RESOURCE_LOADER_BRIDGE
// Each RenderView has a ResourceDispatcher. In unit tests, this function may
diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc
index 7a065f9..286d227 100644
--- a/chrome/renderer/renderer_webkitclient_impl.cc
+++ b/chrome/renderer/renderer_webkitclient_impl.cc
@@ -13,6 +13,7 @@
#include "chrome/plugin/npobject_util.h"
#include "chrome/renderer/net/render_dns_master.h"
#include "chrome/renderer/render_thread.h"
+#include "chrome/renderer/visitedlink_slave.h"
#include "webkit/glue/glue_util.h"
#include "webkit/glue/webkit_glue.h"
@@ -21,6 +22,18 @@ using WebKit::WebURL;
//------------------------------------------------------------------------------
+uint64_t 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) {
+ return RenderThread::current()->visited_link_slave()->IsVisited(link_hash);
+}
+
+//------------------------------------------------------------------------------
+
void RendererWebKitClientImpl::setCookies(
const WebURL& url, const WebURL& policy_url, const WebString& value) {
std::string value_utf8;
diff --git a/chrome/renderer/renderer_webkitclient_impl.h b/chrome/renderer/renderer_webkitclient_impl.h
index 9a7fe1d..2ed397b 100644
--- a/chrome/renderer/renderer_webkitclient_impl.h
+++ b/chrome/renderer/renderer_webkitclient_impl.h
@@ -14,6 +14,8 @@ class RendererWebKitClientImpl : public webkit_glue::WebKitClientImpl {
virtual WebKit::WebMimeRegistry* mimeRegistry() {
return &mime_registry_;
}
+ virtual uint64_t visitedLinkHash(const char* canonicalURL, size_t length);
+ virtual bool isLinkVisited(uint64_t linkHash);
virtual void setCookies(
const WebKit::WebURL& url, const WebKit::WebURL& policy_url,
const WebKit::WebString&);