diff options
author | loyso <loyso@chromium.org> | 2016-02-10 15:54:34 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-02-10 23:55:54 +0000 |
commit | 26f3c5504044531a5772be2009dab72d94ade0cd (patch) | |
tree | 156ef39f0d603c6451861277f6cca1b3871e454d /cc/blink/web_display_item_list_impl.cc | |
parent | bf781415f643cacdb62968ef765f83fa12674ac6 (diff) | |
download | chromium_src-26f3c5504044531a5772be2009dab72d94ade0cd.zip chromium_src-26f3c5504044531a5772be2009dab72d94ade0cd.tar.gz chromium_src-26f3c5504044531a5772be2009dab72d94ade0cd.tar.bz2 |
CC Animation: Move files from cc_blink to Source/platform/animation
Disclaimer: This CL is only about moving files and sections of code.
We:
- Remove Web prefixes on files/classes and add Compositor prefix where necessary.
- Move exported/WebTransformKeyframe.cpp and exported/WebFilterKeyframe.cpp
to animation/ to group them with their headers.
- Move CompositorFilterOperations not to animation/ but to graphics/ folder,
because it's a property of WebLayer.
- Introduce CompositorFactory singleton (works as Platform) to create CC objects
in blink.
All animation methods are moved from CompositorSupport to CompositorFactory.
Other methods are also expected to be moved there.
- Decouple WebLayer and WebCompositorAnimation interfaces
by using cc::Animation class.
It allows us to make WebCompositorAnimation non-public.
WebLayer animation dependencies will go away when we erase the old animation system
(it's already disabled). http://crbug.com/575041
- Move static asserts from content/child/assert_matching_enums.cc to
Source/platform/WebCompositorAnimation.cpp (so the enum becomes non-public).
What's next (separate CLs):
- Remove virtual functions (when gmock-based tests erased)
- Remove redundant enum declarations (using alias).
- Erase the animation delegate adapter.
BUG=577016
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1616653002
Cr-Commit-Position: refs/heads/master@{#374792}
Diffstat (limited to 'cc/blink/web_display_item_list_impl.cc')
-rw-r--r-- | cc/blink/web_display_item_list_impl.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/cc/blink/web_display_item_list_impl.cc b/cc/blink/web_display_item_list_impl.cc index c9d8de7..451a5d5 100644 --- a/cc/blink/web_display_item_list_impl.cc +++ b/cc/blink/web_display_item_list_impl.cc @@ -9,7 +9,6 @@ #include <vector> -#include "cc/blink/web_filter_operations_impl.h" #include "cc/playback/clip_display_item.h" #include "cc/playback/clip_path_display_item.h" #include "cc/playback/compositing_display_item.h" @@ -196,16 +195,13 @@ void WebDisplayItemListImpl::appendEndCompositingItem( void WebDisplayItemListImpl::appendFilterItem( const blink::WebRect& visual_rect, - const blink::WebFilterOperations& filters, + const cc::FilterOperations& filters, const blink::WebFloatRect& bounds) { - const WebFilterOperationsImpl& filters_impl = - static_cast<const WebFilterOperationsImpl&>(filters); - if (display_item_list_->RetainsIndividualDisplayItems()) { display_item_list_->CreateAndAppendItem<cc::FilterDisplayItem>( - visual_rect, filters_impl.AsFilterOperations(), bounds); + visual_rect, filters, bounds); } else { - cc::FilterDisplayItem item(filters_impl.AsFilterOperations(), bounds); + cc::FilterDisplayItem item(filters, bounds); display_item_list_->RasterIntoCanvas(item); } } |