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 "cc/layer_tree_host_impl.h" | 5 #include "cc/layer_tree_host_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
310 return true; | 310 return true; |
311 } | 311 } |
312 | 312 |
313 OutputSurface* LayerTreeHostImpl::outputSurface() const | 313 OutputSurface* LayerTreeHostImpl::outputSurface() const |
314 { | 314 { |
315 return m_outputSurface.get(); | 315 return m_outputSurface.get(); |
316 } | 316 } |
317 | 317 |
318 void LayerTreeHostImpl::animate(base::TimeTicks monotonicTime, base::Time wallCl
ockTime) | 318 void LayerTreeHostImpl::animate(base::TimeTicks monotonicTime, base::Time wallCl
ockTime) |
319 { | 319 { |
| 320 setLatencyInfo(LatencyInfo()); |
320 animatePageScale(monotonicTime); | 321 animatePageScale(monotonicTime); |
321 animateLayers(monotonicTime, wallClockTime); | 322 animateLayers(monotonicTime, wallClockTime); |
322 animateScrollbars(monotonicTime); | 323 animateScrollbars(monotonicTime); |
323 } | 324 } |
324 | 325 |
325 void LayerTreeHostImpl::manageTiles() | 326 void LayerTreeHostImpl::manageTiles() |
326 { | 327 { |
327 DCHECK(m_tileManager); | 328 DCHECK(m_tileManager); |
328 m_tileManager->ManageTiles(); | 329 m_tileManager->ManageTiles(); |
329 | 330 |
(...skipping 601 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
931 | 932 |
932 const RendererCapabilities& LayerTreeHostImpl::rendererCapabilities() const | 933 const RendererCapabilities& LayerTreeHostImpl::rendererCapabilities() const |
933 { | 934 { |
934 return m_renderer->capabilities(); | 935 return m_renderer->capabilities(); |
935 } | 936 } |
936 | 937 |
937 bool LayerTreeHostImpl::swapBuffers() | 938 bool LayerTreeHostImpl::swapBuffers() |
938 { | 939 { |
939 DCHECK(m_renderer); | 940 DCHECK(m_renderer); |
940 | 941 |
| 942 m_createdFrame = false; |
| 943 TRACE_EVENT_ASYNC_END2("cc", "Frame", this, "implFrameNumber", m_latencyInfo
.rendererImplFrameNumber, "mainFrameNumber", m_latencyInfo.rendererMainFrameNumb
er); |
| 944 TRACE_EVENT_INSTANT1("cc", "Frame", "inputNumber", m_latencyInfo.inputNumber
); |
941 m_fpsCounter->markEndOfFrame(); | 945 m_fpsCounter->markEndOfFrame(); |
942 return m_renderer->swapBuffers(); | 946 return m_renderer->swapBuffers(); |
943 } | 947 } |
944 | 948 |
| 949 void LayerTreeHostImpl::setLatencyInfo(const LatencyInfo& latency_info) { |
| 950 m_latencyInfo.rendererMainFrameNumber = std::max(latency_info.rendererMainFr
ameNumber, m_latencyInfo.rendererMainFrameNumber); |
| 951 m_latencyInfo.rendererImplFrameNumber = std::max(latency_info.rendererImplFr
ameNumber, m_latencyInfo.rendererImplFrameNumber); |
| 952 m_latencyInfo.inputNumber = std::max(latency_info.inputNumber, m_latencyInfo
.inputNumber); |
| 953 if (!m_createdFrame) { |
| 954 m_createdFrame = true; |
| 955 m_latencyInfo.rendererImplFrameNumber++; |
| 956 TRACE_EVENT_ASYNC_BEGIN2("cc", "Frame", this, "implFrameNumber", m_laten
cyInfo.rendererImplFrameNumber, "mainFrameNumber", m_latencyInfo.rendererMainFra
meNumber); |
| 957 } |
| 958 m_outputSurface->SetLatencyInfo(m_latencyInfo); |
| 959 } |
| 960 |
| 961 void LayerTreeHostImpl::OnReceivedLatencyInfo(const LatencyInfo& latency_info) { |
| 962 m_client->onReceivedLatencyInfo(latency_info); |
| 963 } |
| 964 |
945 const gfx::Size& LayerTreeHostImpl::deviceViewportSize() const | 965 const gfx::Size& LayerTreeHostImpl::deviceViewportSize() const |
946 { | 966 { |
947 return m_deviceViewportSize; | 967 return m_deviceViewportSize; |
948 } | 968 } |
949 | 969 |
950 const LayerTreeSettings& LayerTreeHostImpl::settings() const | 970 const LayerTreeSettings& LayerTreeHostImpl::settings() const |
951 { | 971 { |
952 return m_settings; | 972 return m_settings; |
953 } | 973 } |
954 | 974 |
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1325 return actualViewportEndPoint - viewportPoint; | 1345 return actualViewportEndPoint - viewportPoint; |
1326 } | 1346 } |
1327 | 1347 |
1328 static gfx::Vector2dF scrollLayerWithLocalDelta(LayerImpl& layerImpl, gfx::Vecto
r2dF localDelta) | 1348 static gfx::Vector2dF scrollLayerWithLocalDelta(LayerImpl& layerImpl, gfx::Vecto
r2dF localDelta) |
1329 { | 1349 { |
1330 gfx::Vector2dF previousDelta(layerImpl.scrollDelta()); | 1350 gfx::Vector2dF previousDelta(layerImpl.scrollDelta()); |
1331 layerImpl.scrollBy(localDelta); | 1351 layerImpl.scrollBy(localDelta); |
1332 return layerImpl.scrollDelta() - previousDelta; | 1352 return layerImpl.scrollDelta() - previousDelta; |
1333 } | 1353 } |
1334 | 1354 |
1335 bool LayerTreeHostImpl::scrollBy(const gfx::Point& viewportPoint, | 1355 bool LayerTreeHostImpl::scrollBy(int64 input_number, |
| 1356 const gfx::Point& viewportPoint, |
1336 const gfx::Vector2d& scrollDelta) | 1357 const gfx::Vector2d& scrollDelta) |
1337 { | 1358 { |
1338 TRACE_EVENT0("cc", "LayerTreeHostImpl::scrollBy"); | 1359 TRACE_EVENT0("cc", "LayerTreeHostImpl::scrollBy"); |
1339 if (!currentlyScrollingLayer()) | 1360 if (!currentlyScrollingLayer()) |
1340 return false; | 1361 return false; |
1341 | 1362 |
1342 gfx::Vector2dF pendingDelta = scrollDelta; | 1363 gfx::Vector2dF pendingDelta = scrollDelta; |
1343 bool didScroll = false; | 1364 bool didScroll = false; |
1344 | 1365 |
1345 for (LayerImpl* layerImpl = currentlyScrollingLayer(); layerImpl; layerImpl
= layerImpl->parent()) { | 1366 for (LayerImpl* layerImpl = currentlyScrollingLayer(); layerImpl; layerImpl
= layerImpl->parent()) { |
(...skipping 27 matching lines...) Expand all Loading... |
1373 // Allow further movement only on an axis perpendicular to the direction
in which the layer | 1394 // Allow further movement only on an axis perpendicular to the direction
in which the layer |
1374 // moved. | 1395 // moved. |
1375 gfx::Vector2dF perpendicularAxis(-appliedDelta.y(), appliedDelta.x()); | 1396 gfx::Vector2dF perpendicularAxis(-appliedDelta.y(), appliedDelta.x()); |
1376 pendingDelta = MathUtil::projectVector(pendingDelta, perpendicularAxis); | 1397 pendingDelta = MathUtil::projectVector(pendingDelta, perpendicularAxis); |
1377 | 1398 |
1378 if (gfx::ToFlooredVector2d(pendingDelta).IsZero()) | 1399 if (gfx::ToFlooredVector2d(pendingDelta).IsZero()) |
1379 break; | 1400 break; |
1380 } | 1401 } |
1381 | 1402 |
1382 if (didScroll) { | 1403 if (didScroll) { |
| 1404 LatencyInfo latency_info; |
| 1405 latency_info.inputNumber = input_number; |
| 1406 setLatencyInfo(latency_info); |
1383 m_client->setNeedsCommitOnImplThread(); | 1407 m_client->setNeedsCommitOnImplThread(); |
1384 m_client->setNeedsRedrawOnImplThread(); | 1408 m_client->setNeedsRedrawOnImplThread(); |
1385 setNeedsUpdateDrawProperties(); | 1409 setNeedsUpdateDrawProperties(); |
1386 } | 1410 } |
1387 return didScroll; | 1411 return didScroll; |
1388 } | 1412 } |
1389 | 1413 |
1390 void LayerTreeHostImpl::clearCurrentlyScrollingLayer() | 1414 void LayerTreeHostImpl::clearCurrentlyScrollingLayer() |
1391 { | 1415 { |
1392 m_activeTree->ClearCurrentlyScrollingLayer(); | 1416 m_activeTree->ClearCurrentlyScrollingLayer(); |
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1718 ScrollbarAnimationController* scrollbarController = layer->scrollbarAnimatio
nController(); | 1742 ScrollbarAnimationController* scrollbarController = layer->scrollbarAnimatio
nController(); |
1719 double monotonicTime = (time - base::TimeTicks()).InSecondsF(); | 1743 double monotonicTime = (time - base::TimeTicks()).InSecondsF(); |
1720 if (scrollbarController && scrollbarController->animate(monotonicTime)) | 1744 if (scrollbarController && scrollbarController->animate(monotonicTime)) |
1721 m_client->setNeedsRedrawOnImplThread(); | 1745 m_client->setNeedsRedrawOnImplThread(); |
1722 | 1746 |
1723 for (size_t i = 0; i < layer->children().size(); ++i) | 1747 for (size_t i = 0; i < layer->children().size(); ++i) |
1724 animateScrollbarsRecursive(layer->children()[i], time); | 1748 animateScrollbarsRecursive(layer->children()[i], time); |
1725 } | 1749 } |
1726 | 1750 |
1727 } // namespace cc | 1751 } // namespace cc |
OLD | NEW |