Re-enable IOSurface Canvas2D.

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 256 matching lines @@
     webContext->texParameteri(target, GL_TEXTURE_MIN_FILTER, getGLFilter());
     webContext->texParameteri(target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
     webContext->texParameteri(target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
     webContext->bindTexImage2DCHROMIUM(target, imageId);
 
     return Canvas2DLayerBridge::ImageInfo(imageId, textureId);
 }
 
 void Canvas2DLayerBridge::deleteCHROMIUMImage(ImageInfo info)
 {
-    WebGraphicsContext3D* webContext = context();
-    if (webContext->isContextLost())
+    if (m_contextProvider->contextGL()->GetGraphicsResetStatusKHR() != GL_NO_ERROR)
         return;
 
     GLenum target = GC3D_TEXTURE_RECTANGLE_ARB;
+    WebGraphicsContext3D* webContext = context();
     webContext->bindTexture(target, info.m_textureId);
     webContext->releaseTexImage2DCHROMIUM(target, info.m_imageId);
     webContext->destroyImageCHROMIUM(info.m_imageId);
     webContext->deleteTexture(info.m_textureId);
     webContext->bindTexture(target, 0);
 
     resetSkiaTextureBinding();
 }
 
 void Canvas2DLayerBridge::clearCHROMIUMImageCache()
@@ skipping 10 matching lines @@
     MailboxInfo tmp;
     tmp.m_parentLayerBridge = this;
     m_mailboxes.prepend(tmp);
 }
 
 bool Canvas2DLayerBridge::prepareMailboxFromImage(PassRefPtr<SkImage> image, WebExternalTextureMailbox* outMailbox)
 {
     createMailboxInfo();
     MailboxInfo& mailboxInfo = m_mailboxes.first();
     mailboxInfo.m_mailbox.nearestNeighbor = getGLFilter() == GL_NEAREST;
+    mailboxInfo.m_mailbox.textureSize = WebSize(m_size.width(), m_size.height());
 
     GrContext* grContext = m_contextProvider->grContext();
     if (!grContext) {
         mailboxInfo.m_image = image;
         return true; // for testing: skip gl stuff when using a mock graphics context.
     }
 
 #if USE_IOSURFACE_FOR_2D_CANVAS
     if (RuntimeEnabledFeatures::canvas2dImageChromiumEnabled()) {
         if (prepareIOSurfaceMailboxFromImage(image.get(), outMailbox))
@@ skipping 668 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