OLD | NEW |
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 CCLayerImpl_h | 5 #ifndef CCLayerImpl_h |
6 #define CCLayerImpl_h | 6 #define CCLayerImpl_h |
7 | 7 |
8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "cc/scoped_ptr_vector.h" | 9 #include "cc/scoped_ptr_vector.h" |
10 #include "CCInputHandler.h" | 10 #include "CCInputHandler.h" |
11 #include "CCLayerAnimationController.h" | 11 #include "CCLayerAnimationController.h" |
12 #include "CCRenderPass.h" | 12 #include "CCRenderPass.h" |
13 #include "CCRenderSurface.h" | 13 #include "CCRenderSurface.h" |
14 #include "CCResourceProvider.h" | 14 #include "CCResourceProvider.h" |
15 #include "CCSharedQuadState.h" | 15 #include "CCSharedQuadState.h" |
16 #include "FloatRect.h" | 16 #include "FloatRect.h" |
17 #include "IntRect.h" | 17 #include "IntRect.h" |
18 #include "Region.h" | 18 #include "Region.h" |
19 #include "third_party/skia/include/core/SkColor.h" | 19 #include "third_party/skia/include/core/SkColor.h" |
20 #include <public/WebFilterOperations.h> | 20 #include <public/WebFilterOperations.h> |
21 #include <public/WebTransformationMatrix.h> | 21 #include <public/WebTransformationMatrix.h> |
22 #include <string> | 22 #include <string> |
23 | 23 |
24 namespace cc { | 24 namespace cc { |
25 | 25 |
26 class CCLayerSorter; | 26 class LayerSorter; |
27 class CCLayerTreeHostImpl; | 27 class LayerTreeHostImpl; |
28 class CCQuadSink; | 28 class QuadSink; |
29 class CCRenderer; | 29 class Renderer; |
30 class CCScrollbarAnimationController; | 30 class ScrollbarAnimationController; |
31 class CCScrollbarLayerImpl; | 31 class ScrollbarLayerImpl; |
32 class LayerChromium; | 32 class Layer; |
33 | 33 |
34 struct CCAppendQuadsData; | 34 struct AppendQuadsData; |
35 | 35 |
36 class CCLayerImpl : public CCLayerAnimationControllerClient { | 36 class LayerImpl : public LayerAnimationControllerClient { |
37 public: | 37 public: |
38 static scoped_ptr<CCLayerImpl> create(int id) | 38 static scoped_ptr<LayerImpl> create(int id) |
39 { | 39 { |
40 return make_scoped_ptr(new CCLayerImpl(id)); | 40 return make_scoped_ptr(new LayerImpl(id)); |
41 } | 41 } |
42 | 42 |
43 virtual ~CCLayerImpl(); | 43 virtual ~LayerImpl(); |
44 | 44 |
45 // CCLayerAnimationControllerClient implementation. | 45 // LayerAnimationControllerClient implementation. |
46 virtual int id() const OVERRIDE; | 46 virtual int id() const OVERRIDE; |
47 virtual void setOpacityFromAnimation(float) OVERRIDE; | 47 virtual void setOpacityFromAnimation(float) OVERRIDE; |
48 virtual float opacity() const OVERRIDE; | 48 virtual float opacity() const OVERRIDE; |
49 virtual void setTransformFromAnimation(const WebKit::WebTransformationMatrix
&) OVERRIDE; | 49 virtual void setTransformFromAnimation(const WebKit::WebTransformationMatrix
&) OVERRIDE; |
50 virtual const WebKit::WebTransformationMatrix& transform() const OVERRIDE; | 50 virtual const WebKit::WebTransformationMatrix& transform() const OVERRIDE; |
51 | 51 |
52 // Tree structure. | 52 // Tree structure. |
53 CCLayerImpl* parent() const { return m_parent; } | 53 LayerImpl* parent() const { return m_parent; } |
54 const ScopedPtrVector<CCLayerImpl>& children() const { return m_children; } | 54 const ScopedPtrVector<LayerImpl>& children() const { return m_children; } |
55 void addChild(scoped_ptr<CCLayerImpl>); | 55 void addChild(scoped_ptr<LayerImpl>); |
56 void removeFromParent(); | 56 void removeFromParent(); |
57 void removeAllChildren(); | 57 void removeAllChildren(); |
58 | 58 |
59 void setMaskLayer(scoped_ptr<CCLayerImpl>); | 59 void setMaskLayer(scoped_ptr<LayerImpl>); |
60 CCLayerImpl* maskLayer() const { return m_maskLayer.get(); } | 60 LayerImpl* maskLayer() const { return m_maskLayer.get(); } |
61 | 61 |
62 void setReplicaLayer(scoped_ptr<CCLayerImpl>); | 62 void setReplicaLayer(scoped_ptr<LayerImpl>); |
63 CCLayerImpl* replicaLayer() const { return m_replicaLayer.get(); } | 63 LayerImpl* replicaLayer() const { return m_replicaLayer.get(); } |
64 | 64 |
65 bool hasMask() const { return m_maskLayer; } | 65 bool hasMask() const { return m_maskLayer; } |
66 bool hasReplica() const { return m_replicaLayer; } | 66 bool hasReplica() const { return m_replicaLayer; } |
67 bool replicaHasMask() const { return m_replicaLayer && (m_maskLayer || m_rep
licaLayer->m_maskLayer); } | 67 bool replicaHasMask() const { return m_replicaLayer && (m_maskLayer || m_rep
licaLayer->m_maskLayer); } |
68 | 68 |
69 CCLayerTreeHostImpl* layerTreeHostImpl() const { return m_layerTreeHostImpl;
} | 69 LayerTreeHostImpl* layerTreeHostImpl() const { return m_layerTreeHostImpl; } |
70 void setLayerTreeHostImpl(CCLayerTreeHostImpl* hostImpl) { m_layerTreeHostIm
pl = hostImpl; } | 70 void setLayerTreeHostImpl(LayerTreeHostImpl* hostImpl) { m_layerTreeHostImpl
= hostImpl; } |
71 | 71 |
72 scoped_ptr<CCSharedQuadState> createSharedQuadState() const; | 72 scoped_ptr<SharedQuadState> createSharedQuadState() const; |
73 // willDraw must be called before appendQuads. If willDraw is called, | 73 // willDraw must be called before appendQuads. If willDraw is called, |
74 // didDraw is guaranteed to be called before another willDraw or before | 74 // didDraw is guaranteed to be called before another willDraw or before |
75 // the layer is destroyed. To enforce this, any class that overrides | 75 // the layer is destroyed. To enforce this, any class that overrides |
76 // willDraw/didDraw must call the base class version. | 76 // willDraw/didDraw must call the base class version. |
77 virtual void willDraw(CCResourceProvider*); | 77 virtual void willDraw(ResourceProvider*); |
78 virtual void appendQuads(CCQuadSink&, CCAppendQuadsData&) { } | 78 virtual void appendQuads(QuadSink&, AppendQuadsData&) { } |
79 virtual void didDraw(CCResourceProvider*); | 79 virtual void didDraw(ResourceProvider*); |
80 | 80 |
81 virtual CCResourceProvider::ResourceId contentsResourceId() const; | 81 virtual ResourceProvider::ResourceId contentsResourceId() const; |
82 | 82 |
83 virtual bool hasContributingDelegatedRenderPasses() const; | 83 virtual bool hasContributingDelegatedRenderPasses() const; |
84 virtual CCRenderPass::Id firstContributingRenderPassId() const; | 84 virtual RenderPass::Id firstContributingRenderPassId() const; |
85 virtual CCRenderPass::Id nextContributingRenderPassId(CCRenderPass::Id) cons
t; | 85 virtual RenderPass::Id nextContributingRenderPassId(RenderPass::Id) const; |
86 | 86 |
87 // Returns true if this layer has content to draw. | 87 // Returns true if this layer has content to draw. |
88 void setDrawsContent(bool); | 88 void setDrawsContent(bool); |
89 bool drawsContent() const { return m_drawsContent; } | 89 bool drawsContent() const { return m_drawsContent; } |
90 | 90 |
91 bool forceRenderSurface() const { return m_forceRenderSurface; } | 91 bool forceRenderSurface() const { return m_forceRenderSurface; } |
92 void setForceRenderSurface(bool force) { m_forceRenderSurface = force; } | 92 void setForceRenderSurface(bool force) { m_forceRenderSurface = force; } |
93 | 93 |
94 // Returns true if any of the layer's descendants has content to draw. | 94 // Returns true if any of the layer's descendants has content to draw. |
95 virtual bool descendantDrawsContent(); | 95 virtual bool descendantDrawsContent(); |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
143 void setDebugBorderColor(SkColor); | 143 void setDebugBorderColor(SkColor); |
144 SkColor debugBorderColor() const { return m_debugBorderColor; } | 144 SkColor debugBorderColor() const { return m_debugBorderColor; } |
145 void setDebugBorderWidth(float); | 145 void setDebugBorderWidth(float); |
146 float debugBorderWidth() const { return m_debugBorderWidth; } | 146 float debugBorderWidth() const { return m_debugBorderWidth; } |
147 bool hasDebugBorders() const; | 147 bool hasDebugBorders() const; |
148 | 148 |
149 // Debug layer name. | 149 // Debug layer name. |
150 void setDebugName(const std::string& debugName) { m_debugName = debugName; } | 150 void setDebugName(const std::string& debugName) { m_debugName = debugName; } |
151 std::string debugName() const { return m_debugName; } | 151 std::string debugName() const { return m_debugName; } |
152 | 152 |
153 CCRenderSurface* renderSurface() const { return m_renderSurface.get(); } | 153 RenderSurfaceImpl* renderSurface() const { return m_renderSurface.get(); } |
154 void createRenderSurface(); | 154 void createRenderSurface(); |
155 void clearRenderSurface() { m_renderSurface.reset(); } | 155 void clearRenderSurface() { m_renderSurface.reset(); } |
156 | 156 |
157 float drawOpacity() const { return m_drawOpacity; } | 157 float drawOpacity() const { return m_drawOpacity; } |
158 void setDrawOpacity(float opacity) { m_drawOpacity = opacity; } | 158 void setDrawOpacity(float opacity) { m_drawOpacity = opacity; } |
159 | 159 |
160 bool drawOpacityIsAnimating() const { return m_drawOpacityIsAnimating; } | 160 bool drawOpacityIsAnimating() const { return m_drawOpacityIsAnimating; } |
161 void setDrawOpacityIsAnimating(bool drawOpacityIsAnimating) { m_drawOpacityI
sAnimating = drawOpacityIsAnimating; } | 161 void setDrawOpacityIsAnimating(bool drawOpacityIsAnimating) { m_drawOpacityI
sAnimating = drawOpacityIsAnimating; } |
162 | 162 |
163 CCLayerImpl* renderTarget() const { ASSERT(!m_renderTarget || m_renderTarget
->renderSurface()); return m_renderTarget; } | 163 LayerImpl* renderTarget() const { ASSERT(!m_renderTarget || m_renderTarget->
renderSurface()); return m_renderTarget; } |
164 void setRenderTarget(CCLayerImpl* target) { m_renderTarget = target; } | 164 void setRenderTarget(LayerImpl* target) { m_renderTarget = target; } |
165 | 165 |
166 void setBounds(const IntSize&); | 166 void setBounds(const IntSize&); |
167 const IntSize& bounds() const { return m_bounds; } | 167 const IntSize& bounds() const { return m_bounds; } |
168 | 168 |
169 const IntSize& contentBounds() const { return m_contentBounds; } | 169 const IntSize& contentBounds() const { return m_contentBounds; } |
170 void setContentBounds(const IntSize&); | 170 void setContentBounds(const IntSize&); |
171 | 171 |
172 const IntPoint& scrollPosition() const { return m_scrollPosition; } | 172 const IntPoint& scrollPosition() const { return m_scrollPosition; } |
173 void setScrollPosition(const IntPoint&); | 173 void setScrollPosition(const IntPoint&); |
174 | 174 |
(...skipping 20 matching lines...) Expand all Loading... |
195 | 195 |
196 bool haveWheelEventHandlers() const { return m_haveWheelEventHandlers; } | 196 bool haveWheelEventHandlers() const { return m_haveWheelEventHandlers; } |
197 void setHaveWheelEventHandlers(bool haveWheelEventHandlers) { m_haveWheelEve
ntHandlers = haveWheelEventHandlers; } | 197 void setHaveWheelEventHandlers(bool haveWheelEventHandlers) { m_haveWheelEve
ntHandlers = haveWheelEventHandlers; } |
198 | 198 |
199 const Region& nonFastScrollableRegion() const { return m_nonFastScrollableRe
gion; } | 199 const Region& nonFastScrollableRegion() const { return m_nonFastScrollableRe
gion; } |
200 void setNonFastScrollableRegion(const Region& region) { m_nonFastScrollableR
egion = region; } | 200 void setNonFastScrollableRegion(const Region& region) { m_nonFastScrollableR
egion = region; } |
201 | 201 |
202 void setDrawCheckerboardForMissingTiles(bool checkerboard) { m_drawCheckerbo
ardForMissingTiles = checkerboard; } | 202 void setDrawCheckerboardForMissingTiles(bool checkerboard) { m_drawCheckerbo
ardForMissingTiles = checkerboard; } |
203 bool drawCheckerboardForMissingTiles() const; | 203 bool drawCheckerboardForMissingTiles() const; |
204 | 204 |
205 CCInputHandlerClient::ScrollStatus tryScroll(const IntPoint& viewportPoint,
CCInputHandlerClient::ScrollInputType) const; | 205 InputHandlerClient::ScrollStatus tryScroll(const IntPoint& viewportPoint, In
putHandlerClient::ScrollInputType) const; |
206 | 206 |
207 const IntRect& visibleContentRect() const { return m_visibleContentRect; } | 207 const IntRect& visibleContentRect() const { return m_visibleContentRect; } |
208 void setVisibleContentRect(const IntRect& visibleContentRect) { m_visibleCon
tentRect = visibleContentRect; } | 208 void setVisibleContentRect(const IntRect& visibleContentRect) { m_visibleCon
tentRect = visibleContentRect; } |
209 | 209 |
210 bool doubleSided() const { return m_doubleSided; } | 210 bool doubleSided() const { return m_doubleSided; } |
211 void setDoubleSided(bool); | 211 void setDoubleSided(bool); |
212 | 212 |
213 void setTransform(const WebKit::WebTransformationMatrix&); | 213 void setTransform(const WebKit::WebTransformationMatrix&); |
214 bool transformIsAnimating() const; | 214 bool transformIsAnimating() const; |
215 | 215 |
(...skipping 16 matching lines...) Expand all Loading... |
232 | 232 |
233 void setStackingOrderChanged(bool); | 233 void setStackingOrderChanged(bool); |
234 | 234 |
235 bool layerPropertyChanged() const { return m_layerPropertyChanged || layerIs
AlwaysDamaged(); } | 235 bool layerPropertyChanged() const { return m_layerPropertyChanged || layerIs
AlwaysDamaged(); } |
236 bool layerSurfacePropertyChanged() const; | 236 bool layerSurfacePropertyChanged() const; |
237 | 237 |
238 void resetAllChangeTrackingForSubtree(); | 238 void resetAllChangeTrackingForSubtree(); |
239 | 239 |
240 virtual bool layerIsAlwaysDamaged() const; | 240 virtual bool layerIsAlwaysDamaged() const; |
241 | 241 |
242 CCLayerAnimationController* layerAnimationController() { return m_layerAnima
tionController.get(); } | 242 LayerAnimationController* layerAnimationController() { return m_layerAnimati
onController.get(); } |
243 | 243 |
244 virtual Region visibleContentOpaqueRegion() const; | 244 virtual Region visibleContentOpaqueRegion() const; |
245 | 245 |
246 // Indicates that the context previously used to render this layer | 246 // Indicates that the context previously used to render this layer |
247 // was lost and that a new one has been created. Won't be called | 247 // was lost and that a new one has been created. Won't be called |
248 // until the new context has been created successfully. | 248 // until the new context has been created successfully. |
249 virtual void didLoseContext(); | 249 virtual void didLoseContext(); |
250 | 250 |
251 CCScrollbarAnimationController* scrollbarAnimationController() const { retur
n m_scrollbarAnimationController.get(); } | 251 ScrollbarAnimationController* scrollbarAnimationController() const { return
m_scrollbarAnimationController.get(); } |
252 | 252 |
253 CCScrollbarLayerImpl* horizontalScrollbarLayer() const; | 253 ScrollbarLayerImpl* horizontalScrollbarLayer() const; |
254 void setHorizontalScrollbarLayer(CCScrollbarLayerImpl*); | 254 void setHorizontalScrollbarLayer(ScrollbarLayerImpl*); |
255 | 255 |
256 CCScrollbarLayerImpl* verticalScrollbarLayer() const; | 256 ScrollbarLayerImpl* verticalScrollbarLayer() const; |
257 void setVerticalScrollbarLayer(CCScrollbarLayerImpl*); | 257 void setVerticalScrollbarLayer(ScrollbarLayerImpl*); |
258 | 258 |
259 protected: | 259 protected: |
260 explicit CCLayerImpl(int); | 260 explicit LayerImpl(int); |
261 | 261 |
262 void appendDebugBorderQuad(CCQuadSink&, const CCSharedQuadState*, CCAppendQu
adsData&) const; | 262 void appendDebugBorderQuad(QuadSink&, const SharedQuadState*, AppendQuadsDat
a&) const; |
263 | 263 |
264 IntRect layerRectToContentRect(const WebKit::WebRect& layerRect); | 264 IntRect layerRectToContentRect(const WebKit::WebRect& layerRect); |
265 | 265 |
266 virtual void dumpLayerProperties(std::string*, int indent) const; | 266 virtual void dumpLayerProperties(std::string*, int indent) const; |
267 static std::string indentString(int indent); | 267 static std::string indentString(int indent); |
268 | 268 |
269 private: | 269 private: |
270 void setParent(CCLayerImpl* parent) { m_parent = parent; } | 270 void setParent(LayerImpl* parent) { m_parent = parent; } |
271 friend class TreeSynchronizer; | 271 friend class TreeSynchronizer; |
272 void clearChildList(); // Warning: This does not preserve tree structure inv
ariants and so is only exposed to the tree synchronizer. | 272 void clearChildList(); // Warning: This does not preserve tree structure inv
ariants and so is only exposed to the tree synchronizer. |
273 | 273 |
274 void noteLayerPropertyChangedForSubtree(); | 274 void noteLayerPropertyChangedForSubtree(); |
275 | 275 |
276 // Note carefully this does not affect the current layer. | 276 // Note carefully this does not affect the current layer. |
277 void noteLayerPropertyChangedForDescendants(); | 277 void noteLayerPropertyChangedForDescendants(); |
278 | 278 |
279 virtual const char* layerTypeAsString() const; | 279 virtual const char* layerTypeAsString() const; |
280 | 280 |
281 void dumpLayer(std::string*, int indent) const; | 281 void dumpLayer(std::string*, int indent) const; |
282 | 282 |
283 // Properties internal to CCLayerImpl | 283 // Properties internal to LayerImpl |
284 CCLayerImpl* m_parent; | 284 LayerImpl* m_parent; |
285 ScopedPtrVector<CCLayerImpl> m_children; | 285 ScopedPtrVector<LayerImpl> m_children; |
286 // m_maskLayer can be temporarily stolen during tree sync, we need this ID t
o confirm newly assigned layer is still the previous one | 286 // m_maskLayer can be temporarily stolen during tree sync, we need this ID t
o confirm newly assigned layer is still the previous one |
287 int m_maskLayerId; | 287 int m_maskLayerId; |
288 scoped_ptr<CCLayerImpl> m_maskLayer; | 288 scoped_ptr<LayerImpl> m_maskLayer; |
289 int m_replicaLayerId; // ditto | 289 int m_replicaLayerId; // ditto |
290 scoped_ptr<CCLayerImpl> m_replicaLayer; | 290 scoped_ptr<LayerImpl> m_replicaLayer; |
291 int m_layerId; | 291 int m_layerId; |
292 CCLayerTreeHostImpl* m_layerTreeHostImpl; | 292 LayerTreeHostImpl* m_layerTreeHostImpl; |
293 | 293 |
294 // Properties synchronized from the associated LayerChromium. | 294 // Properties synchronized from the associated Layer. |
295 FloatPoint m_anchorPoint; | 295 FloatPoint m_anchorPoint; |
296 float m_anchorPointZ; | 296 float m_anchorPointZ; |
297 IntSize m_bounds; | 297 IntSize m_bounds; |
298 IntSize m_contentBounds; | 298 IntSize m_contentBounds; |
299 IntPoint m_scrollPosition; | 299 IntPoint m_scrollPosition; |
300 bool m_scrollable; | 300 bool m_scrollable; |
301 bool m_shouldScrollOnMainThread; | 301 bool m_shouldScrollOnMainThread; |
302 bool m_haveWheelEventHandlers; | 302 bool m_haveWheelEventHandlers; |
303 Region m_nonFastScrollableRegion; | 303 Region m_nonFastScrollableRegion; |
304 SkColor m_backgroundColor; | 304 SkColor m_backgroundColor; |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
337 bool m_fixedToContainerLayer; | 337 bool m_fixedToContainerLayer; |
338 | 338 |
339 FloatSize m_scrollDelta; | 339 FloatSize m_scrollDelta; |
340 IntSize m_sentScrollDelta; | 340 IntSize m_sentScrollDelta; |
341 IntSize m_maxScrollPosition; | 341 IntSize m_maxScrollPosition; |
342 WebKit::WebTransformationMatrix m_implTransform; | 342 WebKit::WebTransformationMatrix m_implTransform; |
343 | 343 |
344 // The layer whose coordinate space this layer draws into. This can be | 344 // The layer whose coordinate space this layer draws into. This can be |
345 // either the same layer (m_renderTarget == this) or an ancestor of this | 345 // either the same layer (m_renderTarget == this) or an ancestor of this |
346 // layer. | 346 // layer. |
347 CCLayerImpl* m_renderTarget; | 347 LayerImpl* m_renderTarget; |
348 | 348 |
349 // The global depth value of the center of the layer. This value is used | 349 // The global depth value of the center of the layer. This value is used |
350 // to sort layers from back to front. | 350 // to sort layers from back to front. |
351 float m_drawDepth; | 351 float m_drawDepth; |
352 float m_drawOpacity; | 352 float m_drawOpacity; |
353 bool m_drawOpacityIsAnimating; | 353 bool m_drawOpacityIsAnimating; |
354 | 354 |
355 // Debug borders. | 355 // Debug borders. |
356 SkColor m_debugBorderColor; | 356 SkColor m_debugBorderColor; |
357 float m_debugBorderWidth; | 357 float m_debugBorderWidth; |
358 | 358 |
359 // Debug layer name. | 359 // Debug layer name. |
360 std::string m_debugName; | 360 std::string m_debugName; |
361 | 361 |
362 WebKit::WebFilterOperations m_filters; | 362 WebKit::WebFilterOperations m_filters; |
363 WebKit::WebFilterOperations m_backgroundFilters; | 363 WebKit::WebFilterOperations m_backgroundFilters; |
364 | 364 |
365 WebKit::WebTransformationMatrix m_drawTransform; | 365 WebKit::WebTransformationMatrix m_drawTransform; |
366 WebKit::WebTransformationMatrix m_screenSpaceTransform; | 366 WebKit::WebTransformationMatrix m_screenSpaceTransform; |
367 bool m_drawTransformIsAnimating; | 367 bool m_drawTransformIsAnimating; |
368 bool m_screenSpaceTransformIsAnimating; | 368 bool m_screenSpaceTransformIsAnimating; |
369 | 369 |
370 #ifndef NDEBUG | 370 #ifndef NDEBUG |
371 bool m_betweenWillDrawAndDidDraw; | 371 bool m_betweenWillDrawAndDidDraw; |
372 #endif | 372 #endif |
373 | 373 |
374 // Render surface associated with this layer. The layer and its descendants | 374 // Render surface associated with this layer. The layer and its descendants |
375 // will render to this surface. | 375 // will render to this surface. |
376 scoped_ptr<CCRenderSurface> m_renderSurface; | 376 scoped_ptr<RenderSurfaceImpl> m_renderSurface; |
377 | 377 |
378 // Hierarchical bounding rect containing the layer and its descendants. | 378 // Hierarchical bounding rect containing the layer and its descendants. |
379 // Uses target surface's space. | 379 // Uses target surface's space. |
380 IntRect m_drawableContentRect; | 380 IntRect m_drawableContentRect; |
381 | 381 |
382 // Rect indicating what was repainted/updated during update. | 382 // Rect indicating what was repainted/updated during update. |
383 // Note that plugin layers bypass this and leave it empty. | 383 // Note that plugin layers bypass this and leave it empty. |
384 // Uses layer's content space. | 384 // Uses layer's content space. |
385 FloatRect m_updateRect; | 385 FloatRect m_updateRect; |
386 | 386 |
387 // Manages animations for this layer. | 387 // Manages animations for this layer. |
388 scoped_ptr<CCLayerAnimationController> m_layerAnimationController; | 388 scoped_ptr<LayerAnimationController> m_layerAnimationController; |
389 | 389 |
390 // Manages scrollbars for this layer | 390 // Manages scrollbars for this layer |
391 scoped_ptr<CCScrollbarAnimationController> m_scrollbarAnimationController; | 391 scoped_ptr<ScrollbarAnimationController> m_scrollbarAnimationController; |
392 }; | 392 }; |
393 | 393 |
394 void sortLayers(std::vector<CCLayerImpl*>::iterator first, std::vector<CCLayerIm
pl*>::iterator end, CCLayerSorter*); | 394 void sortLayers(std::vector<LayerImpl*>::iterator first, std::vector<LayerImpl*>
::iterator end, LayerSorter*); |
395 | 395 |
396 } | 396 } |
397 | 397 |
398 #endif // CCLayerImpl_h | 398 #endif // CCLayerImpl_h |
OLD | NEW |