Index: cc/layers/surface_layer.cc |
diff --git a/cc/layers/surface_layer.cc b/cc/layers/surface_layer.cc |
index 0f8bd3380be1aa873bf5ed197dcafabad45a9c51..dd16ed2dcee81aead883856e6089670e02846e14 100644 |
--- a/cc/layers/surface_layer.cc |
+++ b/cc/layers/surface_layer.cc |
@@ -7,6 +7,7 @@ |
#include <stdint.h> |
#include "base/macros.h" |
+#include "base/threading/thread_task_runner_handle.h" |
#include "base/trace_event/trace_event.h" |
#include "cc/layers/surface_layer_impl.h" |
#include "cc/output/swap_promise.h" |
@@ -18,16 +19,21 @@ namespace cc { |
class SatisfySwapPromise : public SwapPromise { |
public: |
- SatisfySwapPromise(SurfaceSequence sequence, |
- const SurfaceLayer::SatisfyCallback& satisfy_callback) |
- : sequence_(sequence), satisfy_callback_(satisfy_callback) {} |
+ SatisfySwapPromise( |
+ SurfaceSequence sequence, |
Fady Samuel
2016/12/08 18:01:33
nit: const SurfaceSequence& sequence
|
+ const SurfaceLayer::SatisfyCallback& satisfy_callback, |
+ scoped_refptr<base::SingleThreadTaskRunner> main_task_runner) |
+ : sequence_(sequence), |
+ satisfy_callback_(satisfy_callback), |
+ main_task_runner_(main_task_runner) {} |
dcheng
2016/12/08 19:25:38
NIt: std::move() this
|
~SatisfySwapPromise() override {} |
private: |
void DidActivate() override {} |
void DidSwap(CompositorFrameMetadata* metadata) override { |
- metadata->satisfies_sequences.push_back(sequence_.sequence); |
+ main_task_runner_->PostTask(FROM_HERE, |
+ base::Bind(satisfy_callback_, sequence_)); |
} |
DidNotSwapAction DidNotSwap(DidNotSwapReason reason) override { |
@@ -38,6 +44,7 @@ class SatisfySwapPromise : public SwapPromise { |
SurfaceSequence sequence_; |
SurfaceLayer::SatisfyCallback satisfy_callback_; |
+ scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_; |
DISALLOW_COPY_AND_ASSIGN(SatisfySwapPromise); |
}; |
@@ -118,7 +125,8 @@ void SurfaceLayer::SatisfyDestroySequence() { |
return; |
DCHECK(destroy_sequence_.is_valid()); |
std::unique_ptr<SatisfySwapPromise> satisfy( |
- new SatisfySwapPromise(destroy_sequence_, satisfy_callback_)); |
+ new SatisfySwapPromise(destroy_sequence_, satisfy_callback_, |
+ base::ThreadTaskRunnerHandle::Get())); |
layer_tree_host()->GetSwapPromiseManager()->QueueSwapPromise( |
std::move(satisfy)); |
destroy_sequence_ = SurfaceSequence(); |