summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
Diffstat (limited to 'content')
-rw-r--r--content/common/database_util.cc4
-rw-r--r--content/common/database_util.h2
-rw-r--r--content/public/renderer/content_renderer_client.h2
-rw-r--r--content/public/test/render_view_test.cc2
-rw-r--r--content/public/test/render_view_test.h4
-rw-r--r--content/public/test/unittest_test_suite.cc2
-rw-r--r--content/renderer/renderer_webkitplatformsupport_impl.cc8
-rw-r--r--content/renderer/renderer_webkitplatformsupport_impl.h4
-rw-r--r--content/worker/worker_webkitplatformsupport_impl.cc4
-rw-r--r--content/worker/worker_webkitplatformsupport_impl.h2
10 files changed, 17 insertions, 17 deletions
diff --git a/content/common/database_util.cc b/content/common/database_util.cc
index c7ca5be..5ac8eb9 100644
--- a/content/common/database_util.cc
+++ b/content/common/database_util.cc
@@ -10,12 +10,12 @@
#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"
#include "third_party/sqlite/sqlite3.h"
-using WebKit::WebKitPlatformSupport;
+using WebKit::Platform;
using WebKit::WebString;
namespace content {
-WebKitPlatformSupport::FileHandle DatabaseUtil::DatabaseOpenFile(
+Platform::FileHandle DatabaseUtil::DatabaseOpenFile(
const WebString& vfs_file_name, int desired_flags) {
IPC::PlatformFileForTransit file_handle =
IPC::InvalidPlatformFileForTransit();
diff --git a/content/common/database_util.h b/content/common/database_util.h
index f068962..efba065 100644
--- a/content/common/database_util.h
+++ b/content/common/database_util.h
@@ -12,7 +12,7 @@ namespace content {
// WorkerWebKitPlatformSupportImpl to handle database file accesses.
class DatabaseUtil {
public:
- static WebKit::WebKitPlatformSupport::FileHandle DatabaseOpenFile(
+ static WebKit::Platform::FileHandle DatabaseOpenFile(
const WebKit::WebString& vfs_file_name, int desired_flags);
static int DatabaseDeleteFile(
const WebKit::WebString& vfs_file_name, bool sync_dir);
diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
index d5871b4..4c2deeb 100644
--- a/content/public/renderer/content_renderer_client.h
+++ b/content/public/renderer/content_renderer_client.h
@@ -182,7 +182,7 @@ class CONTENT_EXPORT ContentRendererClient {
v8::Handle<v8::Context>,
int world_id) {}
- // See WebKit::WebKitPlatformSupport.
+ // See WebKit::Platform.
virtual unsigned long long VisitedLinkHash(const char* canonical_url,
size_t length);
virtual bool IsLinkVisited(unsigned long long link_hash);
diff --git a/content/public/test/render_view_test.cc b/content/public/test/render_view_test.cc
index e0fb125..005cbab 100644
--- a/content/public/test/render_view_test.cc
+++ b/content/public/test/render_view_test.cc
@@ -62,7 +62,7 @@ RenderViewTest::RendererWebKitPlatformSupportImplNoSandbox::
~RendererWebKitPlatformSupportImplNoSandbox() {
}
-WebKit::WebKitPlatformSupport*
+WebKit::Platform*
RenderViewTest::RendererWebKitPlatformSupportImplNoSandbox::Get() {
return webkit_platform_support_.get();
}
diff --git a/content/public/test/render_view_test.h b/content/public/test/render_view_test.h
index b1ee82e..3b1e160 100644
--- a/content/public/test/render_view_test.h
+++ b/content/public/test/render_view_test.h
@@ -16,11 +16,11 @@
#include "content/public/renderer/content_renderer_client.h"
#include "content/public/test/mock_render_thread.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/Platform.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
namespace WebKit {
class WebHistoryItem;
-class WebKitPlatformSupport;
class WebWidget;
}
@@ -41,7 +41,7 @@ class RenderViewTest : public testing::Test {
public:
RendererWebKitPlatformSupportImplNoSandbox();
~RendererWebKitPlatformSupportImplNoSandbox();
- WebKit::WebKitPlatformSupport* Get();
+ WebKit::Platform* Get();
private:
scoped_ptr<RendererWebKitPlatformSupportImplNoSandboxImpl>
diff --git a/content/public/test/unittest_test_suite.cc b/content/public/test/unittest_test_suite.cc
index b7697b8..1a9502e 100644
--- a/content/public/test/unittest_test_suite.cc
+++ b/content/public/test/unittest_test_suite.cc
@@ -16,7 +16,7 @@ namespace content {
#if !defined(OS_IOS)
// A stubbed out WebKit platform support impl.
class UnitTestTestSuite::UnitTestWebKitPlatformSupport
- : public WebKit::WebKitPlatformSupport {
+ : public WebKit::Platform {
public:
UnitTestWebKitPlatformSupport() {}
virtual ~UnitTestWebKitPlatformSupport() {}
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc
index 3649775..24f7e7b 100644
--- a/content/renderer/renderer_webkitplatformsupport_impl.cc
+++ b/content/renderer/renderer_webkitplatformsupport_impl.cc
@@ -83,7 +83,7 @@ using WebKit::WebFileSystem;
using WebKit::WebFrame;
using WebKit::WebGamepads;
using WebKit::WebIDBFactory;
-using WebKit::WebKitPlatformSupport;
+using WebKit::Platform;
using WebKit::WebMediaStreamCenter;
using WebKit::WebMediaStreamCenterClient;
using WebKit::WebRTCPeerConnectionHandler;
@@ -235,11 +235,11 @@ WebKit::WebCookieJar* RendererWebKitPlatformSupportImpl::cookieJar() {
}
bool RendererWebKitPlatformSupportImpl::sandboxEnabled() {
- // As explained in WebKitPlatformSupport.h, this function is used to decide
+ // As explained in Platform.h, this function is used to decide
// whether to allow file system operations to come out of WebKit or not.
// Even if the sandbox is disabled, there's no reason why the code should
// act any differently...unless we're in single process mode. In which
- // case, we have no other choice. WebKitPlatformSupport.h discourages using
+ // case, we have no other choice. Platform.h discourages using
// this switch unless absolutely necessary, so hopefully we won't end up
// with too many code paths being different in single-process mode.
return !CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess);
@@ -508,7 +508,7 @@ RendererWebKitPlatformSupportImpl::SandboxSupport::getRenderStyleForStrike(
//------------------------------------------------------------------------------
-WebKitPlatformSupport::FileHandle
+Platform::FileHandle
RendererWebKitPlatformSupportImpl::databaseOpenFile(
const WebString& vfs_file_name, int desired_flags) {
return DatabaseUtil::DatabaseOpenFile(vfs_file_name, desired_flags);
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.h b/content/renderer/renderer_webkitplatformsupport_impl.h
index 30895b7..d3c415f 100644
--- a/content/renderer/renderer_webkitplatformsupport_impl.h
+++ b/content/renderer/renderer_webkitplatformsupport_impl.h
@@ -34,7 +34,7 @@ class CONTENT_EXPORT RendererWebKitPlatformSupportImpl
void set_plugin_refresh_allowed(bool plugin_refresh_allowed) {
plugin_refresh_allowed_ = plugin_refresh_allowed;
}
- // WebKitPlatformSupport methods:
+ // Platform methods:
virtual WebKit::WebClipboard* clipboard();
virtual WebKit::WebMimeRegistry* mimeRegistry();
virtual WebKit::WebFileUtilities* fileUtilities();
@@ -52,7 +52,7 @@ class CONTENT_EXPORT RendererWebKitPlatformSupportImpl
virtual void suddenTerminationChanged(bool enabled);
virtual WebKit::WebStorageNamespace* createLocalStorageNamespace(
const WebKit::WebString& path, unsigned quota);
- virtual WebKit::WebKitPlatformSupport::FileHandle databaseOpenFile(
+ virtual WebKit::Platform::FileHandle databaseOpenFile(
const WebKit::WebString& vfs_file_name, int desired_flags);
virtual int databaseDeleteFile(const WebKit::WebString& vfs_file_name,
bool sync_dir);
diff --git a/content/worker/worker_webkitplatformsupport_impl.cc b/content/worker/worker_webkitplatformsupport_impl.cc
index 29fdc62..067ea96 100644
--- a/content/worker/worker_webkitplatformsupport_impl.cc
+++ b/content/worker/worker_webkitplatformsupport_impl.cc
@@ -25,12 +25,12 @@
#include "webkit/glue/webfileutilities_impl.h"
#include "webkit/glue/webkit_glue.h"
+using WebKit::Platform;
using WebKit::WebBlobRegistry;
using WebKit::WebClipboard;
using WebKit::WebFileInfo;
using WebKit::WebFileSystem;
using WebKit::WebFileUtilities;
-using WebKit::WebKitPlatformSupport;
using WebKit::WebMessagePortChannel;
using WebKit::WebMimeRegistry;
using WebKit::WebSandboxSupport;
@@ -170,7 +170,7 @@ void WorkerWebKitPlatformSupportImpl::dispatchStorageEvent(
NOTREACHED();
}
-WebKitPlatformSupport::FileHandle
+Platform::FileHandle
WorkerWebKitPlatformSupportImpl::databaseOpenFile(
const WebString& vfs_file_name, int desired_flags) {
return DatabaseUtil::DatabaseOpenFile(vfs_file_name, desired_flags);
diff --git a/content/worker/worker_webkitplatformsupport_impl.h b/content/worker/worker_webkitplatformsupport_impl.h
index a0430a5..b2c7d35 100644
--- a/content/worker/worker_webkitplatformsupport_impl.h
+++ b/content/worker/worker_webkitplatformsupport_impl.h
@@ -49,7 +49,7 @@ class WorkerWebKitPlatformSupportImpl : public WebKitPlatformSupportImpl,
const WebKit::WebString& new_value, const WebKit::WebString& origin,
const WebKit::WebURL& url, bool is_local_storage);
- virtual WebKit::WebKitPlatformSupport::FileHandle databaseOpenFile(
+ virtual WebKit::Platform::FileHandle databaseOpenFile(
const WebKit::WebString& vfs_file_name, int desired_flags);
virtual int databaseDeleteFile(const WebKit::WebString& vfs_file_name,
bool sync_dir);
generated by cgit v1.1 at 2025-02-19 09:04:02 +0000