| Index: webkit/compositor_bindings/web_image_layer_impl.h
|
| diff --git a/webkit/compositor_bindings/web_image_layer_impl.h b/webkit/compositor_bindings/web_image_layer_impl.h
|
| index 77ec628244eb4518de17ad09a49acd4691ba0552..d4a483cc9ad74b06fdef578d0ef4ef71132cff9d 100644
|
| --- a/webkit/compositor_bindings/web_image_layer_impl.h
|
| +++ b/webkit/compositor_bindings/web_image_layer_impl.h
|
| @@ -2,30 +2,33 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef WebImageLayerImpl_h
|
| -#define WebImageLayerImpl_h
|
| +#ifndef WEBKIT_COMPOSITOR_BINDINGS_WEB_IMAGE_LAYER_IMPL_H_
|
| +#define WEBKIT_COMPOSITOR_BINDINGS_WEB_IMAGE_LAYER_IMPL_H_
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| #include "third_party/WebKit/Source/Platform/chromium/public/WebImageLayer.h"
|
| #include "third_party/skia/include/core/SkBitmap.h"
|
| #include "webkit/compositor_bindings/webkit_compositor_bindings_export.h"
|
|
|
| -namespace WebKit {
|
| +namespace webkit {
|
| +
|
| class WebLayerImpl;
|
|
|
| -class WebImageLayerImpl : public WebImageLayer {
|
| +class WebImageLayerImpl : public WebKit::WebImageLayer {
|
| public:
|
| WEBKIT_COMPOSITOR_BINDINGS_EXPORT WebImageLayerImpl();
|
| virtual ~WebImageLayerImpl();
|
|
|
| - // WebImageLayer implementation.
|
| - virtual WebLayer* layer();
|
| + // WebKit::WebImageLayer implementation.
|
| + virtual WebKit::WebLayer* layer();
|
| virtual void setBitmap(SkBitmap);
|
|
|
| private:
|
| scoped_ptr<WebLayerImpl> layer_;
|
| +
|
| + DISALLOW_COPY_AND_ASSIGN(WebImageLayerImpl);
|
| };
|
|
|
| }
|
|
|
| -#endif // WebImageLayerImpl_h
|
| +#endif // WEBKIT_COMPOSITOR_BINDINGS_WEB_IMAGE_LAYER_IMPL_H_
|
|
|