diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-23 06:27:30 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-23 06:27:30 +0000 |
| commit | 1eb70a2fec054f272adfb991801caf29f53edbe1 (patch) | |
| tree | 4e1425f5b69f50b4ca878463da0a1b47dea75de0 /webkit | |
| parent | fa436970b87076df3de5479e1abf071af13c9bcf (diff) | |
| download | chromium_src-1eb70a2fec054f272adfb991801caf29f53edbe1.zip chromium_src-1eb70a2fec054f272adfb991801caf29f53edbe1.tar.gz chromium_src-1eb70a2fec054f272adfb991801caf29f53edbe1.tar.bz2 | |
Revert 89221 - Reverting this to see if the Flash crashes on Mac canary are due to this CL.
Revert 88773 - Don't retain NPNVWindowNPObject and NPNVPluginElementNPObject twice
Both NPN_GetValue and WebPluginProxy take a reference on access, with
the latter conflating the caller's reference and its internal reference.
To be consistent with WebPluginImpl, let WebPluginProxy only manage its
internal reference and leave the plugin's reference to NPN_GetValue.
Document this in the WebPlugin interface.
Also release plugin-side proxies when WebPluginProxy is destroyed.
R=ananta
BUG=86124
TEST=none
Review URL: http://codereview.chromium.org/6693052
TBR=davidben@chromium.org
Review URL: http://codereview.chromium.org/7171021
TBR=ananta@chromium.org
Review URL: http://codereview.chromium.org/7239010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90170 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/plugins/npapi/webplugin.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/webkit/plugins/npapi/webplugin.h b/webkit/plugins/npapi/webplugin.h index 8b43eb4..986d828 100644 --- a/webkit/plugins/npapi/webplugin.h +++ b/webkit/plugins/npapi/webplugin.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -93,10 +93,12 @@ class WebPlugin { virtual void Invalidate() = 0; virtual void InvalidateRect(const gfx::Rect& rect) = 0; - // Returns the NPObject for the browser's window object. + // Returns the NPObject for the browser's window object. Does not + // take a reference. virtual NPObject* GetWindowScriptNPObject() = 0; - // Returns the DOM element that loaded the plugin. + // Returns the DOM element that loaded the plugin. Does not take a + // reference. virtual NPObject* GetPluginElement() = 0; // Cookies |