From 573ac8f40079aa4429fe734a7f1c7baef546c277 Mon Sep 17 00:00:00 2001 From: Szabolcs David Date: Wed, 24 Oct 2018 14:28:30 +0200 Subject: Disable some DCHECKs to fix printing Change-Id: Ie30a7514b1538b243f3bfe16709fcc9c8209fc12 Reviewed-by: Allan Sandfeld Jensen --- .../blink/renderer/platform/graphics/paint/drawing_recorder.cc | 2 +- .../blink/renderer/platform/graphics/paint/paint_controller.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/chromium/third_party/blink/renderer/platform/graphics/paint/drawing_recorder.cc b/chromium/third_party/blink/renderer/platform/graphics/paint/drawing_recorder.cc index 323eb4aef18..5671b806c32 100644 --- a/chromium/third_party/blink/renderer/platform/graphics/paint/drawing_recorder.cc +++ b/chromium/third_party/blink/renderer/platform/graphics/paint/drawing_recorder.cc @@ -60,7 +60,7 @@ DrawingRecorder::~DrawingRecorder() { sk_sp picture = context_.EndRecording(); -#if DCHECK_IS_ON() +#if DCHECK_IS_ON() && !defined(TOOLKIT_QT) // When skipping cache (e.g. in PaintRecordBuilder with a temporary // PaintController), the client's painting might be different from its normal // painting. diff --git a/chromium/third_party/blink/renderer/platform/graphics/paint/paint_controller.cc b/chromium/third_party/blink/renderer/platform/graphics/paint/paint_controller.cc index abaa96b51bb..745cfbf980c 100644 --- a/chromium/third_party/blink/renderer/platform/graphics/paint/paint_controller.cc +++ b/chromium/third_party/blink/renderer/platform/graphics/paint/paint_controller.cc @@ -752,7 +752,7 @@ void PaintController::CheckDuplicatePaintChunkId(const PaintChunk::Id& id) { const auto& chunk = new_paint_chunks_.PaintChunkAt(index); if (chunk.id == id) { ShowDebugData(); - NOTREACHED() << "New paint chunk id " << id.ToString().Utf8().data() + DLOG(ERROR) << "New paint chunk id " << id.ToString().Utf8().data() << " has duplicated id with previous chuck " << chunk.ToString().Utf8().data(); } -- cgit v1.2.1