| 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" | |
| 6 #include "web_layer_impl.h" | 5 #include "web_layer_impl.h" |
| 7 | 6 |
| 8 #include "SkMatrix44.h" | 7 #include "SkMatrix44.h" |
| 9 #ifdef LOG | 8 #ifdef LOG |
| 10 #undef LOG | 9 #undef LOG |
| 11 #endif | 10 #endif |
| 12 #include "base/string_util.h" | 11 #include "base/string_util.h" |
| 13 #include "cc/active_animation.h" | 12 #include "cc/active_animation.h" |
| 14 #include "cc/layer.h" | 13 #include "cc/layer.h" |
| 15 #include "cc/region.h" | 14 #include "cc/region.h" |
| (...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 327 m_layer->resumeAnimations(monotonicTime); | 326 m_layer->resumeAnimations(monotonicTime); |
| 328 } | 327 } |
| 329 | 328 |
| 330 bool WebLayerImpl::hasActiveAnimation() | 329 bool WebLayerImpl::hasActiveAnimation() |
| 331 { | 330 { |
| 332 return m_layer->hasActiveAnimation(); | 331 return m_layer->hasActiveAnimation(); |
| 333 } | 332 } |
| 334 | 333 |
| 335 void WebLayerImpl::transferAnimationsTo(WebLayer* other) | 334 void WebLayerImpl::transferAnimationsTo(WebLayer* other) |
| 336 { | 335 { |
| 337 ASSERT(other); | 336 DCHECK(other); |
| 338 static_cast<WebLayerImpl*>(other)->m_layer->setLayerAnimationController(m_la
yer->releaseLayerAnimationController()); | 337 static_cast<WebLayerImpl*>(other)->m_layer->setLayerAnimationController(m_la
yer->releaseLayerAnimationController()); |
| 339 } | 338 } |
| 340 | 339 |
| 341 void WebLayerImpl::setForceRenderSurface(bool forceRenderSurface) | 340 void WebLayerImpl::setForceRenderSurface(bool forceRenderSurface) |
| 342 { | 341 { |
| 343 m_layer->setForceRenderSurface(forceRenderSurface); | 342 m_layer->setForceRenderSurface(forceRenderSurface); |
| 344 } | 343 } |
| 345 | 344 |
| 346 void WebLayerImpl::setScrollPosition(WebPoint position) | 345 void WebLayerImpl::setScrollPosition(WebPoint position) |
| 347 { | 346 { |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 464 { | 463 { |
| 465 m_layer->setLayerScrollClient(scrollClient); | 464 m_layer->setLayerScrollClient(scrollClient); |
| 466 } | 465 } |
| 467 | 466 |
| 468 Layer* WebLayerImpl::layer() const | 467 Layer* WebLayerImpl::layer() const |
| 469 { | 468 { |
| 470 return m_layer.get(); | 469 return m_layer.get(); |
| 471 } | 470 } |
| 472 | 471 |
| 473 } // namespace WebKit | 472 } // namespace WebKit |
| OLD | NEW |