| 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 789 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 800 m_fpsCounter->saveTimeStamp(base::TimeTicks::Now()); | 800 m_fpsCounter->saveTimeStamp(base::TimeTicks::Now()); |
| 801 | 801 |
| 802 if (m_debugState.showHudRects()) | 802 if (m_debugState.showHudRects()) |
| 803 m_debugRectHistory->saveDebugRectsForCurrentFrame(rootLayer(), *frame.re
nderSurfaceLayerList, frame.occludingScreenSpaceRects, frame.nonOccludingScreenS
paceRects, m_debugState); | 803 m_debugRectHistory->saveDebugRectsForCurrentFrame(rootLayer(), *frame.re
nderSurfaceLayerList, frame.occludingScreenSpaceRects, frame.nonOccludingScreenS
paceRects, m_debugState); |
| 804 | 804 |
| 805 // Because the contents of the HUD depend on everything else in the frame, t
he contents | 805 // Because the contents of the HUD depend on everything else in the frame, t
he contents |
| 806 // of its texture are updated as the last thing before the frame is drawn. | 806 // of its texture are updated as the last thing before the frame is drawn. |
| 807 if (m_activeTree->hud_layer()) | 807 if (m_activeTree->hud_layer()) |
| 808 m_activeTree->hud_layer()->updateHudTexture(m_resourceProvider.get()); | 808 m_activeTree->hud_layer()->updateHudTexture(m_resourceProvider.get()); |
| 809 | 809 |
| 810 m_activeTree->UpdateFixedPositionViewport(); |
| 811 |
| 810 m_renderer->drawFrame(frame.renderPasses); | 812 m_renderer->drawFrame(frame.renderPasses); |
| 811 // The render passes should be consumed by the renderer. | 813 // The render passes should be consumed by the renderer. |
| 812 DCHECK(frame.renderPasses.empty()); | 814 DCHECK(frame.renderPasses.empty()); |
| 813 frame.renderPassesById.clear(); | 815 frame.renderPassesById.clear(); |
| 814 | 816 |
| 815 // The next frame should start by assuming nothing has changed, and changes
are noted as they occur. | 817 // The next frame should start by assuming nothing has changed, and changes
are noted as they occur. |
| 816 for (unsigned int i = 0; i < frame.renderSurfaceLayerList->size(); i++) | 818 for (unsigned int i = 0; i < frame.renderSurfaceLayerList->size(); i++) |
| 817 (*frame.renderSurfaceLayerList)[i]->renderSurface()->damageTracker()->di
dDrawDamagedArea(); | 819 (*frame.renderSurfaceLayerList)[i]->renderSurface()->damageTracker()->di
dDrawDamagedArea(); |
| 818 rootLayer()->resetAllChangeTrackingForSubtree(); | 820 rootLayer()->resetAllChangeTrackingForSubtree(); |
| 819 } | 821 } |
| (...skipping 655 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1475 if (m_pinchGestureActive) | 1477 if (m_pinchGestureActive) |
| 1476 computePinchZoomDeltas(scrollInfo.get()); | 1478 computePinchZoomDeltas(scrollInfo.get()); |
| 1477 else if (m_pageScaleAnimation.get()) | 1479 else if (m_pageScaleAnimation.get()) |
| 1478 computeDoubleTapZoomDeltas(scrollInfo.get()); | 1480 computeDoubleTapZoomDeltas(scrollInfo.get()); |
| 1479 return scrollInfo.Pass(); | 1481 return scrollInfo.Pass(); |
| 1480 } | 1482 } |
| 1481 | 1483 |
| 1482 collectScrollDeltas(scrollInfo.get(), rootLayer()); | 1484 collectScrollDeltas(scrollInfo.get(), rootLayer()); |
| 1483 scrollInfo->pageScaleDelta = m_pinchZoomViewport.page_scale_delta(); | 1485 scrollInfo->pageScaleDelta = m_pinchZoomViewport.page_scale_delta(); |
| 1484 m_pinchZoomViewport.set_sent_page_scale_delta(scrollInfo->pageScaleDelta); | 1486 m_pinchZoomViewport.set_sent_page_scale_delta(scrollInfo->pageScaleDelta); |
| 1487 if (rootScrollLayer()) { |
| 1488 scrollInfo->desktopCompatibilityViewportOffsetFromScrollPositionDelta =
gfx::ToFlooredVector2d(rootScrollLayer()->desktopCompatibilityViewportOffsetFrom
ScrollPositionDelta()); |
| 1489 rootScrollLayer()->setSentDesktopCompatibilityViewportOffsetFromScrollPo
sitionDelta(scrollInfo->desktopCompatibilityViewportOffsetFromScrollPositionDelt
a); |
| 1490 } |
| 1485 | 1491 |
| 1486 return scrollInfo.Pass(); | 1492 return scrollInfo.Pass(); |
| 1487 } | 1493 } |
| 1488 | 1494 |
| 1489 gfx::Transform LayerTreeHostImpl::implTransform() const | 1495 gfx::Transform LayerTreeHostImpl::implTransform() const |
| 1490 { | 1496 { |
| 1491 return m_pinchZoomViewport.ImplTransform(m_settings.pageScalePinchZoomEnable
d); | 1497 return m_pinchZoomViewport.ImplTransform(m_settings.pageScalePinchZoomEnable
d); |
| 1492 } | 1498 } |
| 1493 | 1499 |
| 1494 void LayerTreeHostImpl::setFullRootLayerDamage() | 1500 void LayerTreeHostImpl::setFullRootLayerDamage() |
| (...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1702 LayerImpl* layer = getNonCompositedContentLayerRecursive(tree->RootLayer()); | 1708 LayerImpl* layer = getNonCompositedContentLayerRecursive(tree->RootLayer()); |
| 1703 return layer ? layer->getPicture() : skia::RefPtr<SkPicture>(); | 1709 return layer ? layer->getPicture() : skia::RefPtr<SkPicture>(); |
| 1704 } | 1710 } |
| 1705 | 1711 |
| 1706 void LayerTreeHostImpl::savePaintTime(const base::TimeDelta& totalPaintTime) | 1712 void LayerTreeHostImpl::savePaintTime(const base::TimeDelta& totalPaintTime) |
| 1707 { | 1713 { |
| 1708 m_paintTimeCounter->SavePaintTime(totalPaintTime); | 1714 m_paintTimeCounter->SavePaintTime(totalPaintTime); |
| 1709 } | 1715 } |
| 1710 | 1716 |
| 1711 } // namespace cc | 1717 } // namespace cc |
| OLD | NEW |