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

Unified Diff: content/browser/plugin_loader_posix.cc

Issue 8440042: Send the index in the canonical list over IPC when using the OOP plugin loader. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: uint32_t Created 9 years, 1 month 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/browser/plugin_loader_posix.h ('k') | content/browser/plugin_loader_posix_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/plugin_loader_posix.cc
diff --git a/content/browser/plugin_loader_posix.cc b/content/browser/plugin_loader_posix.cc
index 14d7c02eef018a4a2473340f8d92fd13465ce21d..15ab75c4c22882d47b9dfc1ee8555e5023a6abd8 100644
--- a/content/browser/plugin_loader_posix.cc
+++ b/content/browser/plugin_loader_posix.cc
@@ -101,10 +101,11 @@ void PluginLoaderPosix::LoadPluginsInternal() {
process_host_->Send(new UtilityMsg_LoadPlugins(canonical_list_));
}
-void PluginLoaderPosix::OnPluginLoaded(const webkit::WebPluginInfo& plugin) {
- if (plugin.path.value() != canonical_list_[next_load_index_].value()) {
+void PluginLoaderPosix::OnPluginLoaded(uint32_t index,
+ const webkit::WebPluginInfo& plugin) {
+ if (index != next_load_index_) {
LOG(ERROR) << "Received unexpected plugin load message for "
- << plugin.path.value();
+ << plugin.path.value() << "; index=" << index;
return;
}
@@ -116,10 +117,11 @@ void PluginLoaderPosix::OnPluginLoaded(const webkit::WebPluginInfo& plugin) {
MaybeRunPendingCallbacks();
}
-void PluginLoaderPosix::OnPluginLoadFailed(const FilePath& plugin_path) {
- if (plugin_path.value() != canonical_list_[next_load_index_].value()) {
+void PluginLoaderPosix::OnPluginLoadFailed(uint32_t index,
+ const FilePath& plugin_path) {
+ if (index != next_load_index_) {
LOG(ERROR) << "Received unexpected plugin load failure message for "
- << plugin_path.value();
+ << plugin_path.value() << "; index=" << index;
return;
}
« no previous file with comments | « content/browser/plugin_loader_posix.h ('k') | content/browser/plugin_loader_posix_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698