diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-24 12:15:48 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-28 13:30:04 +0000 |
| commit | b014812705fc80bff0a5c120dfcef88f349816dc (patch) | |
| tree | 25a2e2d9fa285f1add86aa333389a839f81a39ae /chromium/cc/trees/single_thread_proxy.cc | |
| parent | 9f4560b1027ae06fdb497023cdcaf91b8511fa74 (diff) | |
BASELINE: Update Chromium to 68.0.3440.125
Change-Id: I23f19369e01f688e496f5bf179abb521ad73874f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/cc/trees/single_thread_proxy.cc')
| -rw-r--r-- | chromium/cc/trees/single_thread_proxy.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/chromium/cc/trees/single_thread_proxy.cc b/chromium/cc/trees/single_thread_proxy.cc index 541e264e720..28c45b6196b 100644 --- a/chromium/cc/trees/single_thread_proxy.cc +++ b/chromium/cc/trees/single_thread_proxy.cc @@ -381,10 +381,6 @@ size_t SingleThreadProxy::MainThreadAnimationsCount() const { return 0; } -size_t SingleThreadProxy::MainThreadCompositableAnimationsCount() const { - return 0; -} - bool SingleThreadProxy::CurrentFrameHadRAF() const { return false; } @@ -748,8 +744,8 @@ void SingleThreadProxy::BeginMainFrame( // know we will commit since QueueSwapPromise itself requests a commit. ui::LatencyInfo new_latency_info(ui::SourceEventType::FRAME); new_latency_info.AddLatencyNumberWithTimestamp( - ui::LATENCY_BEGIN_FRAME_UI_MAIN_COMPONENT, 0, 0, - begin_frame_args.frame_time, 1); + ui::LATENCY_BEGIN_FRAME_UI_MAIN_COMPONENT, 0, begin_frame_args.frame_time, + 1); layer_tree_host_->QueueSwapPromise( std::make_unique<LatencyInfoSwapPromise>(new_latency_info)); @@ -839,7 +835,9 @@ void SingleThreadProxy::ScheduledActionPrepareTiles() { } void SingleThreadProxy::ScheduledActionInvalidateLayerTreeFrameSink() { - NOTREACHED(); + // This is an Android WebView codepath, which only uses multi-thread + // compositor. So this should not occur in single-thread mode. + NOTREACHED() << "Android Webview use-case, so multi-thread only"; } void SingleThreadProxy::ScheduledActionPerformImplSideInvalidation() { |