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

Unified Diff: cc/resources/resource_format.h

Issue 1273163004: Revert of cc: Use worker context for one-copy tile initialization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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 | « cc/raster/tile_task_worker_pool_unittest.cc ('k') | cc/resources/resource_format.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/resource_format.h
diff --git a/cc/resources/resource_format.h b/cc/resources/resource_format.h
index 79b815fcd297c73c1b922c98b608c2397c0be87e..d910bb091e7e62e68282d2d5ba289ed218364f77 100644
--- a/cc/resources/resource_format.h
+++ b/cc/resources/resource_format.h
@@ -8,7 +8,6 @@
#include "base/logging.h"
#include "cc/base/cc_export.h"
#include "third_party/skia/include/core/SkBitmap.h"
-#include "ui/gfx/gpu_memory_buffer.h"
// TODO(prashant.n): Including third_party/khronos/GLES2/gl2.h causes
// redefinition errors as macros/functions defined in it conflict with
@@ -36,7 +35,6 @@
CC_EXPORT GLenum GLDataType(ResourceFormat format);
CC_EXPORT GLenum GLDataFormat(ResourceFormat format);
CC_EXPORT GLenum GLInternalFormat(ResourceFormat format);
-CC_EXPORT gfx::BufferFormat BufferFormat(ResourceFormat format);
} // namespace cc
« no previous file with comments | « cc/raster/tile_task_worker_pool_unittest.cc ('k') | cc/resources/resource_format.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698