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

Side by Side Diff: android_webview/browser/shared_renderer_state.cc

Issue 509453002: android_webview : Class member variable WeakPtrFactory in proper order. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "android_webview/browser/shared_renderer_state.h" 5 #include "android_webview/browser/shared_renderer_state.h"
6 6
7 #include "android_webview/browser/browser_view_renderer_client.h" 7 #include "android_webview/browser/browser_view_renderer_client.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 } 71 }
72 72
73 DrawGLInput::~DrawGLInput() { 73 DrawGLInput::~DrawGLInput() {
74 } 74 }
75 75
76 SharedRendererState::SharedRendererState( 76 SharedRendererState::SharedRendererState(
77 scoped_refptr<base::MessageLoopProxy> ui_loop, 77 scoped_refptr<base::MessageLoopProxy> ui_loop,
78 BrowserViewRendererClient* client) 78 BrowserViewRendererClient* client)
79 : ui_loop_(ui_loop), 79 : ui_loop_(ui_loop),
80 client_on_ui_(client), 80 client_on_ui_(client),
81 weak_factory_on_ui_thread_(this),
82 ui_thread_weak_ptr_(weak_factory_on_ui_thread_.GetWeakPtr()), 81 ui_thread_weak_ptr_(weak_factory_on_ui_thread_.GetWeakPtr()),
83 inside_hardware_release_(false), 82 inside_hardware_release_(false),
84 share_context_(NULL) { 83 share_context_(NULL),
84 weak_factory_on_ui_thread_(this) {
85 DCHECK(ui_loop_->BelongsToCurrentThread()); 85 DCHECK(ui_loop_->BelongsToCurrentThread());
86 DCHECK(client_on_ui_); 86 DCHECK(client_on_ui_);
87 ResetRequestDrawGLCallback(); 87 ResetRequestDrawGLCallback();
88 } 88 }
89 89
90 SharedRendererState::~SharedRendererState() { 90 SharedRendererState::~SharedRendererState() {
91 DCHECK(ui_loop_->BelongsToCurrentThread()); 91 DCHECK(ui_loop_->BelongsToCurrentThread());
92 } 92 }
93 93
94 void SharedRendererState::ClientRequestDrawGL() { 94 void SharedRendererState::ClientRequestDrawGL() {
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 : shared_renderer_state_(shared_renderer_state) { 215 : shared_renderer_state_(shared_renderer_state) {
216 DCHECK(!shared_renderer_state_->IsInsideHardwareRelease()); 216 DCHECK(!shared_renderer_state_->IsInsideHardwareRelease());
217 shared_renderer_state_->SetInsideHardwareRelease(true); 217 shared_renderer_state_->SetInsideHardwareRelease(true);
218 } 218 }
219 219
220 InsideHardwareReleaseReset::~InsideHardwareReleaseReset() { 220 InsideHardwareReleaseReset::~InsideHardwareReleaseReset() {
221 shared_renderer_state_->SetInsideHardwareRelease(false); 221 shared_renderer_state_->SetInsideHardwareRelease(false);
222 } 222 }
223 223
224 } // namespace android_webview 224 } // namespace android_webview
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698