diff options
| author | ajuma <ajuma@chromium.org> | 2015-02-18 13:10:14 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-18 21:10:54 +0000 |
| commit | 79500520392971b2fc403fb4b38504a657a5dfa4 (patch) | |
| tree | b86bc2d1040e05b5855a57c15baeab8a7eb11939 /cc/blink | |
| parent | ad79c7a3c00fef1d5cf197c5956fe7be3354edd0 (diff) | |
| download | chromium_src-79500520392971b2fc403fb4b38504a657a5dfa4.zip chromium_src-79500520392971b2fc403fb4b38504a657a5dfa4.tar.gz chromium_src-79500520392971b2fc403fb4b38504a657a5dfa4.tar.bz2 | |
Remove #ifs from WebDisplayItemListImpl
This removes #ifs that are no longer needed since Blink-side changes
(http://crrev.com/875423003) have landed.
BUG=453924
Review URL: https://codereview.chromium.org/940463005
Cr-Commit-Position: refs/heads/master@{#316892}
Diffstat (limited to 'cc/blink')
| -rw-r--r-- | cc/blink/web_display_item_list_impl.cc | 12 | ||||
| -rw-r--r-- | cc/blink/web_display_item_list_impl.h | 5 |
2 files changed, 0 insertions, 17 deletions
diff --git a/cc/blink/web_display_item_list_impl.cc b/cc/blink/web_display_item_list_impl.cc index dc1d430..1b6f91a 100644 --- a/cc/blink/web_display_item_list_impl.cc +++ b/cc/blink/web_display_item_list_impl.cc @@ -101,7 +101,6 @@ void WebDisplayItemListImpl::appendEndTransparencyItem() { display_item_list_->AppendItem(cc::EndTransparencyDisplayItem::Create()); } -#if FILTER_DISPLAY_ITEM_USES_FILTER_OPERATIONS void WebDisplayItemListImpl::appendFilterItem( const blink::WebFilterOperations& filters, const blink::WebFloatRect& bounds) { @@ -110,17 +109,6 @@ void WebDisplayItemListImpl::appendFilterItem( display_item_list_->AppendItem( cc::FilterDisplayItem::Create(filters_impl.AsFilterOperations(), bounds)); } -#else -void WebDisplayItemListImpl::appendFilterItem( - SkImageFilter* filter, - const blink::WebFloatRect& bounds) { - cc::FilterOperations filter_operations; - filter_operations.Append( - cc::FilterOperation::CreateReferenceFilter(skia::SharePtr(filter))); - display_item_list_->AppendItem( - cc::FilterDisplayItem::Create(filter_operations, bounds)); -} -#endif void WebDisplayItemListImpl::appendEndFilterItem() { display_item_list_->AppendItem(cc::EndFilterDisplayItem::Create()); diff --git a/cc/blink/web_display_item_list_impl.h b/cc/blink/web_display_item_list_impl.h index f2ff8c6..1295a13 100644 --- a/cc/blink/web_display_item_list_impl.h +++ b/cc/blink/web_display_item_list_impl.h @@ -50,13 +50,8 @@ class WebDisplayItemListImpl : public blink::WebDisplayItemList { virtual void appendTransparencyItem(float opacity, blink::WebBlendMode blend_mode); virtual void appendEndTransparencyItem(); -#if FILTER_DISPLAY_ITEM_USES_FILTER_OPERATIONS virtual void appendFilterItem(const blink::WebFilterOperations& filters, const blink::WebFloatRect& bounds); -#else - virtual void appendFilterItem(SkImageFilter* filter, - const blink::WebFloatRect& bounds); -#endif virtual void appendEndFilterItem(); private: |