aboutsummaryrefslogtreecommitdiffhomepage
path: root/samplecode
diff options
context:
space:
mode:
authorGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-01-22 14:43:47 +0000
committerGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-01-22 14:43:47 +0000
commit7873333236ba36ac123312666a0b9f7755e73642 (patch)
tree1efaf1c45fb04f46604c9a816e2bb9f6d15a3658 /samplecode
parent566a3f1a1f5a47844664b510592ad60ada7d0635 (diff)
Remove GetGr() hack.
It seems no GM are using this. BUG=None TEST=SampleApp R=bsalomon@google.com, caryclark@google.com Author: tfarina@chromium.org Review URL: https://codereview.chromium.org/144543003 git-svn-id: http://skia.googlecode.com/svn/trunk@13141 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'samplecode')
-rw-r--r--samplecode/SampleApp.cpp13
-rw-r--r--samplecode/SampleCode.h2
2 files changed, 0 insertions, 15 deletions
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index d5fe18217f..127646d0d7 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -642,19 +642,6 @@ SkScalar SampleCode::GetAnimSinScalar(SkScalar amplitude,
return SkScalarMul(amplitude, SkDoubleToScalar(sin(t))) + amplitude;
}
-GrContext* SampleCode::GetGr() {
- return gSampleWindow ? gSampleWindow->getGrContext() : NULL;
-}
-
-// some GMs rely on having a skiagm::GetGr function defined
-namespace skiagm {
- // FIXME: this should be moved into a header
- GrContext* GetGr();
- GrContext* GetGr() { return SampleCode::GetGr(); }
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
enum TilingMode {
kNo_Tiling,
kAbs_128x128_Tiling,
diff --git a/samplecode/SampleCode.h b/samplecode/SampleCode.h
index afca4d2de8..7c0452a90a 100644
--- a/samplecode/SampleCode.h
+++ b/samplecode/SampleCode.h
@@ -39,8 +39,6 @@ public:
static SkScalar GetAnimSinScalar(SkScalar amplitude,
SkScalar periodInSec,
SkScalar phaseInSec = 0);
-
- static GrContext* GetGr();
};
//////////////////////////////////////////////////////////////////////////////