Stop using GrTexture::get/setCustomData in Canvas2DLayerBridge

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 324 matching lines @@
     if (!gl)
         return false;
 
     GLuint textureID = skia::GrBackendObjectToGrGLTextureInfo(mailboxInfo.m_image->getTextureHandle(true))->fID;
     gl->BindTexture(GL_TEXTURE_2D, textureID);
     gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, getGLFilter());
     gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, getGLFilter());
     gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
     gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 
-    // Re-use the texture's existing mailbox, if there is one.
-    if (mailboxInfo.m_image->getTexture()->getCustomData()) {
-        DCHECK(mailboxInfo.m_image->getTexture()->getCustomData()->size() == sizeof(mailboxInfo.m_mailbox.name));
-        memcpy(&mailboxInfo.m_mailbox.name[0], mailboxInfo.m_image->getTexture()->getCustomData()->data(), sizeof(mailboxInfo.m_mailbox.name));
-    } else {
-        gl->GenMailboxCHROMIUM(mailboxInfo.m_mailbox.name);
-        sk_sp<SkData> mailboxNameData = SkData::MakeWithCopy(&mailboxInfo.m_mailbox.name[0], sizeof(mailboxInfo.m_mailbox.name));
-        mailboxInfo.m_image->getTexture()->setCustomData(mailboxNameData.get());
-        gl->ProduceTextureCHROMIUM(GL_TEXTURE_2D, mailboxInfo.m_mailbox.name);
-    }
+    gl->GenMailboxCHROMIUM(mailboxInfo.m_mailbox.name);
+    gl->ProduceTextureCHROMIUM(GL_TEXTURE_2D, mailboxInfo.m_mailbox.name);
 
     if (isHidden()) {
         // With hidden canvases, we release the SkImage immediately because
         // there is no need for animations to be double buffered.
         mailboxInfo.m_image.clear();
     } else {
         // FIXME: We'd rather insert a syncpoint than perform a flush here,
         // but currently the canvas will flicker if we don't flush here.
         const GLuint64 fenceSync = gl->InsertFenceSyncCHROMIUM();
         gl->Flush();
@@ skipping 476 matching lines @@
 #endif // USE_IOSURFACE_FOR_2D_CANVAS
             if (mailbox.validSyncToken) {
                 contextGL()->WaitSyncTokenCHROMIUM(mailbox.syncToken);
             }
             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.empty() && !lostResource) {
             m_imageInfoCache.append(releasedMailboxInfo->m_imageInfo);
         }
 #endif // USE_IOSURFACE_FOR_2D_CANVAS
     }
@@ skipping 131 matching lines @@
 #endif // USE_IOSURFACE_FOR_2D_CANVAS
 }
 
 void Canvas2DLayerBridge::Logger::reportHibernationEvent(HibernationEvent event)
 {
     DEFINE_STATIC_LOCAL(EnumerationHistogram, hibernationHistogram, ("Canvas.HibernationEvents", HibernationEventCount));
     hibernationHistogram.count(event);
 }
 
 } // namespace blink