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

Side by Side Diff: cc/test/tiled_layer_test_common.cc

Issue 11074009: cc: Remove LayerTextureUpdater::Texture::updateRect() callback. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 8 years, 2 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
« no previous file with comments | « cc/test/tiled_layer_test_common.h ('k') | cc/texture_update_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "config.h" 5 #include "config.h"
6 6
7 #include "CCTiledLayerTestCommon.h" 7 #include "CCTiledLayerTestCommon.h"
8 8
9 using namespace cc; 9 using namespace cc;
10 10
11 namespace WebKitTests { 11 namespace WebKitTests {
12 12
13 FakeLayerTextureUpdater::Texture::Texture(FakeLayerTextureUpdater* layer, scoped _ptr<CCPrioritizedTexture> texture) 13 FakeLayerTextureUpdater::Texture::Texture(FakeLayerTextureUpdater* layer, scoped _ptr<CCPrioritizedTexture> texture)
14 : LayerTextureUpdater::Texture(texture.Pass()) 14 : LayerTextureUpdater::Texture(texture.Pass())
15 , m_layer(layer) 15 , m_layer(layer)
16 { 16 {
17 } 17 }
18 18
19 FakeLayerTextureUpdater::Texture::~Texture() 19 FakeLayerTextureUpdater::Texture::~Texture()
20 { 20 {
21 } 21 }
22 22
23 void FakeLayerTextureUpdater::Texture::updateRect(CCResourceProvider* resourcePr ovider, const IntRect&, const IntSize&) 23 void FakeLayerTextureUpdater::Texture::update(CCTextureUpdateQueue& queue, const IntRect&, const IntSize&, bool partialUpdate, CCRenderingStats&)
24 { 24 {
25 texture()->acquireBackingTexture(resourceProvider); 25 TextureUploader::Parameters upload = { texture(), NULL, NULL, { IntRect(), I ntRect(), IntSize() } };
26 m_layer->updateRect(); 26 if (partialUpdate)
27 } 27 queue.appendPartialUpload(upload);
28 else
29 queue.appendFullUpload(upload);
28 30
29 void FakeLayerTextureUpdater::Texture::prepareRect(const IntRect&, cc::CCRenderi ngStats&) 31 m_layer->update();
30 {
31 m_layer->prepareRect();
32 } 32 }
33 33
34 FakeLayerTextureUpdater::FakeLayerTextureUpdater() 34 FakeLayerTextureUpdater::FakeLayerTextureUpdater()
35 : m_prepareCount(0) 35 : m_prepareCount(0)
36 , m_updateCount(0) 36 , m_updateCount(0)
37 , m_prepareRectCount(0)
38 { 37 {
39 } 38 }
40 39
41 FakeLayerTextureUpdater::~FakeLayerTextureUpdater() 40 FakeLayerTextureUpdater::~FakeLayerTextureUpdater()
42 { 41 {
43 } 42 }
44 43
45 void FakeLayerTextureUpdater::prepareToUpdate(const IntRect& contentRect, const IntSize&, float, float, IntRect& resultingOpaqueRect, CCRenderingStats&) 44 void FakeLayerTextureUpdater::prepareToUpdate(const IntRect& contentRect, const IntSize&, float, float, IntRect& resultingOpaqueRect, CCRenderingStats&)
46 { 45 {
47 m_prepareCount++; 46 m_prepareCount++;
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 { 144 {
146 return 0; 145 return 0;
147 } 146 }
148 147
149 void FakeTextureUploader::markPendingUploadsAsNonBlocking() 148 void FakeTextureUploader::markPendingUploadsAsNonBlocking()
150 { 149 {
151 } 150 }
152 151
153 void FakeTextureUploader::uploadTexture(cc::CCResourceProvider* resourceProvider , Parameters upload) 152 void FakeTextureUploader::uploadTexture(cc::CCResourceProvider* resourceProvider , Parameters upload)
154 { 153 {
155 upload.texture->updateRect(resourceProvider, upload.sourceRect, upload.destO ffset); 154 upload.texture->acquireBackingTexture(resourceProvider);
156 } 155 }
157 156
158 double FakeTextureUploader::estimatedTexturesPerSecond() 157 double FakeTextureUploader::estimatedTexturesPerSecond()
159 { 158 {
160 return std::numeric_limits<double>::max(); 159 return std::numeric_limits<double>::max();
161 } 160 }
162 161
163 } // namespace 162 } // namespace
OLDNEW
« no previous file with comments | « cc/test/tiled_layer_test_common.h ('k') | cc/texture_update_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698