Make RenderViewImpl::OnForceRedraw more robust

cc/trees/layer_tree_impl.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/trees/layer_tree_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 1465 matching lines @@
 }
 
 void LayerTreeImpl::QueuePinnedSwapPromise(
     std::unique_ptr<SwapPromise> swap_promise) {
   DCHECK(IsActiveTree());
   DCHECK(swap_promise);
   pinned_swap_promise_list_.push_back(std::move(swap_promise));
 }
 
 void LayerTreeImpl::PassSwapPromises(
-    std::vector<std::unique_ptr<SwapPromise>>* new_swap_promise) {
-  for (const auto& swap_promise : swap_promise_list_)
-    swap_promise->DidNotSwap(SwapPromise::SWAP_FAILS);
+    std::vector<std::unique_ptr<SwapPromise>>* new_swap_promises) {
+  for (auto& swap_promise : swap_promise_list_) {
+    if (swap_promise->DidNotSwap(SwapPromise::SWAP_FAILS) ==
+        SwapPromise::DidNotSwapAction::KEEP_ACTIVE) {
+      // |swap_promise| must remain active, so place it to |new_swap_promises|

[danakj, 2016/08/10 01:04:15]

"place it in"

[svartmetal, 2016/08/10 17:38:22]

Done.

+      // in order to keep it alive and active.
+      new_swap_promises->push_back(std::move(swap_promise));
+    }
+  }
   swap_promise_list_.clear();
-  swap_promise_list_.swap(*new_swap_promise);
+  swap_promise_list_.swap(*new_swap_promises);
 }
 
 void LayerTreeImpl::FinishSwapPromises(CompositorFrameMetadata* metadata) {
   for (const auto& swap_promise : swap_promise_list_)
     swap_promise->DidSwap(metadata);
   swap_promise_list_.clear();
   for (const auto& swap_promise : pinned_swap_promise_list_)
     swap_promise->DidSwap(metadata);
   pinned_swap_promise_list_.clear();
 }
 
 void LayerTreeImpl::BreakSwapPromises(SwapPromise::DidNotSwapReason reason) {
-  for (const auto& swap_promise : swap_promise_list_)
-    swap_promise->DidNotSwap(reason);
-  swap_promise_list_.clear();
-  for (const auto& swap_promise : pinned_swap_promise_list_)
-    swap_promise->DidNotSwap(reason);
-  pinned_swap_promise_list_.clear();
+  {
+    std::vector<std::unique_ptr<SwapPromise>> persistent_swap_promises;
+    for (auto& swap_promise : swap_promise_list_) {
+      if (swap_promise->DidNotSwap(reason) ==
+          SwapPromise::DidNotSwapAction::KEEP_ACTIVE) {
+        persistent_swap_promises.push_back(std::move(swap_promise));
+      }
+    }
+    // |persistent_swap_promises| must remain active even when swap fails.
+    swap_promise_list_.swap(persistent_swap_promises);

[danakj, 2016/08/10 01:04:15]

nit: swap_promise_list_ = std::move(persistent_swap_promises) cuz we don't
actually care what ends up in persistent_swap_promises.

[svartmetal, 2016/08/10 17:38:22]

Done.

+  }
+
+  {
+    std::vector<std::unique_ptr<SwapPromise>> persistent_swap_promises;
+    for (auto& swap_promise : pinned_swap_promise_list_) {
+      if (swap_promise->DidNotSwap(reason) ==
+          SwapPromise::DidNotSwapAction::KEEP_ACTIVE) {
+        persistent_swap_promises.push_back(std::move(swap_promise));
+      }
+    }
+
+    // |persistent_swap_promises| must remain active even when swap fails.
+    pinned_swap_promise_list_.swap(persistent_swap_promises);

[danakj, 2016/08/10 01:04:15]

ditto

[svartmetal, 2016/08/10 17:38:21]

Done.

+  }
 }
 
 void LayerTreeImpl::DidModifyTilePriorities() {
   layer_tree_host_impl_->DidModifyTilePriorities();
 }
 
 void LayerTreeImpl::set_ui_resource_request_queue(
     const UIResourceRequestQueue& queue) {
   ui_resource_request_queue_ = queue;
 }
@@ skipping 514 matching lines @@
 
 void LayerTreeImpl::ResetAllChangeTracking() {
   layers_that_should_push_properties_.clear();
   // Iterate over all layers, including masks and replicas.
   for (auto& layer : *layers_)
     layer->ResetChangeTracking();
   property_trees_.ResetAllChangeTracking();
 }
 
 }  // namespace cc