Move SkTArray to include/private.

src/gpu/GrContextFactory.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrContextFactory_DEFINED
 #define GrContextFactory_DEFINED
 
 #include "GrContext.h"
 #include "GrContextOptions.h"
 
 #include "gl/SkGLContext.h"
-#include "SkTArray.h"
+#include "../private/SkTArray.h"

[bungeman-skia, 2016/02/16 19:08:43]

This one is probably the most iffy. This shouldn't be necessary (since this is
in 'src'), but this header is included by 'tools/flags/SkCommonFlagsConfig.h'
included by SkCommonFlagsConfig.cpp. Perhaps it would be better to just have the
flags target include private (it already apparently includes 'src', which is
much stronger).

[mtklein, 2016/02/16 19:16:14]

Sounds right to me.

[bungeman-skia, 2016/02/16 19:19:01]

Done.

 
 /**
  * This is a simple class that is useful in test apps that use different
  * GrContexts backed by different types of GL contexts. It manages creating the
  * GL context and a GrContext that uses it. The GL/Gr contexts persist until the
  * factory is destroyed (though the caller can always grab a ref on the returned
  * Gr and GL contexts to make them outlive the factory).
  */
 class GrContextFactory : SkNoncopyable {
 public:
@@ skipping 109 matching lines @@
         GLContextType fType;
         GLContextOptions fOptions;
         SkGLContext*  fGLContext;
         GrContext*    fGrContext;
     };
     SkTArray<Context, true> fContexts;
     const GrContextOptions  fGlobalOptions;
 };
 
 #endif