Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(754)

Unified Diff: content/renderer/compositor_bindings/web_external_bitmap_impl.h

Issue 317163002: Moving compositor_bindings from webkit to content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changing dependencies due to failing ios bots Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..88251ab70bef431b7b954edb87a7f37fdd92818d 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,7 @@ class WebExternalBitmapImpl : public blink::WebExternalBitmap {
DISALLOW_COPY_AND_ASSIGN(WebExternalBitmapImpl);
};
-} // namespace webkit
+} // namespace content
+
+#endif // CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_EXTERNAL_BITMAP_IMPL_H_
-#endif // WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_EXTERNAL_BITMAP_IMPL_H_

Powered by Google App Engine
This is Rietveld 408576698