[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

commit-queue at webkit.org commit-queue at webkit.org
Wed Dec 22 13:01:46 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit aa37c32b5066fc32158b178fe90369176f004db2
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Sep 5 16:30:57 2010 +0000

    2010-09-05  Sheriff Bot  <webkit.review.bot at gmail.com>
    
            Unreviewed, rolling out r66801.
            http://trac.webkit.org/changeset/66801
            https://bugs.webkit.org/show_bug.cgi?id=45242
    
            'breaks editing/pasteboard/onpaste-text-html.html' (Requested
            by mwenge4 on #webkit).
    
            * platform/qt/Skipped:
    2010-09-05  Sheriff Bot  <webkit.review.bot at gmail.com>
    
            Unreviewed, rolling out r66801.
            http://trac.webkit.org/changeset/66801
            https://bugs.webkit.org/show_bug.cgi?id=45242
    
            'breaks editing/pasteboard/onpaste-text-html.html' (Requested
            by mwenge4 on #webkit).
    
            * WebCoreSupport/ChromeClientQt.cpp:
            (WebCore::ChromeClientQt::addMessageToConsole):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66803 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index eb35a74..58e560a 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-05  Sheriff Bot  <webkit.review.bot at gmail.com>
+
+        Unreviewed, rolling out r66801.
+        http://trac.webkit.org/changeset/66801
+        https://bugs.webkit.org/show_bug.cgi?id=45242
+
+        'breaks editing/pasteboard/onpaste-text-html.html' (Requested
+        by mwenge4 on #webkit).
+
+        * platform/qt/Skipped:
+
 2010-09-05  Jeremy Orlow  <jorlow at chromium.org>
 
         Reviewed by Steve Block.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index b3503c8..9c9210b 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -181,6 +181,11 @@ http/tests/security/frameNavigation/not-opener.html
 # missing origin header
 http/tests/security/originHeader/origin-header-for-empty.html
 
+# Possibly related to https://bugs.webkit.org/show_bug.cgi?id=35263
+# are we utf-encoding a string twice over?
+http/tests/security/xssAuditor/embed-tag-null-char.html
+http/tests/security/xssAuditor/object-embed-tag-null-char.html
+
 # Disabled HTTP subdirs for now, needs investigation.
 http/tests/media
 http/tests/wml
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 65e482e..f4dd2db 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-05  Sheriff Bot  <webkit.review.bot at gmail.com>
+
+        Unreviewed, rolling out r66801.
+        http://trac.webkit.org/changeset/66801
+        https://bugs.webkit.org/show_bug.cgi?id=45242
+
+        'breaks editing/pasteboard/onpaste-text-html.html' (Requested
+        by mwenge4 on #webkit).
+
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::addMessageToConsole):
+
 2010-09-05  Robert Hogan  <robert at webkit.org>
 
         Reviewed by Antonio Gomes.
diff --git a/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp b/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
index 2585f6a..8b01d4d 100644
--- a/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
@@ -265,7 +265,7 @@ void ChromeClientQt::setResizable(bool)
 void ChromeClientQt::addMessageToConsole(MessageSource, MessageType, MessageLevel, const String& message,
                                          unsigned int lineNumber, const String& sourceID)
 {
-    QString x = QString(message.utf8().data());
+    QString x = message;
     QString y = sourceID;
     m_webPage->javaScriptConsoleMessage(x, lineNumber, y);
 }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list