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

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

Issue 176543004: aw: Split hardware rendering into HardwareRenderer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review comments Created 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 "android_webview/browser/gl_view_renderer_manager.h" 5 #include "android_webview/browser/gl_view_renderer_manager.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/threading/platform_thread.h" 8 #include "base/threading/platform_thread.h"
9 9
10 namespace android_webview { 10 namespace android_webview {
11 11
12 using base::AutoLock; 12 using base::AutoLock;
13 13
14 namespace {
15 base::LazyInstance<GLViewRendererManager>::Leaky g_view_renderer_manager =
16 LAZY_INSTANCE_INITIALIZER;
17 } // namespace
18
19 // static
20 GLViewRendererManager* GLViewRendererManager::GetInstance() {
21 return g_view_renderer_manager.Pointer();
22 }
23
14 GLViewRendererManager::GLViewRendererManager() {} 24 GLViewRendererManager::GLViewRendererManager() {}
15 25
16 GLViewRendererManager::~GLViewRendererManager() {} 26 GLViewRendererManager::~GLViewRendererManager() {}
17 27
18 bool GLViewRendererManager::OnRenderThread() const { 28 bool GLViewRendererManager::OnRenderThread() const {
19 AutoLock auto_lock(lock_); 29 AutoLock auto_lock(lock_);
20 return render_thread_.is_equal(base::PlatformThread::CurrentHandle()); 30 return render_thread_.is_equal(base::PlatformThread::CurrentHandle());
21 } 31 }
22 32
23 void GLViewRendererManager::MarkRenderThread() { 33 void GLViewRendererManager::MarkRenderThread() {
24 lock_.AssertAcquired(); 34 lock_.AssertAcquired();
25 if (render_thread_.is_null()) 35 if (render_thread_.is_null())
26 render_thread_ = base::PlatformThread::CurrentHandle(); 36 render_thread_ = base::PlatformThread::CurrentHandle();
27 DCHECK(render_thread_.is_equal(base::PlatformThread::CurrentHandle())); 37 DCHECK(render_thread_.is_equal(base::PlatformThread::CurrentHandle()));
28 } 38 }
29 39
30 GLViewRendererManager::Key GLViewRendererManager::DidDrawGL( 40 GLViewRendererManager::Key GLViewRendererManager::DidDrawGL(
31 Key key, 41 Key key,
32 BrowserViewRenderer* view) { 42 HardwareRenderer* view) {
33 AutoLock auto_lock(lock_); 43 AutoLock auto_lock(lock_);
34 MarkRenderThread(); 44 MarkRenderThread();
35 45
36 if (key == mru_list_.end()) { 46 if (key == mru_list_.end()) {
37 DCHECK(mru_list_.end() == 47 DCHECK(mru_list_.end() ==
38 std::find(mru_list_.begin(), mru_list_.end(), view)); 48 std::find(mru_list_.begin(), mru_list_.end(), view));
39 mru_list_.push_front(view); 49 mru_list_.push_front(view);
40 return mru_list_.begin(); 50 return mru_list_.begin();
41 } else { 51 } else {
42 DCHECK(*key == view); 52 DCHECK(*key == view);
43 mru_list_.splice(mru_list_.begin(), mru_list_, key); 53 mru_list_.splice(mru_list_.begin(), mru_list_, key);
44 return key; 54 return key;
45 } 55 }
46 } 56 }
47 57
48 void GLViewRendererManager::NoLongerExpectsDrawGL(Key key) { 58 void GLViewRendererManager::NoLongerExpectsDrawGL(Key key) {
49 AutoLock auto_lock(lock_); 59 AutoLock auto_lock(lock_);
50 DCHECK(mru_list_.end() != key); 60 DCHECK(mru_list_.end() != key);
51 mru_list_.erase(key); 61 mru_list_.erase(key);
52 } 62 }
53 63
54 BrowserViewRenderer* GLViewRendererManager::GetMostRecentlyDrawn() const { 64 HardwareRenderer* GLViewRendererManager::GetMostRecentlyDrawn() const {
55 AutoLock auto_lock(lock_); 65 AutoLock auto_lock(lock_);
56 if (mru_list_.begin() == mru_list_.end()) 66 if (mru_list_.begin() == mru_list_.end())
57 return NULL; 67 return NULL;
58 return *mru_list_.begin(); 68 return *mru_list_.begin();
59 } 69 }
60 70
61 GLViewRendererManager::Key GLViewRendererManager::NullKey() { 71 GLViewRendererManager::Key GLViewRendererManager::NullKey() {
62 AutoLock auto_lock(lock_); 72 AutoLock auto_lock(lock_);
63 return mru_list_.end(); 73 return mru_list_.end();
64 } 74 }
65 75
66 } // namespace android_webview 76 } // namespace android_webview
OLDNEW
« no previous file with comments | « android_webview/browser/gl_view_renderer_manager.h ('k') | android_webview/browser/hardware_renderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698