[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 193f2d792f69af32428eca7e5ed6d7a4e0cb4ba4
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 26 16:53:21 2010 +0000

    2010-02-26  Diego Gonzalez  <diego.gonzalez at openbossa.org>
    
            Reviewed by Simon Hausmann.
    
            Fix documentation of QWebSettings::setUserStyleSheetUrl method
    
            The base 64 data in the exemple shows a not valid code.
    
            REGRESSION: QWebSettings::setUserStyleSheetUrl is not working with a data URL (Base64)
            https://bugs.webkit.org/show_bug.cgi?id=34802
    
            * Api/qwebsettings.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55288 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebsettings.cpp b/WebKit/qt/Api/qwebsettings.cpp
index b6b58da..ce4929f 100644
--- a/WebKit/qt/Api/qwebsettings.cpp
+++ b/WebKit/qt/Api/qwebsettings.cpp
@@ -478,7 +478,8 @@ void QWebSettings::resetFontSize(FontSize type)
     The \a location must be either a path on the local filesystem, or a data URL
     with UTF-8 and Base64 encoded data, such as:
 
-    "data:text/css;charset=utf-8;base64,cCB7IGJhY2tncm91bmQtY29sb3I6IHJlZCB9Ow==;"
+    "data:text/css;charset=utf-8;base64,cCB7IGJhY2tncm91bmQtY29sb3I6IHJlZCB9Ow=="
+    NOTE: In case the base 64 data is not valid the style will not be applied.
 
     \sa userStyleSheetUrl()
 */
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 3ef61a0..fd7478d 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,16 @@
+2010-02-26  Diego Gonzalez  <diego.gonzalez at openbossa.org>
+
+        Reviewed by Simon Hausmann.
+
+        Fix documentation of QWebSettings::setUserStyleSheetUrl method
+
+        The base 64 data in the exemple shows a not valid code.
+
+        REGRESSION: QWebSettings::setUserStyleSheetUrl is not working with a data URL (Base64)
+        https://bugs.webkit.org/show_bug.cgi?id=34802
+
+        * Api/qwebsettings.cpp:
+
 2010-02-26  Jamey Hicks  <jamey.hicks at nokia.com>
 
         Reviewed by Laszlo Gombos.

-- 
WebKit Debian packaging