diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-15 12:52:45 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-15 12:52:45 +0000 |
| commit | 0023e8b1d2b5cf906e320267ab38d909b1700660 (patch) | |
| tree | 900c4abd1b01a9e7b36a6f861d34f3003232aeb7 /cc/layer_tree_host_impl.h | |
| parent | e5c7a6d470fe15744cf13c0cddf30da19421cdbb (diff) | |
| download | chromium_src-0023e8b1d2b5cf906e320267ab38d909b1700660.zip chromium_src-0023e8b1d2b5cf906e320267ab38d909b1700660.tar.gz chromium_src-0023e8b1d2b5cf906e320267ab38d909b1700660.tar.bz2 | |
cc: Remove OwnPtr from CCFrameRateCounter.
Instead use scoped_ptr from base/ library.
BUG=154451
R=enne@chromium.org,jamesr@chromium.org
Review URL: https://codereview.chromium.org/11150007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161850 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layer_tree_host_impl.h')
| -rw-r--r-- | cc/layer_tree_host_impl.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/cc/layer_tree_host_impl.h b/cc/layer_tree_host_impl.h index 297f619..3e81230 100644 --- a/cc/layer_tree_host_impl.h +++ b/cc/layer_tree_host_impl.h @@ -6,13 +6,14 @@ #define CCLayerTreeHostImpl_h #include "base/basictypes.h" +#include "base/memory/scoped_ptr.h" #include "base/time.h" #include "CCAnimationEvents.h" #include "CCInputHandler.h" #include "CCLayerSorter.h" +#include "CCRenderer.h" #include "CCRenderPass.h" #include "CCRenderPassSink.h" -#include "CCRenderer.h" #include "SkColor.h" #include <public/WebCompositorOutputSurfaceClient.h> #include <wtf/PassOwnPtr.h> @@ -329,10 +330,10 @@ private: bool m_pinchGestureActive; IntPoint m_previousPinchAnchor; - OwnPtr<CCPageScaleAnimation> m_pageScaleAnimation; + scoped_ptr<CCPageScaleAnimation> m_pageScaleAnimation; // This is used for ticking animations slowly when hidden. - OwnPtr<CCLayerTreeHostImplTimeSourceAdapter> m_timeSourceClientAdapter; + scoped_ptr<CCLayerTreeHostImplTimeSourceAdapter> m_timeSourceClientAdapter; CCLayerSorter m_layerSorter; @@ -342,8 +343,8 @@ private: CCPinchZoomViewport m_pinchZoomViewport; - OwnPtr<CCFrameRateCounter> m_fpsCounter; - OwnPtr<CCDebugRectHistory> m_debugRectHistory; + scoped_ptr<CCFrameRateCounter> m_fpsCounter; + scoped_ptr<CCDebugRectHistory> m_debugRectHistory; size_t m_numImplThreadScrolls; size_t m_numMainThreadScrolls; @@ -351,6 +352,6 @@ private: DISALLOW_COPY_AND_ASSIGN(CCLayerTreeHostImpl); }; -}; +} // namespace cc #endif |