robertphillips 2014-09-17 06:01:06 -07:00 committed by Commit bot
parent acb882c239
commit e3371304b8
5 changed files with 7 additions and 7 deletions

View File

@ -187,7 +187,7 @@ void GrContext::abandonContext() {
// don't try to free the resources in the API. // don't try to free the resources in the API.
fResourceCache2->abandonAll(); fResourceCache2->abandonAll();
fGpu->contextAbandonded(); fGpu->contextAbandoned();
// a path renderer may be holding onto resources that // a path renderer may be holding onto resources that
// are now unusable // are now unusable

View File

@ -57,7 +57,7 @@ GrGpu::~GrGpu() {
fIndexPool = NULL; fIndexPool = NULL;
} }
void GrGpu::contextAbandonded() {} void GrGpu::contextAbandoned() {}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////

View File

@ -62,8 +62,8 @@ public:
// Called by GrContext when the underlying backend context has been destroyed. // 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 // GrGpu should use this to ensure that no backend API calls will be made from
// here onward, including in its destructor. Subclasses should call // here onward, including in its destructor. Subclasses should call
// INHERITED::contextAbandonded() if they override this. // INHERITED::contextAbandoned() if they override this.
virtual void contextAbandonded(); virtual void contextAbandoned();
/** /**
* The GrGpu object normally assumes that no outsider is setting state * The GrGpu object normally assumes that no outsider is setting state

View File

@ -166,8 +166,8 @@ GrGpuGL::~GrGpuGL() {
this->releaseGeometry(); this->releaseGeometry();
} }
void GrGpuGL::contextAbandonded() { void GrGpuGL::contextAbandoned() {
INHERITED::contextAbandonded(); INHERITED::contextAbandoned();
fProgramCache->abandon(); fProgramCache->abandon();
fHWProgramID = 0; fHWProgramID = 0;
if (this->glCaps().pathRenderingSupport()) { if (this->glCaps().pathRenderingSupport()) {

View File

@ -30,7 +30,7 @@ public:
GrGpuGL(const GrGLContext& ctx, GrContext* context); GrGpuGL(const GrGLContext& ctx, GrContext* context);
virtual ~GrGpuGL(); virtual ~GrGpuGL();
virtual void contextAbandonded() SK_OVERRIDE; virtual void contextAbandoned() SK_OVERRIDE;
const GrGLContext& glContext() const { return fGLContext; } const GrGLContext& glContext() const { return fGLContext; }