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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_android.cc

Issue 16907002: Update Android 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 unified diff | Download patch | Annotate | Revision Log
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 "content/browser/renderer_host/render_widget_host_view_android.h" 5 #include "content/browser/renderer_host/render_widget_host_view_android.h"
6 6
7 #include <android/bitmap.h> 7 #include <android/bitmap.h>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 } 117 }
118 118
119 RenderWidgetHostViewAndroid::~RenderWidgetHostViewAndroid() { 119 RenderWidgetHostViewAndroid::~RenderWidgetHostViewAndroid() {
120 SetContentViewCore(NULL); 120 SetContentViewCore(NULL);
121 DCHECK(ack_callbacks_.empty()); 121 DCHECK(ack_callbacks_.empty());
122 if (texture_id_in_layer_) { 122 if (texture_id_in_layer_) {
123 ImageTransportFactoryAndroid::GetInstance()->DeleteTexture( 123 ImageTransportFactoryAndroid::GetInstance()->DeleteTexture(
124 texture_id_in_layer_); 124 texture_id_in_layer_);
125 } 125 }
126 126
127 if (texture_layer_) 127 if (texture_layer_.get())
128 texture_layer_->ClearClient(); 128 texture_layer_->ClearClient();
129 } 129 }
130 130
131 131
132 bool RenderWidgetHostViewAndroid::OnMessageReceived( 132 bool RenderWidgetHostViewAndroid::OnMessageReceived(
133 const IPC::Message& message) { 133 const IPC::Message& message) {
134 bool handled = true; 134 bool handled = true;
135 IPC_BEGIN_MESSAGE_MAP(RenderWidgetHostViewAndroid, message) 135 IPC_BEGIN_MESSAGE_MAP(RenderWidgetHostViewAndroid, message)
136 IPC_MESSAGE_HANDLER(ViewHostMsg_ImeBatchStateChanged_ACK, 136 IPC_MESSAGE_HANDLER(ViewHostMsg_ImeBatchStateChanged_ACK,
137 OnProcessImeBatchStateAck) 137 OnProcessImeBatchStateAck)
(...skipping 901 matching lines...) Expand 10 before | Expand all | Expand 10 after
1039 // RenderWidgetHostView, public: 1039 // RenderWidgetHostView, public:
1040 1040
1041 // static 1041 // static
1042 RenderWidgetHostView* 1042 RenderWidgetHostView*
1043 RenderWidgetHostView::CreateViewForWidget(RenderWidgetHost* widget) { 1043 RenderWidgetHostView::CreateViewForWidget(RenderWidgetHost* widget) {
1044 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(widget); 1044 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(widget);
1045 return new RenderWidgetHostViewAndroid(rwhi, NULL); 1045 return new RenderWidgetHostViewAndroid(rwhi, NULL);
1046 } 1046 }
1047 1047
1048 } // namespace content 1048 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698