diff options
author | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-05 06:23:04 +0000 |
---|---|---|
committer | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-05 06:23:04 +0000 |
commit | 220e908a24ce7805baede951409585e8cfe0db84 (patch) | |
tree | e26f37b5919590ee5cab114f71bd230ef749c462 /android_webview/public | |
parent | bb664cfb48112bae9d753e567298aacb4436032c (diff) | |
download | chromium_src-220e908a24ce7805baede951409585e8cfe0db84.zip chromium_src-220e908a24ce7805baede951409585e8cfe0db84.tar.gz chromium_src-220e908a24ce7805baede951409585e8cfe0db84.tar.bz2 |
aw: Move HardwareRenderer out of BrowserViewRenderer
Hardware initialization now is done as part of HardwareRenderer constructor
and destructor. AwContents now directly owns HardwareRenderer and post
results back to BrowserViewRenderer where needed.
Expose View.executeHardwareAction to chromium and use it to run hardware
only code.
Also take this opportunity to clean up unneeded public draw_gl.h and
draw_sw.h interfaces.
Rolled corresponding AOSP change:
https://android-review.googlesource.com/#/c/83824/
BUG=344087
NOTRY=true
Review URL: https://codereview.chromium.org/185133003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254957 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/public')
-rw-r--r-- | android_webview/public/browser/draw_gl.h | 16 | ||||
-rw-r--r-- | android_webview/public/browser/draw_sw.h | 4 |
2 files changed, 0 insertions, 20 deletions
diff --git a/android_webview/public/browser/draw_gl.h b/android_webview/public/browser/draw_gl.h index e3108d5..f898025 100644 --- a/android_webview/public/browser/draw_gl.h +++ b/android_webview/public/browser/draw_gl.h @@ -50,22 +50,6 @@ struct AwDrawGLInfo { // Input: current transformation matrix in surface pixels. // Uses the column-based OpenGL matrix format. float transform[16]; - - // Output: tells the caller what to do next. - enum StatusMask { - kStatusMaskDone = 0x0, - kStatusMaskDraw = 0x1, - kStatusMaskInvoke = 0x2, - }; - - // Output: mask indicating the status after calling the functor. - unsigned int status_mask; - - // Output: dirty region to redraw in surface coordinates. - float dirty_left; - float dirty_top; - float dirty_right; - float dirty_bottom; }; // Function to invoke a direct GL draw into the client's pre-configured diff --git a/android_webview/public/browser/draw_sw.h b/android_webview/public/browser/draw_sw.h index 91becfc..97d6607 100644 --- a/android_webview/public/browser/draw_sw.h +++ b/android_webview/public/browser/draw_sw.h @@ -48,10 +48,6 @@ typedef bool (AwIsSkiaVersionCompatibleFunction)(SkiaVersionFunction function); struct AwDrawSWFunctionTable { AwAccessPixelsFunction* access_pixels; AwReleasePixelsFunction* release_pixels; - - // Deprecated. Remove them. - AwCreatePictureFunction* deprecated_create_picture; - AwIsSkiaVersionCompatibleFunction* deprecated_is_skia_version_compatible; }; #endif // ANDROID_WEBVIEW_PUBLIC_BROWSER_DRAW_SW_H_ |