OLD | NEW |
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 "CCSingleThreadProxy.h" | 7 #include "CCSingleThreadProxy.h" |
8 | 8 |
9 #include "CCDrawQuad.h" | 9 #include "CCDrawQuad.h" |
10 #include "CCGraphicsContext.h" | 10 #include "CCGraphicsContext.h" |
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
200 m_layerTreeHostImpl->resourceProvider()->textureUploader()); | 200 m_layerTreeHostImpl->resourceProvider()->textureUploader()); |
201 updateController->finalize(); | 201 updateController->finalize(); |
202 | 202 |
203 m_layerTreeHost->finishCommitOnImplThread(m_layerTreeHostImpl.get()); | 203 m_layerTreeHost->finishCommitOnImplThread(m_layerTreeHostImpl.get()); |
204 | 204 |
205 m_layerTreeHostImpl->commitComplete(); | 205 m_layerTreeHostImpl->commitComplete(); |
206 | 206 |
207 #if !ASSERT_DISABLED | 207 #if !ASSERT_DISABLED |
208 // In the single-threaded case, the scroll deltas should never be | 208 // In the single-threaded case, the scroll deltas should never be |
209 // touched on the impl layer tree. | 209 // touched on the impl layer tree. |
210 OwnPtr<CCScrollAndScaleSet> scrollInfo = m_layerTreeHostImpl->processScr
ollDeltas(); | 210 scoped_ptr<CCScrollAndScaleSet> scrollInfo = m_layerTreeHostImpl->proces
sScrollDeltas(); |
211 ASSERT(!scrollInfo->scrolls.size()); | 211 ASSERT(!scrollInfo->scrolls.size()); |
212 #endif | 212 #endif |
213 | 213 |
214 base::TimeTicks endTime = base::TimeTicks::HighResNow(); | 214 base::TimeTicks endTime = base::TimeTicks::HighResNow(); |
215 m_totalCommitTime += endTime - startTime; | 215 m_totalCommitTime += endTime - startTime; |
216 m_totalCommitCount++; | 216 m_totalCommitCount++; |
217 } | 217 } |
218 m_layerTreeHost->commitComplete(); | 218 m_layerTreeHost->commitComplete(); |
219 m_nextFrameIsNewlyCommittedFrame = true; | 219 m_nextFrameIsNewlyCommittedFrame = true; |
220 } | 220 } |
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
376 | 376 |
377 void CCSingleThreadProxy::didSwapFrame() | 377 void CCSingleThreadProxy::didSwapFrame() |
378 { | 378 { |
379 if (m_nextFrameIsNewlyCommittedFrame) { | 379 if (m_nextFrameIsNewlyCommittedFrame) { |
380 m_nextFrameIsNewlyCommittedFrame = false; | 380 m_nextFrameIsNewlyCommittedFrame = false; |
381 m_layerTreeHost->didCommitAndDrawFrame(); | 381 m_layerTreeHost->didCommitAndDrawFrame(); |
382 } | 382 } |
383 } | 383 } |
384 | 384 |
385 } | 385 } |
OLD | NEW |