From 45c11b1020a64aae88b859870d5b2e312dab4f76 Mon Sep 17 00:00:00 2001 From: Steve Kondik Date: Mon, 7 Dec 2015 13:09:40 -0800 Subject: Revert "libhwui: make setSurface asynchronous" This reverts commit 3973c59b77243793c9f5d9aed7a44483decf8c17. Change-Id: I9348e68bcecb30a66a71e571fdce587f786aad7d --- libs/hwui/renderthread/CanvasContext.h | 1 - libs/hwui/renderthread/RenderProxy.cpp | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'libs') 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& 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) { -- cgit v1.1