Skip to content

Commit

Permalink
Revert "cc: CHECK surface invariants in LayerTreeHost on all platforms"
Browse files Browse the repository at this point in the history
This reverts commit 827ddeb.

Reason for revert: crbug.com/823119

Original change's description:
> cc: CHECK surface invariants in LayerTreeHost on all platforms
>
> This is an option now that aura::WindowTreeHost have been fixed
>
> Bug: 818085
> Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel
> Change-Id: I074ade34758a5005862543549e4bbe69838301b9
> Reviewed-on: https://chromium-review.googlesource.com/959550
> Commit-Queue: ccameron <ccameron@chromium.org>
> Reviewed-by: Fady Samuel <fsamuel@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#543656}

TBR=ccameron@chromium.org,fsamuel@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 818085, 823119
Change-Id: Ib0e66b23c1fb3420a2a6d38e17255e7b01b9e803
Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel
Reviewed-on: https://chromium-review.googlesource.com/968161
Commit-Queue: ccameron <ccameron@chromium.org>
Reviewed-by: ccameron <ccameron@chromium.org>
Cr-Commit-Position: refs/heads/master@{#543993}
  • Loading branch information
ccameron-chromium authored and Commit Bot committed Mar 19, 2018
1 parent 62158e3 commit 519c97b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 5 additions & 0 deletions cc/trees/layer_tree_host.cc
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include "base/timer/elapsed_timer.h"
#include "base/trace_event/trace_event.h"
#include "base/trace_event/trace_event_argument.h"
#include "build/build_config.h"
#include "cc/base/devtools_instrumentation.h"
#include "cc/base/histograms.h"
#include "cc/base/math_util.h"
Expand Down Expand Up @@ -1079,7 +1080,11 @@ void LayerTreeHost::SetViewportSizeAndScale(
if (changed) {
SetPropertyTreesNeedRebuild();
SetNeedsCommit();
#if defined(OS_MACOSX)
// TODO(ccameron): This check is not valid on Aura or Mus yet, but should
// be.
CHECK(!has_pushed_local_surface_id_ || !local_surface_id_.is_valid());
#endif
}
}

Expand Down
2 changes: 0 additions & 2 deletions testing/buildbot/filters/mash.ash_unittests.filter
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,6 @@
-HighlighterControllerTest.HighlighterGesturesScaled
# Test is flaky. http://crbug.com/817327.
-HighlighterControllerTest.HighlighterGesturesRotated
# Test fails due to DSF routing bug https://crbug.com/821535
-HighlighterControllerTest.SelectionInsideScreen

# TODO: Top-of-screen mouse reveal doesn't work, maybe problem with
# EventGenerator. http://crbug.com/698085
Expand Down

0 comments on commit 519c97b

Please sign in to comment.