Merge 88429 - 2011-06-08 Justin Novosad <junov@chromium.org>

Source/WebCore/platform/graphics/gpu/SharedGraphicsContext3D.cpp

 /*
  * Copyright (c) 2010, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 103 matching lines @@
     m_oesStandardDerivativesSupported = extensions->supports("GL_OES_standard_derivatives");
     if (m_oesStandardDerivativesSupported)
         extensions->ensureEnabled("GL_OES_standard_derivatives");
 }
 
 SharedGraphicsContext3D::~SharedGraphicsContext3D()
 {
     m_context->deleteBuffer(m_quadVertices);
     allContexts()->remove(this);
 #if USE(SKIA)
-    GrSafeUnref(m_grContext);
+    if (m_grContext) {
+        m_grContext->contextDestroyed();
+        GrSafeUnref(m_grContext);
+    }
 #endif
 }
 
 void SharedGraphicsContext3D::makeContextCurrent()
 {
     m_context->makeContextCurrent();
 }
 
 void SharedGraphicsContext3D::scissor(GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height)
 {
@@ skipping 351 matching lines @@
         if (m_grContext)
             m_grContext->setTextureCacheLimits(maxTextureCacheCount, maxTextureCacheBytes);
     }
     return m_grContext;
 }
 #endif
 
 } // namespace WebCore
 
 #endif