Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix ripple clipping + quick rejection"

Browse Source
This commit is contained in:
Chris Craik
2016-02-04 19:08:59 +00:00
committed by Android (Google) Code Review
parent c8ca8ceba0 7fc1b0349b
commit 37fd29f284
3 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/hwui/ClipArea.cpp
View File

@@ -213,6 +213,7 @@ void ClipArea::setClip(float left, float top, float right, float bottom) {
void ClipArea::clipRectWithTransform(const Rect& r, const mat4* transform,
SkRegion::Op op) {
if (!mPostViewportClipObserved && op == SkRegion::kIntersect_Op) op = SkRegion::kReplace_Op;
onClipUpdated();
switch (mMode) {
case ClipMode::Rectangle:
@@ -228,6 +229,7 @@ void ClipArea::clipRectWithTransform(const Rect& r, const mat4* transform,
}
void ClipArea::clipRegion(const SkRegion& region, SkRegion::Op op) {
if (!mPostViewportClipObserved && op == SkRegion::kIntersect_Op) op = SkRegion::kReplace_Op;
onClipUpdated();
enterRegionMode();
mClipRegion.op(region, op);
@@ -236,6 +238,7 @@ void ClipArea::clipRegion(const SkRegion& region, SkRegion::Op op) {
void ClipArea::clipPathWithTransform(const SkPath& path, const mat4* transform,
SkRegion::Op op) {
if (!mPostViewportClipObserved && op == SkRegion::kIntersect_Op) op = SkRegion::kReplace_Op;
onClipUpdated();
SkMatrix skTransform;
transform->copyTo(skTransform);

4
libs/hwui/FrameBuilder.cpp
View File

@@ -203,7 +203,9 @@ void FrameBuilder::deferNodePropsAndOps(RenderNode& node) {
mCanvasState.setClippingOutline(mAllocator, &(properties.getOutline()));
}
if (!mCanvasState.quickRejectConservative(0, 0, width, height)) {
bool quickRejected = properties.getClipToBounds()
&& mCanvasState.quickRejectConservative(0, 0, width, height);
if (!quickRejected) {
// not rejected, so defer render as either Layer, or direct (possibly wrapped in saveLayer)
if (node.getLayer()) {
// HW layer

17
libs/hwui/tests/unit/RecordingCanvasTests.cpp
View File

@@ -455,6 +455,23 @@ TEST(RecordingCanvas, drawRenderNode_projection) {
}
}
TEST(RecordingCanvas, firstClipWillReplace) {
auto dl = TestUtils::createDisplayList<RecordingCanvas>(200, 200, [](RecordingCanvas& canvas) {
canvas.save(SaveFlags::MatrixClip);
// since no explicit clip set on canvas, this should be the one observed on op:
canvas.clipRect(-100, -100, 300, 300, SkRegion::kIntersect_Op);
SkPaint paint;
paint.setColor(SK_ColorWHITE);
canvas.drawRect(0, 0, 100, 100, paint);
canvas.restore();
});
ASSERT_EQ(1u, dl->getOps().size()) << "Must have one op";
// first clip must be preserved, even if it extends beyond canvas bounds
EXPECT_CLIP_RECT(Rect(-100, -100, 300, 300), dl->getOps()[0]->localClip);
}
TEST(RecordingCanvas, insertReorderBarrier) {
auto dl = TestUtils::createDisplayList<RecordingCanvas>(200, 200, [](RecordingCanvas& canvas) {
canvas.drawRect(0, 0, 400, 400, SkPaint());