aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rwxr-xr-xsrc/gpu/GrContext.cpp2
-rw-r--r--src/gpu/GrGpu.cpp2
-rw-r--r--src/gpu/GrGpu.h4
-rw-r--r--src/gpu/gl/GrGpuGL.cpp4
-rw-r--r--src/gpu/gl/GrGpuGL.h2
5 files changed, 7 insertions, 7 deletions
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index 8d515bf09c..962b397c3f 100755
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -187,7 +187,7 @@ void GrContext::abandonContext() {
// don't try to free the resources in the API.
fResourceCache2->abandonAll();
- fGpu->contextAbandonded();
+ fGpu->contextAbandoned();
// a path renderer may be holding onto resources that
// are now unusable
diff --git a/src/gpu/GrGpu.cpp b/src/gpu/GrGpu.cpp
index 667cae9c44..6003d8af7c 100644
--- a/src/gpu/GrGpu.cpp
+++ b/src/gpu/GrGpu.cpp
@@ -57,7 +57,7 @@ GrGpu::~GrGpu() {
fIndexPool = NULL;
}
-void GrGpu::contextAbandonded() {}
+void GrGpu::contextAbandoned() {}
////////////////////////////////////////////////////////////////////////////////
diff --git a/src/gpu/GrGpu.h b/src/gpu/GrGpu.h
index 1ae2f5856b..48bb0d6400 100644
--- a/src/gpu/GrGpu.h
+++ b/src/gpu/GrGpu.h
@@ -62,8 +62,8 @@ public:
// Called by GrContext when the underlying backend context has been destroyed.
// GrGpu should use this to ensure that no backend API calls will be made from
// here onward, including in its destructor. Subclasses should call
- // INHERITED::contextAbandonded() if they override this.
- virtual void contextAbandonded();
+ // INHERITED::contextAbandoned() if they override this.
+ virtual void contextAbandoned();
/**
* The GrGpu object normally assumes that no outsider is setting state
diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp
index 5ff868ccaf..5d4bd8b7b7 100644
--- a/src/gpu/gl/GrGpuGL.cpp
+++ b/src/gpu/gl/GrGpuGL.cpp
@@ -166,8 +166,8 @@ GrGpuGL::~GrGpuGL() {
this->releaseGeometry();
}
-void GrGpuGL::contextAbandonded() {
- INHERITED::contextAbandonded();
+void GrGpuGL::contextAbandoned() {
+ INHERITED::contextAbandoned();
fProgramCache->abandon();
fHWProgramID = 0;
if (this->glCaps().pathRenderingSupport()) {
diff --git a/src/gpu/gl/GrGpuGL.h b/src/gpu/gl/GrGpuGL.h
index 2859b43b31..a8130d8099 100644
--- a/src/gpu/gl/GrGpuGL.h
+++ b/src/gpu/gl/GrGpuGL.h
@@ -30,7 +30,7 @@ public:
GrGpuGL(const GrGLContext& ctx, GrContext* context);
virtual ~GrGpuGL();
- virtual void contextAbandonded() SK_OVERRIDE;
+ virtual void contextAbandoned() SK_OVERRIDE;
const GrGLContext& glContext() const { return fGLContext; }