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

Unified Diff: content/renderer/render_thread_impl.cc

Issue 17859002: Allow WebExternalTextureLayers to receive a bitmap along with a mailbox (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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/render_thread_impl.cc
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 32109c0d41ac8dfc4a4456a06aad7e015f458788..cbe29a5434de0bd582abd6de14f9e88d1c06df3c 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -105,6 +105,7 @@
#include "webkit/glue/webkit_glue.h"
#include "webkit/child/worker_task_runner.h"
#include "webkit/renderer/appcache/appcache_frontend_impl.h"
+#include "webkit/renderer/compositor_bindings/web_external_bitmap_impl.h"
#if defined(OS_WIN)
#include <windows.h>
@@ -216,6 +217,10 @@ void AddHistogramSample(void* hist, int sample) {
histogram->Add(sample);
}
+scoped_ptr<base::SharedMemory> AllocateSharedMemoryFunction(size_t size) {
+ return RenderThreadImpl::Get()->HostAllocateSharedMemoryBuffer(size);
+}
+
} // namespace
class RenderThreadImpl::GpuVDAContextLostCallback
@@ -723,6 +728,8 @@ void RenderThreadImpl::EnsureWebKitInitialized() {
if (GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden())
ScheduleIdleHandler(kLongIdleHandlerDelayMs);
+
+ webkit::SetSharedMemoryAllocationFunction(AllocateSharedMemoryFunction);
}
void RenderThreadImpl::RegisterSchemes() {

Powered by Google App Engine
This is Rietveld 408576698