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

Side by Side Diff: cc/texture_layer_unittest.cc

Issue 12335088: Move sync point from TransferResourceList to individual TransferResources (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test Created 7 years, 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/texture_layer.h" 5 #include "cc/texture_layer.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "cc/layer_tree_host.h" 10 #include "cc/layer_tree_host.h"
(...skipping 462 matching lines...) Expand 10 before | Expand all | Expand 10 after
473 TEST_F(TextureLayerImplWithMailboxTest, testCallbackOnInUseResource) 473 TEST_F(TextureLayerImplWithMailboxTest, testCallbackOnInUseResource)
474 { 474 {
475 ResourceProvider *provider = m_hostImpl.activeTree()->resource_provider(); 475 ResourceProvider *provider = m_hostImpl.activeTree()->resource_provider();
476 ResourceProvider::ResourceId id = 476 ResourceProvider::ResourceId id =
477 provider->createResourceFromTextureMailbox(m_testData.m_mailbox1); 477 provider->createResourceFromTextureMailbox(m_testData.m_mailbox1);
478 provider->allocateForTesting(id); 478 provider->allocateForTesting(id);
479 479
480 // Transfer some resources to the parent. 480 // Transfer some resources to the parent.
481 ResourceProvider::ResourceIdArray resourceIdsToTransfer; 481 ResourceProvider::ResourceIdArray resourceIdsToTransfer;
482 resourceIdsToTransfer.push_back(id); 482 resourceIdsToTransfer.push_back(id);
483 TransferableResourceList list; 483 TransferableResourceArray list;
484 provider->prepareSendToParent(resourceIdsToTransfer, &list); 484 provider->prepareSendToParent(resourceIdsToTransfer, &list);
485 EXPECT_TRUE(provider->inUseByConsumer(id)); 485 EXPECT_TRUE(provider->inUseByConsumer(id));
486 EXPECT_CALL(m_testData.m_mockCallback, Release(_, _)).Times(0); 486 EXPECT_CALL(m_testData.m_mockCallback, Release(_, _)).Times(0);
487 provider->deleteResource(id); 487 provider->deleteResource(id);
488 Mock::VerifyAndClearExpectations(&m_testData.m_mockCallback); 488 Mock::VerifyAndClearExpectations(&m_testData.m_mockCallback);
489 EXPECT_CALL(m_testData.m_mockCallback, 489 EXPECT_CALL(m_testData.m_mockCallback,
490 Release(m_testData.m_mailboxName1, _)).Times(1); 490 Release(m_testData.m_mailboxName1, _)).Times(1);
491 provider->receiveFromParent(list); 491 provider->receiveFromParent(list);
492 } 492 }
493 493
494 } // namespace 494 } // namespace
495 } // namespace cc 495 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698