| Index: cc/texture_uploader.h
|
| diff --git a/cc/texture_uploader.h b/cc/texture_uploader.h
|
| index f2a964dfa60156a76dc2b5ab395a27902e439288..d10ff0eb6f553836c08aed51a58c56a26c24cb0f 100644
|
| --- a/cc/texture_uploader.h
|
| +++ b/cc/texture_uploader.h
|
| @@ -26,9 +26,12 @@ namespace cc {
|
| class TextureUploader {
|
| public:
|
| static scoped_ptr<TextureUploader> create(
|
| - WebKit::WebGraphicsContext3D* context, bool useMapTexSubImage)
|
| + WebKit::WebGraphicsContext3D* context,
|
| + bool useMapTexSubImage,
|
| + bool useShallowFlush)
|
| {
|
| - return make_scoped_ptr(new TextureUploader(context, useMapTexSubImage));
|
| + return make_scoped_ptr(
|
| + new TextureUploader(context, useMapTexSubImage, useShallowFlush));
|
| }
|
| ~TextureUploader();
|
|
|
| @@ -47,6 +50,8 @@ public:
|
| GLenum format,
|
| const gfx::Size& size);
|
|
|
| + void flush();
|
| +
|
| private:
|
| class Query {
|
| public:
|
| @@ -72,7 +77,9 @@ private:
|
| bool m_isNonBlocking;
|
| };
|
|
|
| - TextureUploader(WebKit::WebGraphicsContext3D*, bool useMapTexSubImage);
|
| + TextureUploader(WebKit::WebGraphicsContext3D*,
|
| + bool useMapTexSubImage,
|
| + bool useShallowFlush);
|
|
|
| void beginQuery();
|
| void endQuery();
|
| @@ -99,6 +106,9 @@ private:
|
| size_t m_subImageSize;
|
| scoped_array<uint8> m_subImage;
|
|
|
| + bool m_useShallowFlush;
|
| + size_t m_numTextureUploadsSinceLastFlush;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(TextureUploader);
|
| };
|
|
|
|
|