diff options
| author | Szabolcs David <davidsz@inf.u-szeged.hu> | 2018-10-24 14:28:30 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-12-20 13:50:53 +0100 |
| commit | ddd92bd2f65b313f72ef3cbc138e259f54ad8ff7 (patch) | |
| tree | 627449eec0c0000e7b1dc2593bc31a70010a4ad5 | |
| parent | 6a61d723dba4bd8b688028e3b0fdf4540a3ab328 (diff) | |
| download | qtwebengine-chromium-ddd92bd2f65b313f72ef3cbc138e259f54ad8ff7.tar.gz | |
Disable some DCHECKs to fix printing
Change-Id: Ie30a7514b1538b243f3bfe16709fcc9c8209fc12
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | chromium/third_party/blink/renderer/platform/graphics/paint/drawing_recorder.cc | 2 | ||||
| -rw-r--r-- | chromium/third_party/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<const PaintRecord> 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 b2faaef74f8..75ab274bc44 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 @@ -750,7 +750,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(); } |