OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 3995 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4006 m_layerTreeView->registerForAnimations(layer); | 4006 m_layerTreeView->registerForAnimations(layer); |
4007 } | 4007 } |
4008 | 4008 |
4009 GraphicsLayer* WebViewImpl::rootGraphicsLayer() | 4009 GraphicsLayer* WebViewImpl::rootGraphicsLayer() |
4010 { | 4010 { |
4011 return m_rootGraphicsLayer; | 4011 return m_rootGraphicsLayer; |
4012 } | 4012 } |
4013 | 4013 |
4014 void WebViewImpl::scheduleAnimation() | 4014 void WebViewImpl::scheduleAnimation() |
4015 { | 4015 { |
| 4016 WTF_LOG(ScriptedAnimationController, "WebViewImpl::scheduleAnimation: accele
rated = %d", isAcceleratedCompositingActive() ? 1 : 0); |
4016 if (isAcceleratedCompositingActive()) { | 4017 if (isAcceleratedCompositingActive()) { |
4017 ASSERT(m_layerTreeView); | 4018 ASSERT(m_layerTreeView); |
4018 m_layerTreeView->setNeedsAnimate(); | 4019 m_layerTreeView->setNeedsAnimate(); |
4019 return; | 4020 return; |
4020 } | 4021 } |
4021 if (m_client) | 4022 if (m_client) |
4022 m_client->scheduleAnimation(); | 4023 m_client->scheduleAnimation(); |
4023 } | 4024 } |
4024 | 4025 |
4025 void WebViewImpl::initializeLayerTreeView() | 4026 void WebViewImpl::initializeLayerTreeView() |
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4290 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); | 4291 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); |
4291 | 4292 |
4292 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) | 4293 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) |
4293 return false; | 4294 return false; |
4294 | 4295 |
4295 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 4296 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
4296 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); | 4297 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); |
4297 } | 4298 } |
4298 | 4299 |
4299 } // namespace blink | 4300 } // namespace blink |
OLD | NEW |