OLD | NEW |
1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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 "web_layer_impl.h" | 5 #include "web_layer_impl.h" |
6 | 6 |
7 #include "SkMatrix44.h" | 7 #include "SkMatrix44.h" |
8 #ifdef LOG | 8 #ifdef LOG |
9 #undef LOG | 9 #undef LOG |
10 #endif | 10 #endif |
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
234 m_layer->setFilters(filters); | 234 m_layer->setFilters(filters); |
235 } | 235 } |
236 | 236 |
237 void WebLayerImpl::setBackgroundFilters(const WebFilterOperations& filters) | 237 void WebLayerImpl::setBackgroundFilters(const WebFilterOperations& filters) |
238 { | 238 { |
239 m_layer->setBackgroundFilters(filters); | 239 m_layer->setBackgroundFilters(filters); |
240 } | 240 } |
241 | 241 |
242 void WebLayerImpl::setFilter(SkImageFilter* filter) | 242 void WebLayerImpl::setFilter(SkImageFilter* filter) |
243 { | 243 { |
244 m_layer->setFilter(filter); | 244 m_layer->setFilter(cc::SkiaRefPtr<SkImageFilter>::Adopt(filter)); |
245 } | 245 } |
246 | 246 |
247 void WebLayerImpl::setDebugName(WebString name) | 247 void WebLayerImpl::setDebugName(WebString name) |
248 { | 248 { |
249 m_layer->setDebugName(UTF16ToASCII(string16(name.data(), name.length()))); | 249 m_layer->setDebugName(UTF16ToASCII(string16(name.data(), name.length()))); |
250 } | 250 } |
251 | 251 |
252 void WebLayerImpl::setAnimationDelegate(WebAnimationDelegate* delegate) | 252 void WebLayerImpl::setAnimationDelegate(WebAnimationDelegate* delegate) |
253 { | 253 { |
254 m_layer->setLayerAnimationDelegate(delegate); | 254 m_layer->setLayerAnimationDelegate(delegate); |
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
421 { | 421 { |
422 m_layer->setLayerScrollClient(scrollClient); | 422 m_layer->setLayerScrollClient(scrollClient); |
423 } | 423 } |
424 | 424 |
425 Layer* WebLayerImpl::layer() const | 425 Layer* WebLayerImpl::layer() const |
426 { | 426 { |
427 return m_layer.get(); | 427 return m_layer.get(); |
428 } | 428 } |
429 | 429 |
430 } // namespace WebKit | 430 } // namespace WebKit |
OLD | NEW |