Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 { | 14 namespace { |
| 15 base::LazyInstance<GLViewRendererManager>::Leaky g_view_renderer_manager = | 15 base::LazyInstance<GLViewRendererManager>::Leaky g_view_renderer_manager = |
| 16 LAZY_INSTANCE_INITIALIZER; | 16 LAZY_INSTANCE_INITIALIZER; |
| 17 } // namespace | 17 } // namespace |
| 18 | 18 |
| 19 // static | 19 // static |
| 20 GLViewRendererManager* GLViewRendererManager::GetInstance() { | 20 GLViewRendererManager* GLViewRendererManager::GetInstance() { |
| 21 return g_view_renderer_manager.Pointer(); | 21 return g_view_renderer_manager.Pointer(); |
| 22 } | 22 } |
| 23 | 23 |
| 24 GLViewRendererManager::GLViewRendererManager() {} | 24 GLViewRendererManager::GLViewRendererManager() {} |
| 25 | 25 |
| 26 GLViewRendererManager::~GLViewRendererManager() {} | 26 GLViewRendererManager::~GLViewRendererManager() {} |
| 27 | 27 |
| 28 GLViewRendererManager::Key GLViewRendererManager::PushBack(RendererType view) { | 28 GLViewRendererManager::Key GLViewRendererManager::PushBack(RendererType view) { |
| 29 AutoLock auto_lock(lock_); | |
|
sgurun-gerrit only
2014/05/08 22:55:12
did you need to add this because of the refactorin
boliu
2014/05/08 23:03:47
Just an unrelated bug found while refactoring. Upd
| |
| 29 DCHECK(mru_list_.end() == | 30 DCHECK(mru_list_.end() == |
| 30 std::find(mru_list_.begin(), mru_list_.end(), view)); | 31 std::find(mru_list_.begin(), mru_list_.end(), view)); |
| 31 mru_list_.push_back(view); | 32 mru_list_.push_back(view); |
| 32 Key back = mru_list_.end(); | 33 Key back = mru_list_.end(); |
| 33 back--; | 34 back--; |
| 34 return back; | 35 return back; |
| 35 } | 36 } |
| 36 | 37 |
| 37 void GLViewRendererManager::DidDrawGL(Key key) { | 38 void GLViewRendererManager::DidDrawGL(Key key) { |
| 38 AutoLock auto_lock(lock_); | 39 AutoLock auto_lock(lock_); |
| 39 DCHECK(mru_list_.end() != key); | 40 DCHECK(mru_list_.end() != key); |
| 40 mru_list_.splice(mru_list_.begin(), mru_list_, key); | 41 mru_list_.splice(mru_list_.begin(), mru_list_, key); |
| 41 } | 42 } |
| 42 | 43 |
| 43 void GLViewRendererManager::Remove(Key key) { | 44 void GLViewRendererManager::Remove(Key key) { |
| 44 AutoLock auto_lock(lock_); | 45 AutoLock auto_lock(lock_); |
| 45 DCHECK(mru_list_.end() != key); | 46 DCHECK(mru_list_.end() != key); |
| 46 mru_list_.erase(key); | 47 mru_list_.erase(key); |
| 47 } | 48 } |
| 48 | 49 |
| 49 GLViewRendererManager::RendererType | 50 GLViewRendererManager::RendererType |
| 50 GLViewRendererManager::GetMostRecentlyDrawn() const { | 51 GLViewRendererManager::GetMostRecentlyDrawn() const { |
| 51 AutoLock auto_lock(lock_); | 52 AutoLock auto_lock(lock_); |
| 52 if (mru_list_.begin() == mru_list_.end()) | 53 if (mru_list_.begin() == mru_list_.end()) |
| 53 return NULL; | 54 return NULL; |
| 54 return *mru_list_.begin(); | 55 return *mru_list_.begin(); |
| 55 } | 56 } |
| 56 | 57 |
| 57 } // namespace android_webview | 58 } // namespace android_webview |
| OLD | NEW |