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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/gl/gl_image_memory.cc

Issue 1078253002: gfx namespace cleanup. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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
« no previous file with comments | « ui/gl/gl_image_memory.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_image_memory.cc
diff --git a/ui/gl/gl_image_memory.cc b/ui/gl/gl_image_memory.cc
index 908ce7eb774736d12530b948b1fdb977c26756c0..56301dfab6c953acc677b27ea74f2259efcb79d7 100644
--- a/ui/gl/gl_image_memory.cc
+++ b/ui/gl/gl_image_memory.cc
@@ -28,19 +28,19 @@ bool ValidInternalFormat(unsigned internalformat) {
}
}
-bool ValidFormat(gfx::GpuMemoryBuffer::Format format) {
+bool ValidFormat(GpuMemoryBuffer::Format format) {
switch (format) {
- case gfx::GpuMemoryBuffer::ATC:
- case gfx::GpuMemoryBuffer::ATCIA:
- case gfx::GpuMemoryBuffer::DXT1:
- case gfx::GpuMemoryBuffer::DXT5:
- case gfx::GpuMemoryBuffer::ETC1:
- case gfx::GpuMemoryBuffer::R_8:
- case gfx::GpuMemoryBuffer::RGBA_8888:
- case gfx::GpuMemoryBuffer::BGRA_8888:
+ case GpuMemoryBuffer::ATC:
+ case GpuMemoryBuffer::ATCIA:
+ case GpuMemoryBuffer::DXT1:
+ case GpuMemoryBuffer::DXT5:
+ case GpuMemoryBuffer::ETC1:
+ case GpuMemoryBuffer::R_8:
+ case GpuMemoryBuffer::RGBA_8888:
+ case GpuMemoryBuffer::BGRA_8888:
return true;
- case gfx::GpuMemoryBuffer::RGBX_8888:
- case gfx::GpuMemoryBuffer::YUV_420:
+ case GpuMemoryBuffer::RGBX_8888:
+ case GpuMemoryBuffer::YUV_420:
return false;
}
@@ -48,19 +48,19 @@ bool ValidFormat(gfx::GpuMemoryBuffer::Format format) {
return false;
}
-bool IsCompressedFormat(gfx::GpuMemoryBuffer::Format format) {
+bool IsCompressedFormat(GpuMemoryBuffer::Format format) {
switch (format) {
- case gfx::GpuMemoryBuffer::ATC:
- case gfx::GpuMemoryBuffer::ATCIA:
- case gfx::GpuMemoryBuffer::DXT1:
- case gfx::GpuMemoryBuffer::DXT5:
- case gfx::GpuMemoryBuffer::ETC1:
- case gfx::GpuMemoryBuffer::YUV_420:
+ case GpuMemoryBuffer::ATC:
+ case GpuMemoryBuffer::ATCIA:
+ case GpuMemoryBuffer::DXT1:
+ case GpuMemoryBuffer::DXT5:
+ case GpuMemoryBuffer::ETC1:
+ case GpuMemoryBuffer::YUV_420:
return true;
- case gfx::GpuMemoryBuffer::R_8:
- case gfx::GpuMemoryBuffer::RGBA_8888:
- case gfx::GpuMemoryBuffer::BGRA_8888:
- case gfx::GpuMemoryBuffer::RGBX_8888:
+ case GpuMemoryBuffer::R_8:
+ case GpuMemoryBuffer::RGBA_8888:
+ case GpuMemoryBuffer::BGRA_8888:
+ case GpuMemoryBuffer::RGBX_8888:
return false;
}
@@ -68,26 +68,26 @@ bool IsCompressedFormat(gfx::GpuMemoryBuffer::Format format) {
return false;
}
-GLenum TextureFormat(gfx::GpuMemoryBuffer::Format format) {
+GLenum TextureFormat(GpuMemoryBuffer::Format format) {
switch (format) {
- case gfx::GpuMemoryBuffer::ATC:
+ case GpuMemoryBuffer::ATC:
return GL_ATC_RGB_AMD;
- case gfx::GpuMemoryBuffer::ATCIA:
+ case GpuMemoryBuffer::ATCIA:
return GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD;
- case gfx::GpuMemoryBuffer::DXT1:
+ case GpuMemoryBuffer::DXT1:
return GL_COMPRESSED_RGB_S3TC_DXT1_EXT;
- case gfx::GpuMemoryBuffer::DXT5:
+ case GpuMemoryBuffer::DXT5:
return GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
- case gfx::GpuMemoryBuffer::ETC1:
+ case GpuMemoryBuffer::ETC1:
return GL_ETC1_RGB8_OES;
- case gfx::GpuMemoryBuffer::R_8:
+ case GpuMemoryBuffer::R_8:
return GL_RED;
- case gfx::GpuMemoryBuffer::RGBA_8888:
+ case GpuMemoryBuffer::RGBA_8888:
return GL_RGBA;
- case gfx::GpuMemoryBuffer::BGRA_8888:
+ case GpuMemoryBuffer::BGRA_8888:
return GL_BGRA_EXT;
- case gfx::GpuMemoryBuffer::RGBX_8888:
- case gfx::GpuMemoryBuffer::YUV_420:
+ case GpuMemoryBuffer::RGBX_8888:
+ case GpuMemoryBuffer::YUV_420:
NOTREACHED();
return 0;
}
@@ -96,23 +96,23 @@ GLenum TextureFormat(gfx::GpuMemoryBuffer::Format format) {
return 0;
}
-GLenum DataFormat(gfx::GpuMemoryBuffer::Format format) {
+GLenum DataFormat(GpuMemoryBuffer::Format format) {
return TextureFormat(format);
}
-GLenum DataType(gfx::GpuMemoryBuffer::Format format) {
+GLenum DataType(GpuMemoryBuffer::Format format) {
switch (format) {
- case gfx::GpuMemoryBuffer::RGBA_8888:
- case gfx::GpuMemoryBuffer::BGRA_8888:
- case gfx::GpuMemoryBuffer::R_8:
+ case GpuMemoryBuffer::RGBA_8888:
+ case GpuMemoryBuffer::BGRA_8888:
+ case GpuMemoryBuffer::R_8:
return GL_UNSIGNED_BYTE;
- case gfx::GpuMemoryBuffer::ATC:
- case gfx::GpuMemoryBuffer::ATCIA:
- case gfx::GpuMemoryBuffer::DXT1:
- case gfx::GpuMemoryBuffer::DXT5:
- case gfx::GpuMemoryBuffer::ETC1:
- case gfx::GpuMemoryBuffer::RGBX_8888:
- case gfx::GpuMemoryBuffer::YUV_420:
+ case GpuMemoryBuffer::ATC:
+ case GpuMemoryBuffer::ATCIA:
+ case GpuMemoryBuffer::DXT1:
+ case GpuMemoryBuffer::DXT5:
+ case GpuMemoryBuffer::ETC1:
+ case GpuMemoryBuffer::RGBX_8888:
+ case GpuMemoryBuffer::YUV_420:
NOTREACHED();
return 0;
}
@@ -121,8 +121,8 @@ GLenum DataType(gfx::GpuMemoryBuffer::Format format) {
return 0;
}
-GLsizei SizeInBytes(const gfx::Size& size,
- gfx::GpuMemoryBuffer::Format format) {
+GLsizei SizeInBytes(const Size& size,
+ GpuMemoryBuffer::Format format) {
size_t stride_in_bytes = 0;
bool valid_stride = GLImageMemory::StrideInBytes(
size.width(), format, &stride_in_bytes);
@@ -132,11 +132,11 @@ GLsizei SizeInBytes(const gfx::Size& size,
} // namespace
-GLImageMemory::GLImageMemory(const gfx::Size& size, unsigned internalformat)
+GLImageMemory::GLImageMemory(const Size& size, unsigned internalformat)
: size_(size),
internalformat_(internalformat),
memory_(NULL),
- format_(gfx::GpuMemoryBuffer::RGBA_8888),
+ format_(GpuMemoryBuffer::RGBA_8888),
in_use_(false),
target_(0),
need_do_bind_tex_image_(false)
@@ -159,35 +159,35 @@ GLImageMemory::~GLImageMemory() {
// static
bool GLImageMemory::StrideInBytes(size_t width,
- gfx::GpuMemoryBuffer::Format format,
+ GpuMemoryBuffer::Format format,
size_t* stride_in_bytes) {
base::CheckedNumeric<size_t> checked_stride = width;
switch (format) {
- case gfx::GpuMemoryBuffer::ATCIA:
- case gfx::GpuMemoryBuffer::DXT5:
+ case GpuMemoryBuffer::ATCIA:
+ case GpuMemoryBuffer::DXT5:
*stride_in_bytes = width;
return true;
- case gfx::GpuMemoryBuffer::ATC:
- case gfx::GpuMemoryBuffer::DXT1:
- case gfx::GpuMemoryBuffer::ETC1:
+ case GpuMemoryBuffer::ATC:
+ case GpuMemoryBuffer::DXT1:
+ case GpuMemoryBuffer::ETC1:
DCHECK_EQ(width % 2, 0u);
*stride_in_bytes = width / 2;
return true;
- case gfx::GpuMemoryBuffer::R_8:
+ case GpuMemoryBuffer::R_8:
checked_stride += 3;
if (!checked_stride.IsValid())
return false;
*stride_in_bytes = checked_stride.ValueOrDie() & ~0x3;
return true;
- case gfx::GpuMemoryBuffer::RGBA_8888:
- case gfx::GpuMemoryBuffer::BGRA_8888:
+ case GpuMemoryBuffer::RGBA_8888:
+ case GpuMemoryBuffer::BGRA_8888:
checked_stride *= 4;
if (!checked_stride.IsValid())
return false;
*stride_in_bytes = checked_stride.ValueOrDie();
return true;
- case gfx::GpuMemoryBuffer::RGBX_8888:
- case gfx::GpuMemoryBuffer::YUV_420:
+ case GpuMemoryBuffer::RGBX_8888:
+ case GpuMemoryBuffer::YUV_420:
NOTREACHED();
return false;
}
@@ -197,7 +197,7 @@ bool GLImageMemory::StrideInBytes(size_t width,
}
bool GLImageMemory::Initialize(const unsigned char* memory,
- gfx::GpuMemoryBuffer::Format format) {
+ GpuMemoryBuffer::Format format) {
if (!ValidInternalFormat(internalformat_)) {
LOG(ERROR) << "Invalid internalformat: " << internalformat_;
return false;
@@ -234,7 +234,7 @@ void GLImageMemory::Destroy(bool have_context) {
memory_ = NULL;
}
-gfx::Size GLImageMemory::GetSize() {
+Size GLImageMemory::GetSize() {
return size_;
}
@@ -298,7 +298,7 @@ void GLImageMemory::DidUseTexImage() {
in_use_ = false;
}
-bool GLImageMemory::ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
+bool GLImageMemory::ScheduleOverlayPlane(AcceleratedWidget widget,
int z_order,
OverlayTransform transform,
const Rect& bounds_rect,
« no previous file with comments | « ui/gl/gl_image_memory.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698