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

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 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
« no previous file with comments | « no previous file | cc/layer_tree_host.cc » ('j') | cc/tiled_layer.cc » ('J')
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 "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/hash_tables.h" 9 #include "base/hash_tables.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 void setImplTransform(const WebKit::WebTransformationMatrix&); 187 void setImplTransform(const WebKit::WebTransformationMatrix&);
188 188
189 void startRateLimiter(WebKit::WebGraphicsContext3D*); 189 void startRateLimiter(WebKit::WebGraphicsContext3D*);
190 void stopRateLimiter(WebKit::WebGraphicsContext3D*); 190 void stopRateLimiter(WebKit::WebGraphicsContext3D*);
191 191
192 // RateLimitClient implementation 192 // RateLimitClient implementation
193 virtual void rateLimit() OVERRIDE; 193 virtual void rateLimit() OVERRIDE;
194 194
195 bool bufferedUpdates(); 195 bool bufferedUpdates();
196 bool requestPartialTextureUpdate(); 196 bool requestPartialTextureUpdate();
197 void deleteTextureAfterCommit(scoped_ptr<CCPrioritizedTexture>);
198 197
199 void setDeviceScaleFactor(float); 198 void setDeviceScaleFactor(float);
200 float deviceScaleFactor() const { return m_deviceScaleFactor; } 199 float deviceScaleFactor() const { return m_deviceScaleFactor; }
201 200
202 void setFontAtlas(scoped_ptr<CCFontAtlas>); 201 void setFontAtlas(scoped_ptr<CCFontAtlas>);
203 202
204 HeadsUpDisplayLayerChromium* hudLayer() const { return m_hudLayer.get(); } 203 HeadsUpDisplayLayerChromium* hudLayer() const { return m_hudLayer.get(); }
205 204
206 protected: 205 protected:
207 CCLayerTreeHost(CCLayerTreeHostClient*, const CCLayerTreeSettings&); 206 CCLayerTreeHost(CCLayerTreeHostClient*, const CCLayerTreeSettings&);
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 260
262 float m_pageScaleFactor; 261 float m_pageScaleFactor;
263 float m_minPageScaleFactor, m_maxPageScaleFactor; 262 float m_minPageScaleFactor, m_maxPageScaleFactor;
264 WebKit::WebTransformationMatrix m_implTransform; 263 WebKit::WebTransformationMatrix m_implTransform;
265 bool m_triggerIdleUpdates; 264 bool m_triggerIdleUpdates;
266 265
267 SkColor m_backgroundColor; 266 SkColor m_backgroundColor;
268 bool m_hasTransparentBackground; 267 bool m_hasTransparentBackground;
269 268
270 typedef ScopedPtrVector<CCPrioritizedTexture> TextureList; 269 typedef ScopedPtrVector<CCPrioritizedTexture> TextureList;
271 TextureList m_deleteTextureAfterCommitList;
272 size_t m_partialTextureUpdateRequests; 270 size_t m_partialTextureUpdateRequests;
273 271
274 static bool s_needsFilterContext; 272 static bool s_needsFilterContext;
275 273
276 DISALLOW_COPY_AND_ASSIGN(CCLayerTreeHost); 274 DISALLOW_COPY_AND_ASSIGN(CCLayerTreeHost);
277 }; 275 };
278 276
279 } // namespace cc 277 } // namespace cc
280 278
281 #endif 279 #endif
OLDNEW
« no previous file with comments | « no previous file | cc/layer_tree_host.cc » ('j') | cc/tiled_layer.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698