Chromium Code Reviews| Index: third_party/WebKit/Source/platform/graphics/paint/PaintController.cpp |
| diff --git a/third_party/WebKit/Source/platform/graphics/paint/PaintController.cpp b/third_party/WebKit/Source/platform/graphics/paint/PaintController.cpp |
| index 99229a013de5112f1a441b962747188779e123a5..f01bdc40ef97b3c87c3f6e05dab7f02f3a88488c 100644 |
| --- a/third_party/WebKit/Source/platform/graphics/paint/PaintController.cpp |
| +++ b/third_party/WebKit/Source/platform/graphics/paint/PaintController.cpp |
| @@ -287,10 +287,10 @@ void PaintController::ProcessNewItem(DisplayItem& display_item) { |
| if (index != kNotFound) { |
| #ifndef NDEBUG |
| ShowDebugData(); |
| - WTFLogAlways( |
| - "DisplayItem %s has duplicated id with previous %s (index=%zu)\n", |
| - display_item.AsDebugString().Utf8().data(), |
| - new_display_item_list_[index].AsDebugString().Utf8().data(), index); |
| + DLOG(INFO) << "DisplayItem " << display_item.AsDebugString().Utf8().data() |
| + << " has duplicated id with previous " |
| + << new_display_item_list_[index].AsDebugString().Utf8().data() |
| + << " (index=" << index << ")"; |
|
Stephen Chennney
2017/08/02 13:23:45
Same issue with unnecessary .Utf8().data()
|
| #endif |
| NOTREACHED(); |
| } |
| @@ -961,31 +961,35 @@ void PaintController::CheckUnderInvalidation() { |
| } |
| void PaintController::ShowDebugDataInternal(bool show_paint_records) const { |
| - WTFLogAlways("current display item list: [%s]\n", |
| - current_paint_artifact_.GetDisplayItemList() |
| - .SubsequenceAsJSON( |
| - 0, current_paint_artifact_.GetDisplayItemList().size(), |
| - show_paint_records |
| - ? DisplayItemList::JsonOptions::kShowPaintRecords |
| - : DisplayItemList::JsonOptions::kDefault) |
| - ->ToPrettyJSONString() |
| - .Utf8() |
| - .data()); |
| + DLOG(INFO) << "\n" |
| + << "current display item list: [" |
| + << current_paint_artifact_.GetDisplayItemList() |
| + .SubsequenceAsJSON( |
| + 0, current_paint_artifact_.GetDisplayItemList().size(), |
| + show_paint_records |
| + ? DisplayItemList::JsonOptions::kShowPaintRecords |
| + : DisplayItemList::JsonOptions::kDefault) |
| + ->ToPrettyJSONString() |
| + .Utf8() |
| + .data() |
| + << "]"; |
|
Stephen Chennney
2017/08/02 13:23:45
Ditto.
|
| // debugName() and clientCacheIsValid() can only be called on a live |
| // client, so only output it for m_newDisplayItemList, in which we are |
| // sure the clients are all alive. |
| - WTFLogAlways( |
| - "new display item list: [%s]\n", |
| - new_display_item_list_ |
| - .SubsequenceAsJSON( |
| - 0, new_display_item_list_.size(), |
| - show_paint_records |
| - ? (DisplayItemList::JsonOptions::kShowPaintRecords | |
| - DisplayItemList::JsonOptions::kShowClientDebugName) |
| - : DisplayItemList::JsonOptions::kShowClientDebugName) |
| - ->ToPrettyJSONString() |
| - .Utf8() |
| - .data()); |
| + DLOG(INFO) |
| + << "\n" |
| + << "new display item list: [" |
| + << new_display_item_list_ |
| + .SubsequenceAsJSON( |
| + 0, new_display_item_list_.size(), |
| + show_paint_records |
| + ? (DisplayItemList::JsonOptions::kShowPaintRecords | |
| + DisplayItemList::JsonOptions::kShowClientDebugName) |
| + : DisplayItemList::JsonOptions::kShowClientDebugName) |
| + ->ToPrettyJSONString() |
| + .Utf8() |
| + .data() |
| + << "]"; |
|
Stephen Chennney
2017/08/02 13:23:45
Ditto.
|
| } |
| void PaintController::SetFirstPainted() { |