[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 15:38:10 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit d0fab09caa4ec76139d2c56b9dbe1040b92dbabf
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 9 19:16:33 2010 +0000
2010-11-09 Peter Rybin <peter.rybin at gmail.com>
Reviewed by Adam Barth.
XMLDocumentParser gets deleted and then used in LayoutTest/fast/frames/set-parent-src-synchronously.xhtml on QT/Linux
https://bugs.webkit.org/show_bug.cgi?id=48643
* dom/XMLDocumentParserQt.cpp:
(WebCore::XMLDocumentParser::doWrite):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71654 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 934267d..57f5260 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-09 Peter Rybin <peter.rybin at gmail.com>
+
+ Reviewed by Adam Barth.
+
+ XMLDocumentParser gets deleted and then used in LayoutTest/fast/frames/set-parent-src-synchronously.xhtml on QT/Linux
+ https://bugs.webkit.org/show_bug.cgi?id=48643
+
+ * dom/XMLDocumentParserQt.cpp:
+ (WebCore::XMLDocumentParser::doWrite):
+
2010-11-09 Simon Fraser <simon.fraser at apple.com>
Reviewed by Dave Hyatt.
diff --git a/WebCore/dom/XMLDocumentParserQt.cpp b/WebCore/dom/XMLDocumentParserQt.cpp
index 03b083e..974784c 100644
--- a/WebCore/dom/XMLDocumentParserQt.cpp
+++ b/WebCore/dom/XMLDocumentParserQt.cpp
@@ -192,6 +192,10 @@ void XMLDocumentParser::doWrite(const String& parseString)
QString data(parseString);
if (!data.isEmpty()) {
+ // JavaScript may cause the parser to detach,
+ // keep this alive until this function is done.
+ RefPtr<XMLDocumentParser> protect(this);
+
m_stream.addData(data);
parse();
}
@@ -716,4 +720,3 @@ void XMLDocumentParser::parseDtd()
}
}
-
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list