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

Side by Side Diff: cc/LayerChromium.h

Issue 10917153: Update cc snapshot to r127918 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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/FloatQuadTest.cpp ('k') | cc/LayerChromium.cpp » ('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 2010 The Chromium Authors. All rights reserved. 1 // Copyright 2010 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 5
6 #ifndef LayerChromium_h 6 #ifndef LayerChromium_h
7 #define LayerChromium_h 7 #define LayerChromium_h
8 8
9 #if USE(ACCELERATED_COMPOSITING) 9 #if USE(ACCELERATED_COMPOSITING)
10 10
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 // It converts logical, non-page-scaled pixels to physical pixels. 217 // It converts logical, non-page-scaled pixels to physical pixels.
218 const WebKit::WebTransformationMatrix& screenSpaceTransform() const { return m_screenSpaceTransform; } 218 const WebKit::WebTransformationMatrix& screenSpaceTransform() const { return m_screenSpaceTransform; }
219 void setScreenSpaceTransform(const WebKit::WebTransformationMatrix& matrix) { m_screenSpaceTransform = matrix; } 219 void setScreenSpaceTransform(const WebKit::WebTransformationMatrix& matrix) { m_screenSpaceTransform = matrix; }
220 const IntRect& drawableContentRect() const { return m_drawableContentRect; } 220 const IntRect& drawableContentRect() const { return m_drawableContentRect; }
221 void setDrawableContentRect(const IntRect& rect) { m_drawableContentRect = r ect; } 221 void setDrawableContentRect(const IntRect& rect) { m_drawableContentRect = r ect; }
222 // The contentsScale converts from logical, non-page-scaled pixels to target pixels. 222 // The contentsScale converts from logical, non-page-scaled pixels to target pixels.
223 // The contentsScale is 1 for the root layer as it is already in physical pi xels. 223 // The contentsScale is 1 for the root layer as it is already in physical pi xels.
224 float contentsScale() const { return m_contentsScale; } 224 float contentsScale() const { return m_contentsScale; }
225 void setContentsScale(float); 225 void setContentsScale(float);
226 226
227 // When true, the layer's contents are not scaled by the current page scale factor.
228 void setBoundsContainPageScale(bool);
229 bool boundsContainPageScale() const { return m_boundsContainPageScale; }
230
227 // Returns true if any of the layer's descendants has content to draw. 231 // Returns true if any of the layer's descendants has content to draw.
228 bool descendantDrawsContent(); 232 bool descendantDrawsContent();
229 233
230 CCLayerTreeHost* layerTreeHost() const { return m_layerTreeHost; } 234 CCLayerTreeHost* layerTreeHost() const { return m_layerTreeHost; }
231 235
232 // Set the priority of all desired textures in this layer. 236 // Set the priority of all desired textures in this layer.
233 virtual void setTexturePriorities(const CCPriorityCalculator&) { } 237 virtual void setTexturePriorities(const CCPriorityCalculator&) { }
234 238
235 bool addAnimation(PassOwnPtr<CCActiveAnimation>); 239 bool addAnimation(PassOwnPtr<CCActiveAnimation>);
236 void pauseAnimation(int animationId, double timeOffset); 240 void pauseAnimation(int animationId, double timeOffset);
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 LayerChromium* m_renderTarget; 356 LayerChromium* m_renderTarget;
353 357
354 WebKit::WebTransformationMatrix m_drawTransform; 358 WebKit::WebTransformationMatrix m_drawTransform;
355 WebKit::WebTransformationMatrix m_screenSpaceTransform; 359 WebKit::WebTransformationMatrix m_screenSpaceTransform;
356 bool m_drawTransformIsAnimating; 360 bool m_drawTransformIsAnimating;
357 bool m_screenSpaceTransformIsAnimating; 361 bool m_screenSpaceTransformIsAnimating;
358 362
359 // Uses target surface space. 363 // Uses target surface space.
360 IntRect m_drawableContentRect; 364 IntRect m_drawableContentRect;
361 float m_contentsScale; 365 float m_contentsScale;
366 bool m_boundsContainPageScale;
362 367
363 WebKit::WebAnimationDelegate* m_layerAnimationDelegate; 368 WebKit::WebAnimationDelegate* m_layerAnimationDelegate;
364 WebKit::WebLayerScrollClient* m_layerScrollClient; 369 WebKit::WebLayerScrollClient* m_layerScrollClient;
365 }; 370 };
366 371
367 void sortLayers(Vector<RefPtr<LayerChromium> >::iterator, Vector<RefPtr<LayerChr omium> >::iterator, void*); 372 void sortLayers(Vector<RefPtr<LayerChromium> >::iterator, Vector<RefPtr<LayerChr omium> >::iterator, void*);
368 373
369 } 374 }
370 #endif // USE(ACCELERATED_COMPOSITING) 375 #endif // USE(ACCELERATED_COMPOSITING)
371 376
372 #endif 377 #endif
OLDNEW
« no previous file with comments | « cc/FloatQuadTest.cpp ('k') | cc/LayerChromium.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698