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

Unified Diff: content/renderer/pepper/pepper_plugin_instance_impl.cc

Issue 1457963002: Use scoped_ptr instead of linked_ptr from /content/renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix android compile error Created 5 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/renderer/pepper/host_var_tracker.h ('k') | content/renderer/pepper/video_decoder_shim.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/pepper/pepper_plugin_instance_impl.cc
diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.cc b/content/renderer/pepper/pepper_plugin_instance_impl.cc
index a4e73c5054d07d312a1756f0f54961aa3936cf03..028d936b1b7a5f9eb1365bd3c91747db3ab0e57b 100644
--- a/content/renderer/pepper/pepper_plugin_instance_impl.cc
+++ b/content/renderer/pepper/pepper_plugin_instance_impl.cc
@@ -8,7 +8,6 @@
#include "base/callback_helpers.h"
#include "base/location.h"
#include "base/logging.h"
-#include "base/memory/linked_ptr.h"
#include "base/metrics/histogram.h"
#include "base/single_thread_task_runner.h"
#include "base/stl_util.h"
@@ -2119,14 +2118,11 @@ void PepperPluginInstanceImpl::SimulateInputEvent(
if (handled)
return;
- std::vector<linked_ptr<WebInputEvent> > events =
- CreateSimulatedWebInputEvents(
- input_event,
- view_data_.rect.point.x + view_data_.rect.size.width / 2,
- view_data_.rect.point.y + view_data_.rect.size.height / 2);
- for (std::vector<linked_ptr<WebInputEvent> >::iterator it = events.begin();
- it != events.end();
- ++it) {
+ std::vector<scoped_ptr<WebInputEvent>> events = CreateSimulatedWebInputEvents(
+ input_event, view_data_.rect.point.x + view_data_.rect.size.width / 2,
+ view_data_.rect.point.y + view_data_.rect.size.height / 2);
+ for (std::vector<scoped_ptr<WebInputEvent>>::iterator it = events.begin();
+ it != events.end(); ++it) {
web_view->handleInputEvent(*it->get());
}
}
« no previous file with comments | « content/renderer/pepper/host_var_tracker.h ('k') | content/renderer/pepper/video_decoder_shim.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698