Fix Canvas2DLayerBridge IOSurface leak.

third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp

 /*
  * Copyright (C) 2012 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 958 matching lines @@
   auto releasedMailboxInfo = m_mailboxes.end();
   auto firstMailbox = m_mailboxes.begin();
 
   while (true) {
     --releasedMailboxInfo;
     if (releasedMailboxInfo->m_mailbox == mailbox)
       break;
     DCHECK(releasedMailboxInfo != firstMailbox);
   }
 
+#if USE_IOSURFACE_FOR_2D_CANVAS
+  if (releasedMailboxInfo->m_imageInfo && !lostResource) {
+    if (contextLost) {
+      deleteCHROMIUMImage(releasedMailboxInfo->m_imageInfo);
+    } else {
+      m_imageInfoCache.append(releasedMailboxInfo->m_imageInfo);
+    }
+  }
+#endif  // USE_IOSURFACE_FOR_2D_CANVAS
+
   if (!contextLost) {
     // Invalidate texture state in case the compositor altered it since the
     // copy-on-write.
     if (releasedMailboxInfo->m_image) {
 #if USE_IOSURFACE_FOR_2D_CANVAS
       DCHECK(!releasedMailboxInfo->m_imageInfo);
 #endif  // USE_IOSURFACE_FOR_2D_CANVAS
       if (syncToken.HasData()) {
         contextGL()->WaitSyncTokenCHROMIUM(syncToken.GetConstData());
       }
       GrTexture* texture = releasedMailboxInfo->m_image->getTexture();
       if (texture) {
         if (lostResource) {
           texture->abandon();
         } else {
           texture->textureParamsModified();
           // Break the mailbox association to avoid leaking mailboxes every time
           // skia recycles a texture.
           gpu::gles2::GLES2Interface* gl = contextGL();
           if (gl)
             gl->ProduceTextureDirectCHROMIUM(
                 0, GL_TEXTURE_2D, releasedMailboxInfo->m_mailbox.name);
         }
       }
     }
-
-#if USE_IOSURFACE_FOR_2D_CANVAS
-    if (releasedMailboxInfo->m_imageInfo && !lostResource) {
-      m_imageInfoCache.append(releasedMailboxInfo->m_imageInfo);
-    }
-#endif  // USE_IOSURFACE_FOR_2D_CANVAS
   }
 
   RefPtr<Canvas2DLayerBridge> selfRef;
   if (m_destructionInProgress) {
     // To avoid memory use after free, take a scoped self-reference
     // to postpone destruction until the end of this function.
     selfRef = this;
   }
 
   // The destruction of 'releasedMailboxInfo' will:
@@ skipping 117 matching lines @@
     default;
 
 void Canvas2DLayerBridge::Logger::reportHibernationEvent(
     HibernationEvent event) {
   DEFINE_STATIC_LOCAL(EnumerationHistogram, hibernationHistogram,
                       ("Canvas.HibernationEvents", HibernationEventCount));
   hibernationHistogram.count(event);
 }
 
 }  // namespace blink