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

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

Issue 2155583004: Plugins: Remove obsolete check in PepperWebPluginImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove extra check Created 4 years, 5 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
« no previous file with comments | « content/renderer/pepper/pepper_webplugin_impl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/pepper/pepper_webplugin_impl.cc
diff --git a/content/renderer/pepper/pepper_webplugin_impl.cc b/content/renderer/pepper/pepper_webplugin_impl.cc
index 3949db81188b30159e9e162361643513944423d4..d685ac2438fd967834fd5030f1516e6948209313 100644
--- a/content/renderer/pepper/pepper_webplugin_impl.cc
+++ b/content/renderer/pepper/pepper_webplugin_impl.cc
@@ -67,8 +67,7 @@ PepperWebPluginImpl::PepperWebPluginImpl(
full_frame_(params.loadManually),
throttler_(std::move(throttler)),
instance_object_(PP_MakeUndefined()),
- container_(nullptr),
- destroyed_(false) {
+ container_(nullptr) {
DCHECK(plugin_module);
init_data_->module = plugin_module;
init_data_->render_frame = render_frame;
@@ -111,8 +110,6 @@ bool PepperWebPluginImpl::initialize(WebPluginContainer* container) {
if (!container_)
return false;
- DCHECK(!destroyed_);
-
DCHECK(instance_);
ppapi::PpapiGlobals::Get()->GetVarTracker()->ReleaseVar(instance_object_);
instance_object_ = PP_MakeUndefined();
@@ -144,10 +141,6 @@ bool PepperWebPluginImpl::initialize(WebPluginContainer* container) {
}
void PepperWebPluginImpl::destroy() {
- // TODO(tommycli): Remove once we fix https://crbug.com/588624.
- CHECK(!destroyed_);
- destroyed_ = true;
-
container_ = nullptr;
if (instance_) {
« no previous file with comments | « content/renderer/pepper/pepper_webplugin_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698