| 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 "config.h" | 5 #include "config.h" |
| 6 #include "WebLayerImpl.h" | 6 #include "WebLayerImpl.h" |
| 7 | 7 |
| 8 #include "CCActiveAnimation.h" | 8 #include "CCActiveAnimation.h" |
| 9 #include "LayerChromium.h" | 9 #include "LayerChromium.h" |
| 10 #include "SkMatrix44.h" | 10 #include "SkMatrix44.h" |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 m_layer->setOpacity(opacity); | 177 m_layer->setOpacity(opacity); |
| 178 } | 178 } |
| 179 | 179 |
| 180 float WebLayerImpl::opacity() const | 180 float WebLayerImpl::opacity() const |
| 181 { | 181 { |
| 182 return m_layer->opacity(); | 182 return m_layer->opacity(); |
| 183 } | 183 } |
| 184 | 184 |
| 185 void WebLayerImpl::setOpaque(bool opaque) | 185 void WebLayerImpl::setOpaque(bool opaque) |
| 186 { | 186 { |
| 187 m_layer->setOpaque(opaque); | 187 m_layer->setContentsOpaque(opaque); |
| 188 } | 188 } |
| 189 | 189 |
| 190 bool WebLayerImpl::opaque() const | 190 bool WebLayerImpl::opaque() const |
| 191 { | 191 { |
| 192 return m_layer->opaque(); | 192 return m_layer->contentsOpaque(); |
| 193 } | 193 } |
| 194 | 194 |
| 195 void WebLayerImpl::setPosition(const WebFloatPoint& position) | 195 void WebLayerImpl::setPosition(const WebFloatPoint& position) |
| 196 { | 196 { |
| 197 m_layer->setPosition(convert(position)); | 197 m_layer->setPosition(convert(position)); |
| 198 } | 198 } |
| 199 | 199 |
| 200 WebFloatPoint WebLayerImpl::position() const | 200 WebFloatPoint WebLayerImpl::position() const |
| 201 { | 201 { |
| 202 return WebFloatPoint(m_layer->position().x(), m_layer->position().y()); | 202 return WebFloatPoint(m_layer->position().x(), m_layer->position().y()); |
| (...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 427 { | 427 { |
| 428 m_layer->setLayerScrollClient(scrollClient); | 428 m_layer->setLayerScrollClient(scrollClient); |
| 429 } | 429 } |
| 430 | 430 |
| 431 LayerChromium* WebLayerImpl::layer() const | 431 LayerChromium* WebLayerImpl::layer() const |
| 432 { | 432 { |
| 433 return m_layer.get(); | 433 return m_layer.get(); |
| 434 } | 434 } |
| 435 | 435 |
| 436 } // namespace WebKit | 436 } // namespace WebKit |
| OLD | NEW |