aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar joshualitt <joshualitt@chromium.org>2015-02-23 17:03:33 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-02-23 17:03:33 -0800
commit9ece6a95481c3226b4519c8e9f685eb3fc1873b3 (patch)
tree18554d30b109c3aaca02d9c7dea69311e8c46e9a
parent58773334d7f4f27b11458e0ee77f60fe0ed939b9 (diff)
move static init to cpp file to fix linux builder
TBR=bsalomon@google.com BUG=skia: Review URL: https://codereview.chromium.org/947933004
-rw-r--r--include/gpu/GrClip.h5
-rw-r--r--src/gpu/GrClip.cpp5
2 files changed, 6 insertions, 4 deletions
diff --git a/include/gpu/GrClip.h b/include/gpu/GrClip.h
index f07a9749ca..8c8b9b358f 100644
--- a/include/gpu/GrClip.h
+++ b/include/gpu/GrClip.h
@@ -147,10 +147,7 @@ public:
SkIRect* devResult,
bool* isIntersectionOfRects = NULL) const;
- static const GrClip& WideOpen() {
- static GrClip clip;
- return clip;
- }
+ static const GrClip& WideOpen();
enum ClipType {
kClipStack_ClipType,
diff --git a/src/gpu/GrClip.cpp b/src/gpu/GrClip.cpp
index 0f8aac8749..15b1fbc811 100644
--- a/src/gpu/GrClip.cpp
+++ b/src/gpu/GrClip.cpp
@@ -48,3 +48,8 @@ void GrClip::getConservativeBounds(int width, int height, SkIRect* devResult,
}
}
+
+const GrClip& GrClip::WideOpen() {
+ static GrClip clip;
+ return clip;
+}