Cleanup in GrPipelineBuilder

Cleanup in GrPipelineBuilder

Committed: https://skia.googlesource.com/skia/+/6be6f7cb66b277e7b1ce13d09b635fb8e09a2f68

[bsalomon, 2015-02-26 18:17:17]

bsalomon@google.com changed reviewers:
+ egdaniel@google.com, joshualitt@google.com

[bsalomon, 2015-02-26 18:17:17]

Adding/updating comments, renames, grouping related functions/structs.

[bsalomon, 2015-02-26 18:17:18]

Adding/updating comments, renames, grouping related functions/structs.

[joshualitt, 2015-02-26 18:21:02]

On 2015/02/26 18:17:18, bsalomon wrote:
> Adding/updating comments, renames, grouping related functions/structs.

lgtm

[bsalomon, 2015-02-26 19:26:42]

The CQ bit was checked by bsalomon@google.com

[commit-bot: I haz the power, 2015-02-26 19:26:50]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/956363003/1

[commit-bot: I haz the power, 2015-02-26 19:26:53]

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

[commit-bot: I haz the power, 2015-02-26 19:26:54]

Failed to apply patch for src/gpu/GrInOrderDrawBuffer.cpp:
While running git apply --index -3 -p1;
  error: patch failed: src/gpu/GrInOrderDrawBuffer.cpp:301
  Falling back to three-way merge...
  Applied patch to 'src/gpu/GrInOrderDrawBuffer.cpp' with conflicts.
  U src/gpu/GrInOrderDrawBuffer.cpp

Patch:       src/gpu/GrInOrderDrawBuffer.cpp
Index: src/gpu/GrInOrderDrawBuffer.cpp
diff --git a/src/gpu/GrInOrderDrawBuffer.cpp b/src/gpu/GrInOrderDrawBuffer.cpp
index
5dc851c768c8702035c1f366887fe81d390273d4..6e9e051f5f375ae42d41bfae70b00afd7680f0c0
100644
--- a/src/gpu/GrInOrderDrawBuffer.cpp
+++ b/src/gpu/GrInOrderDrawBuffer.cpp
@@ -301,7 +301,7 @@ void GrInOrderDrawBuffer::onDrawRect(GrPipelineBuilder*
pipelineBuilder,
                                      const SkRect& rect,
                                      const SkRect* localRect,
                                      const SkMatrix* localMatrix) {
-    GrPipelineBuilder::AutoRestoreEffects are(pipelineBuilder);
+    GrPipelineBuilder::AutoRestoreFragmentProcessors arfp(pipelineBuilder);
     RectBatch::Geometry geometry;
     geometry.fColor = color;
     geometry.fViewMatrix = viewMatrix;

[bsalomon, 2015-02-26 20:09:20]

The CQ bit was checked by bsalomon@google.com

[bsalomon, 2015-02-26 20:09:21]

The patchset sent to the CQ was uploaded after l-g-t-m from
joshualitt@google.com
Link to the patchset: https://codereview.chromium.org/956363003/#ps20001 (title:
"rebase")

[commit-bot: I haz the power, 2015-02-26 20:10:20]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/956363003/20001

[commit-bot: I haz the power, 2015-02-26 20:17:12]

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

[commit-bot: I haz the power, 2015-02-26 20:17:13]

Try jobs failed on following builders:
  Build-Ubuntu13.10-Clang-x86_64-Debug-Trybot on client.skia.compile
(JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu13.10-Cl...)

[bsalomon, 2015-02-26 20:48:41]

The CQ bit was checked by bsalomon@google.com

[bsalomon, 2015-02-26 20:48:42]

The patchset sent to the CQ was uploaded after l-g-t-m from
joshualitt@google.com
Link to the patchset: https://codereview.chromium.org/956363003/#ps40001 (title:
"fix")

[commit-bot: I haz the power, 2015-02-26 20:49:30]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/956363003/40001

[commit-bot: I haz the power, 2015-02-26 21:05:25]

Committed patchset #3 (id:40001) as
https://skia.googlesource.com/skia/+/6be6f7cb66b277e7b1ce13d09b635fb8e09a2f68