| Index: webkit/child/webkitplatformsupport_impl.cc
|
| diff --git a/webkit/child/webkitplatformsupport_impl.cc b/webkit/child/webkitplatformsupport_impl.cc
|
| index 9bdcd25615093e92910244d1f039c018308aae5e..b7fae24e9779c1f23b4d138b7751ae3a4e14c25d 100644
|
| --- a/webkit/child/webkitplatformsupport_impl.cc
|
| +++ b/webkit/child/webkitplatformsupport_impl.cc
|
| @@ -55,17 +55,17 @@
|
| #include "base/android/sys_utils.h"
|
| #endif
|
|
|
| -using WebKit::WebAudioBus;
|
| -using WebKit::WebCookie;
|
| -using WebKit::WebData;
|
| -using WebKit::WebLocalizedString;
|
| -using WebKit::WebPluginListBuilder;
|
| -using WebKit::WebString;
|
| -using WebKit::WebSocketStreamHandle;
|
| -using WebKit::WebURL;
|
| -using WebKit::WebURLError;
|
| -using WebKit::WebURLLoader;
|
| -using WebKit::WebVector;
|
| +using blink::WebAudioBus;
|
| +using blink::WebCookie;
|
| +using blink::WebData;
|
| +using blink::WebLocalizedString;
|
| +using blink::WebPluginListBuilder;
|
| +using blink::WebString;
|
| +using blink::WebSocketStreamHandle;
|
| +using blink::WebURL;
|
| +using blink::WebURLError;
|
| +using blink::WebURLLoader;
|
| +using blink::WebVector;
|
|
|
| namespace {
|
|
|
| @@ -469,11 +469,11 @@ long* WebKitPlatformSupportImpl::getTraceSamplingState(
|
| }
|
|
|
| COMPILE_ASSERT(
|
| - sizeof(WebKit::Platform::TraceEventHandle) ==
|
| + sizeof(blink::Platform::TraceEventHandle) ==
|
| sizeof(base::debug::TraceEventHandle),
|
| TraceEventHandle_types_must_be_same_size);
|
|
|
| -WebKit::Platform::TraceEventHandle WebKitPlatformSupportImpl::addTraceEvent(
|
| +blink::Platform::TraceEventHandle WebKitPlatformSupportImpl::addTraceEvent(
|
| char phase,
|
| const unsigned char* category_group_enabled,
|
| const char* name,
|
| @@ -486,7 +486,7 @@ WebKit::Platform::TraceEventHandle WebKitPlatformSupportImpl::addTraceEvent(
|
| base::debug::TraceEventHandle handle = TRACE_EVENT_API_ADD_TRACE_EVENT(
|
| phase, category_group_enabled, name, id,
|
| num_args, arg_names, arg_types, arg_values, NULL, flags);
|
| - WebKit::Platform::TraceEventHandle result;
|
| + blink::Platform::TraceEventHandle result;
|
| memcpy(&result, &handle, sizeof(result));
|
| return result;
|
| }
|
| @@ -794,35 +794,35 @@ void WebKitPlatformSupportImpl::callOnMainThread(
|
| }
|
|
|
| base::PlatformFile WebKitPlatformSupportImpl::databaseOpenFile(
|
| - const WebKit::WebString& vfs_file_name, int desired_flags) {
|
| + const blink::WebString& vfs_file_name, int desired_flags) {
|
| return base::kInvalidPlatformFileValue;
|
| }
|
|
|
| int WebKitPlatformSupportImpl::databaseDeleteFile(
|
| - const WebKit::WebString& vfs_file_name, bool sync_dir) {
|
| + const blink::WebString& vfs_file_name, bool sync_dir) {
|
| return -1;
|
| }
|
|
|
| long WebKitPlatformSupportImpl::databaseGetFileAttributes(
|
| - const WebKit::WebString& vfs_file_name) {
|
| + const blink::WebString& vfs_file_name) {
|
| return 0;
|
| }
|
|
|
| long long WebKitPlatformSupportImpl::databaseGetFileSize(
|
| - const WebKit::WebString& vfs_file_name) {
|
| + const blink::WebString& vfs_file_name) {
|
| return 0;
|
| }
|
|
|
| long long WebKitPlatformSupportImpl::databaseGetSpaceAvailableForOrigin(
|
| - const WebKit::WebString& origin_identifier) {
|
| + const blink::WebString& origin_identifier) {
|
| return 0;
|
| }
|
|
|
| -WebKit::WebString WebKitPlatformSupportImpl::signedPublicKeyAndChallengeString(
|
| +blink::WebString WebKitPlatformSupportImpl::signedPublicKeyAndChallengeString(
|
| unsigned key_size_index,
|
| - const WebKit::WebString& challenge,
|
| - const WebKit::WebURL& url) {
|
| - return WebKit::WebString("");
|
| + const blink::WebString& challenge,
|
| + const blink::WebURL& url) {
|
| + return blink::WebString("");
|
| }
|
|
|
| static scoped_ptr<base::ProcessMetrics> CurrentProcessMetrics() {
|
| @@ -864,7 +864,7 @@ size_t WebKitPlatformSupportImpl::physicalMemoryMB() {
|
| }
|
|
|
| void WebKitPlatformSupportImpl::startHeapProfiling(
|
| - const WebKit::WebString& prefix) {
|
| + const blink::WebString& prefix) {
|
| // FIXME(morrita): Make this built on windows.
|
| #if !defined(NO_TCMALLOC) && defined(USE_TCMALLOC) && !defined(OS_WIN)
|
| HeapProfilerStart(prefix.utf8().data());
|
| @@ -878,7 +878,7 @@ void WebKitPlatformSupportImpl::stopHeapProfiling() {
|
| }
|
|
|
| void WebKitPlatformSupportImpl::dumpHeapProfiling(
|
| - const WebKit::WebString& reason) {
|
| + const blink::WebString& reason) {
|
| #if !defined(NO_TCMALLOC) && defined(USE_TCMALLOC) && !defined(OS_WIN)
|
| HeapProfilerDump(reason.utf8().data());
|
| #endif
|
|
|