diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/view/View.java | 6 | ||||
| -rw-r--r-- | core/jni/android_view_RenderNode.cpp | 8 |
2 files changed, 3 insertions, 11 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 9761f1a..0196ca1 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -2968,12 +2968,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, private boolean mLastIsOpaque; /** - * Convenience value to check for float values that are close enough to zero to be considered - * zero. - */ - private static final float NONZERO_EPSILON = .001f; - - /** * The distance in pixels from the left edge of this view's parent * to the left edge of this view. * {@hide} diff --git a/core/jni/android_view_RenderNode.cpp b/core/jni/android_view_RenderNode.cpp index 31a1de6..8dacfeb 100644 --- a/core/jni/android_view_RenderNode.cpp +++ b/core/jni/android_view_RenderNode.cpp @@ -376,7 +376,8 @@ static jboolean android_view_RenderNode_isPivotExplicitlySet(JNIEnv* env, static jboolean android_view_RenderNode_hasIdentityMatrix(JNIEnv* env, jobject clazz, jlong renderNodePtr) { RenderNode* renderNode = reinterpret_cast<RenderNode*>(renderNodePtr); - return renderNode->stagingProperties().getMatrixFlags() == 0; + renderNode->mutateStagingProperties().updateMatrix(); + return !renderNode->stagingProperties().hasTransformMatrix(); } // ---------------------------------------------------------------------------- @@ -391,10 +392,7 @@ static void android_view_RenderNode_getTransformMatrix(JNIEnv* env, renderNode->mutateStagingProperties().updateMatrix(); const SkMatrix* transformMatrix = renderNode->stagingProperties().getTransformMatrix(); - if (renderNode->stagingProperties().getMatrixFlags() == TRANSLATION) { - outMatrix->setTranslate(renderNode->stagingProperties().getTranslationX(), - renderNode->stagingProperties().getTranslationY()); - } else if (transformMatrix) { + if (transformMatrix) { *outMatrix = *transformMatrix; } else { outMatrix->setIdentity(); |