[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 42fb8c820f5bfd12d4a9be101050c5cc8e9e1f7f
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Mar 13 09:21:24 2010 +0000

    2010-03-13  Simon Hausmann  <simon.hausmann at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] Enable accelerated compositing by default
            https://bugs.webkit.org/show_bug.cgi?id=35866
    
            * Api/qwebsettings.cpp:
            (QWebSettings::QWebSettings):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55955 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebsettings.cpp b/WebKit/qt/Api/qwebsettings.cpp
index 59a7d83..a2616db 100644
--- a/WebKit/qt/Api/qwebsettings.cpp
+++ b/WebKit/qt/Api/qwebsettings.cpp
@@ -391,6 +391,10 @@ QWebSettings* QWebSettings::globalSettings()
     \value LocalContentCanAccessRemoteUrls Specifies whether locally loaded documents are allowed to access remote urls.
     \value LocalContentCanAccessFileUrls Specifies whether locally loaded documents are allowed to access other local urls.
     \value XSSAuditorEnabled Specifies whether load requests should be monitored for cross-site scripting attempts.
+    \value AcceleratedCompositingEnabled This feature, when used in conjunction with
+        QGraphicsWebView, accelerates animations of web content. CSS animations of the transform and
+        opacity properties will be rendered by composing the cached content of the animated elements.
+        This feature is enabled by default
 */
 
 /*!
@@ -423,7 +427,7 @@ QWebSettings::QWebSettings()
     d->attributes.insert(QWebSettings::LocalStorageEnabled, false);
     d->attributes.insert(QWebSettings::LocalContentCanAccessRemoteUrls, false);
     d->attributes.insert(QWebSettings::LocalContentCanAccessFileUrls, true);
-    d->attributes.insert(QWebSettings::AcceleratedCompositingEnabled, false);
+    d->attributes.insert(QWebSettings::AcceleratedCompositingEnabled, true);
     d->attributes.insert(QWebSettings::WebGLEnabled, false);
     d->offlineStorageDefaultQuota = 5 * 1024 * 1024;
     d->defaultTextEncoding = QLatin1String("iso-8859-1");
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 81f91c3..42b59ed 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-13  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Enable accelerated compositing by default
+        https://bugs.webkit.org/show_bug.cgi?id=35866
+
+        * Api/qwebsettings.cpp:
+        (QWebSettings::QWebSettings):
+
 2010-03-11  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by David Hyatt.

-- 
WebKit Debian packaging