diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-12-07 13:09:40 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-12-07 18:47:04 -0800 |
| commit | 45c11b1020a64aae88b859870d5b2e312dab4f76 (patch) | |
| tree | 322cdb6e04e5a40553ba6bbfed06cc1e8377f244 /libs | |
| parent | d904207b29904a0df0bacd0ad45478fcb0dae97d (diff) | |
| download | frameworks_base-45c11b1020a64aae88b859870d5b2e312dab4f76.zip frameworks_base-45c11b1020a64aae88b859870d5b2e312dab4f76.tar.gz frameworks_base-45c11b1020a64aae88b859870d5b2e312dab4f76.tar.bz2 | |
Revert "libhwui: make setSurface asynchronous"
This reverts commit 3973c59b77243793c9f5d9aed7a44483decf8c17.
Change-Id: I9348e68bcecb30a66a71e571fdce587f786aad7d
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/renderthread/CanvasContext.h | 1 | ||||
| -rw-r--r-- | libs/hwui/renderthread/RenderProxy.cpp | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/libs/hwui/renderthread/CanvasContext.h b/libs/hwui/renderthread/CanvasContext.h index 91ac64e..f2fa9cd 100644 --- a/libs/hwui/renderthread/CanvasContext.h +++ b/libs/hwui/renderthread/CanvasContext.h @@ -117,7 +117,6 @@ private: // TODO: Replace with something better for layer & other GL object // lifecycle tracking friend class android::uirenderer::RenderState; - friend class RenderProxy; void setSurface(ANativeWindow* window); void swapBuffers(const SkRect& dirty, EGLint width, EGLint height); diff --git a/libs/hwui/renderthread/RenderProxy.cpp b/libs/hwui/renderthread/RenderProxy.cpp index bad12bb..6d9acd4 100644 --- a/libs/hwui/renderthread/RenderProxy.cpp +++ b/libs/hwui/renderthread/RenderProxy.cpp @@ -147,9 +147,7 @@ bool RenderProxy::initialize(const sp<ANativeWindow>& window) { SETUP_TASK(initialize); args->context = mContext; args->window = window.get(); - bool ret = mContext->mCanvas == NULL; - post(task); - return ret; + return (bool) postAndWait(task); } CREATE_BRIDGE2(updateSurface, CanvasContext* context, ANativeWindow* window) { |