Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(201)

Unified Diff: content/child/webkitplatformsupport_child_impl.cc

Issue 148333009: Move webkit/child/webkitplatformsupport_child_impl to content/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes for Windows and Android builds, plus fix nits Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/child/webkitplatformsupport_child_impl.h ('k') | content/child/webkitplatformsupport_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/webkitplatformsupport_child_impl.cc
diff --git a/webkit/child/webkitplatformsupport_child_impl.cc b/content/child/webkitplatformsupport_child_impl.cc
similarity index 81%
rename from webkit/child/webkitplatformsupport_child_impl.cc
rename to content/child/webkitplatformsupport_child_impl.cc
index 7253540d1295871f2f63bcab73bc806c8c683b77..2f2b1b6e57f2d2a6738a8481105149365a943456 100644
--- a/webkit/child/webkitplatformsupport_child_impl.cc
+++ b/content/child/webkitplatformsupport_child_impl.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "webkit/child/webkitplatformsupport_child_impl.h"
+#include "content/child/webkitplatformsupport_child_impl.h"
#include "base/memory/discardable_memory.h"
#include "base/memory/scoped_ptr.h"
@@ -21,7 +21,7 @@
using blink::WebFallbackThemeEngine;
using blink::WebThemeEngine;
-namespace webkit_glue {
+namespace content {
namespace {
@@ -46,7 +46,7 @@ class WebWaitableEventImpl : public blink::WebWaitableEvent {
WebKitPlatformSupportChildImpl::WebKitPlatformSupportChildImpl()
: current_thread_slot_(&DestroyCurrentThread),
- fling_curve_configuration_(new FlingCurveConfiguration) {}
+ fling_curve_configuration_(new webkit_glue::FlingCurveConfiguration) {}
WebKitPlatformSupportChildImpl::~WebKitPlatformSupportChildImpl() {}
@@ -70,7 +70,7 @@ WebKitPlatformSupportChildImpl::createFlingAnimationCurve(
const blink::WebFloatPoint& velocity,
const blink::WebSize& cumulative_scroll) {
#if defined(OS_ANDROID)
- return FlingAnimatorImpl::CreateAndroidGestureCurve(velocity,
+ return webkit_glue::FlingAnimatorImpl::CreateAndroidGestureCurve(velocity,
cumulative_scroll);
#endif
@@ -84,12 +84,13 @@ WebKitPlatformSupportChildImpl::createFlingAnimationCurve(
blink::WebThread* WebKitPlatformSupportChildImpl::createThread(
const char* name) {
- return new WebThreadImpl(name);
+ return new webkit_glue::WebThreadImpl(name);
}
blink::WebThread* WebKitPlatformSupportChildImpl::currentThread() {
- WebThreadImplForMessageLoop* thread =
- static_cast<WebThreadImplForMessageLoop*>(current_thread_slot_.Get());
+ webkit_glue::WebThreadImplForMessageLoop* thread =
+ static_cast<webkit_glue::WebThreadImplForMessageLoop*>(
+ current_thread_slot_.Get());
if (thread)
return (thread);
@@ -98,7 +99,7 @@ blink::WebThread* WebKitPlatformSupportChildImpl::currentThread() {
if (!message_loop.get())
return NULL;
- thread = new WebThreadImplForMessageLoop(message_loop.get());
+ thread = new webkit_glue::WebThreadImplForMessageLoop(message_loop.get());
current_thread_slot_.Set(thread);
return thread;
}
@@ -119,13 +120,15 @@ blink::WebWaitableEvent* WebKitPlatformSupportChildImpl::waitMultipleEvents(
void WebKitPlatformSupportChildImpl::didStartWorkerRunLoop(
const blink::WebWorkerRunLoop& runLoop) {
- WorkerTaskRunner* worker_task_runner = WorkerTaskRunner::Instance();
+ webkit_glue::WorkerTaskRunner* worker_task_runner =
+ webkit_glue::WorkerTaskRunner::Instance();
worker_task_runner->OnWorkerRunLoopStarted(runLoop);
}
void WebKitPlatformSupportChildImpl::didStopWorkerRunLoop(
const blink::WebWorkerRunLoop& runLoop) {
- WorkerTaskRunner* worker_task_runner = WorkerTaskRunner::Instance();
+ webkit_glue::WorkerTaskRunner* worker_task_runner =
+ webkit_glue::WorkerTaskRunner::Instance();
worker_task_runner->OnWorkerRunLoopStopped(runLoop);
}
@@ -135,14 +138,15 @@ WebKitPlatformSupportChildImpl::allocateAndLockDiscardableMemory(size_t bytes) {
base::DiscardableMemory::GetPreferredType();
if (type == base::DISCARDABLE_MEMORY_TYPE_EMULATED)
return NULL;
- return WebDiscardableMemoryImpl::CreateLockedMemory(bytes).release();
+ return webkit_glue::WebDiscardableMemoryImpl::CreateLockedMemory(
+ bytes).release();
}
// static
void WebKitPlatformSupportChildImpl::DestroyCurrentThread(void* thread) {
- WebThreadImplForMessageLoop* impl =
- static_cast<WebThreadImplForMessageLoop*>(thread);
+ webkit_glue::WebThreadImplForMessageLoop* impl =
+ static_cast<webkit_glue::WebThreadImplForMessageLoop*>(thread);
delete impl;
}
-} // namespace webkit_glue
+} // namespace content
« no previous file with comments | « content/child/webkitplatformsupport_child_impl.h ('k') | content/child/webkitplatformsupport_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698