| OLD | NEW |
| 1 // Copyright 2010 The Chromium Authors. All rights reserved. | 1 // Copyright 2010 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 #include "cc/video_layer.h" | 7 #include "cc/video_layer.h" |
| 8 | 8 |
| 9 #include "cc/video_layer_impl.h" | 9 #include "cc/video_layer_impl.h" |
| 10 | 10 |
| 11 namespace cc { | 11 namespace cc { |
| 12 | 12 |
| 13 scoped_refptr<VideoLayer> VideoLayer::create(WebKit::WebVideoFrameProvider* prov
ider) | 13 scoped_refptr<VideoLayer> VideoLayer::create( |
| 14 WebKit::WebVideoFrameProvider* provider, |
| 15 const FrameUnwrapper& unwrapper) |
| 14 { | 16 { |
| 15 return make_scoped_refptr(new VideoLayer(provider)); | 17 return make_scoped_refptr(new VideoLayer(provider, unwrapper)); |
| 16 } | 18 } |
| 17 | 19 |
| 18 VideoLayer::VideoLayer(WebKit::WebVideoFrameProvider* provider) | 20 VideoLayer::VideoLayer(WebKit::WebVideoFrameProvider* provider, |
| 19 : Layer() | 21 const FrameUnwrapper& unwrapper) |
| 20 , m_provider(provider) | 22 : m_provider(provider) |
| 23 , m_unwrapper(unwrapper) |
| 21 { | 24 { |
| 22 DCHECK(m_provider); | 25 DCHECK(m_provider); |
| 23 } | 26 } |
| 24 | 27 |
| 25 VideoLayer::~VideoLayer() | 28 VideoLayer::~VideoLayer() |
| 26 { | 29 { |
| 27 } | 30 } |
| 28 | 31 |
| 29 scoped_ptr<LayerImpl> VideoLayer::createLayerImpl() | 32 scoped_ptr<LayerImpl> VideoLayer::createLayerImpl() |
| 30 { | 33 { |
| 31 return VideoLayerImpl::create(m_layerId, m_provider).PassAs<LayerImpl>(); | 34 return VideoLayerImpl::create(m_layerId, m_provider, m_unwrapper).PassAs<Lay
erImpl>(); |
| 32 } | 35 } |
| 33 | 36 |
| 34 } // namespace cc | 37 } // namespace cc |
| OLD | NEW |