OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "ui/compositor/layer.h" | 5 #include "ui/compositor/layer.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
11 #include "base/logging.h" | 11 #include "base/logging.h" |
12 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
13 #include "cc/base/scoped_ptr_algorithm.h" | 13 #include "cc/base/scoped_ptr_algorithm.h" |
14 #include "cc/content_layer.h" | 14 #include "cc/content_layer.h" |
15 #include "cc/delegated_frame_data.h" | |
16 #include "cc/delegated_renderer_layer.h" | 15 #include "cc/delegated_renderer_layer.h" |
| 16 #include "cc/output/delegated_frame_data.h" |
17 #include "cc/solid_color_layer.h" | 17 #include "cc/solid_color_layer.h" |
18 #include "cc/texture_layer.h" | 18 #include "cc/texture_layer.h" |
19 #include "cc/transferable_resource.h" | 19 #include "cc/transferable_resource.h" |
20 #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperation.
h" | 20 #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperation.
h" |
21 #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations
.h" | 21 #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations
.h" |
22 #include "ui/base/animation/animation.h" | 22 #include "ui/base/animation/animation.h" |
23 #include "ui/compositor/compositor_switches.h" | 23 #include "ui/compositor/compositor_switches.h" |
24 #include "ui/compositor/dip_util.h" | 24 #include "ui/compositor/dip_util.h" |
25 #include "ui/compositor/layer_animator.h" | 25 #include "ui/compositor/layer_animator.h" |
26 #include "ui/gfx/canvas.h" | 26 #include "ui/gfx/canvas.h" |
(...skipping 899 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
926 texture_layer_->SetUV(uv_top_left, uv_bottom_right); | 926 texture_layer_->SetUV(uv_top_left, uv_bottom_right); |
927 } else if (delegated_renderer_layer_.get()) { | 927 } else if (delegated_renderer_layer_.get()) { |
928 delegated_renderer_layer_->SetDisplaySize( | 928 delegated_renderer_layer_->SetDisplaySize( |
929 ConvertSizeToPixel(this, delegated_frame_size_in_dip_)); | 929 ConvertSizeToPixel(this, delegated_frame_size_in_dip_)); |
930 size.ClampToMax(delegated_frame_size_in_dip_); | 930 size.ClampToMax(delegated_frame_size_in_dip_); |
931 } | 931 } |
932 cc_layer_->SetBounds(ConvertSizeToPixel(this, size)); | 932 cc_layer_->SetBounds(ConvertSizeToPixel(this, size)); |
933 } | 933 } |
934 | 934 |
935 } // namespace ui | 935 } // namespace ui |
OLD | NEW |