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

Unified Diff: gpu/command_buffer/service/async_pixel_transfer_manager_share_group.cc

Issue 17948002: Update Linux to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/worker/worker_webkitplatformsupport_impl.cc ('k') | gpu/command_buffer/service/buffer_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/async_pixel_transfer_manager_share_group.cc
diff --git a/gpu/command_buffer/service/async_pixel_transfer_manager_share_group.cc b/gpu/command_buffer/service/async_pixel_transfer_manager_share_group.cc
index 5a1931147b4f3a634a6ef09a9125ff67972e0832..bb301a472d699de59440bfcf13263ea997787543 100644
--- a/gpu/command_buffer/service/async_pixel_transfer_manager_share_group.cc
+++ b/gpu/command_buffer/service/async_pixel_transfer_manager_share_group.cc
@@ -216,7 +216,8 @@ class TransferStateInternal
: texture_id_(texture_id), define_params_(define_params) {}
bool TransferIsInProgress() {
- return pending_upload_task_ && pending_upload_task_->TaskIsInProgress();
+ return pending_upload_task_.get() &&
+ pending_upload_task_->TaskIsInProgress();
}
void BindTransfer() {
@@ -231,7 +232,7 @@ class TransferStateInternal
void WaitForTransferCompletion() {
TRACE_EVENT0("gpu", "WaitForTransferCompletion");
- DCHECK(pending_upload_task_);
+ DCHECK(pending_upload_task_.get());
if (!pending_upload_task_->TryRun()) {
pending_upload_task_->WaitForTask();
}
@@ -240,7 +241,7 @@ class TransferStateInternal
void CancelUpload() {
TRACE_EVENT0("gpu", "CancelUpload");
- if (pending_upload_task_)
+ if (pending_upload_task_.get())
pending_upload_task_->Cancel();
pending_upload_task_ = NULL;
}
« no previous file with comments | « content/worker/worker_webkitplatformsupport_impl.cc ('k') | gpu/command_buffer/service/buffer_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698