| OLD | NEW |
| 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_display_item_list_impl.h" | 5 #include "cc/blink/web_display_item_list_impl.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "cc/blink/web_blend_mode.h" | 9 #include "cc/blink/web_blend_mode.h" |
| 10 #include "cc/blink/web_filter_operations_impl.h" | 10 #include "cc/blink/web_filter_operations_impl.h" |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 91 blink::WebBlendMode blend_mode) { | 91 blink::WebBlendMode blend_mode) { |
| 92 display_item_list_->AppendItem(cc::TransparencyDisplayItem::Create( | 92 display_item_list_->AppendItem(cc::TransparencyDisplayItem::Create( |
| 93 opacity, BlendModeToSkia(blend_mode))); | 93 opacity, BlendModeToSkia(blend_mode))); |
| 94 } | 94 } |
| 95 | 95 |
| 96 // TODO(pdr): Remove once there are no more callers. | 96 // TODO(pdr): Remove once there are no more callers. |
| 97 void WebDisplayItemListImpl::appendEndTransparencyItem() { | 97 void WebDisplayItemListImpl::appendEndTransparencyItem() { |
| 98 display_item_list_->AppendItem(cc::EndTransparencyDisplayItem::Create()); | 98 display_item_list_->AppendItem(cc::EndTransparencyDisplayItem::Create()); |
| 99 } | 99 } |
| 100 | 100 |
| 101 // TODO(pdr): Remove this once the blink-side callers have been removed. |
| 102 void WebDisplayItemListImpl::appendCompositingItem( |
| 103 float opacity, |
| 104 SkXfermode::Mode xfermode, |
| 105 SkColorFilter* color_filter) { |
| 106 appendCompositingItem(opacity, xfermode, nullptr, color_filter); |
| 107 } |
| 108 |
| 101 void WebDisplayItemListImpl::appendCompositingItem( | 109 void WebDisplayItemListImpl::appendCompositingItem( |
| 102 float opacity, | 110 float opacity, |
| 103 SkXfermode::Mode xfermode, | 111 SkXfermode::Mode xfermode, |
| 112 SkRect* bounds, |
| 104 SkColorFilter* color_filter) { | 113 SkColorFilter* color_filter) { |
| 105 display_item_list_->AppendItem(cc::CompositingDisplayItem::Create( | 114 display_item_list_->AppendItem(cc::CompositingDisplayItem::Create( |
| 106 opacity, xfermode, skia::SharePtr(color_filter))); | 115 opacity, xfermode, bounds, skia::SharePtr(color_filter))); |
| 107 } | 116 } |
| 108 | 117 |
| 109 void WebDisplayItemListImpl::appendEndCompositingItem() { | 118 void WebDisplayItemListImpl::appendEndCompositingItem() { |
| 110 display_item_list_->AppendItem(cc::EndCompositingDisplayItem::Create()); | 119 display_item_list_->AppendItem(cc::EndCompositingDisplayItem::Create()); |
| 111 } | 120 } |
| 112 | 121 |
| 113 void WebDisplayItemListImpl::appendFilterItem( | 122 void WebDisplayItemListImpl::appendFilterItem( |
| 114 const blink::WebFilterOperations& filters, | 123 const blink::WebFilterOperations& filters, |
| 115 const blink::WebFloatRect& bounds) { | 124 const blink::WebFloatRect& bounds) { |
| 116 const WebFilterOperationsImpl& filters_impl = | 125 const WebFilterOperationsImpl& filters_impl = |
| (...skipping 15 matching lines...) Expand all Loading... |
| 132 } | 141 } |
| 133 | 142 |
| 134 void WebDisplayItemListImpl::appendEndScrollItem() { | 143 void WebDisplayItemListImpl::appendEndScrollItem() { |
| 135 appendEndTransformItem(); | 144 appendEndTransformItem(); |
| 136 } | 145 } |
| 137 | 146 |
| 138 WebDisplayItemListImpl::~WebDisplayItemListImpl() { | 147 WebDisplayItemListImpl::~WebDisplayItemListImpl() { |
| 139 } | 148 } |
| 140 | 149 |
| 141 } // namespace cc_blink | 150 } // namespace cc_blink |
| OLD | NEW |