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