Merge 91736 - Source/WebCore: Removed support for the GL_latch_CHROMIUM extension which Chromium ...

Source/WebCore/platform/graphics/chromium/Canvas2DLayerChromium.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 70 matching lines @@
         context->bindTexture(GraphicsContext3D::TEXTURE_2D, m_textureId);
         IntSize size = m_drawingBuffer->size();
         context->texImage2DResourceSafe(GraphicsContext3D::TEXTURE_2D, 0, GraphicsContext3D::RGBA, size.width(), size.height(), 0, GraphicsContext3D::RGBA, GraphicsContext3D::UNSIGNED_BYTE);
         // Set the min-mag filters to linear and wrap modes to GraphicsContext3D::CLAMP_TO_EDGE
         // to get around NPOT texture limitations of GLES.
         context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_MIN_FILTER, GraphicsContext3D::LINEAR);
         context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_MAG_FILTER, GraphicsContext3D::LINEAR);
         context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_WRAP_S, GraphicsContext3D::CLAMP_TO_EDGE);
         context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_WRAP_T, GraphicsContext3D::CLAMP_TO_EDGE);
         m_textureChanged = false;
-        // FIXME: The finish() here is required because we have to make sure that the texture created in this
+        // The flush() here is required because we have to make sure that the texture created in this
         // context (the compositor context) is actually created by the service side before the child context
-        // attempts to use it (in publishToPlatformLayer).  finish() is currently the only call with strong
-        // enough semantics to promise this, but is actually much stronger.  Ideally we'd do something like
-        // inserting a fence here and waiting for it before trying to publish.
-        context->finish();
+        // attempts to use it (in publishToPlatformLayer).
+        context->flush();
     }
     // Update the contents of the texture used by the compositor.
     if (m_contentsDirty) {
         m_drawingBuffer->publishToPlatformLayer();
         m_contentsDirty = false;
     }
 }
 
 void Canvas2DLayerChromium::setTextureChanged()
 {
@@ skipping 28 matching lines @@
             if (newLayerRenderer)
                 newLayerRenderer->addChildContext(m_drawingBuffer->graphicsContext3D().get());
         }
 
         LayerChromium::setLayerRenderer(newLayerRenderer);
     }
 }
 
 }
 #endif // USE(ACCELERATED_COMPOSITING)