Our SkPicture::Analysis visitors should recurse into nested pictures.

Our SkPicture::Analysis visitors should recurse into nested pictures.

BUG=skia:

Committed: https://skia.googlesource.com/skia/+/53fecfb15d254397ab03032b888daa9d15c487b6

[reed1, 2014-08-20 22:30:31]

api lgtm

https://codereview.chromium.org/495793002/diff/1/src/core/SkPicture.cpp
File src/core/SkPicture.cpp (right):

https://codereview.chromium.org/495793002/diff/1/src/core/SkPicture.cpp#newco...
src/core/SkPicture.cpp:120: // All ops with text have that text as a char array
member named "text".
clever, and possible fragile. All the more reason to have explicit tests for
these queries.

[tomhudson, 2014-08-21 12:15:44]

Code LGTM, but please add tests before landing.

Sorry I missed this case!

[mtklein, 2014-08-21 15:35:39]

On 2014/08/21 12:15:44, tomhudson wrote:
> Code LGTM, but please add tests before landing.
You bet.

> Sorry I missed this case!
No worries.  I did too.  We stopped unrolling drawPicture() calls only recently;
I'm also not used to having to think about the existence of DrawPicture yet.

[mtklein, 2014-08-21 15:49:11]

The CQ bit was checked by mtklein@google.com

[commit-bot: I haz the power, 2014-08-21 15:49:33]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/mtklein@chromium.org/495793002/20001

[commit-bot: I haz the power, 2014-08-21 15:56:33]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  Test-Ubuntu13.10-GCE-NoGPU-x86_64-Debug-Trybot on tryserver.skia
(http://108.170.220.120:10117/builders/Test-Ubuntu13.10-GCE-NoGPU-x86_64-Debug...)
  Test-Ubuntu13.10-GCE-NoGPU-x86_64-Release-Shared-Trybot on tryserver.skia
(http://108.170.220.120:10117/builders/Test-Ubuntu13.10-GCE-NoGPU-x86_64-Relea...)

[commit-bot: I haz the power, 2014-08-21 15:57:25]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-08-21 15:57:28]

Try jobs failed on following builders:
  Test-Ubuntu13.10-GCE-NoGPU-x86_64-Debug-Trybot on tryserver.skia
(http://108.170.220.120:10117/builders/Test-Ubuntu13.10-GCE-NoGPU-x86_64-Debug...)
  Test-Ubuntu13.10-GCE-NoGPU-x86_64-Release-Shared-Trybot on tryserver.skia
(http://108.170.220.120:10117/builders/Test-Ubuntu13.10-GCE-NoGPU-x86_64-Relea...)

[mtklein, 2014-08-21 15:57:53]

The CQ bit was checked by mtklein@google.com

[commit-bot: I haz the power, 2014-08-21 15:58:43]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/mtklein@chromium.org/495793002/40001

[commit-bot: I haz the power, 2014-08-21 15:58:45]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-08-21 15:58:46]

Failed to apply patch for src/core/SkRecords.h:
While running git apply --index -p1;
  error: patch failed: src/core/SkRecords.h:11
  error: src/core/SkRecords.h: patch does not apply

Patch:       src/core/SkRecords.h
Index: src/core/SkRecords.h
diff --git a/src/core/SkRecords.h b/src/core/SkRecords.h
index
6ec6e9ca2e8485674310018e488b347062797d50..0401b274129828453786d15d93b8d252bc390983
100644
--- a/src/core/SkRecords.h
+++ b/src/core/SkRecords.h
@@ -11,20 +11,6 @@
 #include "SkCanvas.h"
 #include "SkPicture.h"
 
-class SkPictureBox {
-public:
-    SkPictureBox(const SkPicture* obj) : fObj(SkRef(obj)) {}
-    ~SkPictureBox() { fObj->unref(); }
-
-    operator const SkPicture*() const { return fObj; }
-
-private:
-    SkPictureBox(const SkPictureBox&);
-    SkPictureBox& operator=(const SkPictureBox&);
-
-    const SkPicture* fObj;
-};
-
 namespace SkRecords {
 
 // A list of all the types of canvas calls we can record.
@@ -132,6 +118,18 @@ struct T {                                                 
              \
     T* operator->() { return ptr; }           \
     const T* operator->() const { return ptr; }
 
+template <typename T>
+class SkTRefBox : SkNoncopyable {
+public:
+    SkTRefBox(T* obj) : fObj(SkRef(obj)) {}
+    ~SkTRefBox() { fObj->unref(); }
+
+    ACT_AS_PTR(fObj);
+
+private:
+    T* fObj;
+};
+
 // An Optional doesn't own the pointer's memory, but may need to destroy
non-POD data.
 template <typename T>
 class Optional : SkNoncopyable {
@@ -231,7 +229,9 @@ RECORD2(DrawOval, SkPaint, paint, SkRect, oval);
 RECORD1(DrawPaint, SkPaint, paint);
 RECORD2(DrawPath, SkPaint, paint, SkPath, path);
 //RECORD2(DrawPatch, SkPaint, paint, SkPatch, patch);
-RECORD3(DrawPicture, Optional<SkPaint>, paint, SkPictureBox, picture,
Optional<SkMatrix>, matrix);
+RECORD3(DrawPicture, Optional<SkPaint>, paint,
+                     SkTRefBox<const SkPicture>, picture,
+                     Optional<SkMatrix>, matrix);
 RECORD4(DrawPoints, SkPaint, paint, SkCanvas::PointMode, mode, size_t, count,
SkPoint*, pts);
 RECORD4(DrawPosText, SkPaint, paint,
                      PODArray<char>, text,

[mtklein, 2014-08-21 16:02:55]

The CQ bit was checked by mtklein@google.com

[commit-bot: I haz the power, 2014-08-21 16:03:43]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/mtklein@chromium.org/495793002/60001

[commit-bot: I haz the power, 2014-08-21 16:11:43]

Committed patchset #4 (60001) as 53fecfb15d254397ab03032b888daa9d15c487b6