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

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

Issue 2561963002: base: Remove the string logging from CHECK(). (Closed)
Patch Set: checkstring: rebase Created 4 years 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 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
(...skipping 16 matching lines...) Expand all
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->add(this); 31 liveDisplayItemClients->add(this);
32 } 32 }
33 33
34 DisplayItemClient::~DisplayItemClient() { 34 DisplayItemClient::~DisplayItemClient() {
35 if (displayItemClientsShouldKeepAlive) { 35 if (displayItemClientsShouldKeepAlive) {
36 for (auto& item : *displayItemClientsShouldKeepAlive) { 36 for (auto& item : *displayItemClientsShouldKeepAlive) {
37 CHECK(!item.value.contains(this)) 37 // Short-lived DisplayItemClient. See crbug.com/609218.
38 << "Short-lived DisplayItemClient: " << item.value.get(this) 38 CHECK(!item.value.contains(this));
39 << ". See crbug.com/609218.";
40 } 39 }
41 } 40 }
42 liveDisplayItemClients->remove(this); 41 liveDisplayItemClients->remove(this);
43 // In case this object is a subsequence owner. 42 // In case this object is a subsequence owner.
44 endShouldKeepAliveAllClients(this); 43 endShouldKeepAliveAllClients(this);
45 } 44 }
46 45
47 bool DisplayItemClient::isAlive() const { 46 bool DisplayItemClient::isAlive() const {
48 return liveDisplayItemClients && liveDisplayItemClients->contains(this); 47 return liveDisplayItemClients && liveDisplayItemClients->contains(this);
49 } 48 }
(...skipping 23 matching lines...) Expand all
73 } 72 }
74 73
75 void DisplayItemClient::endShouldKeepAliveAllClients() { 74 void DisplayItemClient::endShouldKeepAliveAllClients() {
76 delete displayItemClientsShouldKeepAlive; 75 delete displayItemClientsShouldKeepAlive;
77 displayItemClientsShouldKeepAlive = nullptr; 76 displayItemClientsShouldKeepAlive = nullptr;
78 } 77 }
79 78
80 #endif // CHECK_DISPLAY_ITEM_CLIENT_ALIVENESS 79 #endif // CHECK_DISPLAY_ITEM_CLIENT_ALIVENESS
81 80
82 } // namespace blink 81 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698