Remove unnamed namespace usage from 'gm'.

gm/optimizations.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 #include "SkDebugCanvas.h"
 #include "SkPictureFlat.h"
 
 #define WARN(msg)                                           \
     SkDebugf("%s:%d: %s\n", __FILE__, __LINE__, msg);
 
-namespace {
-
 // Do the commands in 'input' match the supplied pattern? Note: this is a pretty
 // heavy-weight operation since we are drawing the picture into a debug canvas
 // to extract the commands.
-bool check_pattern(SkPicture& input, const SkTDArray<DrawType> &pattern) {
+static bool check_pattern(SkPicture& input, const SkTDArray<DrawType> &pattern) {
     SkDebugCanvas debugCanvas(input.width(), input.height());
     debugCanvas.setBounds(input.width(), input.height());
     input.draw(&debugCanvas);
 
     if (pattern.count() != debugCanvas.getSize()) {
         return false;
     }
 
     for (int i = 0; i < pattern.count(); ++i) {
         if (pattern[i] != debugCanvas.getDrawCommandAt(i)->getType()) {
             return false;
         }
     }
 
     return true;
 }
 
 // construct the pattern removed by the SkPictureRecord::remove_save_layer1
 // optimization, i.e.:
 //   SAVE_LAYER
 //       DRAW_BITMAP|DRAW_BITMAP_MATRIX|DRAW_BITMAP_NINE|DRAW_BITMAP_RECT_TO_RECT
 //   RESTORE
 //
 // saveLayerHasPaint - control if the saveLayer has a paint (the optimization
 //                     takes a different path if this is false)
 // dbmr2rHasPaint    - control if the dbmr2r has a paint (the optimization
 //                     takes a different path if this is false)
 // colorsMatch       - control if the saveLayer and dbmr2r paint colors
 //                     match (the optimization will fail if they do not)
-SkPicture* create_save_layer_opt_1(SkTDArray<DrawType> *preOptPattern,
-                                   SkTDArray<DrawType> *postOptPattern,
-                                   const SkBitmap& checkerBoard,
-                                   bool saveLayerHasPaint,
-                                   bool dbmr2rHasPaint,
-                                   bool colorsMatch)  {
+static SkPicture* create_save_layer_opt_1(SkTDArray<DrawType>* preOptPattern,
+                                          SkTDArray<DrawType>* postOptPattern,
+                                          const SkBitmap& checkerBoard,
+                                          bool saveLayerHasPaint,
+                                          bool dbmr2rHasPaint,
+                                          bool colorsMatch)  {
     // Create the pattern that should trigger the optimization
     preOptPattern->setCount(5);
     (*preOptPattern)[0] = SAVE;
     (*preOptPattern)[1] = SAVE_LAYER;
     (*preOptPattern)[2] = DRAW_BITMAP_RECT_TO_RECT;
     (*preOptPattern)[3] = RESTORE;
     (*preOptPattern)[4] = RESTORE;
 
     if (colorsMatch) {
         // Create the pattern that should appear after the optimization
@@ skipping 47 matching lines @@
         canvas->drawBitmapRectToRect(checkerBoard, NULL, rect, NULL);
     }
     canvas->restore();
 
     result->endRecording();
 
     return result;
 }
 
 // straight-ahead version that is seen in the skps
-SkPicture* create_save_layer_opt_1_v1(SkTDArray<DrawType> *preOptPattern,
-                                      SkTDArray<DrawType> *postOptPattern,
-                                      const SkBitmap& checkerBoard) {
+static SkPicture* create_save_layer_opt_1_v1(SkTDArray<DrawType>* preOptPattern,
+                                             SkTDArray<DrawType>* postOptPattern,
+                                             const SkBitmap& checkerBoard) {
     return create_save_layer_opt_1(preOptPattern, postOptPattern, checkerBoard,
                                    true,   // saveLayer has a paint
                                    true,   // dbmr2r has a paint
                                    true);  // and the colors match
 }
 
 // alternate version that should still succeed
-SkPicture* create_save_layer_opt_1_v2(SkTDArray<DrawType> *preOptPattern,
-                                      SkTDArray<DrawType> *postOptPattern,
-                                      const SkBitmap& checkerBoard) {
+static SkPicture* create_save_layer_opt_1_v2(SkTDArray<DrawType>* preOptPattern,
+                                             SkTDArray<DrawType>* postOptPattern,
+                                             const SkBitmap& checkerBoard) {
     return create_save_layer_opt_1(preOptPattern, postOptPattern, checkerBoard,
                                    false,  // saveLayer doesn't have a paint!
                                    true,   // dbmr2r has a paint
                                    true);  // color matching not really applicable
 }
 
 // alternate version that should still succeed
-SkPicture* create_save_layer_opt_1_v3(SkTDArray<DrawType> *preOptPattern,
-                                      SkTDArray<DrawType> *postOptPattern,
-                                      const SkBitmap& checkerBoard) {
+static SkPicture* create_save_layer_opt_1_v3(SkTDArray<DrawType>* preOptPattern,
+                                             SkTDArray<DrawType>* postOptPattern,
+                                             const SkBitmap& checkerBoard) {
     return create_save_layer_opt_1(preOptPattern, postOptPattern, checkerBoard,
                                    true,   // saveLayer has a paint
                                    false,  // dbmr2r doesn't have a paint!
                                    true);  // color matching not really applicable
 }
 
 // version in which the optimization fails b.c. the colors don't match
-SkPicture* create_save_layer_opt_1_v4(SkTDArray<DrawType> *preOptPattern,
-                                      SkTDArray<DrawType> *postOptPattern,
-                                      const SkBitmap& checkerBoard) {
+static SkPicture* create_save_layer_opt_1_v4(SkTDArray<DrawType>* preOptPattern,
+                                             SkTDArray<DrawType>* postOptPattern,
+                                             const SkBitmap& checkerBoard) {
     return create_save_layer_opt_1(preOptPattern, postOptPattern, checkerBoard,
                                    true,   // saveLayer has a paint
                                    true,   // dbmr2r has a paint
                                    false); // and the colors don't match!
 }
 
 // construct the pattern removed by the SkPictureRecord::remove_save_layer2
 // optimization, i.e.:
 //   SAVE_LAYER (with NULL == bounds)
 //      SAVE
 //         CLIP_RECT
 //         DRAW_BITMAP|DRAW_BITMAP_MATRIX|DRAW_BITMAP_NINE|DRAW_BITMAP_RECT_TO_RECT
 //      RESTORE
 //   RESTORE
 //
 // saveLayerHasPaint - control if the saveLayer has a paint (the optimization
 //                     takes a different path if this is false)
 // dbmr2rHasPaint    - control if the dbmr2r has a paint (the optimization
 //                     takes a different path if this is false)
 // colorsMatch       - control if the saveLayer and dbmr2r paint colors
 //                     match (the optimization will fail if they do not)
-SkPicture* create_save_layer_opt_2(SkTDArray<DrawType> *preOptPattern,
-                                   SkTDArray<DrawType> *postOptPattern,
-                                   const SkBitmap& checkerBoard,
-                                   bool saveLayerHasPaint,
-                                   bool dbmr2rHasPaint,
-                                   bool colorsMatch)  {
+static SkPicture* create_save_layer_opt_2(SkTDArray<DrawType>* preOptPattern,
+                                          SkTDArray<DrawType>* postOptPattern,
+                                          const SkBitmap& checkerBoard,
+                                          bool saveLayerHasPaint,
+                                          bool dbmr2rHasPaint,
+                                          bool colorsMatch)  {
     // Create the pattern that should trigger the optimization
     preOptPattern->setCount(8);
     (*preOptPattern)[0] = SAVE;
     (*preOptPattern)[1] = SAVE_LAYER;
     (*preOptPattern)[2] = SAVE;
     (*preOptPattern)[3] = CLIP_RECT;
     (*preOptPattern)[4] = DRAW_BITMAP_RECT_TO_RECT;
     (*preOptPattern)[5] = RESTORE;
     (*preOptPattern)[6] = RESTORE;
     (*preOptPattern)[7] = RESTORE;
@@ skipping 60 matching lines @@
     }
     canvas->restore();
     canvas->restore();
 
     result->endRecording();
 
     return result;
 }
 
 // straight-ahead version that is seen in the skps
-SkPicture* create_save_layer_opt_2_v1(SkTDArray<DrawType> *preOptPattern,
-                                      SkTDArray<DrawType> *postOptPattern,
-                                      const SkBitmap& checkerBoard) {
+static SkPicture* create_save_layer_opt_2_v1(SkTDArray<DrawType>* preOptPattern,
+                                             SkTDArray<DrawType>* postOptPattern,
+                                             const SkBitmap& checkerBoard) {
     return create_save_layer_opt_2(preOptPattern, postOptPattern, checkerBoard,
                                    true,   // saveLayer has a paint
                                    true,   // dbmr2r has a paint
                                    true);  // and the colors match
 }
 
 // alternate version that should still succeed
-SkPicture* create_save_layer_opt_2_v2(SkTDArray<DrawType> *preOptPattern,
-                                      SkTDArray<DrawType> *postOptPattern,
-                                      const SkBitmap& checkerBoard) {
+static SkPicture* create_save_layer_opt_2_v2(SkTDArray<DrawType>* preOptPattern,
+                                             SkTDArray<DrawType>* postOptPattern,
+                                             const SkBitmap& checkerBoard) {
     return create_save_layer_opt_2(preOptPattern, postOptPattern, checkerBoard,
                                    false,  // saveLayer doesn't have a paint!
                                    true,   // dbmr2r has a paint
                                    true);  // color matching not really applicable
 }
 
 // alternate version that should still succeed
-SkPicture* create_save_layer_opt_2_v3(SkTDArray<DrawType> *preOptPattern,
-                                      SkTDArray<DrawType> *postOptPattern,
-                                      const SkBitmap& checkerBoard) {
+static SkPicture* create_save_layer_opt_2_v3(SkTDArray<DrawType>* preOptPattern,
+                                             SkTDArray<DrawType>* postOptPattern,
+                                             const SkBitmap& checkerBoard) {
     return create_save_layer_opt_2(preOptPattern, postOptPattern, checkerBoard,
                                    true,   // saveLayer has a paint
                                    false,  // dbmr2r doesn't have a paint!
                                    true);  // color matching not really applicable
 }
 
 // version in which the optimization fails b.c. the colors don't match
-SkPicture* create_save_layer_opt_2_v4(SkTDArray<DrawType> *preOptPattern,
-                                      SkTDArray<DrawType> *postOptPattern,
-                                      const SkBitmap& checkerBoard) {
+static SkPicture* create_save_layer_opt_2_v4(SkTDArray<DrawType>* preOptPattern,
+                                             SkTDArray<DrawType>* postOptPattern,
+                                             const SkBitmap& checkerBoard) {
     return create_save_layer_opt_2(preOptPattern, postOptPattern, checkerBoard,
                                    true,   // saveLayer has a paint
                                    true,   // dbmr2r has a paint
                                    false); // and the colors don't match!
 }
 
-};
-
-
 // As our .skp optimizations get folded into the captured skps our code will
 // no longer be locally exercised. This GM manually constructs the patterns
 // our optimizations will remove to test them. It acts as both a GM and a unit
 // test
 class OptimizationsGM : public skiagm::GM {
 public:
     OptimizationsGM() {
         this->makeCheckerboard();
     }
 
@@ skipping 96 matching lines @@
     }
 
     SkBitmap fCheckerboard;
 
     typedef skiagm::GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return new OptimizationsGM; )