Update the name of the friended android class and add the appropriate guards.

Update the name of the friended android class and add the appropriate guards.

Committed: https://skia.googlesource.com/skia/+/dbb7b30429691d3a340e49f62c2b3f6f4cb81120

[reed1, 2014-06-17 18:20:12]

https://codereview.chromium.org/344473002/diff/1/include/core/SkPictureRecord...
File include/core/SkPictureRecorder.h (right):

https://codereview.chromium.org/344473002/diff/1/include/core/SkPictureRecord...
include/core/SkPictureRecorder.h:61: friend class Picture;
Is that really the name? No namespace around it? Wow.

[djsollen, 2014-06-17 18:35:02]

added a namespace.

[scroggo, 2014-06-17 18:38:36]

lgtm

[djsollen, 2014-06-17 19:31:14]

The CQ bit was checked by djsollen@google.com

[commit-bot: I haz the power, 2014-06-17 19:31:45]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/djsollen@google.com/344473002/40002

[commit-bot: I haz the power, 2014-06-17 19:31:46]

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

[commit-bot: I haz the power, 2014-06-17 19:31:47]

Failed to apply patch for include/core/SkPictureRecorder.h:
While running git apply --index -p1;
  error: patch failed: include/core/SkPictureRecorder.h:12
  error: include/core/SkPictureRecorder.h: patch does not apply

Patch:       include/core/SkPictureRecorder.h
Index: include/core/SkPictureRecorder.h
diff --git a/include/core/SkPictureRecorder.h b/include/core/SkPictureRecorder.h
index
8d29ff36daa310bcfbb3d3b0f3d9980a702d0dac..741e95f692d234de90fe9e122aef1841ade8e3f0
100644
--- a/include/core/SkPictureRecorder.h
+++ b/include/core/SkPictureRecorder.h
@@ -12,6 +12,12 @@
 #include "SkPicture.h"
 #include "SkRefCnt.h"
 
+#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
+namespace android {
+    class Picture;
+};
+#endif
+
 class SkCanvas;
 class SkPictureRecord;
 
@@ -57,7 +63,10 @@ private:
     /** Replay the current (partially recorded) operation stream into
         canvas. This call doesn't close the current recording.
     */
-    friend class AndroidPicture;
+#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
+    friend class AndroidPicture; // This is temporary until we remove this from
the framework
+    friend class android::Picture;
+#endif
     friend class SkPictureRecorderReplayTester; // for unit testing
     void partialReplay(SkCanvas* canvas) const;

[djsollen, 2014-06-17 19:35:32]

The CQ bit was checked by djsollen@google.com

[commit-bot: I haz the power, 2014-06-17 19:35:44]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/djsollen@google.com/344473002/70001

[commit-bot: I haz the power, 2014-06-17 19:35:46]

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

[commit-bot: I haz the power, 2014-06-17 19:35:47]

Presubmit check for 344473002-70001 failed and returned exit status 1.

Running presubmit commit checks ...

** Presubmit ERRORS **
Since the CL is editing public API, you must have an LGTM from one of:
('reed@chromium.org', 'reed@google.com', 'bsalomon@chromium.org',
'bsalomon@google.com')

[djsollen, 2014-06-17 19:56:02]

reed@ can I get you to lgtm this?

[reed1, 2014-06-17 20:23:06]

lgtm

[djsollen, 2014-06-17 20:27:43]

The CQ bit was checked by djsollen@google.com

[commit-bot: I haz the power, 2014-06-17 20:28:05]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/djsollen@google.com/344473002/70001

[commit-bot: I haz the power, 2014-06-17 20:43:05]

Change committed as dbb7b30429691d3a340e49f62c2b3f6f4cb81120

[robertphillips, 2014-06-23 15:21:15]

https://codereview.chromium.org/344473002/diff/70001/include/core/SkPictureRe...
File include/core/SkPictureRecorder.h (right):

https://codereview.chromium.org/344473002/diff/70001/include/core/SkPictureRe...
include/core/SkPictureRecorder.h:74: #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
Can we get rid of AndroidPicture now?

[djsollen, 2014-06-23 15:40:23]

see https://codereview.chromium.org/345613002/