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

Side by Side Diff: content/plugin/plugin_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, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/plugin/plugin_thread.h" 5 #include "content/plugin/plugin_thread.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 8
9 #if defined(OS_MACOSX) 9 #if defined(OS_MACOSX)
10 #include <CoreFoundation/CoreFoundation.h> 10 #include <CoreFoundation/CoreFoundation.h>
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 } 99 }
100 100
101 PluginThread::~PluginThread() { 101 PluginThread::~PluginThread() {
102 } 102 }
103 103
104 void PluginThread::SetForcefullyTerminatePluginProcess() { 104 void PluginThread::SetForcefullyTerminatePluginProcess() {
105 forcefully_terminate_plugin_process_ = true; 105 forcefully_terminate_plugin_process_ = true;
106 } 106 }
107 107
108 void PluginThread::Shutdown() { 108 void PluginThread::Shutdown() {
109 ChildThread::Shutdown(); 109 ChildThreadImpl::Shutdown();
110 110
111 if (preloaded_plugin_module_) { 111 if (preloaded_plugin_module_) {
112 base::UnloadNativeLibrary(preloaded_plugin_module_); 112 base::UnloadNativeLibrary(preloaded_plugin_module_);
113 preloaded_plugin_module_ = NULL; 113 preloaded_plugin_module_ = NULL;
114 } 114 }
115 NPChannelBase::CleanupChannels(); 115 NPChannelBase::CleanupChannels();
116 PluginLib::UnloadAllPlugins(); 116 PluginLib::UnloadAllPlugins();
117 117
118 if (forcefully_terminate_plugin_process_) 118 if (forcefully_terminate_plugin_process_)
119 base::KillProcess(base::GetCurrentProcessHandle(), 0, /* wait= */ false); 119 base::KillProcess(base::GetCurrentProcessHandle(), 0, /* wait= */ false);
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 } 152 }
153 153
154 Send(new PluginProcessHostMsg_ChannelCreated(channel_handle)); 154 Send(new PluginProcessHostMsg_ChannelCreated(channel_handle));
155 } 155 }
156 156
157 void PluginThread::OnNotifyRenderersOfPendingShutdown() { 157 void PluginThread::OnNotifyRenderersOfPendingShutdown() {
158 PluginChannel::NotifyRenderersOfPendingShutdown(); 158 PluginChannel::NotifyRenderersOfPendingShutdown();
159 } 159 }
160 160
161 } // namespace content 161 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698