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

[cmarrin at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 426eeaedf945925ab9a2c333cabb2a14a7a85b7b
Author: cmarrin at apple.com <cmarrin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 8 22:54:59 2010 +0000

    When WebGL is enabled, enable hardware compositing bypassing check for CoreVideo bug fix
    https://bugs.webkit.org/show_bug.cgi?id=35759
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55685 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7456b20..5b5ef8b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-03-08  Chris Marrin  <cmarrin at apple.com>
+
+        Reviewed by Darin Adler.
+
+        Disallow WebGL when HW comp is not turned on at runtime
+        https://bugs.webkit.org/show_bug.cgi?id=35759
+
+        When HW comp is turned off with the runtime flag, WebGL would still
+        create a context, but silently fail to render. This prevents that.
+        Now if HW comp is turned off getContext('webgl') will return null.
+
+        * html/HTMLCanvasElement.cpp:
+        (WebCore::HTMLCanvasElement::getContext):
+
 2010-03-08  Darin Adler  <darin at apple.com>
 
         Reviewed by Jon Honeycutt.
diff --git a/WebCore/html/HTMLCanvasElement.cpp b/WebCore/html/HTMLCanvasElement.cpp
index adffe4a..61281c4 100644
--- a/WebCore/html/HTMLCanvasElement.cpp
+++ b/WebCore/html/HTMLCanvasElement.cpp
@@ -168,7 +168,7 @@ CanvasRenderingContext* HTMLCanvasElement::getContext(const String& type, Canvas
     }
 #if ENABLE(3D_CANVAS)    
     Settings* settings = document()->settings();
-    if (settings && settings->webGLEnabled()) {
+    if (settings && settings->webGLEnabled() && settings->acceleratedCompositingEnabled()) {
         // Accept the legacy "webkit-3d" name as well as the provisional "experimental-webgl" name.
         // Once ratified, we will also accept "webgl" as the context name.
         if ((type == "webkit-3d") ||
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 6746529..bfbfcd5 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,17 @@
+2010-03-08  Chris Marrin  <cmarrin at apple.com>
+
+        Reviewed by Darin Adler.
+
+        Turn on HW accel on Leopard even if coreVideoHas7228836Fix() is false, when WebGL is enabled
+        https://bugs.webkit.org/show_bug.cgi?id=35759
+
+        This allows WebGL to work on Leopard without the fix. It exposes these users to the crash
+        that happens because of the CoreVideo bug, but it limits the exposure to those who have 
+        chosen to enable WebGL.
+
+        * WebView/WebView.mm:
+        (-[WebView _preferencesChangedNotification:]):
+
 2010-03-02  Adam Treat  <atreat at rim.com>
 
         Reviewed by Dave Hyatt.
diff --git a/WebKit/mac/WebView/WebView.mm b/WebKit/mac/WebView/WebView.mm
index 4b85556..a3c345e 100644
--- a/WebKit/mac/WebView/WebView.mm
+++ b/WebKit/mac/WebView/WebView.mm
@@ -1345,7 +1345,7 @@ static bool fastDocumentTeardownEnabled()
     settings->setZoomMode([preferences zoomsTextOnly] ? ZoomTextOnly : ZoomPage);
     settings->setXSSAuditorEnabled([preferences isXSSAuditorEnabled]);
     settings->setEnforceCSSMIMETypeInStrictMode(!WKAppVersionCheckLessThan(@"com.apple.iWeb", -1, 2.1));
-    settings->setAcceleratedCompositingEnabled(coreVideoHas7228836Fix() && [preferences acceleratedCompositingEnabled]);
+    settings->setAcceleratedCompositingEnabled((coreVideoHas7228836Fix() || [preferences webGLEnabled]) && [preferences acceleratedCompositingEnabled]);
     settings->setShowDebugBorders([preferences showDebugBorders]);
     settings->setShowRepaintCounter([preferences showRepaintCounter]);
     settings->setPluginAllowedRunTime([preferences pluginAllowedRunTime]);

-- 
WebKit Debian packaging