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

Side by Side Diff: content/common/npobject_stub.h

Issue 9959078: Revert 128179 - Make sure the plugin scriptable object is released before NPP_Destroy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | content/plugin/webplugin_delegate_stub.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 // 4 //
5 // A class that receives IPC messages from an NPObjectProxy and calls the real 5 // A class that receives IPC messages from an NPObjectProxy and calls the real
6 // NPObject. 6 // NPObject.
7 7
8 #ifndef CONTENT_COMMON_NPOBJECT_STUB_H_ 8 #ifndef CONTENT_COMMON_NPOBJECT_STUB_H_
9 #define CONTENT_COMMON_NPOBJECT_STUB_H_ 9 #define CONTENT_COMMON_NPOBJECT_STUB_H_
10 #pragma once 10 #pragma once
11 11
(...skipping 22 matching lines...) Expand all
34 NPObjectStub(NPObject* npobject, 34 NPObjectStub(NPObject* npobject,
35 NPChannelBase* channel, 35 NPChannelBase* channel,
36 int route_id, 36 int route_id,
37 gfx::NativeViewId containing_window, 37 gfx::NativeViewId containing_window,
38 const GURL& page_url); 38 const GURL& page_url);
39 virtual ~NPObjectStub(); 39 virtual ~NPObjectStub();
40 40
41 // Schedules tear-down of this stub. The underlying NPObject reference is 41 // Schedules tear-down of this stub. The underlying NPObject reference is
42 // released, and further invokations form the IPC channel will fail once this 42 // released, and further invokations form the IPC channel will fail once this
43 // call has returned. Deletion of the stub is deferred to the main loop, in 43 // call has returned. Deletion of the stub is deferred to the main loop, in
44 // case it is touched as the stack unwinds. DeleteSoon() is safe to call 44 // case it is touched as the stack unwinds.
45 // more than once, until control returns to the main loop.
46 void DeleteSoon(); 45 void DeleteSoon();
47 46
48 // IPC::Message::Sender implementation: 47 // IPC::Message::Sender implementation:
49 virtual bool Send(IPC::Message* msg) OVERRIDE; 48 virtual bool Send(IPC::Message* msg) OVERRIDE;
50 49
51 // NPObjectBase implementation. 50 // NPObjectBase implementation.
52 virtual NPObject* GetUnderlyingNPObject() OVERRIDE; 51 virtual NPObject* GetUnderlyingNPObject() OVERRIDE;
53 virtual IPC::Channel::Listener* GetChannelListener() OVERRIDE; 52 virtual IPC::Channel::Listener* GetChannelListener() OVERRIDE;
54 53
55 private: 54 private:
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 NPObject* npobject_; 86 NPObject* npobject_;
88 scoped_refptr<NPChannelBase> channel_; 87 scoped_refptr<NPChannelBase> channel_;
89 int route_id_; 88 int route_id_;
90 gfx::NativeViewId containing_window_; 89 gfx::NativeViewId containing_window_;
91 90
92 // The url of the main frame hosting the plugin. 91 // The url of the main frame hosting the plugin.
93 GURL page_url_; 92 GURL page_url_;
94 }; 93 };
95 94
96 #endif // CONTENT_COMMON_NPOBJECT_STUB_H_ 95 #endif // CONTENT_COMMON_NPOBJECT_STUB_H_
OLDNEW
« no previous file with comments | « no previous file | content/plugin/webplugin_delegate_stub.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698