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

Side by Side Diff: cc/layer.h

Issue 11189043: cc: Rename cc classes and members to match filenames (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
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 #ifndef LayerChromium_h 5 #ifndef LayerChromium_h
6 #define LayerChromium_h 6 #define LayerChromium_h
7 7
8 #include "CCLayerAnimationController.h" 8 #include "CCLayerAnimationController.h"
9 #include "CCOcclusionTracker.h" 9 #include "CCOcclusionTracker.h"
10 #include "FloatPoint.h" 10 #include "FloatPoint.h"
11 #include "Region.h" 11 #include "Region.h"
12 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
13 #include "cc/render_surface.h" 13 #include "cc/render_surface.h"
14 #include "third_party/skia/include/core/SkColor.h" 14 #include "third_party/skia/include/core/SkColor.h"
15 #include <public/WebFilterOperations.h> 15 #include <public/WebFilterOperations.h>
16 #include <public/WebTransformationMatrix.h> 16 #include <public/WebTransformationMatrix.h>
17 #include <string> 17 #include <string>
18 #include <vector> 18 #include <vector>
19 19
20 namespace WebKit { 20 namespace WebKit {
21 class WebAnimationDelegate; 21 class WebAnimationDelegate;
22 class WebLayerScrollClient; 22 class WebLayerScrollClient;
23 } 23 }
24 24
25 namespace cc { 25 namespace cc {
26 26
27 class CCActiveAnimation; 27 class ActiveAnimation;
28 struct CCAnimationEvent; 28 struct AnimationEvent;
29 class CCLayerAnimationDelegate; 29 class LayerAnimationDelegate;
30 class CCLayerImpl; 30 class LayerImpl;
31 class CCLayerTreeHost; 31 class LayerTreeHost;
32 class CCPriorityCalculator; 32 class PriorityCalculator;
33 class CCTextureUpdateQueue; 33 class TextureUpdateQueue;
34 class ScrollbarLayerChromium; 34 class ScrollbarLayer;
35 struct CCAnimationEvent; 35 struct AnimationEvent;
36 struct CCRenderingStats; 36 struct RenderingStats;
37 37
38 // Base class for composited layers. Special layer types are derived from 38 // Base class for composited layers. Special layer types are derived from
39 // this class. 39 // this class.
40 class LayerChromium : public base::RefCounted<LayerChromium>, public CCLayerAnim ationControllerClient { 40 class Layer : public base::RefCounted<Layer>, public LayerAnimationControllerCli ent {
41 public: 41 public:
42 typedef std::vector<scoped_refptr<LayerChromium> > LayerList; 42 typedef std::vector<scoped_refptr<Layer> > LayerList;
43 43
44 static scoped_refptr<LayerChromium> create(); 44 static scoped_refptr<Layer> create();
45 45
46 // CCLayerAnimationControllerClient implementation 46 // LayerAnimationControllerClient implementation
47 virtual int id() const OVERRIDE; 47 virtual int id() const OVERRIDE;
48 virtual void setOpacityFromAnimation(float) OVERRIDE; 48 virtual void setOpacityFromAnimation(float) OVERRIDE;
49 virtual float opacity() const OVERRIDE; 49 virtual float opacity() const OVERRIDE;
50 virtual void setTransformFromAnimation(const WebKit::WebTransformationMatrix &) OVERRIDE; 50 virtual void setTransformFromAnimation(const WebKit::WebTransformationMatrix &) OVERRIDE;
51 // A layer's transform operates layer space. That is, entirely in logical, 51 // A layer's transform operates layer space. That is, entirely in logical,
52 // non-page-scaled pixels (that is, they have page zoom baked in, but not pa ge scale). 52 // non-page-scaled pixels (that is, they have page zoom baked in, but not pa ge scale).
53 // The root layer is a special case -- it operates in physical pixels. 53 // The root layer is a special case -- it operates in physical pixels.
54 virtual const WebKit::WebTransformationMatrix& transform() const OVERRIDE; 54 virtual const WebKit::WebTransformationMatrix& transform() const OVERRIDE;
55 55
56 LayerChromium* rootLayer(); 56 Layer* rootLayer();
57 LayerChromium* parent() const; 57 Layer* parent() const;
58 void addChild(scoped_refptr<LayerChromium>); 58 void addChild(scoped_refptr<Layer>);
59 void insertChild(scoped_refptr<LayerChromium>, size_t index); 59 void insertChild(scoped_refptr<Layer>, size_t index);
60 void replaceChild(LayerChromium* reference, scoped_refptr<LayerChromium> new Layer); 60 void replaceChild(Layer* reference, scoped_refptr<Layer> newLayer);
61 void removeFromParent(); 61 void removeFromParent();
62 void removeAllChildren(); 62 void removeAllChildren();
63 void setChildren(const LayerList&); 63 void setChildren(const LayerList&);
64 64
65 const LayerList& children() const { return m_children; } 65 const LayerList& children() const { return m_children; }
66 66
67 void setAnchorPoint(const FloatPoint&); 67 void setAnchorPoint(const FloatPoint&);
68 FloatPoint anchorPoint() const { return m_anchorPoint; } 68 FloatPoint anchorPoint() const { return m_anchorPoint; }
69 69
70 void setAnchorPointZ(float); 70 void setAnchorPointZ(float);
71 float anchorPointZ() const { return m_anchorPointZ; } 71 float anchorPointZ() const { return m_anchorPointZ; }
72 72
73 void setBackgroundColor(SkColor); 73 void setBackgroundColor(SkColor);
74 SkColor backgroundColor() const { return m_backgroundColor; } 74 SkColor backgroundColor() const { return m_backgroundColor; }
75 75
76 // A layer's bounds are in logical, non-page-scaled pixels (however, the 76 // A layer's bounds are in logical, non-page-scaled pixels (however, the
77 // root layer's bounds are in physical pixels). 77 // root layer's bounds are in physical pixels).
78 void setBounds(const IntSize&); 78 void setBounds(const IntSize&);
79 const IntSize& bounds() const { return m_bounds; } 79 const IntSize& bounds() const { return m_bounds; }
80 virtual IntSize contentBounds() const; 80 virtual IntSize contentBounds() const;
81 81
82 void setMasksToBounds(bool); 82 void setMasksToBounds(bool);
83 bool masksToBounds() const { return m_masksToBounds; } 83 bool masksToBounds() const { return m_masksToBounds; }
84 84
85 void setMaskLayer(LayerChromium*); 85 void setMaskLayer(Layer*);
86 LayerChromium* maskLayer() const { return m_maskLayer.get(); } 86 Layer* maskLayer() const { return m_maskLayer.get(); }
87 87
88 virtual void setNeedsDisplayRect(const FloatRect& dirtyRect); 88 virtual void setNeedsDisplayRect(const FloatRect& dirtyRect);
89 void setNeedsDisplay() { setNeedsDisplayRect(FloatRect(FloatPoint(), bounds( ))); } 89 void setNeedsDisplay() { setNeedsDisplayRect(FloatRect(FloatPoint(), bounds( ))); }
90 virtual bool needsDisplay() const; 90 virtual bool needsDisplay() const;
91 91
92 void setOpacity(float); 92 void setOpacity(float);
93 bool opacityIsAnimating() const; 93 bool opacityIsAnimating() const;
94 94
95 void setFilters(const WebKit::WebFilterOperations&); 95 void setFilters(const WebKit::WebFilterOperations&);
96 const WebKit::WebFilterOperations& filters() const { return m_filters; } 96 const WebKit::WebFilterOperations& filters() const { return m_filters; }
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 158
159 void setPreserves3D(bool preserve3D) { m_preserves3D = preserve3D; } 159 void setPreserves3D(bool preserve3D) { m_preserves3D = preserve3D; }
160 bool preserves3D() const { return m_preserves3D; } 160 bool preserves3D() const { return m_preserves3D; }
161 161
162 void setUseParentBackfaceVisibility(bool useParentBackfaceVisibility) { m_us eParentBackfaceVisibility = useParentBackfaceVisibility; } 162 void setUseParentBackfaceVisibility(bool useParentBackfaceVisibility) { m_us eParentBackfaceVisibility = useParentBackfaceVisibility; }
163 bool useParentBackfaceVisibility() const { return m_useParentBackfaceVisibil ity; } 163 bool useParentBackfaceVisibility() const { return m_useParentBackfaceVisibil ity; }
164 164
165 virtual void setUseLCDText(bool); 165 virtual void setUseLCDText(bool);
166 bool useLCDText() const { return m_useLCDText; } 166 bool useLCDText() const { return m_useLCDText; }
167 167
168 virtual void setLayerTreeHost(CCLayerTreeHost*); 168 virtual void setLayerTreeHost(LayerTreeHost*);
169 169
170 bool hasContributingDelegatedRenderPasses() const { return false; } 170 bool hasContributingDelegatedRenderPasses() const { return false; }
171 171
172 void setIsDrawable(bool); 172 void setIsDrawable(bool);
173 173
174 void setReplicaLayer(LayerChromium*); 174 void setReplicaLayer(Layer*);
175 LayerChromium* replicaLayer() const { return m_replicaLayer.get(); } 175 Layer* replicaLayer() const { return m_replicaLayer.get(); }
176 176
177 bool hasMask() const { return m_maskLayer; } 177 bool hasMask() const { return m_maskLayer; }
178 bool hasReplica() const { return m_replicaLayer; } 178 bool hasReplica() const { return m_replicaLayer; }
179 bool replicaHasMask() const { return m_replicaLayer && (m_maskLayer || m_rep licaLayer->m_maskLayer); } 179 bool replicaHasMask() const { return m_replicaLayer && (m_maskLayer || m_rep licaLayer->m_maskLayer); }
180 180
181 // These methods typically need to be overwritten by derived classes. 181 // These methods typically need to be overwritten by derived classes.
182 virtual bool drawsContent() const; 182 virtual bool drawsContent() const;
183 virtual void update(CCTextureUpdateQueue&, const CCOcclusionTracker*, CCRend eringStats&) { } 183 virtual void update(TextureUpdateQueue&, const OcclusionTracker*, RenderingS tats&) { }
184 virtual bool needMoreUpdates(); 184 virtual bool needMoreUpdates();
185 virtual void setIsMask(bool) { } 185 virtual void setIsMask(bool) { }
186 virtual void bindContentsTexture() { } 186 virtual void bindContentsTexture() { }
187 virtual bool needsContentsScale() const; 187 virtual bool needsContentsScale() const;
188 188
189 void setDebugBorderColor(SkColor); 189 void setDebugBorderColor(SkColor);
190 void setDebugBorderWidth(float); 190 void setDebugBorderWidth(float);
191 void setDebugName(const std::string&); 191 void setDebugName(const std::string&);
192 192
193 virtual void pushPropertiesTo(CCLayerImpl*); 193 virtual void pushPropertiesTo(LayerImpl*);
194 194
195 void clearRenderSurface() { m_renderSurface.reset(); } 195 void clearRenderSurface() { m_renderSurface.reset(); }
196 RenderSurfaceChromium* renderSurface() const { return m_renderSurface.get(); } 196 RenderSurface* renderSurface() const { return m_renderSurface.get(); }
197 void createRenderSurface(); 197 void createRenderSurface();
198 198
199 float drawOpacity() const { return m_drawOpacity; } 199 float drawOpacity() const { return m_drawOpacity; }
200 void setDrawOpacity(float opacity) { m_drawOpacity = opacity; } 200 void setDrawOpacity(float opacity) { m_drawOpacity = opacity; }
201 201
202 bool drawOpacityIsAnimating() const { return m_drawOpacityIsAnimating; } 202 bool drawOpacityIsAnimating() const { return m_drawOpacityIsAnimating; }
203 void setDrawOpacityIsAnimating(bool drawOpacityIsAnimating) { m_drawOpacityI sAnimating = drawOpacityIsAnimating; } 203 void setDrawOpacityIsAnimating(bool drawOpacityIsAnimating) { m_drawOpacityI sAnimating = drawOpacityIsAnimating; }
204 204
205 LayerChromium* renderTarget() const { ASSERT(!m_renderTarget || m_renderTarg et->renderSurface()); return m_renderTarget; } 205 Layer* renderTarget() const { ASSERT(!m_renderTarget || m_renderTarget->rend erSurface()); return m_renderTarget; }
206 void setRenderTarget(LayerChromium* target) { m_renderTarget = target; } 206 void setRenderTarget(Layer* target) { m_renderTarget = target; }
207 207
208 bool drawTransformIsAnimating() const { return m_drawTransformIsAnimating; } 208 bool drawTransformIsAnimating() const { return m_drawTransformIsAnimating; }
209 void setDrawTransformIsAnimating(bool animating) { m_drawTransformIsAnimatin g = animating; } 209 void setDrawTransformIsAnimating(bool animating) { m_drawTransformIsAnimatin g = animating; }
210 bool screenSpaceTransformIsAnimating() const { return m_screenSpaceTransform IsAnimating; } 210 bool screenSpaceTransformIsAnimating() const { return m_screenSpaceTransform IsAnimating; }
211 void setScreenSpaceTransformIsAnimating(bool animating) { m_screenSpaceTrans formIsAnimating = animating; } 211 void setScreenSpaceTransformIsAnimating(bool animating) { m_screenSpaceTrans formIsAnimating = animating; }
212 212
213 // This moves from layer space, with origin in the center to target space wi th origin in the top left. 213 // This moves from layer space, with origin in the center to target space wi th origin in the top left.
214 // That is, it converts from logical, non-page-scaled, to target pixels (and if the target is the 214 // That is, it converts from logical, non-page-scaled, to target pixels (and if the target is the
215 // root render surface, then this converts to physical pixels). 215 // root render surface, then this converts to physical pixels).
216 const WebKit::WebTransformationMatrix& drawTransform() const { return m_draw Transform; } 216 const WebKit::WebTransformationMatrix& drawTransform() const { return m_draw Transform; }
(...skipping 10 matching lines...) Expand all
227 void setContentsScale(float); 227 void setContentsScale(float);
228 228
229 // When true, the layer's contents are not scaled by the current page scale factor. 229 // When true, the layer's contents are not scaled by the current page scale factor.
230 // setBoundsContainPageScale recursively sets the value on all child layers. 230 // setBoundsContainPageScale recursively sets the value on all child layers.
231 void setBoundsContainPageScale(bool); 231 void setBoundsContainPageScale(bool);
232 bool boundsContainPageScale() const { return m_boundsContainPageScale; } 232 bool boundsContainPageScale() const { return m_boundsContainPageScale; }
233 233
234 // Returns true if any of the layer's descendants has content to draw. 234 // Returns true if any of the layer's descendants has content to draw.
235 bool descendantDrawsContent(); 235 bool descendantDrawsContent();
236 236
237 CCLayerTreeHost* layerTreeHost() const { return m_layerTreeHost; } 237 LayerTreeHost* layerTreeHost() const { return m_layerTreeHost; }
238 238
239 // Set the priority of all desired textures in this layer. 239 // Set the priority of all desired textures in this layer.
240 virtual void setTexturePriorities(const CCPriorityCalculator&) { } 240 virtual void setTexturePriorities(const PriorityCalculator&) { }
241 241
242 bool addAnimation(scoped_ptr<CCActiveAnimation>); 242 bool addAnimation(scoped_ptr<ActiveAnimation>);
243 void pauseAnimation(int animationId, double timeOffset); 243 void pauseAnimation(int animationId, double timeOffset);
244 void removeAnimation(int animationId); 244 void removeAnimation(int animationId);
245 245
246 void suspendAnimations(double monotonicTime); 246 void suspendAnimations(double monotonicTime);
247 void resumeAnimations(double monotonicTime); 247 void resumeAnimations(double monotonicTime);
248 248
249 CCLayerAnimationController* layerAnimationController() { return m_layerAnima tionController.get(); } 249 LayerAnimationController* layerAnimationController() { return m_layerAnimati onController.get(); }
250 void setLayerAnimationController(scoped_ptr<CCLayerAnimationController>); 250 void setLayerAnimationController(scoped_ptr<LayerAnimationController>);
251 scoped_ptr<CCLayerAnimationController> releaseLayerAnimationController(); 251 scoped_ptr<LayerAnimationController> releaseLayerAnimationController();
252 252
253 void setLayerAnimationDelegate(WebKit::WebAnimationDelegate* layerAnimationD elegate) { m_layerAnimationDelegate = layerAnimationDelegate; } 253 void setLayerAnimationDelegate(WebKit::WebAnimationDelegate* layerAnimationD elegate) { m_layerAnimationDelegate = layerAnimationDelegate; }
254 254
255 bool hasActiveAnimation() const; 255 bool hasActiveAnimation() const;
256 256
257 virtual void notifyAnimationStarted(const CCAnimationEvent&, double wallCloc kTime); 257 virtual void notifyAnimationStarted(const AnimationEvent&, double wallClockT ime);
258 virtual void notifyAnimationFinished(double wallClockTime); 258 virtual void notifyAnimationFinished(double wallClockTime);
259 259
260 virtual Region visibleContentOpaqueRegion() const; 260 virtual Region visibleContentOpaqueRegion() const;
261 261
262 virtual ScrollbarLayerChromium* toScrollbarLayerChromium(); 262 virtual ScrollbarLayer* toScrollbarLayer();
263 263
264 protected: 264 protected:
265 friend class CCLayerImpl; 265 friend class LayerImpl;
266 friend class TreeSynchronizer; 266 friend class TreeSynchronizer;
267 virtual ~LayerChromium(); 267 virtual ~Layer();
268 268
269 LayerChromium(); 269 Layer();
270 270
271 void setNeedsCommit(); 271 void setNeedsCommit();
272 272
273 IntRect layerRectToContentRect(const WebKit::WebRect& layerRect); 273 IntRect layerRectToContentRect(const WebKit::WebRect& layerRect);
274 274
275 // This flag is set when layer need repainting/updating. 275 // This flag is set when layer need repainting/updating.
276 bool m_needsDisplay; 276 bool m_needsDisplay;
277 277
278 // Tracks whether this layer may have changed stacking order with its siblin gs. 278 // Tracks whether this layer may have changed stacking order with its siblin gs.
279 bool m_stackingOrderChanged; 279 bool m_stackingOrderChanged;
280 280
281 // The update rect is the region of the compositor resource that was actuall y updated by the compositor. 281 // The update rect is the region of the compositor resource that was actuall y updated by the compositor.
282 // For layers that may do updating outside the compositor's control (i.e. pl ugin layers), this information 282 // For layers that may do updating outside the compositor's control (i.e. pl ugin layers), this information
283 // is not available and the update rect will remain empty. 283 // is not available and the update rect will remain empty.
284 // Note this rect is in layer space (not content space). 284 // Note this rect is in layer space (not content space).
285 FloatRect m_updateRect; 285 FloatRect m_updateRect;
286 286
287 scoped_refptr<LayerChromium> m_maskLayer; 287 scoped_refptr<Layer> m_maskLayer;
288 288
289 // Constructs a CCLayerImpl of the correct runtime type for this LayerChromi um type. 289 // Constructs a LayerImpl of the correct runtime type for this Layer type.
290 virtual scoped_ptr<CCLayerImpl> createCCLayerImpl(); 290 virtual scoped_ptr<LayerImpl> createLayerImpl();
291 int m_layerId; 291 int m_layerId;
292 292
293 private: 293 private:
294 friend class base::RefCounted<LayerChromium>; 294 friend class base::RefCounted<Layer>;
295 295
296 void setParent(LayerChromium*); 296 void setParent(Layer*);
297 bool hasAncestor(LayerChromium*) const; 297 bool hasAncestor(Layer*) const;
298 bool descendantIsFixedToContainerLayer() const; 298 bool descendantIsFixedToContainerLayer() const;
299 299
300 size_t numChildren() const { return m_children.size(); } 300 size_t numChildren() const { return m_children.size(); }
301 301
302 // Returns the index of the child or -1 if not found. 302 // Returns the index of the child or -1 if not found.
303 int indexOfChild(const LayerChromium*); 303 int indexOfChild(const Layer*);
304 304
305 // This should only be called from removeFromParent. 305 // This should only be called from removeFromParent.
306 void removeChild(LayerChromium*); 306 void removeChild(Layer*);
307 307
308 LayerList m_children; 308 LayerList m_children;
309 LayerChromium* m_parent; 309 Layer* m_parent;
310 310
311 // LayerChromium instances have a weak pointer to their CCLayerTreeHost. 311 // Layer instances have a weak pointer to their LayerTreeHost.
312 // This pointer value is nil when a LayerChromium is not in a tree and is 312 // This pointer value is nil when a Layer is not in a tree and is
313 // updated via setLayerTreeHost() if a layer moves between trees. 313 // updated via setLayerTreeHost() if a layer moves between trees.
314 CCLayerTreeHost* m_layerTreeHost; 314 LayerTreeHost* m_layerTreeHost;
315 315
316 scoped_ptr<CCLayerAnimationController> m_layerAnimationController; 316 scoped_ptr<LayerAnimationController> m_layerAnimationController;
317 317
318 // Layer properties. 318 // Layer properties.
319 IntSize m_bounds; 319 IntSize m_bounds;
320 320
321 // Uses layer's content space. 321 // Uses layer's content space.
322 IntRect m_visibleContentRect; 322 IntRect m_visibleContentRect;
323 323
324 IntPoint m_scrollPosition; 324 IntPoint m_scrollPosition;
325 IntSize m_maxScrollPosition; 325 IntSize m_maxScrollPosition;
326 bool m_scrollable; 326 bool m_scrollable;
(...skipping 20 matching lines...) Expand all
347 bool m_useLCDText; 347 bool m_useLCDText;
348 bool m_preserves3D; 348 bool m_preserves3D;
349 bool m_useParentBackfaceVisibility; 349 bool m_useParentBackfaceVisibility;
350 bool m_drawCheckerboardForMissingTiles; 350 bool m_drawCheckerboardForMissingTiles;
351 bool m_forceRenderSurface; 351 bool m_forceRenderSurface;
352 352
353 WebKit::WebTransformationMatrix m_transform; 353 WebKit::WebTransformationMatrix m_transform;
354 WebKit::WebTransformationMatrix m_sublayerTransform; 354 WebKit::WebTransformationMatrix m_sublayerTransform;
355 355
356 // Replica layer used for reflections. 356 // Replica layer used for reflections.
357 scoped_refptr<LayerChromium> m_replicaLayer; 357 scoped_refptr<Layer> m_replicaLayer;
358 358
359 // Transient properties. 359 // Transient properties.
360 scoped_ptr<RenderSurfaceChromium> m_renderSurface; 360 scoped_ptr<RenderSurface> m_renderSurface;
361 float m_drawOpacity; 361 float m_drawOpacity;
362 bool m_drawOpacityIsAnimating; 362 bool m_drawOpacityIsAnimating;
363 363
364 LayerChromium* m_renderTarget; 364 Layer* m_renderTarget;
365 365
366 WebKit::WebTransformationMatrix m_drawTransform; 366 WebKit::WebTransformationMatrix m_drawTransform;
367 WebKit::WebTransformationMatrix m_screenSpaceTransform; 367 WebKit::WebTransformationMatrix m_screenSpaceTransform;
368 bool m_drawTransformIsAnimating; 368 bool m_drawTransformIsAnimating;
369 bool m_screenSpaceTransformIsAnimating; 369 bool m_screenSpaceTransformIsAnimating;
370 370
371 // Uses target surface space. 371 // Uses target surface space.
372 IntRect m_drawableContentRect; 372 IntRect m_drawableContentRect;
373 float m_contentsScale; 373 float m_contentsScale;
374 bool m_boundsContainPageScale; 374 bool m_boundsContainPageScale;
375 375
376 WebKit::WebTransformationMatrix m_implTransform; 376 WebKit::WebTransformationMatrix m_implTransform;
377 377
378 WebKit::WebAnimationDelegate* m_layerAnimationDelegate; 378 WebKit::WebAnimationDelegate* m_layerAnimationDelegate;
379 WebKit::WebLayerScrollClient* m_layerScrollClient; 379 WebKit::WebLayerScrollClient* m_layerScrollClient;
380 }; 380 };
381 381
382 void sortLayers(std::vector<scoped_refptr<LayerChromium> >::iterator, std::vecto r<scoped_refptr<LayerChromium> >::iterator, void*); 382 void sortLayers(std::vector<scoped_refptr<Layer> >::iterator, std::vector<scoped _refptr<Layer> >::iterator, void*);
383 383
384 } // namespace cc 384 } // namespace cc
385 385
386 #endif 386 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698