diff options
| author | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-08 02:35:37 +0000 |
|---|---|---|
| committer | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-08 02:35:37 +0000 |
| commit | bd8c1a953edc059700585a13a82680c8e8b566e3 (patch) | |
| tree | 932db6f1b3a0524b4a48ce8eb149a9f1d25d8972 | |
| parent | 8c879c59558d474501345bc9496dbd2d9cdcd597 (diff) | |
| download | chromium_src-bd8c1a953edc059700585a13a82680c8e8b566e3.zip chromium_src-bd8c1a953edc059700585a13a82680c8e8b566e3.tar.gz chromium_src-bd8c1a953edc059700585a13a82680c8e8b566e3.tar.bz2 | |
Merge 287810 "aw: Add versions to public function tables"
> aw: Add versions to public function tables
>
> BUG=399370
>
> Review URL: https://codereview.chromium.org/433603005
TBR=boliu@chromium.org
Review URL: https://codereview.chromium.org/454583003
git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@288206 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | android_webview/buildbot/aosp_manifest.xml | 2 | ||||
| -rw-r--r-- | android_webview/public/browser/draw_gl.h | 3 | ||||
| -rw-r--r-- | android_webview/public/browser/draw_sw.h | 3 |
3 files changed, 7 insertions, 1 deletions
diff --git a/android_webview/buildbot/aosp_manifest.xml b/android_webview/buildbot/aosp_manifest.xml index aaae29c..19dc9cb 100644 --- a/android_webview/buildbot/aosp_manifest.xml +++ b/android_webview/buildbot/aosp_manifest.xml @@ -261,7 +261,7 @@ <project name="platform/frameworks/support" path="frameworks/support" revision="1e3d0c89282627f8b0d66d2bdae4efc2287ab043"/> <project name="platform/frameworks/testing" path="frameworks/testing" revision="5c8e0271db889518f5969b142a37faa01a4ee54d"/> <project name="platform/frameworks/volley" path="frameworks/volley" revision="a53cb80bea6fc83edfa73e7a850e83f4020fcf07"/> - <project name="platform/frameworks/webview" path="frameworks/webview" revision="2b4719f12bac2f9f71d99567f09f46916903edf8"/> + <project name="platform/frameworks/webview" path="frameworks/webview" revision="707d93ceba55f52771e749b223fbfc010c9a025e"/> <project name="platform/frameworks/wilhelm" path="frameworks/wilhelm" revision="a62c3572e60ae0446632de15418a65089cccf551"/> <project name="platform/hardware/akm" path="hardware/akm" revision="32838ef838d1341aa8b77022869b801fb0bbb26c"/> <project groups="pdk" name="platform/hardware/broadcom/libbt" path="hardware/broadcom/libbt" revision="55ddd0cce019e88829f92b2fe4e17d5869daa9b9"/> diff --git a/android_webview/public/browser/draw_gl.h b/android_webview/public/browser/draw_gl.h index 4a43523..d62375f 100644 --- a/android_webview/public/browser/draw_gl.h +++ b/android_webview/public/browser/draw_gl.h @@ -86,8 +86,11 @@ typedef void* AwGetNativeBufferFunction(long buffer_id); // Called to get the stride of the buffer typedef unsigned int AwGetStrideFunction(long buffer_id); +static const int kAwDrawGLFunctionTableVersion = 1; + // Set of functions used in rendering in hardware mode struct AwDrawGLFunctionTable { + int version; AwCreateGraphicBufferFunction* create_graphic_buffer; AwReleaseGraphicBufferFunction* release_graphic_buffer; AwMapFunction* map; diff --git a/android_webview/public/browser/draw_sw.h b/android_webview/public/browser/draw_sw.h index 97d6607..ae77195 100644 --- a/android_webview/public/browser/draw_sw.h +++ b/android_webview/public/browser/draw_sw.h @@ -43,9 +43,12 @@ typedef void (SkiaVersionFunction)(int* major, int* minor, int* patch); // Called to verify if the Skia versions are compatible. typedef bool (AwIsSkiaVersionCompatibleFunction)(SkiaVersionFunction function); +static const int kAwDrawSWFunctionTableVersion = 1; + // "vtable" for the functions declared in this file. An instance must be set via // AwContents.setAwDrawSWFunctionTable struct AwDrawSWFunctionTable { + int version; AwAccessPixelsFunction* access_pixels; AwReleasePixelsFunction* release_pixels; }; |