summaryrefslogtreecommitdiffstats
path: root/content/app
diff options
context:
space:
mode:
authorjam <jam@chromium.org>2015-02-03 10:16:08 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-03 18:16:56 +0000
commit8a021512a24f87d3b1723f260e0380b874f3b9eb (patch)
treefe0fd8bea7c18d5b6d6f28338d150db187512866 /content/app
parent4adea21c6771ac1aaa6260524c3c283e85415672 (diff)
downloadchromium_src-8a021512a24f87d3b1723f260e0380b874f3b9eb.zip
chromium_src-8a021512a24f87d3b1723f260e0380b874f3b9eb.tar.gz
chromium_src-8a021512a24f87d3b1723f260e0380b874f3b9eb.tar.bz2
Unify the three places that patch font loading for PDFium on Windows.
This also removed the code from content, which doesn't belong there because it's for a feature in Chrome. In order to implement this in a unified way, I needed to create a public interface around ChildThread. A lot of the change is updating callers of ChildThread to use ChildThreadImpl instead. BUG=448473 Review URL: https://codereview.chromium.org/897563002 Cr-Commit-Position: refs/heads/master@{#314367}
Diffstat (limited to 'content/app')
-rw-r--r--content/app/android/child_process_service.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/content/app/android/child_process_service.cc b/content/app/android/child_process_service.cc
index 9d46e08..93c622e 100644
--- a/content/app/android/child_process_service.cc
+++ b/content/app/android/child_process_service.cc
@@ -12,7 +12,7 @@
#include "base/android/memory_pressure_listener_android.h"
#include "base/logging.h"
#include "base/posix/global_descriptors.h"
-#include "content/child/child_thread.h"
+#include "content/child/child_thread_impl.h"
#include "content/common/android/surface_texture_manager.h"
#include "content/common/android/surface_texture_peer.h"
#include "content/common/gpu/gpu_surface_lookup.h"
@@ -188,7 +188,7 @@ bool RegisterChildProcessService(JNIEnv* env) {
}
void ShutdownMainThread(JNIEnv* env, jobject obj) {
- ChildThread::ShutdownThread();
+ ChildThreadImpl::ShutdownThread();
}
} // namespace content