Chromium Code Reviews| Index: cc/trees/layer_tree_host_impl.cc |
| diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc |
| index 1c602b9b944708a3d63a9f83262bc2814f1f16b0..e85648b2e19c5028bcff3e0712e8b38e46c2bf45 100644 |
| --- a/cc/trees/layer_tree_host_impl.cc |
| +++ b/cc/trees/layer_tree_host_impl.cc |
| @@ -1645,7 +1645,7 @@ LayerTreeHostImpl::GetRendererCapabilities() const { |
| bool LayerTreeHostImpl::SwapBuffers(const LayerTreeHostImpl::FrameData& frame) { |
| ResetRequiresHighResToDraw(); |
| if (frame.has_no_damage) { |
| - active_tree()->BreakSwapPromises(SwapPromise::SWAP_FAILS); |
| + active_tree()->BreakSwapPromises(Promise::DidNotSwap::SWAP_FAILS); |
| return false; |
| } |
| CompositorFrameMetadata metadata = MakeCompositorFrameMetadata(); |
| @@ -1862,6 +1862,9 @@ void LayerTreeHostImpl::ActivateSyncTree() { |
| if (!tree_activation_callback_.is_null()) |
| tree_activation_callback_.Run(); |
| + CompositorFrameMetadata metadata = MakeCompositorFrameMetadata(); |
|
boliu
2015/05/08 04:27:23
There's no frame for activation. DidActivate shoul
|
| + active_tree_->FinishActivationPromises(&metadata); |
| + |
| if (debug_state_.continuous_painting) { |
| const RenderingStats& stats = |
| rendering_stats_instrumentation_->GetRenderingStats(); |