diff options
author | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-04 17:26:52 +0000 |
---|---|---|
committer | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-04 17:26:52 +0000 |
commit | 55b5d15b3d371a85b9cbbb4cecd42d751949c820 (patch) | |
tree | 63d3e8aebd55c955718e177b0319bc218f8957ea /pdf | |
parent | 68c88b0f0a645ac90365686f82edb5cb5580c2e9 (diff) | |
download | chromium_src-55b5d15b3d371a85b9cbbb4cecd42d751949c820.zip chromium_src-55b5d15b3d371a85b9cbbb4cecd42d751949c820.tar.gz chromium_src-55b5d15b3d371a85b9cbbb4cecd42d751949c820.tar.bz2 |
Revert 273547 "Reset scoped_ptr to make plugin crash before ente..."
> Reset scoped_ptr to make plugin crash before entering engine_->HandleDocumentLoad, if called for deleted "Instance".
> Suspecting method call for deleted instance.
>
> Example to explain why reset() makes difference:
>
> scoped_ptr<int>* pt = NULL;
> {
> scoped_ptr<int> t(new int);
> pt = &t;
> }
> DCHECK(!(*pt)); // Fail
> {
> scoped_ptr<int> t(new int);
> pt = &t;
> t.reset();
> }
> DCHECK(!(*pt)); // OK
>
> BUG=372095,372548
>
> Review URL: https://codereview.chromium.org/300403002
TBR=vitalybuka@chromium.org
Review URL: https://codereview.chromium.org/318743003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274854 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'pdf')
-rw-r--r-- | pdf/instance.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/pdf/instance.cc b/pdf/instance.cc index 7e62648..a17db57 100644 --- a/pdf/instance.cc +++ b/pdf/instance.cc @@ -308,10 +308,6 @@ Instance::Instance(PP_Instance instance) Instance::~Instance() { RemovePerInstanceObject(kPPPPdfInterface, this); - // TODO(vitalybuka): remove after crbug.com/372095 fixed. - // Reset to NULL to make it crash in HandleDocumentLoad if called for - // deleted instance. scoped_ptr::~scoped_ptr does not reset pointer to NULL. - engine_.reset(); } bool Instance::Init(uint32_t argc, const char* argn[], const char* argv[]) { |