[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 48aeda70f1347f38b7bd31d8389620e26f7ac124
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 23 07:44:05 2010 +0000

    2010-11-22  Alexey Marinichev  <amarinichev at chromium.org>
    
            Reviewed by Kenneth Russell.
    
            [chromium] Implement Extensions3DChromium::getGraphicsResetStatusARB
            https://bugs.webkit.org/show_bug.cgi?id=49946
    
            * public/WebGraphicsContext3D.h: added isContextLost()
            * src/Extensions3DChromium.cpp:
            (WebCore::Extensions3DChromium::getGraphicsResetStatusARB):
            * src/GraphicsContext3DChromium.cpp:
            (WebCore::GraphicsContext3DInternal::isContextLost):
            * src/GraphicsContext3DInternal.h:
            * src/WebGraphicsContext3DDefaultImpl.cpp:
            (WebKit::WebGraphicsContext3DDefaultImpl::isContextLost):
            * src/WebGraphicsContext3DDefaultImpl.h:
            * src/WebViewImpl.cpp:
            (WebKit::WebViewImpl::reallocateRenderer): ensure root layer repaining
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72587 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index d39c82c..7bc9a7d 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,22 @@
+2010-11-22  Alexey Marinichev  <amarinichev at chromium.org>
+
+        Reviewed by Kenneth Russell.
+
+        [chromium] Implement Extensions3DChromium::getGraphicsResetStatusARB
+        https://bugs.webkit.org/show_bug.cgi?id=49946
+
+        * public/WebGraphicsContext3D.h: added isContextLost()
+        * src/Extensions3DChromium.cpp:
+        (WebCore::Extensions3DChromium::getGraphicsResetStatusARB):
+        * src/GraphicsContext3DChromium.cpp:
+        (WebCore::GraphicsContext3DInternal::isContextLost):
+        * src/GraphicsContext3DInternal.h:
+        * src/WebGraphicsContext3DDefaultImpl.cpp:
+        (WebKit::WebGraphicsContext3DDefaultImpl::isContextLost):
+        * src/WebGraphicsContext3DDefaultImpl.h:
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::reallocateRenderer): ensure root layer repaining
+
 2010-11-22  Jay Civelli  <jcivelli at chromium.org>
 
         Reviewed by David Levin.
diff --git a/WebKit/chromium/public/WebGraphicsContext3D.h b/WebKit/chromium/public/WebGraphicsContext3D.h
index 932004c..05c164a 100644
--- a/WebKit/chromium/public/WebGraphicsContext3D.h
+++ b/WebKit/chromium/public/WebGraphicsContext3D.h
@@ -203,6 +203,8 @@ public:
 
     virtual unsigned long getError() = 0;
 
+    virtual bool isContextLost() = 0;
+
     virtual void getFloatv(unsigned long pname, float* value) = 0;
 
     virtual void getFramebufferAttachmentParameteriv(unsigned long target, unsigned long attachment, unsigned long pname, int* value) = 0;
diff --git a/WebKit/chromium/src/Extensions3DChromium.cpp b/WebKit/chromium/src/Extensions3DChromium.cpp
index c36040b..fe04986 100644
--- a/WebKit/chromium/src/Extensions3DChromium.cpp
+++ b/WebKit/chromium/src/Extensions3DChromium.cpp
@@ -50,8 +50,7 @@ bool Extensions3DChromium::supports(const String& name)
 
 int Extensions3DChromium::getGraphicsResetStatusARB()
 {
-    // FIXME: implement this in GraphicsContext3DInternal / WebGraphicsContext3DInternal.
-    return GraphicsContext3D::NO_ERROR;
+    return m_internal->isContextLost() ? static_cast<int>(Extensions3D::UNKNOWN_CONTEXT_RESET_ARB) : static_cast<int>(GraphicsContext3D::NO_ERROR);
 }
 
 void* Extensions3DChromium::mapBufferSubDataCHROMIUM(unsigned target, int offset, int size, unsigned access)
diff --git a/WebKit/chromium/src/GraphicsContext3DChromium.cpp b/WebKit/chromium/src/GraphicsContext3DChromium.cpp
index 8cfe8c0..cc0c5bc 100644
--- a/WebKit/chromium/src/GraphicsContext3DChromium.cpp
+++ b/WebKit/chromium/src/GraphicsContext3DChromium.cpp
@@ -246,6 +246,11 @@ void GraphicsContext3DInternal::reshape(int width, int height)
 #endif // PLATFORM(CG)
 }
 
+bool GraphicsContext3DInternal::isContextLost()
+{
+    return m_impl->isContextLost();
+}
+
 // Macros to assist in delegating from GraphicsContext3DInternal to
 // WebGraphicsContext3D.
 
diff --git a/WebKit/chromium/src/GraphicsContext3DInternal.h b/WebKit/chromium/src/GraphicsContext3DInternal.h
index 4453d28..220cbb8 100644
--- a/WebKit/chromium/src/GraphicsContext3DInternal.h
+++ b/WebKit/chromium/src/GraphicsContext3DInternal.h
@@ -140,6 +140,8 @@ public:
 
     unsigned long getError();
 
+    bool isContextLost();
+
     void getFloatv(unsigned long pname, float* value);
 
     void getFramebufferAttachmentParameteriv(unsigned long target, unsigned long attachment, unsigned long pname, int* value);
diff --git a/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp b/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp
index e9e483c..9a74601 100644
--- a/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp
+++ b/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp
@@ -987,6 +987,11 @@ unsigned long WebGraphicsContext3DDefaultImpl::getError()
     return glGetError();
 }
 
+bool WebGraphicsContext3DDefaultImpl::isContextLost()
+{
+    return false;
+}
+
 DELEGATE_TO_GL_2(getFloatv, GetFloatv, unsigned long, float*)
 
 void WebGraphicsContext3DDefaultImpl::getFramebufferAttachmentParameteriv(unsigned long target, unsigned long attachment,
diff --git a/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.h b/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.h
index e865710..32e3671 100644
--- a/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.h
+++ b/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.h
@@ -145,6 +145,8 @@ public:
 
     virtual unsigned long getError();
 
+    virtual bool isContextLost();
+
     virtual void getFloatv(unsigned long pname, float* value);
 
     virtual void getFramebufferAttachmentParameteriv(unsigned long target, unsigned long attachment, unsigned long pname, int* value);
diff --git a/WebKit/chromium/src/WebViewImpl.cpp b/WebKit/chromium/src/WebViewImpl.cpp
index 44ea116..ff45d71 100644
--- a/WebKit/chromium/src/WebViewImpl.cpp
+++ b/WebKit/chromium/src/WebViewImpl.cpp
@@ -2494,6 +2494,7 @@ void WebViewImpl::reallocateRenderer()
     m_layerRenderer = layerRenderer;
 
     // Enable or disable accelerated compositing and request a refresh.
+    m_isAcceleratedCompositingActive = false;
     setRootGraphicsLayer(m_layerRenderer ? m_layerRenderer->rootLayer() : 0);
 }
 #endif

-- 
WebKit Debian packaging