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

Side by Side Diff: trunk/src/webkit/plugins/npapi/webplugin_delegate_impl.cc

Issue 15757007: Revert 202364 "Track NPObject ownership by the originating plugi..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 6 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "webkit/plugins/npapi/webplugin_delegate_impl.h" 5 #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 return; 179 return;
180 #if !defined(OS_WIN) // See SetFocus above. 180 #if !defined(OS_WIN) // See SetFocus above.
181 SetPluginHasFocus(containing_view_has_focus_ && has_webkit_focus_); 181 SetPluginHasFocus(containing_view_has_focus_ && has_webkit_focus_);
182 #endif 182 #endif
183 } 183 }
184 184
185 NPObject* WebPluginDelegateImpl::GetPluginScriptableObject() { 185 NPObject* WebPluginDelegateImpl::GetPluginScriptableObject() {
186 return instance_->GetPluginScriptableObject(); 186 return instance_->GetPluginScriptableObject();
187 } 187 }
188 188
189 NPP WebPluginDelegateImpl::GetPluginNPP() {
190 return instance_->npp();
191 }
192
193 bool WebPluginDelegateImpl::GetFormValue(base::string16* value) { 189 bool WebPluginDelegateImpl::GetFormValue(base::string16* value) {
194 return instance_->GetFormValue(value); 190 return instance_->GetFormValue(value);
195 } 191 }
196 192
197 void WebPluginDelegateImpl::DidFinishLoadWithReason(const GURL& url, 193 void WebPluginDelegateImpl::DidFinishLoadWithReason(const GURL& url,
198 NPReason reason, 194 NPReason reason,
199 int notify_id) { 195 int notify_id) {
200 if (quirks_ & PLUGIN_QUIRK_ALWAYS_NOTIFY_SUCCESS && 196 if (quirks_ & PLUGIN_QUIRK_ALWAYS_NOTIFY_SUCCESS &&
201 reason == NPRES_NETWORK_ERR) { 197 reason == NPRES_NETWORK_ERR) {
202 // Flash needs this or otherwise it unloads the launching swf object. 198 // Flash needs this or otherwise it unloads the launching swf object.
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 resource_id, url, std::string(), notify_id); 293 resource_id, url, std::string(), notify_id);
298 } 294 }
299 295
300 WebPluginResourceClient* WebPluginDelegateImpl::CreateSeekableResourceClient( 296 WebPluginResourceClient* WebPluginDelegateImpl::CreateSeekableResourceClient(
301 unsigned long resource_id, int range_request_id) { 297 unsigned long resource_id, int range_request_id) {
302 return instance()->GetRangeRequest(range_request_id); 298 return instance()->GetRangeRequest(range_request_id);
303 } 299 }
304 300
305 } // namespace npapi 301 } // namespace npapi
306 } // namespace webkit 302 } // namespace webkit
OLDNEW
« no previous file with comments | « trunk/src/webkit/plugins/npapi/webplugin_delegate_impl.h ('k') | trunk/src/webkit/plugins/npapi/webplugin_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698