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

Side by Side Diff: cc/layer_impl.h

Issue 11138029: cc: Remove wtf includes from layer_impl.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix android build 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 | « no previous file | cc/layer_impl.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 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 "SkColor.h" 19 #include "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 #include <wtf/OwnPtr.h>
24 23
25 namespace cc { 24 namespace cc {
26 25
27 class CCLayerSorter; 26 class CCLayerSorter;
28 class CCLayerTreeHostImpl; 27 class CCLayerTreeHostImpl;
29 class CCQuadSink; 28 class CCQuadSink;
30 class CCRenderer; 29 class CCRenderer;
31 class CCScrollbarAnimationController; 30 class CCScrollbarAnimationController;
32 class CCScrollbarLayerImpl; 31 class CCScrollbarLayerImpl;
33 class LayerChromium; 32 class LayerChromium;
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 void setDebugBorderWidth(float); 145 void setDebugBorderWidth(float);
147 float debugBorderWidth() const { return m_debugBorderWidth; } 146 float debugBorderWidth() const { return m_debugBorderWidth; }
148 bool hasDebugBorders() const; 147 bool hasDebugBorders() const;
149 148
150 // Debug layer name. 149 // Debug layer name.
151 void setDebugName(const std::string& debugName) { m_debugName = debugName; } 150 void setDebugName(const std::string& debugName) { m_debugName = debugName; }
152 std::string debugName() const { return m_debugName; } 151 std::string debugName() const { return m_debugName; }
153 152
154 CCRenderSurface* renderSurface() const { return m_renderSurface.get(); } 153 CCRenderSurface* renderSurface() const { return m_renderSurface.get(); }
155 void createRenderSurface(); 154 void createRenderSurface();
156 void clearRenderSurface() { m_renderSurface.clear(); } 155 void clearRenderSurface() { m_renderSurface.reset(); }
157 156
158 float drawOpacity() const { return m_drawOpacity; } 157 float drawOpacity() const { return m_drawOpacity; }
159 void setDrawOpacity(float opacity) { m_drawOpacity = opacity; } 158 void setDrawOpacity(float opacity) { m_drawOpacity = opacity; }
160 159
161 bool drawOpacityIsAnimating() const { return m_drawOpacityIsAnimating; } 160 bool drawOpacityIsAnimating() const { return m_drawOpacityIsAnimating; }
162 void setDrawOpacityIsAnimating(bool drawOpacityIsAnimating) { m_drawOpacityI sAnimating = drawOpacityIsAnimating; } 161 void setDrawOpacityIsAnimating(bool drawOpacityIsAnimating) { m_drawOpacityI sAnimating = drawOpacityIsAnimating; }
163 162
164 CCLayerImpl* renderTarget() const { ASSERT(!m_renderTarget || m_renderTarget ->renderSurface()); return m_renderTarget; } 163 CCLayerImpl* renderTarget() const { ASSERT(!m_renderTarget || m_renderTarget ->renderSurface()); return m_renderTarget; }
165 void setRenderTarget(CCLayerImpl* target) { m_renderTarget = target; } 164 void setRenderTarget(CCLayerImpl* target) { m_renderTarget = target; }
166 165
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 WebKit::WebTransformationMatrix m_screenSpaceTransform; 366 WebKit::WebTransformationMatrix m_screenSpaceTransform;
368 bool m_drawTransformIsAnimating; 367 bool m_drawTransformIsAnimating;
369 bool m_screenSpaceTransformIsAnimating; 368 bool m_screenSpaceTransformIsAnimating;
370 369
371 #ifndef NDEBUG 370 #ifndef NDEBUG
372 bool m_betweenWillDrawAndDidDraw; 371 bool m_betweenWillDrawAndDidDraw;
373 #endif 372 #endif
374 373
375 // Render surface associated with this layer. The layer and its descendants 374 // Render surface associated with this layer. The layer and its descendants
376 // will render to this surface. 375 // will render to this surface.
377 OwnPtr<CCRenderSurface> m_renderSurface; 376 scoped_ptr<CCRenderSurface> m_renderSurface;
378 377
379 // Hierarchical bounding rect containing the layer and its descendants. 378 // Hierarchical bounding rect containing the layer and its descendants.
380 // Uses target surface's space. 379 // Uses target surface's space.
381 IntRect m_drawableContentRect; 380 IntRect m_drawableContentRect;
382 381
383 // Rect indicating what was repainted/updated during update. 382 // Rect indicating what was repainted/updated during update.
384 // Note that plugin layers bypass this and leave it empty. 383 // Note that plugin layers bypass this and leave it empty.
385 // Uses layer's content space. 384 // Uses layer's content space.
386 FloatRect m_updateRect; 385 FloatRect m_updateRect;
387 386
388 // Manages animations for this layer. 387 // Manages animations for this layer.
389 scoped_ptr<CCLayerAnimationController> m_layerAnimationController; 388 scoped_ptr<CCLayerAnimationController> m_layerAnimationController;
390 389
391 // Manages scrollbars for this layer 390 // Manages scrollbars for this layer
392 OwnPtr<CCScrollbarAnimationController> m_scrollbarAnimationController; 391 scoped_ptr<CCScrollbarAnimationController> m_scrollbarAnimationController;
393 }; 392 };
394 393
395 void sortLayers(std::vector<CCLayerImpl*>::iterator first, std::vector<CCLayerIm pl*>::iterator end, CCLayerSorter*); 394 void sortLayers(std::vector<CCLayerImpl*>::iterator first, std::vector<CCLayerIm pl*>::iterator end, CCLayerSorter*);
396 395
397 } 396 }
398 397
399 #endif // CCLayerImpl_h 398 #endif // CCLayerImpl_h
OLDNEW
« no previous file with comments | « no previous file | cc/layer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698