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

Unified Diff: cc/resources/resource_format.h

Issue 1230203007: Re-land: cc: Use worker context for one-copy tile initialization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase and add missing locks 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
Index: cc/resources/resource_format.h
diff --git a/cc/resources/resource_format.h b/cc/resources/resource_format.h
index d910bb091e7e62e68282d2d5ba289ed218364f77..ab03cdb7de65a480d1c3002fc3e33af3c5f4822b 100644
--- a/cc/resources/resource_format.h
+++ b/cc/resources/resource_format.h
@@ -8,6 +8,7 @@
#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
@@ -35,6 +36,8 @@ CC_EXPORT int BitsPerPixel(ResourceFormat format);
CC_EXPORT GLenum GLDataType(ResourceFormat format);
CC_EXPORT GLenum GLDataFormat(ResourceFormat format);
CC_EXPORT GLenum GLInternalFormat(ResourceFormat format);
+CC_EXPORT gfx::GpuMemoryBuffer::Format GpuMemoryBufferFormat(
+ ResourceFormat format);
} // namespace cc

Powered by Google App Engine
This is Rietveld 408576698