| OLD | NEW |
| 1 // Copyright 2010 The Chromium Authors. All rights reserved. | 1 // Copyright 2010 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.h" | 5 #include "cc/layer.h" |
| 6 | 6 |
| 7 #include "cc/active_animation.h" | 7 #include "cc/active_animation.h" |
| 8 #include "cc/animation_events.h" | 8 #include "cc/animation_events.h" |
| 9 #include "cc/layer_animation_controller.h" | 9 #include "cc/layer_animation_controller.h" |
| 10 #include "cc/layer_impl.h" | 10 #include "cc/layer_impl.h" |
| 11 #include "cc/layer_tree_host.h" | 11 #include "cc/layer_tree_host.h" |
| 12 #include "third_party/WebKit/Source/Platform/chromium/public/WebAnimationDelegat
e.h" |
| 13 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerScrollClien
t.h" |
| 14 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" |
| 12 #include "third_party/skia/include/core/SkImageFilter.h" | 15 #include "third_party/skia/include/core/SkImageFilter.h" |
| 13 #include "ui/gfx/rect_conversions.h" | 16 #include "ui/gfx/rect_conversions.h" |
| 14 #include <public/WebAnimationDelegate.h> | |
| 15 #include <public/WebLayerScrollClient.h> | |
| 16 #include <public/WebSize.h> | |
| 17 | 17 |
| 18 using namespace std; | 18 using namespace std; |
| 19 | 19 |
| 20 namespace cc { | 20 namespace cc { |
| 21 | 21 |
| 22 static int s_nextLayerId = 1; | 22 static int s_nextLayerId = 1; |
| 23 | 23 |
| 24 scoped_refptr<Layer> Layer::create() | 24 scoped_refptr<Layer> Layer::create() |
| 25 { | 25 { |
| 26 return make_scoped_refptr(new Layer()); | 26 return make_scoped_refptr(new Layer()); |
| (...skipping 814 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 841 { | 841 { |
| 842 return 0; | 842 return 0; |
| 843 } | 843 } |
| 844 | 844 |
| 845 void sortLayers(std::vector<scoped_refptr<Layer> >::iterator, std::vector<scoped
_refptr<Layer> >::iterator, void*) | 845 void sortLayers(std::vector<scoped_refptr<Layer> >::iterator, std::vector<scoped
_refptr<Layer> >::iterator, void*) |
| 846 { | 846 { |
| 847 // Currently we don't use z-order to decide what to paint, so there's no nee
d to actually sort Layers. | 847 // Currently we don't use z-order to decide what to paint, so there's no nee
d to actually sort Layers. |
| 848 } | 848 } |
| 849 | 849 |
| 850 } // namespace cc | 850 } // namespace cc |
| OLD | NEW |