[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 6c67397c491d9f69eb206a363e93d465932fcd9e
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 30 23:17:43 2010 +0000

    2010-09-30  Alexey Marinichev  <amarinichev at chromium.org>
    
            Reviewed by Chris Marrin.
    
            Add GetGraphicsResetStatusARB entry point from ARB_robustness
            extension to GraphicsContext3D
            https://bugs.webkit.org/show_bug.cgi?id=46850
    
            Added stubs for GraphicsContext3D::getGraphicsResetStatusARB for
            Mac and QT.
    
            * platform/graphics/GraphicsContext3D.h:
            * platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
            (WebCore::GraphicsContext3D::getGraphicsResetStatusARB):
            * platform/graphics/qt/GraphicsContext3DQt.cpp:
            (WebCore::GraphicsContext3D::getGraphicsResetStatusARB):
    2010-09-30  Alexey Marinichev  <amarinichev at chromium.org>
    
            Reviewed by Chris Marrin.
    
            Add GetGraphicsResetStatusARB entry point from ARB_robustness
            extension to GraphicsContext3D
            https://bugs.webkit.org/show_bug.cgi?id=46850
    
            Added a stub for GraphicsContext3D::getGraphicsResetStatusARB.
    
            * src/GraphicsContext3DChromium.cpp:
            (WebCore::GraphicsContext3D::getGraphicsResetStatusARB):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68850 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d84943d..21353e3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-09-30  Alexey Marinichev  <amarinichev at chromium.org>
+
+        Reviewed by Chris Marrin.
+
+        Add GetGraphicsResetStatusARB entry point from ARB_robustness
+        extension to GraphicsContext3D
+        https://bugs.webkit.org/show_bug.cgi?id=46850
+
+        Added stubs for GraphicsContext3D::getGraphicsResetStatusARB for
+        Mac and QT.
+
+        * platform/graphics/GraphicsContext3D.h:
+        * platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
+        (WebCore::GraphicsContext3D::getGraphicsResetStatusARB):
+        * platform/graphics/qt/GraphicsContext3DQt.cpp:
+        (WebCore::GraphicsContext3D::getGraphicsResetStatusARB):
+
 2010-09-30  David Hyatt  <hyatt at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebCore/platform/graphics/GraphicsContext3D.h b/WebCore/platform/graphics/GraphicsContext3D.h
index a12b1c4..28ef8f2 100644
--- a/WebCore/platform/graphics/GraphicsContext3D.h
+++ b/WebCore/platform/graphics/GraphicsContext3D.h
@@ -409,7 +409,13 @@ public:
 
         // GL_CHROMIUM_map_sub (enums inherited from GL_ARB_vertex_buffer_object)
         READ_ONLY = 0x88B8,
-        WRITE_ONLY = 0x88B9
+        WRITE_ONLY = 0x88B9,
+
+        // GL_ARB_robustness enums
+        GUILTY_CONTEXT_RESET_ARB = 0x8253,
+        INNOCENT_CONTEXT_RESET_ARB = 0x8254,
+        UNKNOWN_CONTEXT_RESET_ARB = 0x8255
+
     };
 
     // Context creation attributes.
@@ -777,6 +783,9 @@ public:
     bool supportsCopyTextureToParentTextureCHROMIUM();
     void copyTextureToParentTextureCHROMIUM(unsigned texture, unsigned parentTexture);
 
+    // GL_ARB_robustness
+    int getGraphicsResetStatusARB();
+
   private:
     GraphicsContext3D(Attributes attrs, HostWindow* hostWindow, bool renderDirectlyToHostWindow);
 
diff --git a/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp b/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
index 53d9b86..438312f 100644
--- a/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
+++ b/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
@@ -1449,6 +1449,11 @@ void GraphicsContext3D::synthesizeGLError(unsigned long error)
     m_syntheticErrors.add(error);
 }
 
+int GraphicsContext3D::getGraphicsResetStatusARB()
+{
+    return NO_ERROR;
+}
+
 }
 
 #endif // ENABLE(3D_CANVAS)
diff --git a/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp b/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp
index 0756aa7..cda8606 100644
--- a/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp
+++ b/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp
@@ -286,6 +286,11 @@ bool GraphicsContext3D::isErrorGeneratedOnOutOfBoundsAccesses() const
     return false;
 }
 
+int GraphicsContext3D::getGraphicsResetStatusARB()
+{
+    return NO_ERROR;
+}
+
  
 GraphicsContext3DInternal::GraphicsContext3DInternal(GraphicsContext3D::Attributes attrs, HostWindow* hostWindow)
     : m_attrs(attrs)
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 4d32c54..685ac20 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-30  Alexey Marinichev  <amarinichev at chromium.org>
+
+        Reviewed by Chris Marrin.
+
+        Add GetGraphicsResetStatusARB entry point from ARB_robustness
+        extension to GraphicsContext3D
+        https://bugs.webkit.org/show_bug.cgi?id=46850
+
+        Added a stub for GraphicsContext3D::getGraphicsResetStatusARB.
+
+        * src/GraphicsContext3DChromium.cpp:
+        (WebCore::GraphicsContext3D::getGraphicsResetStatusARB):
+
 2010-09-30  Dumitru Daniliuc  <dumi at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/src/GraphicsContext3DChromium.cpp b/WebKit/chromium/src/GraphicsContext3DChromium.cpp
index c78d334..b859b05 100644
--- a/WebKit/chromium/src/GraphicsContext3DChromium.cpp
+++ b/WebKit/chromium/src/GraphicsContext3DChromium.cpp
@@ -1047,6 +1047,11 @@ bool GraphicsContext3D::isErrorGeneratedOnOutOfBoundsAccesses() const
     return m_internal->isErrorGeneratedOnOutOfBoundsAccesses();
 }
 
+int GraphicsContext3D::getGraphicsResetStatusARB()
+{
+    return NO_ERROR;
+}
+
 } // namespace WebCore
 
 #endif // ENABLE(3D_CANVAS)

-- 
WebKit Debian packaging