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

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

Issue 16136005: Update remaining files to use WeakPtr<T>::get() instead of "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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 side-by-side diff with in-line comments
Download patch
Index: gpu/command_buffer/service/gles2_cmd_decoder.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index c4dd98bf9b80fea03821df9fec37419f0ccff436..234d8d8e653c94c22bd17a0bd332519f28863f86 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -2982,7 +2982,7 @@ GLenum GLES2DecoderImpl::GetBoundDrawFrameBufferInternalFormat() {
}
void GLES2DecoderImpl::UpdateParentTextureInfo() {
- if (parent_) {
+ if (parent_.get()) {
// Update the info about the offscreen saved color texture in the parent.
// The reference to the parent is a weak pointer and will become null if the
// parent is later destroyed.
@@ -3247,11 +3247,9 @@ bool GLES2DecoderImpl::SetParent(GLES2Decoder* new_parent,
// Remove the saved frame buffer mapping from the parent decoder. The
// parent pointer is a weak pointer so it will be null if the parent has
// already been destroyed.
- if (parent_) {
- ChildList::iterator it = std::find(
- parent_->children_.begin(),
- parent_->children_.end(),
- this);
+ if (parent_.get()) {
+ ChildList::iterator it =
+ std::find(parent_->children_.begin(), parent_->children_.end(), this);
DCHECK(it != parent_->children_.end());
parent_->children_.erase(it);
// First check the texture has been mapped into the parent. This might not
@@ -9046,7 +9044,7 @@ void GLES2DecoderImpl::LoseContext(uint32 reset_status) {
current_decoder_error_ = error::kLostContext;
// Loses the parent's context.
- if (parent_) {
+ if (parent_.get()) {
parent_->LoseContext(reset_status);
}

Powered by Google App Engine
This is Rietveld 408576698