diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2020-02-13 08:22:31 +0100 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2020-02-14 12:16:06 +0000 |
| commit | 432e1a9b1a0fc3be1035adde2d36aff573679c86 (patch) | |
| tree | f2b11545b55ba7ad7a79a5add439e0769bc37481 | |
| parent | bbc3a3082b4a5080f9dc59098878c599e47c7b67 (diff) | |
| download | qtwebengine-chromium-432e1a9b1a0fc3be1035adde2d36aff573679c86.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.cc | 2 |
1 files changed, 2 insertions, 0 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 912fa83b133..3831ab71be9 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 @@ -1296,12 +1296,14 @@ static LayoutUnit ComputeContentSize( if (mode == NGLineBreakerMode::kMinContent) { *max_size_out = max_size_from_min_size.Finish(items_data.items.end()); +#ifndef TOOLKIT_QT // Check the max size matches to the value computed from 2 pass. DCHECK_EQ(**max_size_out, ComputeContentSize(node, container_writing_mode, input, NGLineBreakerMode::kMaxContent, max_size_cache, nullptr)) << node.GetLayoutBox(); +#endif } return result; |