Move SkRecordComputeLayers and CollectLayers into SkRecordDraw.cpp

tests/PictureTest.cpp

Index: tests/PictureTest.cpp
diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp
index 42bd25806c7ca85561e230ebf2e3ff8e438d7aeb..3cb145e7a4822019b5158b628ea76fca3e4806a3 100644
--- a/tests/PictureTest.cpp
+++ b/tests/PictureTest.cpp
@@ -1018,11 +1018,12 @@ static void test_gpu_picture_optimization(skiatest::Reporter* reporter,
             REPORTER_ASSERT(reporter, !info0.fIsNested && !info0.fHasNestedLayers);
 
             REPORTER_ASSERT(reporter, NULL == info1.fPicture);
-            REPORTER_ASSERT(reporter, kWidth == info1.fBounds.width() &&
-                                      kHeight == info1.fBounds.height());
+            REPORTER_ASSERT(reporter, kWidth/2.0 == info1.fBounds.width() &&

[mtklein, 2014/11/11 21:17:30]

What happened here?

[robertphillips, 2014/11/12 13:46:26]

The CollectLayers code was based on a version of FillBounds prior to (Shrink
saveLayer device bounds when it supplies an explicit bounds and has a complex
paint - https://codereview.chromium.org/696763002/) so this CL also changes how
the bounding boxes are computed in the CollectLayers case. Note that this case
here is exactly the one mentioned in the shrinking patch's description so this
is an expected result of this CL. 

+                                      kHeight/2.0 == info1.fBounds.height());
             REPORTER_ASSERT(reporter, info1.fLocalMat.isIdentity());
             REPORTER_ASSERT(reporter, info1.fPreMat.isIdentity());
-            REPORTER_ASSERT(reporter, 0 == info1.fBounds.fLeft && 0 == info1.fBounds.fTop);
+            REPORTER_ASSERT(reporter, kWidth/2.0 == info1.fBounds.fLeft && 
+                                      kHeight/2.0 == info1.fBounds.fTop);
             REPORTER_ASSERT(reporter, NULL == info1.fPaint);
             REPORTER_ASSERT(reporter, !info1.fIsNested &&
                                       info1.fHasNestedLayers); // has a nested SL