OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/DisplayItemList.h" | 5 #include "platform/graphics/paint/DisplayItemList.h" |
6 | 6 |
7 #include "platform/graphics/LoggingCanvas.h" | 7 #include "platform/graphics/LoggingCanvas.h" |
8 #include "platform/graphics/paint/DrawingDisplayItem.h" | 8 #include "platform/graphics/paint/DrawingDisplayItem.h" |
9 #include "platform/graphics/paint/PaintChunk.h" | 9 #include "platform/graphics/paint/PaintChunk.h" |
10 #include "third_party/skia/include/core/SkPictureAnalyzer.h" | 10 #include "third_party/skia/include/core/SkPictureAnalyzer.h" |
11 | 11 |
12 #ifndef NDEBUG | 12 #ifndef NDEBUG |
13 #include "platform/wtf/text/WTFString.h" | 13 #include "platform/wtf/text/WTFString.h" |
14 #endif | 14 #endif |
15 | 15 |
16 namespace blink { | 16 namespace blink { |
17 | 17 |
18 DisplayItem& DisplayItemList::appendByMoving(DisplayItem& item) { | 18 DisplayItem& DisplayItemList::appendByMoving(DisplayItem& item) { |
19 #ifndef NDEBUG | 19 #ifndef NDEBUG |
20 String originalDebugString = item.asDebugString(); | 20 String originalDebugString = item.asDebugString(); |
21 #endif | 21 #endif |
22 ASSERT(item.hasValidClient()); | 22 DCHECK(item.hasValidClient()); |
23 DisplayItem& result = | 23 DisplayItem& result = |
24 ContiguousContainer::appendByMoving(item, item.derivedSize()); | 24 ContiguousContainer::appendByMoving(item, item.derivedSize()); |
25 // ContiguousContainer::appendByMoving() calls an in-place constructor | 25 // ContiguousContainer::appendByMoving() calls an in-place constructor |
26 // on item which replaces it with a tombstone/"dead display item" that | 26 // on item which replaces it with a tombstone/"dead display item" that |
27 // can be safely destructed but should never be used. | 27 // can be safely destructed but should never be used. |
28 ASSERT(!item.hasValidClient()); | 28 DCHECK(!item.hasValidClient()); |
29 #ifndef NDEBUG | 29 #ifndef NDEBUG |
30 // Save original debug string in the old item to help debugging. | 30 // Save original debug string in the old item to help debugging. |
31 item.setClientDebugString(originalDebugString); | 31 item.setClientDebugString(originalDebugString); |
32 #endif | 32 #endif |
33 return result; | 33 return result; |
34 } | 34 } |
35 | 35 |
36 void DisplayItemList::appendVisualRect(const IntRect& visualRect) { | 36 void DisplayItemList::appendVisualRect(const IntRect& visualRect) { |
37 m_visualRects.push_back(visualRect); | 37 m_visualRects.push_back(visualRect); |
38 } | 38 } |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
106 String::format("[%d,%d %dx%d]", localVisualRect.x(), | 106 String::format("[%d,%d %dx%d]", localVisualRect.x(), |
107 localVisualRect.y(), localVisualRect.width(), | 107 localVisualRect.y(), localVisualRect.width(), |
108 localVisualRect.height())); | 108 localVisualRect.height())); |
109 } | 109 } |
110 jsonArray->pushObject(std::move(json)); | 110 jsonArray->pushObject(std::move(json)); |
111 } | 111 } |
112 return jsonArray; | 112 return jsonArray; |
113 } | 113 } |
114 | 114 |
115 } // namespace blink | 115 } // namespace blink |
OLD | NEW |