| 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 269 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 280 if (!m_settings.pageScalePinchZoomEnabled) | 280 if (!m_settings.pageScalePinchZoomEnabled) |
| 281 scaledTargetOffset.Scale(1 / pageScale); | 281 scaledTargetOffset.Scale(1 / pageScale); |
| 282 m_pageScaleAnimation->zoomTo(scaledTargetOffset, pageScale, duration.InS
econdsF()); | 282 m_pageScaleAnimation->zoomTo(scaledTargetOffset, pageScale, duration.InS
econdsF()); |
| 283 } | 283 } |
| 284 | 284 |
| 285 setNeedsUpdateDrawProperties(); | 285 setNeedsUpdateDrawProperties(); |
| 286 m_client->setNeedsRedrawOnImplThread(); | 286 m_client->setNeedsRedrawOnImplThread(); |
| 287 m_client->setNeedsCommitOnImplThread(); | 287 m_client->setNeedsCommitOnImplThread(); |
| 288 } | 288 } |
| 289 | 289 |
| 290 void LayerTreeHostImpl::programmaticScroll(gfx::Vector2d targetOffset) |
| 291 { |
| 292 if (m_topControlsManager) |
| 293 m_topControlsManager->ProgrammaticScroll(targetOffset); |
| 294 } |
| 295 |
| 290 void LayerTreeHostImpl::scheduleAnimation() | 296 void LayerTreeHostImpl::scheduleAnimation() |
| 291 { | 297 { |
| 292 m_client->setNeedsRedrawOnImplThread(); | 298 m_client->setNeedsRedrawOnImplThread(); |
| 293 } | 299 } |
| 294 | 300 |
| 295 bool LayerTreeHostImpl::haveTouchEventHandlersAt(const gfx::Point& viewportPoint
) | 301 bool LayerTreeHostImpl::haveTouchEventHandlersAt(const gfx::Point& viewportPoint
) |
| 296 { | 302 { |
| 297 if (!ensureRenderSurfaceLayerList()) | 303 if (!ensureRenderSurfaceLayerList()) |
| 298 return false; | 304 return false; |
| 299 | 305 |
| (...skipping 30 matching lines...) Expand all Loading... |
| 330 { | 336 { |
| 331 if (!needsUpdateDrawProperties()) | 337 if (!needsUpdateDrawProperties()) |
| 332 return; | 338 return; |
| 333 | 339 |
| 334 if (!m_renderer) { // For maxTextureSize. | 340 if (!m_renderer) { // For maxTextureSize. |
| 335 // This will get set if renderer gets initialized. | 341 // This will get set if renderer gets initialized. |
| 336 m_needsUpdateDrawProperties = false; | 342 m_needsUpdateDrawProperties = false; |
| 337 return; | 343 return; |
| 338 } | 344 } |
| 339 | 345 |
| 340 if (m_topControlsManager) | |
| 341 m_topControlsManager->UpdateDrawPositions(); | |
| 342 activeTree()->UpdateDrawProperties(); | 346 activeTree()->UpdateDrawProperties(); |
| 343 if (pendingTree()) | 347 if (pendingTree()) |
| 344 pendingTree()->UpdateDrawProperties(); | 348 pendingTree()->UpdateDrawProperties(); |
| 345 | 349 |
| 346 m_needsUpdateDrawProperties = false; | 350 m_needsUpdateDrawProperties = false; |
| 347 } | 351 } |
| 348 | 352 |
| 349 void LayerTreeHostImpl::FrameData::appendRenderPass(scoped_ptr<RenderPass> rende
rPass) | 353 void LayerTreeHostImpl::FrameData::appendRenderPass(scoped_ptr<RenderPass> rende
rPass) |
| 350 { | 354 { |
| 351 renderPassesById[renderPass->id] = renderPass.get(); | 355 renderPassesById[renderPass->id] = renderPass.get(); |
| (...skipping 1360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1712 LayerImpl* layer = getNonCompositedContentLayerRecursive(tree->RootLayer()); | 1716 LayerImpl* layer = getNonCompositedContentLayerRecursive(tree->RootLayer()); |
| 1713 return layer ? layer->getPicture() : skia::RefPtr<SkPicture>(); | 1717 return layer ? layer->getPicture() : skia::RefPtr<SkPicture>(); |
| 1714 } | 1718 } |
| 1715 | 1719 |
| 1716 void LayerTreeHostImpl::savePaintTime(const base::TimeDelta& totalPaintTime) | 1720 void LayerTreeHostImpl::savePaintTime(const base::TimeDelta& totalPaintTime) |
| 1717 { | 1721 { |
| 1718 m_paintTimeCounter->SavePaintTime(totalPaintTime); | 1722 m_paintTimeCounter->SavePaintTime(totalPaintTime); |
| 1719 } | 1723 } |
| 1720 | 1724 |
| 1721 } // namespace cc | 1725 } // namespace cc |
| OLD | NEW |