| Index: content/browser/compositor/gpu_process_transport_factory.cc
|
| diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc
|
| index 4abccc1a4f815d6be83df789cacc728c746f909a..1f397f921dc6db3b7769de1c8a65c557c095076d 100644
|
| --- a/content/browser/compositor/gpu_process_transport_factory.cc
|
| +++ b/content/browser/compositor/gpu_process_transport_factory.cc
|
| @@ -401,8 +401,26 @@ void GpuProcessTransportFactory::RemoveCompositor(ui::Compositor* compositor) {
|
|
|
| bool GpuProcessTransportFactory::DoesCreateTestContexts() { return false; }
|
|
|
| -uint32 GpuProcessTransportFactory::GetImageTextureTarget() {
|
| - return BrowserGpuChannelHostFactory::GetImageTextureTarget();
|
| +uint32 GpuProcessTransportFactory::GetMapImageTextureTarget() {
|
| + // TODO(reveman): We currently assume that the compositor will use BGRA_8888
|
| + // if it's able to, and RGBA_8888 otherwise. Since we don't know what it will
|
| + // use we hardcode BGRA_8888 here for now. We should instead move decisions
|
| + // about GpuMemoryBuffer format to the browser embedder so we know it here,
|
| + // and pass that decision to the compositor.
|
| + gfx::GpuMemoryBuffer::Format format = gfx::GpuMemoryBuffer::BGRA_8888;
|
| + return BrowserGpuChannelHostFactory::GetImageTextureTarget(
|
| + format, gfx::GpuMemoryBuffer::MAP);
|
| +}
|
| +
|
| +uint32 GpuProcessTransportFactory::GetPersistentMapImageTextureTarget() {
|
| + // TODO(reveman): We currently assume that the compositor will use BGRA_8888
|
| + // if it's able to, and RGBA_8888 otherwise. Since we don't know what it will
|
| + // use we hardcode BGRA_8888 here for now. We should instead move decisions
|
| + // about GpuMemoryBuffer format to the browser embedder so we know it here,
|
| + // and pass that decision to the compositor.
|
| + gfx::GpuMemoryBuffer::Format format = gfx::GpuMemoryBuffer::BGRA_8888;
|
| + return BrowserGpuChannelHostFactory::GetImageTextureTarget(
|
| + format, gfx::GpuMemoryBuffer::PERSISTENT_MAP);
|
| }
|
|
|
| cc::SharedBitmapManager* GpuProcessTransportFactory::GetSharedBitmapManager() {
|
|
|