summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Varga <pvarga@inf.u-szeged.hu>2020-02-13 08:27:27 +0100
committerPeter Varga <pvarga@inf.u-szeged.hu>2020-02-14 12:15:59 +0000
commita0781dc499809c340761721591a7bca78009d189 (patch)
tree021e817b9bb789f306738cc0db98dcc922191ce2
parentb6d6e4b4aba0f78fbdc71c5f88731ae5ff0ac390 (diff)
downloadqtwebengine-chromium-a0781dc499809c340761721591a7bca78009d189.tar.gz
Suppress DCHECK triggered by NGInlineNode::ComputeMinMaxSize
Task-number: QTBUG-82060 Change-Id: I59cd70e179d8e44d214c37e7a1dcf026ca0e65a1 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--chromium/third_party/blink/renderer/core/layout/ng/inline/ng_inline_node.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/third_party/blink/renderer/core/layout/ng/inline/ng_inline_node.cc b/chromium/third_party/blink/renderer/core/layout/ng/inline/ng_inline_node.cc
index c42d8af65b9..660f0b43314 100644
--- a/chromium/third_party/blink/renderer/core/layout/ng/inline/ng_inline_node.cc
+++ b/chromium/third_party/blink/renderer/core/layout/ng/inline/ng_inline_node.cc
@@ -1740,7 +1740,7 @@ static LayoutUnit ComputeContentSize(
if (mode == NGLineBreakerMode::kMinContent) {
*max_size_out = max_size_from_min_size.Finish(items_data.items.end());
// Check the max size matches to the value computed from 2 pass.
-#if DCHECK_IS_ON()
+#if DCHECK_IS_ON() && !defined(TOOLKIT_QT)
LayoutUnit content_size = ComputeContentSize(
node, container_writing_mode, input, NGLineBreakerMode::kMaxContent,
max_size_cache, nullptr);