Commit 5f483236 authored by trchen's avatar trchen Committed by Commit bot

Revert of Fix WebViewPlugin::scheduleAnimation crash (patchset #2 id:20001 of...

Revert of Fix WebViewPlugin::scheduleAnimation crash (patchset #2 id:20001 of https://codereview.chromium.org/1137663006/)

Reason for revert:
This is converting the original crash to another crash. Will need another null check.

Original issue's description:
> Fix WebViewPlugin::scheduleAnimation crash
>
> The crash was probably due to accessing a dangling pointer to the plugin
> container during a small time frame between PepperWebPluginImpl::destroy()
> and the destructor being called. (Speculated from source since no reliable
> repro is found.)
>
> This CL clears eveything in the destroy() function as if the destructor has
> been called, only delaying memory release.
>
> R=tommycli
> BUG=483068
>
> Committed: https://crrev.com/6a9b5b10ff3515adb47718fc23ebe039a9e3b9ff
> Cr-Commit-Position: refs/heads/master@{#329309}

TBR=tommycli@chromium.org,raymes@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=487607,483068

Review URL: https://codereview.chromium.org/1127293004

Cr-Commit-Position: refs/heads/master@{#329715}
parent 5d6949c9
......@@ -699,8 +699,6 @@ void PepperPluginInstanceImpl::Delete() {
fullscreen_container_ = NULL;
}
throttler_.reset();
// Force-unbind any Graphics. In the case of Graphics2D, if the plugin
// leaks the graphics 2D, it may actually get cleaned up after our
// destruction, so we need its pointers to be up-to-date.
......
......@@ -124,7 +124,6 @@ void PepperWebPluginImpl::destroy() {
// Tell |container_| to clear references to this plugin's script objects.
if (container_)
container_->clearScriptObjects();
container_ = nullptr;
if (instance_.get()) {
ppapi::PpapiGlobals::Get()->GetVarTracker()->ReleaseVar(instance_object_);
......@@ -132,7 +131,6 @@ void PepperWebPluginImpl::destroy() {
instance_->Delete();
instance_ = NULL;
}
throttler_.reset();
base::MessageLoop::current()->DeleteSoon(FROM_HERE, this);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment