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

Side by Side Diff: third_party/WebKit/Source/platform/graphics/paint/DisplayItemClient.cpp

Issue 2712703002: DisplayItemClient: avoid hash table temporaries when iterating. (Closed)
Patch Set: Created 3 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "platform/graphics/paint/DisplayItemClient.h" 5 #include "platform/graphics/paint/DisplayItemClient.h"
6 6
7 #if CHECK_DISPLAY_ITEM_CLIENT_ALIVENESS 7 #if CHECK_DISPLAY_ITEM_CLIENT_ALIVENESS
8 #include "wtf/HashMap.h" 8 #include "wtf/HashMap.h"
9 #include "wtf/HashSet.h" 9 #include "wtf/HashSet.h"
10 #endif 10 #endif
11 11
12 namespace blink { 12 namespace blink {
13 13
14 DisplayItemClient::CacheGenerationOrInvalidationReason::ValueType 14 DisplayItemClient::CacheGenerationOrInvalidationReason::ValueType
15 DisplayItemClient::CacheGenerationOrInvalidationReason::s_nextGeneration = 15 DisplayItemClient::CacheGenerationOrInvalidationReason::s_nextGeneration =
16 kFirstValidGeneration; 16 kFirstValidGeneration;
17 17
18 #if CHECK_DISPLAY_ITEM_CLIENT_ALIVENESS 18 #if CHECK_DISPLAY_ITEM_CLIENT_ALIVENESS
19 19
20 HashSet<const DisplayItemClient*>* liveDisplayItemClients = nullptr; 20 HashSet<const DisplayItemClient*>* liveDisplayItemClients = nullptr;
21 HashMap<const void*, HashMap<const DisplayItemClient*, String>>* 21 HashMap<const void*, HashMap<const DisplayItemClient*, String>>*
22 displayItemClientsShouldKeepAlive = nullptr; 22 displayItemClientsShouldKeepAlive = nullptr;
23 23
24 DisplayItemClient::DisplayItemClient() { 24 DisplayItemClient::DisplayItemClient() {
25 if (displayItemClientsShouldKeepAlive) { 25 if (displayItemClientsShouldKeepAlive) {
26 for (auto item : *displayItemClientsShouldKeepAlive) 26 for (const auto& item : *displayItemClientsShouldKeepAlive)
27 CHECK(!item.value.contains(this)); 27 CHECK(!item.value.contains(this));
28 } 28 }
29 if (!liveDisplayItemClients) 29 if (!liveDisplayItemClients)
30 liveDisplayItemClients = new HashSet<const DisplayItemClient*>(); 30 liveDisplayItemClients = new HashSet<const DisplayItemClient*>();
31 liveDisplayItemClients->insert(this); 31 liveDisplayItemClients->insert(this);
32 } 32 }
33 33
34 DisplayItemClient::~DisplayItemClient() { 34 DisplayItemClient::~DisplayItemClient() {
35 if (displayItemClientsShouldKeepAlive) { 35 if (displayItemClientsShouldKeepAlive) {
36 for (auto& item : *displayItemClientsShouldKeepAlive) { 36 for (const auto& item : *displayItemClientsShouldKeepAlive) {
37 CHECK(!item.value.contains(this)) 37 CHECK(!item.value.contains(this))
38 << "Short-lived DisplayItemClient: " << item.value.get(this) 38 << "Short-lived DisplayItemClient: " << item.value.get(this)
39 << ". See crbug.com/609218."; 39 << ". See crbug.com/609218.";
40 } 40 }
41 } 41 }
42 liveDisplayItemClients->erase(this); 42 liveDisplayItemClients->erase(this);
43 // In case this object is a subsequence owner. 43 // In case this object is a subsequence owner.
44 endShouldKeepAliveAllClients(this); 44 endShouldKeepAliveAllClients(this);
45 } 45 }
46 46
(...skipping 27 matching lines...) Expand all
74 } 74 }
75 75
76 void DisplayItemClient::endShouldKeepAliveAllClients() { 76 void DisplayItemClient::endShouldKeepAliveAllClients() {
77 delete displayItemClientsShouldKeepAlive; 77 delete displayItemClientsShouldKeepAlive;
78 displayItemClientsShouldKeepAlive = nullptr; 78 displayItemClientsShouldKeepAlive = nullptr;
79 } 79 }
80 80
81 #endif // CHECK_DISPLAY_ITEM_CLIENT_ALIVENESS 81 #endif // CHECK_DISPLAY_ITEM_CLIENT_ALIVENESS
82 82
83 } // namespace blink 83 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698