diff options
| author | Kaan Baloglu <kaanb@google.com> | 2013-05-21 13:35:37 -0700 |
|---|---|---|
| committer | Kaan Baloglu <kaanb@google.com> | 2013-05-21 13:52:22 -0700 |
| commit | 1cc1c4153a26307948af9f1ee6d9cde7a7103b94 (patch) | |
| tree | 7758103e3e8b69a241cb1694f896a1aec9efd89c /chromium/plat_support/graphic_buffer_impl.h | |
| parent | 97481221b4e9b3d8e9e94011266cf1a74835e3f3 (diff) | |
| download | webview-1cc1c4153a26307948af9f1ee6d9cde7a7103b94.tar.gz | |
Use a public enum to pass in the map mode instead of an int. Fixes b/8633434
Change-Id: Ifbe7c7752effe3fe3e9ca722b9c5c611819fc5e6
Diffstat (limited to 'chromium/plat_support/graphic_buffer_impl.h')
| -rw-r--r-- | chromium/plat_support/graphic_buffer_impl.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/chromium/plat_support/graphic_buffer_impl.h b/chromium/plat_support/graphic_buffer_impl.h index 7db502f..13b806e 100644 --- a/chromium/plat_support/graphic_buffer_impl.h +++ b/chromium/plat_support/graphic_buffer_impl.h @@ -22,6 +22,8 @@ #include <ui/GraphicBuffer.h> +#include "android_webview/public/browser/draw_gl.h" + namespace android { class GraphicBufferImpl { @@ -30,14 +32,14 @@ class GraphicBufferImpl { static int Create(int w, int h); static void Release(int buffer_id); - static int LockStatic(int buffer_id, int mode, void** vaddr); - static int UnlockStatic(int buffer_id); + static int MapStatic(int buffer_id, AwMapMode mode, void** vaddr); + static int UnmapStatic(int buffer_id); static void* GetNativeBufferStatic(int buffer_id); static uint32_t GetStrideStatic(int buffer_id); private: - status_t Lock(int mode, void** vaddr); - status_t Unlock(); + status_t Map(AwMapMode mode, void** vaddr); + status_t Unmap(); status_t InitCheck() const; void* GetNativeBuffer() const; uint32_t GetStride() const; @@ -46,6 +48,6 @@ class GraphicBufferImpl { sp<android::GraphicBuffer> mBuffer; }; -} // namespace android +} // namespace android -#endif // ANDROID_GRAPHIC_BUFFER_IMPL_H +#endif // ANDROID_GRAPHIC_BUFFER_IMPL_H |