Index: content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc |
diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc b/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc |
index 401d37a39cd082097e0b84abc818e8dd54608c7c..6c5735d197e06dad0f706600d11ce9e5a48e3d49 100644 |
--- a/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc |
+++ b/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc |
@@ -18,6 +18,11 @@ int WindowFormat(gfx::GpuMemoryBuffer::Format format) { |
return WINDOW_FORMAT_RGBA_8888; |
case gfx::GpuMemoryBuffer::RGBX_8888: |
case gfx::GpuMemoryBuffer::BGRA_8888: |
+ case gfx::GpuMemoryBuffer::ATC: |
+ case gfx::GpuMemoryBuffer::ATCIA: |
+ case gfx::GpuMemoryBuffer::DXT1: |
+ case gfx::GpuMemoryBuffer::DXT5: |
+ case gfx::GpuMemoryBuffer::ETC1: |
NOTREACHED(); |
return 0; |
} |
@@ -76,7 +81,7 @@ void* GpuMemoryBufferImplSurfaceTexture::Map() { |
} |
DCHECK_LE(size_.width(), buffer.stride); |
- stride_ = buffer.stride * BytesPerPixel(format_); |
+ stride_ = buffer.stride * BitsPerPixel(format_) / 8; |
mapped_ = true; |
return buffer.bits; |
} |