| Index: webkit/compositor_bindings/web_video_layer_impl.h
|
| diff --git a/webkit/compositor_bindings/web_video_layer_impl.h b/webkit/compositor_bindings/web_video_layer_impl.h
|
| index 71c45e74ee436155cb8138c2444c5f7a12fe29b2..3e4bee2d0d7af0bf6af89a49bd1afb0f8625b33e 100644
|
| --- a/webkit/compositor_bindings/web_video_layer_impl.h
|
| +++ b/webkit/compositor_bindings/web_video_layer_impl.h
|
| @@ -2,35 +2,35 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef WebVideoLayerImpl_h
|
| -#define WebVideoLayerImpl_h
|
| +#ifndef WEBKIT_COMPOSITOR_BINDINGS_WEB_VIDEO_LAYER_IMPL_H_
|
| +#define WEBKIT_COMPOSITOR_BINDINGS_WEB_VIDEO_LAYER_IMPL_H_
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| #include "third_party/WebKit/Source/Platform/chromium/public/WebVideoLayer.h"
|
| #include "webkit/compositor_bindings/webkit_compositor_bindings_export.h"
|
|
|
| -namespace webkit { class WebToCCVideoFrameProvider; }
|
| +namespace WebKit { class WebVideoFrameProvider; }
|
|
|
| -namespace WebKit {
|
| +namespace webkit {
|
|
|
| class WebLayerImpl;
|
| -class WebVideoFrameProvider;
|
| +class WebToCCVideoFrameProvider;
|
|
|
| -class WebVideoLayerImpl : public WebVideoLayer {
|
| +class WebVideoLayerImpl : public WebKit::WebVideoLayer {
|
| public:
|
| WEBKIT_COMPOSITOR_BINDINGS_EXPORT explicit WebVideoLayerImpl(
|
| - WebVideoFrameProvider*);
|
| + WebKit::WebVideoFrameProvider*);
|
| virtual ~WebVideoLayerImpl();
|
|
|
| - // WebVideoLayer implementation.
|
| - virtual WebLayer* layer();
|
| + // WebKit::WebVideoLayer implementation.
|
| + virtual WebKit::WebLayer* layer();
|
| virtual bool active() const;
|
|
|
| private:
|
| - scoped_ptr<webkit::WebToCCVideoFrameProvider> provider_adapter_;
|
| + scoped_ptr<WebToCCVideoFrameProvider> provider_adapter_;
|
| scoped_ptr<WebLayerImpl> layer_;
|
| };
|
|
|
| }
|
|
|
| -#endif // WebVideoLayerImpl_h
|
| +#endif // WEBKIT_COMPOSITOR_BINDINGS_WEB_VIDEO_LAYER_IMPL_H_
|
|
|