[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit ef575e8954a6c23580d54d4589b2547a1870a805
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 26 21:33:10 2010 +0000

    2010-02-26  Jarkko Sakkinen  <jarkko.sakkinen at tieto.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            https://bugs.webkit.org/show_bug.cgi?id=35419
            3D canvas did not update when WTF_USE_ACCELERATED_COMPOSITING
            was enabled but not from run-time settings. Added run-time
            check that compositing is enabled.
    
            * html/canvas/WebGLRenderingContext.cpp:
            (WebCore::WebGLRenderingContext::markContextChanged):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55306 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 34fd8d0..9a19a94 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,18 @@
 
         Reviewed by Kenneth Rohde Christiansen.
 
+        https://bugs.webkit.org/show_bug.cgi?id=35419
+        3D canvas did not update when WTF_USE_ACCELERATED_COMPOSITING
+        was enabled but not from run-time settings. Added run-time 
+        check that compositing is enabled.
+
+        * html/canvas/WebGLRenderingContext.cpp:
+        (WebCore::WebGLRenderingContext::markContextChanged):
+
+2010-02-26  Jarkko Sakkinen  <jarkko.sakkinen at tieto.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
         Compilation failed because functions glSampleCoverage, glBlendEquation
         and glActiveTexture were not available.
         https://bugs.webkit.org/show_bug.cgi?id=35423
diff --git a/WebCore/html/canvas/WebGLRenderingContext.cpp b/WebCore/html/canvas/WebGLRenderingContext.cpp
index e258a61..5e908a9 100644
--- a/WebCore/html/canvas/WebGLRenderingContext.cpp
+++ b/WebCore/html/canvas/WebGLRenderingContext.cpp
@@ -108,7 +108,7 @@ WebGLRenderingContext::~WebGLRenderingContext()
 void WebGLRenderingContext::markContextChanged()
 {
 #if USE(ACCELERATED_COMPOSITING)
-    if (canvas()->renderBox() && canvas()->renderBox()->hasLayer()) {
+    if (canvas()->renderBox() && canvas()->renderBox()->hasLayer() && canvas()->renderBox()->layer()->hasAcceleratedCompositing()) {
         canvas()->renderBox()->layer()->rendererContentChanged();
     } else {
 #endif

-- 
WebKit Debian packaging