| 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 "webkit/compositor_bindings/web_layer_impl.h" | 5 #include "webkit/compositor_bindings/web_layer_impl.h" |
| 6 | 6 |
| 7 #include "base/string_util.h" | 7 #include "base/string_util.h" |
| 8 #include "cc/animation.h" | 8 #include "cc/animation/animation.h" |
| 9 #include "cc/base/region.h" | 9 #include "cc/base/region.h" |
| 10 #include "cc/layer.h" | 10 #include "cc/layer.h" |
| 11 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" | 11 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" |
| 12 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h" | 12 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h" |
| 13 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" | 13 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" |
| 14 #include "third_party/skia/include/utils/SkMatrix44.h" | 14 #include "third_party/skia/include/utils/SkMatrix44.h" |
| 15 #include "webkit/compositor_bindings/web_animation_impl.h" | 15 #include "webkit/compositor_bindings/web_animation_impl.h" |
| 16 | 16 |
| 17 using cc::Animation; | 17 using cc::Animation; |
| 18 using cc::Layer; | 18 using cc::Layer; |
| (...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 311 return layer_->fixed_to_container_layer(); | 311 return layer_->fixed_to_container_layer(); |
| 312 } | 312 } |
| 313 | 313 |
| 314 void WebLayerImpl::setScrollClient(WebLayerScrollClient* scroll_client) { | 314 void WebLayerImpl::setScrollClient(WebLayerScrollClient* scroll_client) { |
| 315 layer_->set_layer_scroll_client(scroll_client); | 315 layer_->set_layer_scroll_client(scroll_client); |
| 316 } | 316 } |
| 317 | 317 |
| 318 Layer* WebLayerImpl::layer() const { return layer_.get(); } | 318 Layer* WebLayerImpl::layer() const { return layer_.get(); } |
| 319 | 319 |
| 320 } // namespace WebKit | 320 } // namespace WebKit |
| OLD | NEW |