fix 'no static globals' for chromium

M    include/core/SkFlattenable.h
M    include/core/SkPixelRef.h
M    src/core/SkGraphics.cpp

git-svn-id: http://skia.googlecode.com/svn/trunk@2908 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/include/core/SkFlattenable.h b/include/core/SkFlattenable.h
index 99127af..a66638e 100644 (file)
--- a/include/core/SkFlattenable.h
+++ b/include/core/SkFlattenable.h
@@ -100,6 +100,8 @@ private:
 #if !SK_ALLOW_STATIC_GLOBAL_INITIALIZERS
     static void InitializeFlattenables();
 #endif
+
+    friend class SkGraphics;
 };
 
 // helpers for matrix and region

diff --git a/include/core/SkPixelRef.h b/include/core/SkPixelRef.h
index 3a64393..e247479 100644 (file)
--- a/include/core/SkPixelRef.h
+++ b/include/core/SkPixelRef.h
@@ -221,6 +221,8 @@ private:
 
     // can go from false to true, but never from true to false
     bool    fIsImmutable;
+
+    friend class SkGraphics;
 };
 
 #endif

diff --git a/src/core/SkGraphics.cpp b/src/core/SkGraphics.cpp
index 1b56936..ff38f85 100644 (file)
--- a/src/core/SkGraphics.cpp
+++ b/src/core/SkGraphics.cpp
@@ -18,6 +18,7 @@
 #include "SkMatrix.h"
 #include "SkPath.h"
 #include "SkPathEffect.h"
+#include "SkPixelRef.h"
 #include "SkRandom.h"
 #include "SkRefCnt.h"
 #include "SkScalerContext.h"