Move Google3-specific stack limitation logic to template classes.

src/gpu/gl/GrGLGpu.cpp

Index: src/gpu/gl/GrGLGpu.cpp
diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp
index 3b7ccd32417718a14367399125d5247981f84978..57ba078b0452a692c47bc0585f5328f30ed12403 100644
--- a/src/gpu/gl/GrGLGpu.cpp
+++ b/src/gpu/gl/GrGLGpu.cpp
@@ -5,6 +5,7 @@
  * found in the LICENSE file.
  */
 
+#include <functional>

[mtklein, 2016/02/04 19:16:05]

// TODO: wtf?

We still don't think this explains things, right?  I don't see any use of
std::function or other <functional> things inside this file.  It looks like to
me that everyone who needs it includes it themselves:

~/skia (status) $ git grep functional\>
dm/DMSrcSink.cpp:#include <functional>
gm/image.cpp:#include <functional>
include/views/SkOSWindow_Win.h:#include <functional>
src/core/SkTaskGroup.h:#include <functional>
src/gpu/gl/GrGLCaps.h:#include <functional>
tests/BlendTest.cpp:#include <functional>
tests/ImageTest.cpp:#include <functional>

~/skia (status) $ git grep std::function
dm/DMSrcSink.cpp:                            SkISize size,
std::function<Error(SkCanvas*)> draw) {
dm/DMSrcSink.cpp:        ProxySrc(SkISize size, std::function<Error(SkCanvas*)>
draw) : fSize(size), fDraw(draw) {}
dm/DMSrcSink.cpp:        std::function<Error(SkCanvas*)> fDraw;
gm/image.cpp:    std::function<SkImage*()> imageFactories[] = {
include/views/SkOSWindow_Win.h:    static void ForAllWindows(const
std::function<void(void*, SkOSWindow**)>& f) {
src/core/SkTaskGroup.cpp:    static void Add(std::function<void(void)> fn,
SkAtomic<int32_t>* pending) {
src/core/SkTaskGroup.cpp:    static void Batch(int N, std::function<void(int)>
fn, SkAtomic<int32_t>* pending) {
src/core/SkTaskGroup.cpp:        std::function<void(void)> fn; // A function to
call
src/core/SkTaskGroup.cpp:    void add(std::function<void(void)> fn,
SkAtomic<int32_t>* pending) {
src/core/SkTaskGroup.cpp:    void batch(int N, std::function<void(int)> fn,
SkAtomic<int32_t>* pending) {
src/core/SkTaskGroup.cpp:void SkTaskGroup::add(std::function<void(void)> fn) {
ThreadPool::Add(fn, &fPending); }
src/core/SkTaskGroup.cpp:void SkTaskGroup::batch(int N, std::function<void(int)>
fn) {
src/core/SkTaskGroup.h:    void add(std::function<void(void)> fn);
src/core/SkTaskGroup.h:    void batch(int N, std::function<void(int)> fn);
src/gpu/gl/GrGLCaps.cpp:                                   std::function<void
(GrGLenum, GrGLint*)> getIntegerv,
src/gpu/gl/GrGLCaps.cpp:                                   std::function<bool
()> bindRenderTarget) const {
src/gpu/gl/GrGLCaps.h:                             std::function<void (GrGLenum,
GrGLint*)> getIntegerv,
src/gpu/gl/GrGLCaps.h:                             std::function<bool ()>
bindRenderTarget) const;
tests/ImageTest.cpp:    std::function<SkImage*()> imageFactories[] = {

[dogben, 2016/02/04 19:23:39]

There is an implicit conversion from lambda to std::function on lines 2081/2077
and 2101/1097.

I agree that the order of includes shouldn't cause a build to succeed/fail, but
at least it's an explanation.

[mtklein, 2016/02/04 19:48:30]

Ah!  What's the path for getting <functional> included into this file today?

 
 #include "GrGLGpu.h"
 #include "GrGLGLSL.h"
@@ -857,12 +858,7 @@ bool GrGLGpu::uploadTexData(const GrSurfaceDesc& desc,
     size_t trimRowBytes = width * bpp;
 
     // in case we need a temporary, trimmed copy of the src pixels
-#if defined(GOOGLE3)
-    // Stack frame size is limited in GOOGLE3.
-    SkAutoSMalloc<64 * 128> tempStorage;
-#else
     SkAutoSMalloc<128 * 128> tempStorage;
-#endif
 
     // Internal format comes from the texture desc.
     GrGLenum internalFormat;