OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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 | 6 |
7 #if USE(ACCELERATED_COMPOSITING) | 7 #if USE(ACCELERATED_COMPOSITING) |
8 | 8 |
9 #include "IOSurfaceLayerChromium.h" | 9 #include "IOSurfaceLayerChromium.h" |
10 | 10 |
(...skipping 16 matching lines...) Expand all Loading... |
27 { | 27 { |
28 } | 28 } |
29 | 29 |
30 void IOSurfaceLayerChromium::setIOSurfaceProperties(uint32_t ioSurfaceId, const
IntSize& size) | 30 void IOSurfaceLayerChromium::setIOSurfaceProperties(uint32_t ioSurfaceId, const
IntSize& size) |
31 { | 31 { |
32 m_ioSurfaceId = ioSurfaceId; | 32 m_ioSurfaceId = ioSurfaceId; |
33 m_ioSurfaceSize = size; | 33 m_ioSurfaceSize = size; |
34 setNeedsCommit(); | 34 setNeedsCommit(); |
35 } | 35 } |
36 | 36 |
37 PassOwnPtr<CCLayerImpl> IOSurfaceLayerChromium::createCCLayerImpl() | 37 scoped_ptr<CCLayerImpl> IOSurfaceLayerChromium::createCCLayerImpl() |
38 { | 38 { |
39 return CCIOSurfaceLayerImpl::create(m_layerId); | 39 return CCIOSurfaceLayerImpl::create(m_layerId).PassAs<CCLayerImpl>(); |
40 } | 40 } |
41 | 41 |
42 bool IOSurfaceLayerChromium::drawsContent() const | 42 bool IOSurfaceLayerChromium::drawsContent() const |
43 { | 43 { |
44 return m_ioSurfaceId && LayerChromium::drawsContent(); | 44 return m_ioSurfaceId && LayerChromium::drawsContent(); |
45 } | 45 } |
46 | 46 |
47 void IOSurfaceLayerChromium::pushPropertiesTo(CCLayerImpl* layer) | 47 void IOSurfaceLayerChromium::pushPropertiesTo(CCLayerImpl* layer) |
48 { | 48 { |
49 LayerChromium::pushPropertiesTo(layer); | 49 LayerChromium::pushPropertiesTo(layer); |
50 | 50 |
51 CCIOSurfaceLayerImpl* textureLayer = static_cast<CCIOSurfaceLayerImpl*>(laye
r); | 51 CCIOSurfaceLayerImpl* textureLayer = static_cast<CCIOSurfaceLayerImpl*>(laye
r); |
52 textureLayer->setIOSurfaceProperties(m_ioSurfaceId, m_ioSurfaceSize); | 52 textureLayer->setIOSurfaceProperties(m_ioSurfaceId, m_ioSurfaceSize); |
53 } | 53 } |
54 | 54 |
55 } | 55 } |
56 #endif // USE(ACCELERATED_COMPOSITING) | 56 #endif // USE(ACCELERATED_COMPOSITING) |
OLD | NEW |