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

Unified Diff: cc/layers/texture_layer_unittest.cc

Issue 2270533002: cc: Remove the software compositing bool from PrepareTextureMailbox (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@softwarerendering
Patch Set: remove-prepare-mailbox-param: bad-merge Created 4 years, 4 months 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/layers/texture_layer_client.h ('k') | cc/output/delegating_renderer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/texture_layer_unittest.cc
diff --git a/cc/layers/texture_layer_unittest.cc b/cc/layers/texture_layer_unittest.cc
index 9454055474f15442cdc8041d2497e16afc835fe6..f03e04b76f6f30d05f62d9a61abfa60398f30728 100644
--- a/cc/layers/texture_layer_unittest.cc
+++ b/cc/layers/texture_layer_unittest.cc
@@ -103,8 +103,7 @@ class FakeTextureLayerClient : public TextureLayerClient {
bool PrepareTextureMailbox(
TextureMailbox* mailbox,
- std::unique_ptr<SingleReleaseCallback>* release_callback,
- bool use_shared_memory) override {
+ std::unique_ptr<SingleReleaseCallback>* release_callback) override {
if (!mailbox_changed_)
return false;
@@ -1052,8 +1051,7 @@ class TextureLayerNoExtraCommitForMailboxTest
// TextureLayerClient implementation.
bool PrepareTextureMailbox(
TextureMailbox* texture_mailbox,
- std::unique_ptr<SingleReleaseCallback>* release_callback,
- bool use_shared_memory) override {
+ std::unique_ptr<SingleReleaseCallback>* release_callback) override {
if (layer_tree_host()->source_frame_number() == 1) {
// Once this has been committed, the mailbox will be released.
*texture_mailbox = TextureMailbox();
@@ -1131,8 +1129,7 @@ class TextureLayerChangeInvisibleMailboxTest
// TextureLayerClient implementation.
bool PrepareTextureMailbox(
TextureMailbox* mailbox,
- std::unique_ptr<SingleReleaseCallback>* release_callback,
- bool use_shared_memory) override {
+ std::unique_ptr<SingleReleaseCallback>* release_callback) override {
++prepare_called_;
if (!mailbox_changed_)
return false;
@@ -1251,8 +1248,7 @@ class TextureLayerReleaseResourcesBase
// TextureLayerClient implementation.
bool PrepareTextureMailbox(
TextureMailbox* mailbox,
- std::unique_ptr<SingleReleaseCallback>* release_callback,
- bool use_shared_memory) override {
+ std::unique_ptr<SingleReleaseCallback>* release_callback) override {
*mailbox = TextureMailbox(MailboxFromChar('1'), SyncTokenFromUInt(1),
GL_TEXTURE_2D);
*release_callback = SingleReleaseCallback::Create(
« no previous file with comments | « cc/layers/texture_layer_client.h ('k') | cc/output/delegating_renderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698