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

Unified Diff: cc/surfaces/surface_manager.cc

Issue 2379653006: Replaced cc::SurfaceId::nonce_ with base::UnguessableToken (Closed)
Patch Set: Changed SurfaceManager::kRootSurfaceId to a private field to avoid static initialization Created 4 years, 1 month 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
« no previous file with comments | « cc/surfaces/surface_manager.h ('k') | cc/surfaces/surface_manager_ref_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/surfaces/surface_manager.cc
diff --git a/cc/surfaces/surface_manager.cc b/cc/surfaces/surface_manager.cc
index b0b814fb1b2d212e841bc4b4a10f724d6b4aade8..b8b121142ff7f18f707f9dea142be0f0faa6c6ee 100644
--- a/cc/surfaces/surface_manager.cc
+++ b/cc/surfaces/surface_manager.cc
@@ -16,9 +16,6 @@
namespace cc {
-const SurfaceId SurfaceManager::kRootSurfaceId(FrameSinkId(0u, 0u),
- LocalFrameId(0u, 0u));
-
SurfaceManager::FrameSinkSourceMapping::FrameSinkSourceMapping()
: client(nullptr), source(nullptr) {}
@@ -30,7 +27,9 @@ SurfaceManager::FrameSinkSourceMapping::~FrameSinkSourceMapping() {
<< ", children: " << children.size();
}
-SurfaceManager::SurfaceManager() {
+SurfaceManager::SurfaceManager()
+ : kRootSurfaceId(FrameSinkId(0u, 0u),
+ LocalFrameId(0u, base::UnguessableToken::Create())) {
thread_checker_.DetachFromThread();
}
« no previous file with comments | « cc/surfaces/surface_manager.h ('k') | cc/surfaces/surface_manager_ref_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698