Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1293)

Unified Diff: cc/layers/surface_layer.cc

Issue 2585543003: Revert of Getting rid of CompositorFrameMetadata::satisfies_sequences (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/ipc/struct_traits_unittest.cc ('k') | cc/layers/surface_layer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/surface_layer.cc
diff --git a/cc/layers/surface_layer.cc b/cc/layers/surface_layer.cc
index d3b25acf5f522151c45a473dd263c68d103f31a6..3ff9e67aaa796bbff41a2ed2a4312341cf67d13c 100644
--- a/cc/layers/surface_layer.cc
+++ b/cc/layers/surface_layer.cc
@@ -7,7 +7,6 @@
#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"
@@ -19,36 +18,27 @@
class SatisfySwapPromise : public SwapPromise {
public:
- SatisfySwapPromise(
- const SurfaceSequence& sequence,
- const SurfaceLayer::SatisfyCallback& satisfy_callback,
- scoped_refptr<base::SingleThreadTaskRunner> main_task_runner)
- : sequence_(sequence),
- satisfy_callback_(satisfy_callback),
- main_task_runner_(std::move(main_task_runner)) {}
+ SatisfySwapPromise(SurfaceSequence sequence,
+ const SurfaceLayer::SatisfyCallback& satisfy_callback)
+ : sequence_(sequence), satisfy_callback_(satisfy_callback) {}
~SatisfySwapPromise() override {}
private:
void DidActivate() override {}
- void WillSwap(CompositorFrameMetadata* metadata) override {}
- void DidSwap() override {
- // DidSwap could run on compositor thread but satisfy callback must
- // run on the main thread.
- main_task_runner_->PostTask(FROM_HERE,
- base::Bind(satisfy_callback_, sequence_));
+ void WillSwap(CompositorFrameMetadata* metadata) override {
+ metadata->satisfies_sequences.push_back(sequence_.sequence);
}
+ void DidSwap() override {}
DidNotSwapAction DidNotSwap(DidNotSwapReason reason) override {
- main_task_runner_->PostTask(FROM_HERE,
- base::Bind(satisfy_callback_, sequence_));
+ satisfy_callback_.Run(sequence_);
return DidNotSwapAction::BREAK_PROMISE;
}
int64_t TraceId() const override { return 0; }
SurfaceSequence sequence_;
SurfaceLayer::SatisfyCallback satisfy_callback_;
- scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;
DISALLOW_COPY_AND_ASSIGN(SatisfySwapPromise);
};
@@ -130,9 +120,8 @@
if (!layer_tree_host())
return;
DCHECK(destroy_sequence_.is_valid());
- auto satisfy =
- base::MakeUnique<SatisfySwapPromise>(destroy_sequence_, satisfy_callback_,
- base::ThreadTaskRunnerHandle::Get());
+ std::unique_ptr<SatisfySwapPromise> satisfy(
+ new SatisfySwapPromise(destroy_sequence_, satisfy_callback_));
layer_tree_host()->GetSwapPromiseManager()->QueueSwapPromise(
std::move(satisfy));
destroy_sequence_ = SurfaceSequence();
« no previous file with comments | « cc/ipc/struct_traits_unittest.cc ('k') | cc/layers/surface_layer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698