diff options
| author | John Reck <jreck@google.com> | 2014-10-31 22:55:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-31 22:55:47 +0000 |
| commit | a8d83d639a5687b2ab5689db4ea61e2a6cce66f4 (patch) | |
| tree | e8441152d52d9388d9db09e039e3797cc2e38295 /libs/hwui/renderthread/RenderProxy.h | |
| parent | f34fa3e7aa9be9bf24c955a9ebf34022e4b88c25 (diff) | |
| parent | 0e89e2b7bcb2c035e8cee77f93120e7c5617f8d2 (diff) | |
| download | frameworks_base-a8d83d639a5687b2ab5689db4ea61e2a6cce66f4.zip frameworks_base-a8d83d639a5687b2ab5689db4ea61e2a6cce66f4.tar.gz frameworks_base-a8d83d639a5687b2ab5689db4ea61e2a6cce66f4.tar.bz2 | |
Merge "Layer changes" into lmp-mr1-dev
Diffstat (limited to 'libs/hwui/renderthread/RenderProxy.h')
| -rw-r--r-- | libs/hwui/renderthread/RenderProxy.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/hwui/renderthread/RenderProxy.h b/libs/hwui/renderthread/RenderProxy.h index dddf0c7..4989b14 100644 --- a/libs/hwui/renderthread/RenderProxy.h +++ b/libs/hwui/renderthread/RenderProxy.h @@ -81,7 +81,6 @@ public: ANDROID_API void runWithGlContext(RenderTask* task); - static void enqueueDestroyLayer(Layer* layer); ANDROID_API DeferredLayerUpdater* createTextureLayer(); ANDROID_API void buildLayer(RenderNode* node); ANDROID_API bool copyLayerInto(DeferredLayerUpdater* layer, SkBitmap* bitmap); @@ -97,6 +96,7 @@ public: ANDROID_API void notifyFramePending(); ANDROID_API void dumpProfileInfo(int fd); + ANDROID_API static void outputLogBuffer(int fd); ANDROID_API void setTextureAtlas(const sp<GraphicBuffer>& buffer, int64_t* map, size_t size); @@ -114,6 +114,8 @@ private: void post(RenderTask* task); void* postAndWait(MethodInvokeRenderTask* task); + static void* staticPostAndWait(MethodInvokeRenderTask* task); + // Friend class to help with bridging friend class RenderProxyBridge; }; |