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

Unified Diff: content/gpu/gpu_child_thread.cc

Issue 897563002: Unify the three places that patch font loading for PDFium on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
Index: content/gpu/gpu_child_thread.cc
diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc
index b7846f43c8f43967ad6c362f2ebb11b6f5467121..1064a70adc111cae2969eafde6b6368b4335d886 100644
--- a/content/gpu/gpu_child_thread.cc
+++ b/content/gpu/gpu_child_thread.cc
@@ -44,8 +44,8 @@ bool GpuProcessLogMessageHandler(int severity,
return false;
}
-ChildThread::Options GetOptions() {
- ChildThread::Options options;
+ChildThreadImpl::Options GetOptions() {
+ ChildThreadImpl::Options options;
#if defined(USE_OZONE)
IPC::MessageFilter* message_filter = ui::OzonePlatform::GetInstance()
@@ -64,7 +64,7 @@ GpuChildThread::GpuChildThread(GpuWatchdogThread* watchdog_thread,
bool dead_on_arrival,
const gpu::GPUInfo& gpu_info,
const DeferredMessages& deferred_messages)
- : ChildThread(GetOptions()),
+ : ChildThreadImpl(GetOptions()),
dead_on_arrival_(dead_on_arrival),
gpu_info_(gpu_info),
deferred_messages_(deferred_messages),
@@ -77,7 +77,7 @@ GpuChildThread::GpuChildThread(GpuWatchdogThread* watchdog_thread,
}
GpuChildThread::GpuChildThread(const std::string& channel_id)
- : ChildThread(Options(channel_id, false)),
+ : ChildThreadImpl(Options(channel_id, false)),
dead_on_arrival_(false),
in_browser_process_(true) {
#if defined(OS_WIN)
@@ -102,7 +102,7 @@ GpuChildThread::~GpuChildThread() {
}
void GpuChildThread::Shutdown() {
- ChildThread::Shutdown();
+ ChildThreadImpl::Shutdown();
logging::SetLogMessageHandler(NULL);
}
@@ -115,7 +115,7 @@ bool GpuChildThread::Send(IPC::Message* msg) {
// process. This could result in deadlock.
DCHECK(!msg->is_sync());
- return ChildThread::Send(msg);
+ return ChildThreadImpl::Send(msg);
}
bool GpuChildThread::OnControlMessageReceived(const IPC::Message& msg) {

Powered by Google App Engine
This is Rietveld 408576698