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

Side by Side Diff: cc/CCLayerTreeHostImpl.h

Issue 10942040: Fix CC*Renderer and CC*LayerImpl to compile with Clang (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
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 CCLayerTreeHostImpl_h 5 #ifndef CCLayerTreeHostImpl_h
6 #define CCLayerTreeHostImpl_h 6 #define CCLayerTreeHostImpl_h
7 7
8 #include "CCAnimationEvents.h" 8 #include "CCAnimationEvents.h"
9 #include "CCInputHandler.h" 9 #include "CCInputHandler.h"
10 #include "CCLayerSorter.h" 10 #include "CCLayerSorter.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 virtual CCInputHandlerClient::ScrollStatus scrollBegin(const IntPoint&, CCIn putHandlerClient::ScrollInputType) OVERRIDE; 58 virtual CCInputHandlerClient::ScrollStatus scrollBegin(const IntPoint&, CCIn putHandlerClient::ScrollInputType) OVERRIDE;
59 virtual void scrollBy(const IntPoint&, const IntSize&) OVERRIDE; 59 virtual void scrollBy(const IntPoint&, const IntSize&) OVERRIDE;
60 virtual void scrollEnd() OVERRIDE; 60 virtual void scrollEnd() OVERRIDE;
61 virtual void pinchGestureBegin() OVERRIDE; 61 virtual void pinchGestureBegin() OVERRIDE;
62 virtual void pinchGestureUpdate(float, const IntPoint&) OVERRIDE; 62 virtual void pinchGestureUpdate(float, const IntPoint&) OVERRIDE;
63 virtual void pinchGestureEnd() OVERRIDE; 63 virtual void pinchGestureEnd() OVERRIDE;
64 virtual void startPageScaleAnimation(const IntSize& targetPosition, bool anc horPoint, float pageScale, double startTime, double duration) OVERRIDE; 64 virtual void startPageScaleAnimation(const IntSize& targetPosition, bool anc horPoint, float pageScale, double startTime, double duration) OVERRIDE;
65 virtual void scheduleAnimation() OVERRIDE; 65 virtual void scheduleAnimation() OVERRIDE;
66 66
67 struct FrameData : public CCRenderPassSink { 67 struct FrameData : public CCRenderPassSink {
68 FrameData();
69 ~FrameData();
70
68 Vector<IntRect> occludingScreenSpaceRects; 71 Vector<IntRect> occludingScreenSpaceRects;
69 CCRenderPassList renderPasses; 72 CCRenderPassList renderPasses;
70 CCRenderPassIdHashMap renderPassesById; 73 CCRenderPassIdHashMap renderPassesById;
71 CCLayerList* renderSurfaceLayerList; 74 CCLayerList* renderSurfaceLayerList;
72 CCLayerList willDrawLayers; 75 CCLayerList willDrawLayers;
73 76
74 // CCRenderPassSink implementation. 77 // CCRenderPassSink implementation.
75 virtual void appendRenderPass(PassOwnPtr<CCRenderPass>) OVERRIDE; 78 virtual void appendRenderPass(PassOwnPtr<CCRenderPass>) OVERRIDE;
76 }; 79 };
77 80
78 // Virtual for testing. 81 // Virtual for testing.
79 virtual void beginCommit(); 82 virtual void beginCommit();
80 virtual void commitComplete(); 83 virtual void commitComplete();
81 virtual void animate(double monotonicTime, double wallClockTime); 84 virtual void animate(double monotonicTime, double wallClockTime);
82 85
83 // Returns false if problems occured preparing the frame, and we should try 86 // Returns false if problems occured preparing the frame, and we should try
84 // to avoid displaying the frame. If prepareToDraw is called, 87 // to avoid displaying the frame. If prepareToDraw is called,
85 // didDrawAllLayers must also be called, regardless of whether drawLayers is 88 // didDrawAllLayers must also be called, regardless of whether drawLayers is
86 // called between the two. 89 // called between the two.
87 virtual bool prepareToDraw(FrameData&); 90 virtual bool prepareToDraw(FrameData&);
88 virtual void drawLayers(const FrameData&); 91 virtual void drawLayers(const FrameData&);
89 // Must be called if and only if prepareToDraw was called. 92 // Must be called if and only if prepareToDraw was called.
90 void didDrawAllLayers(const FrameData&); 93 void didDrawAllLayers(const FrameData&);
91 94
92 // CCRendererClient implementation 95 // CCRendererClient implementation
93 virtual const IntSize& deviceViewportSize() const OVERRIDE { return m_device ViewportSize; } 96 virtual const IntSize& deviceViewportSize() const OVERRIDE;
94 virtual const CCLayerTreeSettings& settings() const OVERRIDE { return m_sett ings; } 97 virtual const CCLayerTreeSettings& settings() const OVERRIDE;
95 virtual void didLoseContext() OVERRIDE; 98 virtual void didLoseContext() OVERRIDE;
96 virtual void onSwapBuffersComplete() OVERRIDE; 99 virtual void onSwapBuffersComplete() OVERRIDE;
97 virtual void setFullRootLayerDamage() OVERRIDE; 100 virtual void setFullRootLayerDamage() OVERRIDE;
98 virtual void releaseContentsTextures() OVERRIDE; 101 virtual void releaseContentsTextures() OVERRIDE;
99 virtual void setMemoryAllocationLimitBytes(size_t) OVERRIDE; 102 virtual void setMemoryAllocationLimitBytes(size_t) OVERRIDE;
100 103
101 // WebCompositorOutputSurfaceClient implementation. 104 // WebCompositorOutputSurfaceClient implementation.
102 virtual void onVSyncParametersChanged(double monotonicTimebase, double inter valInSeconds) OVERRIDE; 105 virtual void onVSyncParametersChanged(double monotonicTimebase, double inter valInSeconds) OVERRIDE;
103 106
104 // Implementation 107 // Implementation
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 // rendering and input event hit testing. 290 // rendering and input event hit testing.
288 CCLayerList m_renderSurfaceLayerList; 291 CCLayerList m_renderSurfaceLayerList;
289 292
290 OwnPtr<CCFrameRateCounter> m_fpsCounter; 293 OwnPtr<CCFrameRateCounter> m_fpsCounter;
291 OwnPtr<CCDebugRectHistory> m_debugRectHistory; 294 OwnPtr<CCDebugRectHistory> m_debugRectHistory;
292 }; 295 };
293 296
294 }; 297 };
295 298
296 #endif 299 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698