diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2018-10-16 15:44:36 +0200 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2018-10-16 14:23:15 +0000 |
| commit | 156c2b70ceef9a4464a5a241c9f816dea4fd3168 (patch) | |
| tree | 1cf72111e8e88c33ac1c46cc46a06bc853f078a5 | |
| parent | 52bf8b453173479d2128fc1a31532a76989349f7 (diff) | |
Disable "some invariants violation checks" for Qtv5.12.0-beta3
Task-number: QTBUG-71188
Change-Id: Ia81a1d090c9dbbff0de3128e1b9206df0289d318
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | chromium/cc/trees/layer_tree_host.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/cc/trees/layer_tree_host.cc b/chromium/cc/trees/layer_tree_host.cc index 09f2fe5e574..da80c4a31c3 100644 --- a/chromium/cc/trees/layer_tree_host.cc +++ b/chromium/cc/trees/layer_tree_host.cc @@ -1097,7 +1097,7 @@ void LayerTreeHost::SetViewportSizeAndScale( if (changed) { SetPropertyTreesNeedRebuild(); SetNeedsCommit(); -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) && !defined(TOOLKIT_QT) // TODO(ccameron): This check is not valid on Aura or Mus yet, but should // be. CHECK(!has_pushed_local_surface_id_from_parent_ || |