Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / platform / graphics / gpu / DrawingBufferTest.cpp

diff --git a/src/third_party/WebKit/Source/platform/graphics/gpu/DrawingBufferTest.cpp b/src/third_party/WebKit/Source/platform/graphics/gpu/DrawingBufferTest.cpp
index fdaadf7..9060e18 100644 (file)
--- a/src/third_party/WebKit/Source/platform/graphics/gpu/DrawingBufferTest.cpp
+++ b/src/third_party/WebKit/Source/platform/graphics/gpu/DrawingBufferTest.cpp
@@ -109,7 +109,7 @@ public:
         m_mostRecentlyWaitedSyncPoint = syncPoint;
     }
 
-    virtual WGC3Duint createImageCHROMIUM(WGC3Dsizei width, WGC3Dsizei height, WGC3Denum internalformat, WGC3Denum usage)
+    virtual WGC3Duint createGpuMemoryBufferImageCHROMIUM(WGC3Dsizei width, WGC3Dsizei height, WGC3Denum internalformat, WGC3Denum usage)
     {
         m_imageSizes.set(m_currentImageId, IntSize(width, height));
         return m_currentImageId++;
@@ -190,7 +190,7 @@ public:
         PreserveDrawingBuffer preserve,
         PassRefPtr<ContextEvictionManager> contextEvictionManager)
         : DrawingBuffer(context, extensionsUtil, false /* multisampleExtensionSupported */,
-            false /* packedDepthStencilExtensionSupported */, preserve, WebGraphicsContext3D::Attributes(), contextEvictionManager)
+            false /* packedDepthStencilExtensionSupported */, false /* discardFramebufferSupported */, preserve, WebGraphicsContext3D::Attributes(), contextEvictionManager)
         , m_live(0)
     { }
 
@@ -547,7 +547,7 @@ public:
     WebGLId stencilAttachment() const { return m_stencilAttachment; }
     WebGLId depthAttachment() const { return m_depthAttachment; }
 
-    virtual WebString getString(WGC3Denum type) OVERRIDE
+    virtual WebString getString(WGC3Denum type) override
     {
         if (type == GL_EXTENSIONS) {
             return WebString::fromUTF8("GL_OES_packed_depth_stencil");
@@ -555,12 +555,12 @@ public:
         return WebString();
     }
 
-    virtual WebGLId createRenderbuffer() OVERRIDE
+    virtual WebGLId createRenderbuffer() override
     {
         return ++m_nextRenderBufferId;
     }
 
-    virtual void framebufferRenderbuffer(WGC3Denum target, WGC3Denum attachment, WGC3Denum renderbuffertarget, WebGLId renderbuffer) OVERRIDE
+    virtual void framebufferRenderbuffer(WGC3Denum target, WGC3Denum attachment, WGC3Denum renderbuffertarget, WebGLId renderbuffer) override
     {
         if (attachment == GL_STENCIL_ATTACHMENT) {
             m_stencilAttachment = renderbuffer;
@@ -569,7 +569,7 @@ public:
         }
     }
 
-    virtual void getIntegerv(WGC3Denum ptype, WGC3Dint* value) OVERRIDE
+    virtual void getIntegerv(WGC3Denum ptype, WGC3Dint* value) override
     {
         switch (ptype) {
         case GL_DEPTH_BITS: