diff options
author | Chris Craik <ccraik@google.com> | 2014-07-21 10:25:54 -0700 |
---|---|---|
committer | Chris Craik <ccraik@google.com> | 2014-07-22 15:15:11 -0700 |
commit | 0645128b80621edee70f8cab4afb208fe0c26bec (patch) | |
tree | 8c12a055a0231303726cf2b6724b5b7264ca7357 /libs | |
parent | 94ca6cd7c932689b8018d1b118ddcd6b7a9eab27 (diff) | |
download | frameworks_base-0645128b80621edee70f8cab4afb208fe0c26bec.zip frameworks_base-0645128b80621edee70f8cab4afb208fe0c26bec.tar.gz frameworks_base-0645128b80621edee70f8cab4afb208fe0c26bec.tar.bz2 |
Make setter methods on Outline call setEmpty() based on params
bug:16142564
Additionally, better define behavior around null outline providers:
A view with an empty outline, and setClipToOutline=true will not be
rendered, though one with a null outline provider
(and thus no outline) will be.
Change-Id: Ic9549841b107b2eb51b417c66058a0cd69dd89eb
Diffstat (limited to 'libs')
-rw-r--r-- | libs/hwui/Outline.h | 18 | ||||
-rw-r--r-- | libs/hwui/RenderNode.cpp | 19 |
2 files changed, 25 insertions, 12 deletions
diff --git a/libs/hwui/Outline.h b/libs/hwui/Outline.h index 024bdfd..83426e8 100644 --- a/libs/hwui/Outline.h +++ b/libs/hwui/Outline.h @@ -49,15 +49,20 @@ public: mBounds.set(outline->getBounds()); } - bool isEmpty() const { - return mType == kOutlineType_None; + void setEmpty() { + mType = kOutlineType_Empty; + mPath.reset(); } - void setEmpty() { + void setNone() { mType = kOutlineType_None; mPath.reset(); } + bool isEmpty() const { + return mType == kOutlineType_Empty; + } + void setShouldClip(bool clip) { mShouldClip = clip; } @@ -81,7 +86,7 @@ public: } const SkPath* getPath() const { - if (mType == kOutlineType_None) return NULL; + if (mType == kOutlineType_None || mType == kOutlineType_Empty) return NULL; return &mPath; } @@ -89,8 +94,9 @@ public: private: enum OutlineType { kOutlineType_None = 0, - kOutlineType_ConvexPath = 1, - kOutlineType_RoundRect = 2 + kOutlineType_Empty = 1, + kOutlineType_ConvexPath = 2, + kOutlineType_RoundRect = 3 }; bool mShouldClip; diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp index fe03806..3eb779f 100644 --- a/libs/hwui/RenderNode.cpp +++ b/libs/hwui/RenderNode.cpp @@ -581,7 +581,7 @@ void RenderNode::buildZSortedChildList(Vector<ZDrawRenderNodeOpPair>& zTranslate template <class T> void RenderNode::issueDrawShadowOperation(const Matrix4& transformFromParent, T& handler) { - if (properties().getAlpha() <= 0.0f || properties().getOutline().isEmpty()) return; + if (properties().getAlpha() <= 0.0f || !properties().getOutline().getPath()) return; mat4 shadowMatrixXY(transformFromParent); applyViewPropertyTransforms(shadowMatrixXY); @@ -776,16 +776,23 @@ void RenderNode::issueOperationsOfProjectedChildren(OpenGLRenderer& renderer, T& */ template <class T> void RenderNode::issueOperations(OpenGLRenderer& renderer, T& handler) { + const int level = handler.level(); + if (mDisplayListData->isEmpty()) { + DISPLAY_LIST_LOGD("%*sEmpty display list (%p, %s)", level * 2, "", this, getName()); + return; + } + const bool drawLayer = (mLayer && (&renderer != mLayer->renderer)); // If we are updating the contents of mLayer, we don't want to apply any of // the RenderNode's properties to this issueOperations pass. Those will all // be applied when the layer is drawn, aka when this is true. const bool useViewProperties = (!mLayer || drawLayer); - - const int level = handler.level(); - if (mDisplayListData->isEmpty() || (useViewProperties && properties().getAlpha() <= 0)) { - DISPLAY_LIST_LOGD("%*sEmpty display list (%p, %s)", level * 2, "", this, getName()); - return; + if (useViewProperties) { + const Outline& outline = properties().getOutline(); + if (properties().getAlpha() <= 0 || (outline.getShouldClip() && outline.isEmpty())) { + DISPLAY_LIST_LOGD("%*sRejected display list (%p, %s)", level * 2, "", this, getName()); + return; + } } handler.startMark(getName()); |