Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9)

Side by Side Diff: cc/blink/web_compositor_support_impl.cc

Issue 761903003: Update from https://crrev.com/306655 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/blink/web_compositor_support_impl.h ('k') | cc/blink/web_content_layer_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/blink/web_compositor_support_impl.h" 5 #include "cc/blink/web_compositor_support_impl.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/message_loop/message_loop_proxy.h" 8 #include "base/message_loop/message_loop_proxy.h"
9 #include "cc/animation/transform_operations.h" 9 #include "cc/animation/transform_operations.h"
10 #include "cc/blink/web_animation_impl.h" 10 #include "cc/blink/web_animation_impl.h"
11 #include "cc/blink/web_content_layer_impl.h" 11 #include "cc/blink/web_content_layer_impl.h"
12 #include "cc/blink/web_display_item_list_impl.h"
12 #include "cc/blink/web_external_texture_layer_impl.h" 13 #include "cc/blink/web_external_texture_layer_impl.h"
13 #include "cc/blink/web_filter_animation_curve_impl.h" 14 #include "cc/blink/web_filter_animation_curve_impl.h"
14 #include "cc/blink/web_filter_operations_impl.h" 15 #include "cc/blink/web_filter_operations_impl.h"
15 #include "cc/blink/web_float_animation_curve_impl.h" 16 #include "cc/blink/web_float_animation_curve_impl.h"
16 #include "cc/blink/web_image_layer_impl.h" 17 #include "cc/blink/web_image_layer_impl.h"
17 #include "cc/blink/web_layer_impl.h" 18 #include "cc/blink/web_layer_impl.h"
18 #include "cc/blink/web_nine_patch_layer_impl.h" 19 #include "cc/blink/web_nine_patch_layer_impl.h"
19 #include "cc/blink/web_scroll_offset_animation_curve_impl.h" 20 #include "cc/blink/web_scroll_offset_animation_curve_impl.h"
20 #include "cc/blink/web_scrollbar_layer_impl.h" 21 #include "cc/blink/web_scrollbar_layer_impl.h"
21 #include "cc/blink/web_transform_animation_curve_impl.h" 22 #include "cc/blink/web_transform_animation_curve_impl.h"
22 #include "cc/blink/web_transform_operations_impl.h" 23 #include "cc/blink/web_transform_operations_impl.h"
23 #include "cc/output/output_surface.h" 24 #include "cc/output/output_surface.h"
24 #include "cc/output/software_output_device.h" 25 #include "cc/output/software_output_device.h"
25 26
26 using blink::WebCompositorAnimation; 27 using blink::WebCompositorAnimation;
27 using blink::WebCompositorAnimationCurve; 28 using blink::WebCompositorAnimationCurve;
28 using blink::WebContentLayer; 29 using blink::WebContentLayer;
29 using blink::WebContentLayerClient; 30 using blink::WebContentLayerClient;
31 #if WEB_DISPLAY_ITEM_LIST_IS_DEFINED
32 using blink::WebDisplayItemList;
33 #endif
30 using blink::WebExternalTextureLayer; 34 using blink::WebExternalTextureLayer;
31 using blink::WebExternalTextureLayerClient; 35 using blink::WebExternalTextureLayerClient;
32 using blink::WebFilterAnimationCurve; 36 using blink::WebFilterAnimationCurve;
33 using blink::WebFilterOperations; 37 using blink::WebFilterOperations;
34 using blink::WebFloatAnimationCurve; 38 using blink::WebFloatAnimationCurve;
35 using blink::WebImageLayer; 39 using blink::WebImageLayer;
36 using blink::WebNinePatchLayer; 40 using blink::WebNinePatchLayer;
37 using blink::WebLayer; 41 using blink::WebLayer;
38 using blink::WebScrollbar; 42 using blink::WebScrollbar;
39 using blink::WebScrollbarLayer; 43 using blink::WebScrollbarLayer;
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 WebScrollbar::Orientation orientation, 88 WebScrollbar::Orientation orientation,
85 int thumb_thickness, 89 int thumb_thickness,
86 int track_start, 90 int track_start,
87 bool is_left_side_vertical_scrollbar) { 91 bool is_left_side_vertical_scrollbar) {
88 return new WebScrollbarLayerImpl(orientation, 92 return new WebScrollbarLayerImpl(orientation,
89 thumb_thickness, 93 thumb_thickness,
90 track_start, 94 track_start,
91 is_left_side_vertical_scrollbar); 95 is_left_side_vertical_scrollbar);
92 } 96 }
93 97
98 #if WEB_DISPLAY_ITEM_LIST_IS_DEFINED
99 WebDisplayItemList* WebCompositorSupportImpl::createDisplayItemList() {
100 return new WebDisplayItemListImpl();
101 }
102 #endif
103
94 WebCompositorAnimation* WebCompositorSupportImpl::createAnimation( 104 WebCompositorAnimation* WebCompositorSupportImpl::createAnimation(
95 const blink::WebCompositorAnimationCurve& curve, 105 const blink::WebCompositorAnimationCurve& curve,
96 blink::WebCompositorAnimation::TargetProperty target, 106 blink::WebCompositorAnimation::TargetProperty target,
97 #ifdef WEB_COMPOSITOR_SUPPORT_CREATE_ANIMATION_SUPPORTS_GROUP 107 #ifdef WEB_COMPOSITOR_SUPPORT_CREATE_ANIMATION_SUPPORTS_GROUP
98 int group_id, 108 int group_id,
99 #endif 109 #endif
100 int animation_id) { 110 int animation_id) {
101 #ifdef WEB_COMPOSITOR_SUPPORT_CREATE_ANIMATION_SUPPORTS_GROUP 111 #ifdef WEB_COMPOSITOR_SUPPORT_CREATE_ANIMATION_SUPPORTS_GROUP
102 return new WebCompositorAnimationImpl(curve, target, animation_id, group_id); 112 return new WebCompositorAnimationImpl(curve, target, animation_id, group_id);
103 #else 113 #else
(...skipping 24 matching lines...) Expand all
128 138
129 WebTransformOperations* WebCompositorSupportImpl::createTransformOperations() { 139 WebTransformOperations* WebCompositorSupportImpl::createTransformOperations() {
130 return new WebTransformOperationsImpl(); 140 return new WebTransformOperationsImpl();
131 } 141 }
132 142
133 WebFilterOperations* WebCompositorSupportImpl::createFilterOperations() { 143 WebFilterOperations* WebCompositorSupportImpl::createFilterOperations() {
134 return new WebFilterOperationsImpl(); 144 return new WebFilterOperationsImpl();
135 } 145 }
136 146
137 } // namespace cc_blink 147 } // namespace cc_blink
OLDNEW
« no previous file with comments | « cc/blink/web_compositor_support_impl.h ('k') | cc/blink/web_content_layer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698