commit 93f52a69443f9be16f4e98c21d1f6cf760a65f00
author mtklein <mtklein@chromium.org> Mon Sep 08 08:41:37 2014 -0700
committer Commit bot <commit-bot@chromium.org> Mon Sep 08 08:41:37 2014 -0700
tree c1f42cef552349f32eb60a004f7597c6125b2f8f
parent 95fd68e5ccd242a91e6dd827dd695f18661efbe6

Turn on the save-layer optimization.

BUG=skia:
R=robertphillips@google.com, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/551853002

tests/PictureTest.cpp

diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp
index 8755440..05aec09 100644
--- a/tests/PictureTest.cpp
+++ b/tests/PictureTest.cpp
@@ -935,20 +935,23 @@
                 c->saveLayer(NULL, &p); // layer #3
                 c->restore();
             }
+
+            SkPaint layerPaint;
+            layerPaint.setColor(SK_ColorRED);  // Non-alpha only to avoid SaveLayerDrawRestoreNooper
             // 4)
             {
-                c->saveLayer(NULL, NULL);  // layer #4
+                c->saveLayer(NULL, &layerPaint);  // layer #4
                     c->drawPicture(child);  // layer #5 inside picture
                 c->restore();
             }
             // 5
             {
-                SkPaint p;
+                SkPaint picturePaint;
                 SkMatrix trans;
                 trans.setTranslate(10, 10);
 
-                c->saveLayer(NULL, NULL);  // layer #6
-                    c->drawPicture(child, &trans, &p); // layer #7 inside picture
+                c->saveLayer(NULL, &layerPaint);  // layer #6
+                    c->drawPicture(child, &trans, &picturePaint); // layer #7 inside picture
                 c->restore();
             }
 
@@ -1032,7 +1035,7 @@
                                       kHeight == info4.fSize.fHeight);
             REPORTER_ASSERT(reporter, 0 == info4.fOffset.fX && 0 == info4.fOffset.fY);
             REPORTER_ASSERT(reporter, info4.fOriginXform.isIdentity());
-            REPORTER_ASSERT(reporter, NULL == info4.fPaint);
+            REPORTER_ASSERT(reporter, info4.fPaint);
             REPORTER_ASSERT(reporter, !info4.fIsNested &&
                                       info4.fHasNestedLayers); // has a nested SL
 
@@ -1051,7 +1054,7 @@
                                       kHeight == info6.fSize.fHeight);
             REPORTER_ASSERT(reporter, 0 == info6.fOffset.fX && 0 == info6.fOffset.fY);
             REPORTER_ASSERT(reporter, info6.fOriginXform.isIdentity());
-            REPORTER_ASSERT(reporter, NULL == info6.fPaint);
+            REPORTER_ASSERT(reporter, info6.fPaint);
             REPORTER_ASSERT(reporter, !info6.fIsNested &&
                                       info6.fHasNestedLayers); // has a nested SL