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

Side by Side Diff: webkit/plugins/ppapi/ppb_url_loader_impl.cc

Issue 7477014: Merge 94063 - Revert 93987 - Close the URL request in the destroctor. This ensures the load is ac... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/835/src/
Patch Set: Created 9 years, 5 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 | no next file » | 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) 2011 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 #include "webkit/plugins/ppapi/ppb_url_loader_impl.h" 5 #include "webkit/plugins/ppapi/ppb_url_loader_impl.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "net/base/net_errors.h" 8 #include "net/base/net_errors.h"
9 #include "ppapi/c/pp_completion_callback.h" 9 #include "ppapi/c/pp_completion_callback.h"
10 #include "ppapi/c/pp_errors.h" 10 #include "ppapi/c/pp_errors.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 user_buffer_(NULL), 63 user_buffer_(NULL),
64 user_buffer_size_(0), 64 user_buffer_size_(0),
65 done_status_(PP_OK_COMPLETIONPENDING), 65 done_status_(PP_OK_COMPLETIONPENDING),
66 is_streaming_to_file_(false), 66 is_streaming_to_file_(false),
67 is_asynchronous_load_suspended_(false), 67 is_asynchronous_load_suspended_(false),
68 has_universal_access_(false), 68 has_universal_access_(false),
69 status_callback_(NULL) { 69 status_callback_(NULL) {
70 } 70 }
71 71
72 PPB_URLLoader_Impl::~PPB_URLLoader_Impl() { 72 PPB_URLLoader_Impl::~PPB_URLLoader_Impl() {
73 Close();
74 } 73 }
75 74
76 PPB_URLLoader_API* PPB_URLLoader_Impl::AsPPB_URLLoader_API() { 75 PPB_URLLoader_API* PPB_URLLoader_Impl::AsPPB_URLLoader_API() {
77 return this; 76 return this;
78 } 77 }
79 78
80 void PPB_URLLoader_Impl::ClearInstance() { 79 void PPB_URLLoader_Impl::ClearInstance() {
81 Resource::ClearInstance(); 80 Resource::ClearInstance();
82 loader_.reset(); 81 loader_.reset();
83 } 82 }
(...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after
439 bool PPB_URLLoader_Impl::RecordDownloadProgress() const { 438 bool PPB_URLLoader_Impl::RecordDownloadProgress() const {
440 return request_info_ && request_info_->record_download_progress(); 439 return request_info_ && request_info_->record_download_progress();
441 } 440 }
442 441
443 bool PPB_URLLoader_Impl::RecordUploadProgress() const { 442 bool PPB_URLLoader_Impl::RecordUploadProgress() const {
444 return request_info_ && request_info_->record_upload_progress(); 443 return request_info_ && request_info_->record_upload_progress();
445 } 444 }
446 445
447 } // namespace ppapi 446 } // namespace ppapi
448 } // namespace webkit 447 } // namespace webkit
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698