Cleanup: Turn GrReducedClip into a class with a static function.

src/gpu/GrReducedClip.h

Index: src/gpu/GrReducedClip.h
diff --git a/src/gpu/GrReducedClip.h b/src/gpu/GrReducedClip.h
index e3a28cc0c573810db13522c3397aa34aaae41248..377331b755e9a1179cb0b52a15c2741825549533 100644
--- a/src/gpu/GrReducedClip.h
+++ b/src/gpu/GrReducedClip.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2012 Google Inc.
  *
@@ -12,37 +11,36 @@
 #include "SkClipStack.h"
 #include "SkTLList.h"
 
-namespace GrReducedClip {
-
-typedef SkTLList<SkClipStack::Element> ElementList;
-
-enum InitialState {
-    kAllIn_InitialState,
-    kAllOut_InitialState,
+class SK_API GrReducedClip {
+public:
+    typedef SkTLList<SkClipStack::Element> ElementList;
+
+    enum InitialState {
+        kAllIn_InitialState,
+        kAllOut_InitialState,
+    };
+
+    /**

[robertphillips, 2014/10/23 12:24:17]

overlength lines due to new indentation ?

[tfarina, 2014/10/24 00:38:57]

Done.

+     * This function takes a clip stack and a query rectangle and it produces a reduced set of
+     * SkClipStack::Elements that are equivalent to applying the full stack to the rectangle. The clip
+     * stack generation id that represents the list of elements is returned in resultGenID. The
+     * initial state of the query rectangle before the first clip element is applied is returned via
+     * initialState. Optionally, the caller can request a tighter bounds on the clip be returned via
+     * tighterBounds. If not NULL, tighterBounds will always be contained by queryBounds after return.
+     * If tighterBounds is specified then it is assumed that the caller will implicitly clip against it.
+     * If the caller specifies non-NULL for requiresAA then it will indicate whether anti-aliasing is
+     * required to process any of the elements in the result.
+     *
+     * This may become a member function of SkClipStack when its interface is determined to be stable.
+     * Marked SK_API so that SkLua can call this in a shared library build.
+     */
+    static void ReduceClipStack(const SkClipStack& stack,
+                                const SkIRect& queryBounds,
+                                ElementList* result,
+                                int32_t* resultGenID,
+                                InitialState* initialState,
+                                SkIRect* tighterBounds = NULL,
+                                bool* requiresAA = NULL);
 };
 
-/**
- * This function takes a clip stack and a query rectangle and it produces a reduced set of
- * SkClipStack::Elements that are equivalent to applying the full stack to the rectangle. The clip
- * stack generation id that represents the list of elements is returned in resultGenID. The
- * initial state of the query rectangle before the first clip element is applied is returned via
- * initialState. Optionally, the caller can request a tighter bounds on the clip be returned via
- * tighterBounds. If not NULL, tighterBounds will always be contained by queryBounds after return.
- * If tighterBounds is specified then it is assumed that the caller will implicitly clip against it.
- * If the caller specifies non-NULL for requiresAA then it will indicate whether anti-aliasing is
- * required to process any of the elements in the result.
- *
- * This may become a member function of SkClipStack when its interface is determined to be stable.
- * Marked SK_API so that SkLua can call this in a shared library build.
- */
-SK_API void ReduceClipStack(const SkClipStack& stack,
-                            const SkIRect& queryBounds,
-                            ElementList* result,
-                            int32_t* resultGenID,
-                            InitialState* initialState,
-                            SkIRect* tighterBounds = NULL,
-                            bool* requiresAA = NULL);
-
-} // namespace GrReducedClip
-
 #endif