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

Unified Diff: content/child/blink_platform_impl.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/child/blink_platform_impl.cc
diff --git a/content/child/blink_platform_impl.cc b/content/child/blink_platform_impl.cc
index d5b536727c98045967c2c2f999704dc9c55b185f..a8d488ac58a3d6fc457beb259064d0852f8dddf7 100644
--- a/content/child/blink_platform_impl.cc
+++ b/content/child/blink_platform_impl.cc
@@ -31,7 +31,7 @@
#include "content/app/resources/grit/content_resources.h"
#include "content/app/strings/grit/content_strings.h"
#include "content/child/bluetooth/web_bluetooth_impl.h"
-#include "content/child/child_thread.h"
+#include "content/child/child_thread_impl.h"
#include "content/child/content_child_helpers.h"
#include "content/child/geofencing/web_geofencing_provider_impl.h"
#include "content/child/navigator_connect/navigator_connect_provider.h"
@@ -436,15 +436,15 @@ BlinkPlatformImpl::BlinkPlatformImpl(
void BlinkPlatformImpl::InternalInit() {
// ChildThread may not exist in some tests.
- if (ChildThread::current()) {
+ if (ChildThreadImpl::current()) {
geofencing_provider_.reset(new WebGeofencingProviderImpl(
- ChildThread::current()->thread_safe_sender()));
+ ChildThreadImpl::current()->thread_safe_sender()));
bluetooth_.reset(
- new WebBluetoothImpl(ChildThread::current()->thread_safe_sender()));
- thread_safe_sender_ = ChildThread::current()->thread_safe_sender();
+ new WebBluetoothImpl(ChildThreadImpl::current()->thread_safe_sender()));
+ thread_safe_sender_ = ChildThreadImpl::current()->thread_safe_sender();
notification_dispatcher_ =
- ChildThread::current()->notification_dispatcher();
- push_dispatcher_ = ChildThread::current()->push_dispatcher();
+ ChildThreadImpl::current()->notification_dispatcher();
+ push_dispatcher_ = ChildThreadImpl::current()->push_dispatcher();
}
if (main_thread_task_runner_.get()) {
@@ -456,7 +456,7 @@ BlinkPlatformImpl::~BlinkPlatformImpl() {
}
WebURLLoader* BlinkPlatformImpl::createURLLoader() {
- ChildThread* child_thread = ChildThread::current();
+ ChildThreadImpl* child_thread = ChildThreadImpl::current();
// There may be no child thread in RenderViewTests. These tests can still use
// data URLs to bypass the ResourceDispatcher.
return new WebURLLoaderImpl(

Powered by Google App Engine
This is Rietveld 408576698