[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8
enrica at apple.com
enrica at apple.com
Wed Feb 10 22:14:57 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit cad977cf6c3f6c2a536291266c43760e0e5639a1
Author: enrica at apple.com <enrica at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Feb 4 23:30:35 2010 +0000
Fixed crash on QT introduced with the fix for
https://bugs.webkit.org/show_bug.cgi?id=34609
Reviewed by Csaba Osztrogonac.
The test has been added with the original patch.
* platform/qt/ClipboardQt.cpp:
(WebCore::ClipboardQt::writePlainText): Added missing allocation of m_writeData.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54377 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6d0ca0b..9cd3b0b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-02-04 Enrica Casucci <enrica at apple.com>
+
+ Reviewed by Csaba Osztrogonac.
+
+ Fixed crash on QT introduced with the fix for
+ https://bugs.webkit.org/show_bug.cgi?id=34609
+
+ The test has been added with the original patch.
+
+ * platform/qt/ClipboardQt.cpp:
+ (WebCore::ClipboardQt::writePlainText): Added missing allocation of m_writeData.
+
2010-02-04 Christian Dywan <christian at twotoasts.de>
Reviewed by Xan Lopez.
diff --git a/WebCore/platform/qt/ClipboardQt.cpp b/WebCore/platform/qt/ClipboardQt.cpp
index 5ed4cb0..c23e42e 100644
--- a/WebCore/platform/qt/ClipboardQt.cpp
+++ b/WebCore/platform/qt/ClipboardQt.cpp
@@ -292,6 +292,8 @@ void ClipboardQt::writeRange(Range* range, Frame* frame)
void ClipboardQt::writePlainText(const String& str)
{
+ if (!m_writableData)
+ m_writableData = new QMimeData;
QString text = str;
text.replace(QChar(0xa0), QLatin1Char(' '));
m_writableData->setText(text);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list