| Index: content/renderer/compositor_bindings/web_external_bitmap_impl.h
|
| diff --git a/webkit/renderer/compositor_bindings/web_external_bitmap_impl.h b/content/renderer/compositor_bindings/web_external_bitmap_impl.h
|
| similarity index 62%
|
| rename from webkit/renderer/compositor_bindings/web_external_bitmap_impl.h
|
| rename to content/renderer/compositor_bindings/web_external_bitmap_impl.h
|
| index b113d6453d62955087c84758fdbd431db9d334fc..b00cfd10d0dfb137e1652881334c5b32ee9999c9 100644
|
| --- a/webkit/renderer/compositor_bindings/web_external_bitmap_impl.h
|
| +++ b/content/renderer/compositor_bindings/web_external_bitmap_impl.h
|
| @@ -2,30 +2,29 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_EXTERNAL_BITMAP_IMPL_H_
|
| -#define WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_EXTERNAL_BITMAP_IMPL_H_
|
| +#ifndef CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_EXTERNAL_BITMAP_IMPL_H_
|
| +#define CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_EXTERNAL_BITMAP_IMPL_H_
|
|
|
| #include "base/bind.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "content/common/content_export.h"
|
| #include "third_party/WebKit/public/platform/WebExternalBitmap.h"
|
| -#include "webkit/renderer/compositor_bindings/webkit_compositor_bindings_export.h"
|
|
|
| namespace base {
|
| class SharedMemory;
|
| }
|
|
|
| -namespace webkit {
|
| +namespace content {
|
|
|
| -typedef scoped_ptr<base::SharedMemory> (*SharedMemoryAllocationFunction)(
|
| - size_t);
|
| +typedef scoped_ptr<base::SharedMemory>(*SharedMemoryAllocationFunction)(size_t);
|
|
|
| // Sets the function that this will use to allocate shared memory.
|
| -WEBKIT_COMPOSITOR_BINDINGS_EXPORT void SetSharedMemoryAllocationFunction(
|
| +CONTENT_EXPORT void SetSharedMemoryAllocationFunction(
|
| SharedMemoryAllocationFunction);
|
|
|
| class WebExternalBitmapImpl : public blink::WebExternalBitmap {
|
| public:
|
| - WEBKIT_COMPOSITOR_BINDINGS_EXPORT explicit WebExternalBitmapImpl();
|
| + CONTENT_EXPORT explicit WebExternalBitmapImpl();
|
| virtual ~WebExternalBitmapImpl();
|
|
|
| // blink::WebExternalBitmap implementation.
|
| @@ -42,6 +41,6 @@ class WebExternalBitmapImpl : public blink::WebExternalBitmap {
|
| DISALLOW_COPY_AND_ASSIGN(WebExternalBitmapImpl);
|
| };
|
|
|
| -} // namespace webkit
|
| +} // namespace content
|
|
|
| -#endif // WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_EXTERNAL_BITMAP_IMPL_H_
|
| +#endif // CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_EXTERNAL_BITMAP_IMPL_H_
|
|
|