From 9d0c6ecb8440e8e546881a4ff850eb6333f24541 Mon Sep 17 00:00:00 2001
From: "caryclark@google.com"
 <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Date: Tue, 20 Dec 2011 20:26:56 +0000
Subject: [PATCH] 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
---
 include/core/SkFlattenable.h | 2 ++
 include/core/SkPixelRef.h    | 2 ++
 src/core/SkGraphics.cpp      | 1 +
 3 files changed, 5 insertions(+)

diff --git a/include/core/SkFlattenable.h b/include/core/SkFlattenable.h
index 99127afab7..a66638eb4e 100644
--- 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 3a64393eb0..e247479ad5 100644
--- 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 1b56936c8e..ff38f8591c 100644
--- 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"