1 files changed, 51 insertions, 56 deletions

diff --git a/WebCore/platform/graphics/gpu/DrawingBuffer.cpp b/WebCore/platform/graphics/gpu/DrawingBuffer.cpp
index 8cb6d0c..d2415ca 100644
--- a/WebCore/platform/graphics/gpu/DrawingBuffer.cpp
+++ b/WebCore/platform/graphics/gpu/DrawingBuffer.cpp
@@ -41,7 +41,13 @@ namespace WebCore {
 PassRefPtr<DrawingBuffer> DrawingBuffer::create(GraphicsContext3D* context, const IntSize& size)
 {
     RefPtr<DrawingBuffer> drawingBuffer = adoptRef(new DrawingBuffer(context, size));
-    drawingBuffer->m_multisampleExtensionSupported = context->getExtensions()->supports("GL_ANGLE_framebuffer_blit") && context->getExtensions()->supports("GL_ANGLE_framebuffer_multisample");
+    Extensions3D* extensions = context->getExtensions();
+    bool multisampleSupported = extensions->supports("GL_ANGLE_framebuffer_blit") && extensions->supports("GL_ANGLE_framebuffer_multisample");
+    if (multisampleSupported) {
+        extensions->ensureEnabled("GL_ANGLE_framebuffer_blit");
+        extensions->ensureEnabled("GL_ANGLE_framebuffer_multisample");
+    }
+    drawingBuffer->m_multisampleExtensionSupported = multisampleSupported;
     return (drawingBuffer->m_context) ? drawingBuffer.release() : 0;
 }
 
@@ -113,13 +119,11 @@ void DrawingBuffer::reset(const IntSize& newSize)
 
     // resize multisample FBO
     if (multisample()) {
-        int maxSampleCount;
+        int maxSampleCount = 0;
         
         m_context->getIntegerv(Extensions3D::MAX_SAMPLES, &maxSampleCount);
         int sampleCount = std::min(8, maxSampleCount);
-        if (sampleCount > maxSampleCount)
-            sampleCount = maxSampleCount;
-        
+
         m_context->bindFramebuffer(GraphicsContext3D::FRAMEBUFFER, m_multisampleFBO);
 
         m_context->bindRenderbuffer(GraphicsContext3D::RENDERBUFFER, m_multisampleColorBuffer);
@@ -145,7 +149,7 @@ void DrawingBuffer::reset(const IntSize& newSize)
     m_context->bindFramebuffer(GraphicsContext3D::FRAMEBUFFER, m_fbo);
 
     m_context->bindTexture(GraphicsContext3D::TEXTURE_2D, m_colorBuffer);
-    m_context->texImage2D(GraphicsContext3D::TEXTURE_2D, 0, internalColorFormat, m_size.width(), m_size.height(), 0, colorFormat, GraphicsContext3D::UNSIGNED_BYTE, 0);
+    m_context->texImage2DResourceSafe(GraphicsContext3D::TEXTURE_2D, 0, internalColorFormat, m_size.width(), m_size.height(), 0, colorFormat, GraphicsContext3D::UNSIGNED_BYTE);
     m_context->framebufferTexture2D(GraphicsContext3D::FRAMEBUFFER, GraphicsContext3D::COLOR_ATTACHMENT0, GraphicsContext3D::TEXTURE, m_colorBuffer, 0);
     m_context->bindTexture(GraphicsContext3D::TEXTURE_2D, 0);
     if (!multisample() && (attributes.stencil || attributes.depth)) {
@@ -166,57 +170,48 @@ void DrawingBuffer::reset(const IntSize& newSize)
     if (multisample())
         m_context->bindFramebuffer(GraphicsContext3D::FRAMEBUFFER, m_multisampleFBO);
 
-    // Initialize renderbuffers to 0.
-    float clearColor[] = {0, 0, 0, 0}, clearDepth = 0;
-    int clearStencil = 0;
-    unsigned char colorMask[] = {true, true, true, true}, depthMask = true;
-    unsigned int stencilMask = 0xffffffff;
-    unsigned char isScissorEnabled = false;
-    unsigned char isDitherEnabled = false;
-    unsigned long clearMask = GraphicsContext3D::COLOR_BUFFER_BIT;
-    m_context->getFloatv(GraphicsContext3D::COLOR_CLEAR_VALUE, clearColor);
-    m_context->clearColor(0, 0, 0, 0);
-    m_context->getBooleanv(GraphicsContext3D::COLOR_WRITEMASK, colorMask);
-    m_context->colorMask(true, true, true, true);
-    if (attributes.depth) {
-        m_context->getFloatv(GraphicsContext3D::DEPTH_CLEAR_VALUE, &clearDepth);
-        m_context->clearDepth(1);
-        m_context->getBooleanv(GraphicsContext3D::DEPTH_WRITEMASK, &depthMask);
-        m_context->depthMask(true);
-        clearMask |= GraphicsContext3D::DEPTH_BUFFER_BIT;
-    }
-    if (attributes.stencil) {
-        m_context->getIntegerv(GraphicsContext3D::STENCIL_CLEAR_VALUE, &clearStencil);
-        m_context->clearStencil(0);
-        m_context->getIntegerv(GraphicsContext3D::STENCIL_WRITEMASK, reinterpret_cast<int*>(&stencilMask));
-        m_context->stencilMaskSeparate(GraphicsContext3D::FRONT, 0xffffffff);
-        clearMask |= GraphicsContext3D::STENCIL_BUFFER_BIT;
-    }
-    isScissorEnabled = m_context->isEnabled(GraphicsContext3D::SCISSOR_TEST);
-    m_context->disable(GraphicsContext3D::SCISSOR_TEST);
-    isDitherEnabled = m_context->isEnabled(GraphicsContext3D::DITHER);
-    m_context->disable(GraphicsContext3D::DITHER);
-
-    m_context->clear(clearMask);
-
-    m_context->clearColor(clearColor[0], clearColor[1], clearColor[2], clearColor[3]);
-    m_context->colorMask(colorMask[0], colorMask[1], colorMask[2], colorMask[3]);
-    if (attributes.depth) {
-        m_context->clearDepth(clearDepth);
-        m_context->depthMask(depthMask);
-    }
-    if (attributes.stencil) {
-        m_context->clearStencil(clearStencil);
-        m_context->stencilMaskSeparate(GraphicsContext3D::FRONT, stencilMask);
+    if (!m_context->getExtensions()->supports("GL_CHROMIUM_resource_safe")) {
+        // Initialize renderbuffers (depth/stencil).
+        float clearDepth = 0;
+        int clearStencil = 0;
+        unsigned char depthMask = true;
+        unsigned int stencilMask = 0xffffffff;
+        unsigned char isScissorEnabled = false;
+        unsigned long clearMask = 0;
+        if (attributes.depth) {
+            m_context->getFloatv(GraphicsContext3D::DEPTH_CLEAR_VALUE, &clearDepth);
+            m_context->clearDepth(1);
+            m_context->getBooleanv(GraphicsContext3D::DEPTH_WRITEMASK, &depthMask);
+            m_context->depthMask(true);
+            clearMask |= GraphicsContext3D::DEPTH_BUFFER_BIT;
+        }
+        if (attributes.stencil) {
+            m_context->getIntegerv(GraphicsContext3D::STENCIL_CLEAR_VALUE, &clearStencil);
+            m_context->clearStencil(0);
+            m_context->getIntegerv(GraphicsContext3D::STENCIL_WRITEMASK, reinterpret_cast<int*>(&stencilMask));
+            m_context->stencilMaskSeparate(GraphicsContext3D::FRONT, 0xffffffff);
+            clearMask |= GraphicsContext3D::STENCIL_BUFFER_BIT;
+        }
+        if (clearMask) {
+            isScissorEnabled = m_context->isEnabled(GraphicsContext3D::SCISSOR_TEST);
+            m_context->disable(GraphicsContext3D::SCISSOR_TEST);
+
+            m_context->clear(clearMask);
+
+            if (attributes.depth) {
+                m_context->clearDepth(clearDepth);
+                m_context->depthMask(depthMask);
+            }
+            if (attributes.stencil) {
+                m_context->clearStencil(clearStencil);
+                m_context->stencilMaskSeparate(GraphicsContext3D::FRONT, stencilMask);
+            }
+            if (isScissorEnabled)
+                m_context->enable(GraphicsContext3D::SCISSOR_TEST);
+            else
+                m_context->disable(GraphicsContext3D::SCISSOR_TEST);
+        }
     }
-    if (isScissorEnabled)
-        m_context->enable(GraphicsContext3D::SCISSOR_TEST);
-    else
-        m_context->disable(GraphicsContext3D::SCISSOR_TEST);
-    if (isDitherEnabled)
-        m_context->enable(GraphicsContext3D::DITHER);
-    else
-        m_context->disable(GraphicsContext3D::DITHER);
 
     m_context->flush();