diff options
| author | Chris Craik <ccraik@google.com> | 2014-07-23 00:25:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-22 22:02:55 +0000 |
| commit | c403a3908940ff9c7436c0153f941bec693bb39d (patch) | |
| tree | d08a58e80ce6f7dddec7c229ec52f0e4291b8b61 /core/jni | |
| parent | 0edc8cea2b939204afe9b654bf492fe0bb3715ba (diff) | |
| parent | 0645128b80621edee70f8cab4afb208fe0c26bec (diff) | |
| download | frameworks_base-c403a3908940ff9c7436c0153f941bec693bb39d.zip frameworks_base-c403a3908940ff9c7436c0153f941bec693bb39d.tar.gz frameworks_base-c403a3908940ff9c7436c0153f941bec693bb39d.tar.bz2 | |
Merge "Make setter methods on Outline call setEmpty() based on params" into lmp-dev
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/android_view_RenderNode.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/core/jni/android_view_RenderNode.cpp b/core/jni/android_view_RenderNode.cpp index c6ae9cc..1f3909a 100644 --- a/core/jni/android_view_RenderNode.cpp +++ b/core/jni/android_view_RenderNode.cpp @@ -153,6 +153,14 @@ static jboolean android_view_RenderNode_setOutlineEmpty(JNIEnv* env, return true; } +static jboolean android_view_RenderNode_setOutlineNone(JNIEnv* env, + jobject clazz, jlong renderNodePtr) { + RenderNode* renderNode = reinterpret_cast<RenderNode*>(renderNodePtr); + renderNode->mutateStagingProperties().mutableOutline().setNone(); + renderNode->setPropertyFieldsDirty(RenderNode::GENERIC); + return true; +} + static jboolean android_view_RenderNode_setClipToOutline(JNIEnv* env, jobject clazz, jlong renderNodePtr, jboolean clipToOutline) { RenderNode* renderNode = reinterpret_cast<RenderNode*>(renderNodePtr); @@ -486,6 +494,7 @@ static JNINativeMethod gMethods[] = { { "nSetOutlineRoundRect", "(JIIIIF)Z", (void*) android_view_RenderNode_setOutlineRoundRect }, { "nSetOutlineConvexPath", "(JJ)Z", (void*) android_view_RenderNode_setOutlineConvexPath }, { "nSetOutlineEmpty", "(J)Z", (void*) android_view_RenderNode_setOutlineEmpty }, + { "nSetOutlineNone", "(J)Z", (void*) android_view_RenderNode_setOutlineNone }, { "nSetClipToOutline", "(JZ)Z", (void*) android_view_RenderNode_setClipToOutline }, { "nSetRevealClip", "(JZZFFF)Z", (void*) android_view_RenderNode_setRevealClip }, |