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

Side by Side Diff: cc/CCLayerTreeHostImpl.cpp

Issue 10985088: cc: Switch it to use DISALLOW_COPY_AND_ASSIGN macro from base/ library. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review 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 | « cc/CCLayerTreeHostImpl.h ('k') | cc/CCOcclusionTracker.h » ('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 #include "config.h" 5 #include "config.h"
6 6
7 #include "CCLayerTreeHostImpl.h" 7 #include "CCLayerTreeHostImpl.h"
8 8
9 #include "base/basictypes.h"
9 #include "CCAppendQuadsData.h" 10 #include "CCAppendQuadsData.h"
10 #include "CCDamageTracker.h" 11 #include "CCDamageTracker.h"
11 #include "CCDebugRectHistory.h" 12 #include "CCDebugRectHistory.h"
12 #include "CCDelayBasedTimeSource.h" 13 #include "CCDelayBasedTimeSource.h"
13 #include "CCFontAtlas.h" 14 #include "CCFontAtlas.h"
14 #include "CCFrameRateCounter.h" 15 #include "CCFrameRateCounter.h"
15 #include "CCHeadsUpDisplayLayerImpl.h" 16 #include "CCHeadsUpDisplayLayerImpl.h"
16 #include "CCLayerIterator.h" 17 #include "CCLayerIterator.h"
17 #include "CCLayerTreeHost.h" 18 #include "CCLayerTreeHost.h"
18 #include "CCLayerTreeHostCommon.h" 19 #include "CCLayerTreeHostCommon.h"
(...skipping 25 matching lines...) Expand all
44 } 45 }
45 46
46 TRACE_EVENT_ASYNC_END0("webkit", "CCLayerTreeHostImpl::setVisible", id); 47 TRACE_EVENT_ASYNC_END0("webkit", "CCLayerTreeHostImpl::setVisible", id);
47 } 48 }
48 49
49 } // namespace 50 } // namespace
50 51
51 namespace cc { 52 namespace cc {
52 53
53 class CCLayerTreeHostImplTimeSourceAdapter : public CCTimeSourceClient { 54 class CCLayerTreeHostImplTimeSourceAdapter : public CCTimeSourceClient {
54 WTF_MAKE_NONCOPYABLE(CCLayerTreeHostImplTimeSourceAdapter);
55 public: 55 public:
56 static PassOwnPtr<CCLayerTreeHostImplTimeSourceAdapter> create(CCLayerTreeHo stImpl* layerTreeHostImpl, PassRefPtr<CCDelayBasedTimeSource> timeSource) 56 static PassOwnPtr<CCLayerTreeHostImplTimeSourceAdapter> create(CCLayerTreeHo stImpl* layerTreeHostImpl, PassRefPtr<CCDelayBasedTimeSource> timeSource)
57 { 57 {
58 return adoptPtr(new CCLayerTreeHostImplTimeSourceAdapter(layerTreeHostIm pl, timeSource)); 58 return adoptPtr(new CCLayerTreeHostImplTimeSourceAdapter(layerTreeHostIm pl, timeSource));
59 } 59 }
60 virtual ~CCLayerTreeHostImplTimeSourceAdapter() 60 virtual ~CCLayerTreeHostImplTimeSourceAdapter()
61 { 61 {
62 m_timeSource->setClient(0); 62 m_timeSource->setClient(0);
63 m_timeSource->setActive(false); 63 m_timeSource->setActive(false);
64 } 64 }
(...skipping 17 matching lines...) Expand all
82 private: 82 private:
83 CCLayerTreeHostImplTimeSourceAdapter(CCLayerTreeHostImpl* layerTreeHostImpl, PassRefPtr<CCDelayBasedTimeSource> timeSource) 83 CCLayerTreeHostImplTimeSourceAdapter(CCLayerTreeHostImpl* layerTreeHostImpl, PassRefPtr<CCDelayBasedTimeSource> timeSource)
84 : m_layerTreeHostImpl(layerTreeHostImpl) 84 : m_layerTreeHostImpl(layerTreeHostImpl)
85 , m_timeSource(timeSource) 85 , m_timeSource(timeSource)
86 { 86 {
87 m_timeSource->setClient(this); 87 m_timeSource->setClient(this);
88 } 88 }
89 89
90 CCLayerTreeHostImpl* m_layerTreeHostImpl; 90 CCLayerTreeHostImpl* m_layerTreeHostImpl;
91 RefPtr<CCDelayBasedTimeSource> m_timeSource; 91 RefPtr<CCDelayBasedTimeSource> m_timeSource;
92
93 DISALLOW_COPY_AND_ASSIGN(CCLayerTreeHostImplTimeSourceAdapter);
92 }; 94 };
93 95
94 CCLayerTreeHostImpl::FrameData::FrameData() 96 CCLayerTreeHostImpl::FrameData::FrameData()
95 { 97 {
96 } 98 }
97 99
98 CCLayerTreeHostImpl::FrameData::~FrameData() 100 CCLayerTreeHostImpl::FrameData::~FrameData()
99 { 101 {
100 } 102 }
101 103
(...skipping 1204 matching lines...) Expand 10 before | Expand all | Expand 10 after
1306 1308
1307 CCScrollbarAnimationController* scrollbarController = layer->scrollbarAnimat ionController(); 1309 CCScrollbarAnimationController* scrollbarController = layer->scrollbarAnimat ionController();
1308 if (scrollbarController && scrollbarController->animate(monotonicTime)) 1310 if (scrollbarController && scrollbarController->animate(monotonicTime))
1309 m_client->setNeedsRedrawOnImplThread(); 1311 m_client->setNeedsRedrawOnImplThread();
1310 1312
1311 for (size_t i = 0; i < layer->children().size(); ++i) 1313 for (size_t i = 0; i < layer->children().size(); ++i)
1312 animateScrollbarsRecursive(layer->children()[i], monotonicTime); 1314 animateScrollbarsRecursive(layer->children()[i], monotonicTime);
1313 } 1315 }
1314 1316
1315 } // namespace cc 1317 } // namespace cc
OLDNEW
« no previous file with comments | « cc/CCLayerTreeHostImpl.h ('k') | cc/CCOcclusionTracker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698