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

Side by Side Diff: chrome_frame/plugin_url_request.cc

Issue 39203004: [Net] Fix error handling on wrong file in UploadData (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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 | « chrome_frame/chrome_frame.gyp ('k') | chrome_frame/urlmon_upload_data_stream.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) 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 "chrome_frame/plugin_url_request.h" 5 #include "chrome_frame/plugin_url_request.h"
6 6
7 #include "chrome/common/automation_messages.h" 7 #include "chrome/common/automation_messages.h"
8 8
9 PluginUrlRequest::PluginUrlRequest() 9 PluginUrlRequest::PluginUrlRequest()
10 : delegate_(NULL), 10 : delegate_(NULL),
(...skipping 26 matching lines...) Expand all
37 // We store a pointer to UrlmonUploadDataStream and not net::UploadData 37 // We store a pointer to UrlmonUploadDataStream and not net::UploadData
38 // since UrlmonUploadDataStream implements thread safe ref counting and 38 // since UrlmonUploadDataStream implements thread safe ref counting and
39 // UploadData does not. 39 // UploadData does not.
40 CComObject<UrlmonUploadDataStream>* upload_stream = NULL; 40 CComObject<UrlmonUploadDataStream>* upload_stream = NULL;
41 HRESULT hr = CComObject<UrlmonUploadDataStream>::CreateInstance( 41 HRESULT hr = CComObject<UrlmonUploadDataStream>::CreateInstance(
42 &upload_stream); 42 &upload_stream);
43 if (FAILED(hr)) { 43 if (FAILED(hr)) {
44 NOTREACHED(); 44 NOTREACHED();
45 } else { 45 } else {
46 upload_stream->AddRef(); 46 upload_stream->AddRef();
47 upload_stream->Initialize(upload_data); 47 if (!upload_stream->Initialize(upload_data)) {
48 upload_stream->Release();
49 enable_frame_busting_ = enable_frame_busting;
hashimoto 2013/11/11 04:27:53 Can't lines 49 & 61 moved to above, to avoid code
tzik 2013/11/11 05:33:52 Done.
50 return true;
51 }
52
48 upload_data_.Attach(upload_stream); 53 upload_data_.Attach(upload_stream);
49 is_chunked_upload_ = upload_data->is_chunked(); 54 is_chunked_upload_ = upload_data->is_chunked();
50 STATSTG stat; 55 STATSTG stat;
51 upload_stream->Stat(&stat, STATFLAG_NONAME); 56 upload_stream->Stat(&stat, STATFLAG_NONAME);
52 post_data_len_ = stat.cbSize.QuadPart; 57 post_data_len_ = stat.cbSize.QuadPart;
53 } 58 }
54 } 59 }
55 60
56 enable_frame_busting_ = enable_frame_busting; 61 enable_frame_busting_ = enable_frame_busting;
57 62
58 return true; 63 return true;
59 } 64 }
OLDNEW
« no previous file with comments | « chrome_frame/chrome_frame.gyp ('k') | chrome_frame/urlmon_upload_data_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698