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

Side by Side Diff: ppapi/proxy/url_loader_resource.cc

Issue 915403003: Enable size_t to int truncation warnings in PPAPI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "ppapi/proxy/url_loader_resource.h" 5 #include "ppapi/proxy/url_loader_resource.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "ppapi/c/pp_completion_callback.h" 8 #include "ppapi/c/pp_completion_callback.h"
9 #include "ppapi/c/pp_errors.h" 9 #include "ppapi/c/pp_errors.h"
10 #include "ppapi/c/ppb_url_loader.h" 10 #include "ppapi/c/ppb_url_loader.h"
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 PP_Resource body_as_file_ref = 0; 367 PP_Resource body_as_file_ref = 0;
368 if (data.body_as_file_ref.IsValid()) { 368 if (data.body_as_file_ref.IsValid()) {
369 body_as_file_ref = FileRefResource::CreateFileRef(connection(), 369 body_as_file_ref = FileRefResource::CreateFileRef(connection(),
370 pp_instance(), 370 pp_instance(),
371 data.body_as_file_ref); 371 data.body_as_file_ref);
372 } 372 }
373 response_info_ = new URLResponseInfoResource( 373 response_info_ = new URLResponseInfoResource(
374 connection(), pp_instance(), data, body_as_file_ref); 374 connection(), pp_instance(), data, body_as_file_ref);
375 } 375 }
376 376
377 size_t URLLoaderResource::FillUserBuffer() { 377 int32_t URLLoaderResource::FillUserBuffer() {
378 DCHECK(user_buffer_); 378 DCHECK(user_buffer_);
379 DCHECK(user_buffer_size_); 379 DCHECK(user_buffer_size_);
380 380
381 size_t bytes_to_copy = std::min(buffer_.size(), user_buffer_size_); 381 size_t bytes_to_copy = std::min(buffer_.size(), user_buffer_size_);
382 std::copy(buffer_.begin(), buffer_.begin() + bytes_to_copy, user_buffer_); 382 std::copy(buffer_.begin(), buffer_.begin() + bytes_to_copy, user_buffer_);
383 buffer_.erase(buffer_.begin(), buffer_.begin() + bytes_to_copy); 383 buffer_.erase(buffer_.begin(), buffer_.begin() + bytes_to_copy);
384 384
385 // If the buffer is getting too empty, resume asynchronous loading. 385 // If the buffer is getting too empty, resume asynchronous loading.
386 if (is_asynchronous_load_suspended_ && 386 if (is_asynchronous_load_suspended_ &&
387 buffer_.size() <= static_cast<size_t>( 387 buffer_.size() <= static_cast<size_t>(
388 request_data_.prefetch_buffer_lower_threshold)) { 388 request_data_.prefetch_buffer_lower_threshold)) {
389 DVLOG(1) << "Resuming async load - buffer size: " << buffer_.size(); 389 DVLOG(1) << "Resuming async load - buffer size: " << buffer_.size();
390 SetDefersLoading(false); 390 SetDefersLoading(false);
391 } 391 }
392 392
393 // Reset for next time. 393 // Reset for next time.
394 user_buffer_ = NULL; 394 user_buffer_ = NULL;
395 user_buffer_size_ = 0; 395 user_buffer_size_ = 0;
396 return bytes_to_copy; 396 return static_cast<int32_t>(bytes_to_copy);
dmichael (off chromium) 2015/02/12 18:56:43 another unsigned->signed where checked_cast might
397 } 397 }
398 398
399 } // namespace proxy 399 } // namespace proxy
400 } // namespace ppapi 400 } // namespace ppapi
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698