Reenable IOSurface Canvas2D. Disable new trace tests.

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 210 matching lines @@
     GLuint imageTexture = skia::GrBackendObjectToGrGLTextureInfo(image->getTextureHandle(true))->fID;
     gl->CopySubTextureCHROMIUM(imageTexture, imageInfo.m_textureId, 0, 0, 0, 0, m_size.width(), m_size.height(), GL_FALSE, GL_FALSE, GL_FALSE);
 
     MailboxInfo& info = m_mailboxes.first();
     info.m_mailbox.textureTarget = GC3D_TEXTURE_RECTANGLE_ARB;
     gl->GenMailboxCHROMIUM(info.m_mailbox.name);
     gl->ProduceTextureDirectCHROMIUM(imageInfo.m_textureId, info.m_mailbox.textureTarget, info.m_mailbox.name);
     info.m_mailbox.allowOverlay = true;
 
     const WGC3Duint64 fenceSync = gl->InsertFenceSyncCHROMIUM();
-    context()->flush();
+    gl->Flush();
     gl->GenSyncTokenCHROMIUM(fenceSync, info.m_mailbox.syncToken);
     info.m_mailbox.validSyncToken = true;
 
     info.m_imageInfo = imageInfo;
     *outMailbox = info.m_mailbox;
 
     gl->BindTexture(GC3D_TEXTURE_RECTANGLE_ARB, 0);
 
     // Because we are changing the texture binding without going through skia,
     // we must dirty the context.
@@ skipping 765 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