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

Side by Side Diff: cc/layer_tree_host.h

Issue 11028132: cc: The recent texture manager bug uncovered some unnecessary code (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase to ToT Created 8 years, 1 month 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
« no previous file with comments | « no previous file | cc/layer_tree_host.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 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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 #ifndef CCLayerTreeHost_h 5 #ifndef CCLayerTreeHost_h
6 #define CCLayerTreeHost_h 6 #define CCLayerTreeHost_h
7 7
8 #include <limits> 8 #include <limits>
9 9
10 #include "IntRect.h" 10 #include "IntRect.h"
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 void setImplTransform(const WebKit::WebTransformationMatrix&); 188 void setImplTransform(const WebKit::WebTransformationMatrix&);
189 189
190 void startRateLimiter(WebKit::WebGraphicsContext3D*); 190 void startRateLimiter(WebKit::WebGraphicsContext3D*);
191 void stopRateLimiter(WebKit::WebGraphicsContext3D*); 191 void stopRateLimiter(WebKit::WebGraphicsContext3D*);
192 192
193 // RateLimitClient implementation 193 // RateLimitClient implementation
194 virtual void rateLimit() OVERRIDE; 194 virtual void rateLimit() OVERRIDE;
195 195
196 bool bufferedUpdates(); 196 bool bufferedUpdates();
197 bool requestPartialTextureUpdate(); 197 bool requestPartialTextureUpdate();
198 void deleteTextureAfterCommit(scoped_ptr<PrioritizedTexture>);
199 198
200 void setDeviceScaleFactor(float); 199 void setDeviceScaleFactor(float);
201 float deviceScaleFactor() const { return m_deviceScaleFactor; } 200 float deviceScaleFactor() const { return m_deviceScaleFactor; }
202 201
203 void setFontAtlas(scoped_ptr<FontAtlas>); 202 void setFontAtlas(scoped_ptr<FontAtlas>);
204 203
205 HeadsUpDisplayLayer* hudLayer() const { return m_hudLayer.get(); } 204 HeadsUpDisplayLayer* hudLayer() const { return m_hudLayer.get(); }
206 205
207 protected: 206 protected:
208 LayerTreeHost(LayerTreeHostClient*, const LayerTreeSettings&); 207 LayerTreeHost(LayerTreeHostClient*, const LayerTreeSettings&);
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 261
263 float m_pageScaleFactor; 262 float m_pageScaleFactor;
264 float m_minPageScaleFactor, m_maxPageScaleFactor; 263 float m_minPageScaleFactor, m_maxPageScaleFactor;
265 WebKit::WebTransformationMatrix m_implTransform; 264 WebKit::WebTransformationMatrix m_implTransform;
266 bool m_triggerIdleUpdates; 265 bool m_triggerIdleUpdates;
267 266
268 SkColor m_backgroundColor; 267 SkColor m_backgroundColor;
269 bool m_hasTransparentBackground; 268 bool m_hasTransparentBackground;
270 269
271 typedef ScopedPtrVector<PrioritizedTexture> TextureList; 270 typedef ScopedPtrVector<PrioritizedTexture> TextureList;
272 TextureList m_deleteTextureAfterCommitList;
273 size_t m_partialTextureUpdateRequests; 271 size_t m_partialTextureUpdateRequests;
274 272
275 static bool s_needsFilterContext; 273 static bool s_needsFilterContext;
276 274
277 DISALLOW_COPY_AND_ASSIGN(LayerTreeHost); 275 DISALLOW_COPY_AND_ASSIGN(LayerTreeHost);
278 }; 276 };
279 277
280 } // namespace cc 278 } // namespace cc
281 279
282 #endif 280 #endif
OLDNEW
« no previous file with comments | « no previous file | cc/layer_tree_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698