Title: [107380] trunk
- Revision
- 107380
- Author
- [email protected]
- Date
- 2012-02-10 01:06:04 -0800 (Fri, 10 Feb 2012)
Log Message
[Qt] REGRESSION(r107242): It made 5 inspector tests crash in debug mode
https://bugs.webkit.org/show_bug.cgi?id=78330
Reviewed by Yury Semikhatsky.
Source/WebCore:
* inspector/DOMPatchSupport.cpp:
(WebCore::DOMPatchSupport::innerPatchChildren):
LayoutTests:
* platform/chromium/test_expectations.txt:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (107379 => 107380)
--- trunk/LayoutTests/ChangeLog 2012-02-10 09:04:15 UTC (rev 107379)
+++ trunk/LayoutTests/ChangeLog 2012-02-10 09:06:04 UTC (rev 107380)
@@ -1,3 +1,12 @@
+2012-02-10 Pavel Feldman <[email protected]>
+
+ [Qt] REGRESSION(r107242): It made 5 inspector tests crash in debug mode
+ https://bugs.webkit.org/show_bug.cgi?id=78330
+
+ Reviewed by Yury Semikhatsky.
+
+ * platform/chromium/test_expectations.txt:
+
2012-02-10 Adam Barth <[email protected]>
* platform/chromium-mac/storage/domstorage/quota-expected.txt: Removed.
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (107379 => 107380)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2012-02-10 09:04:15 UTC (rev 107379)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2012-02-10 09:06:04 UTC (rev 107380)
@@ -3982,10 +3982,5 @@
// Just needs a rebaseline.
BUGWK47907 : media/video-empty-source.html = IMAGE+TEXT
-// Started crashing after r107242.
-BUGWK78251 DEBUG XP : inspector/elements/edit-dom-actions.html = CRASH
-BUGWK78251 DEBUG XP : inspector/elements/set-outer-html-body.html = CRASH
-BUGWK78251 DEBUG XP : inspector/elements/undo-dom-edits.html = CRASH
-
// Started to fail after r107349.
BUGWK78331 editing/spelling/spelling-marker-description.html = TEXT
Modified: trunk/LayoutTests/platform/qt/Skipped (107379 => 107380)
--- trunk/LayoutTests/platform/qt/Skipped 2012-02-10 09:04:15 UTC (rev 107379)
+++ trunk/LayoutTests/platform/qt/Skipped 2012-02-10 09:06:04 UTC (rev 107380)
@@ -2617,10 +2617,3 @@
# https://bugs.webkit.org/show_bug.cgi?id=78044
fast/text/synthetic-bold-transformed.html
-# [Qt] REGRESSION(r107242): It made 5 inspector tests crash in debug mode
-# https://bugs.webkit.org/show_bug.cgi?id=78330
-inspector/elements/set-outer-html-body.html
-inspector/elements/set-outer-html-2.html
-inspector/elements/undo-dom-edits.html
-inspector/elements/set-outer-html.html
-inspector/elements/edit-dom-actions.html
Modified: trunk/Source/WebCore/ChangeLog (107379 => 107380)
--- trunk/Source/WebCore/ChangeLog 2012-02-10 09:04:15 UTC (rev 107379)
+++ trunk/Source/WebCore/ChangeLog 2012-02-10 09:06:04 UTC (rev 107380)
@@ -1,3 +1,13 @@
+2012-02-10 Pavel Feldman <[email protected]>
+
+ [Qt] REGRESSION(r107242): It made 5 inspector tests crash in debug mode
+ https://bugs.webkit.org/show_bug.cgi?id=78330
+
+ Reviewed by Yury Semikhatsky.
+
+ * inspector/DOMPatchSupport.cpp:
+ (WebCore::DOMPatchSupport::innerPatchChildren):
+
2012-02-09 Andrey Kosyakov <[email protected]>
Web Inspector: [refactoring] TimelineModel should not depend on TimelinePanel
Modified: trunk/Source/WebCore/inspector/DOMPatchSupport.cpp (107379 => 107380)
--- trunk/Source/WebCore/inspector/DOMPatchSupport.cpp 2012-02-10 09:04:15 UTC (rev 107379)
+++ trunk/Source/WebCore/inspector/DOMPatchSupport.cpp 2012-02-10 09:06:04 UTC (rev 107380)
@@ -45,6 +45,7 @@
#include "Node.h"
#include <wtf/Deque.h>
+#include <wtf/HashTraits.h>
#include <wtf/RefPtr.h>
#include <wtf/SHA1.h>
#include <wtf/text/CString.h>
@@ -279,7 +280,7 @@
// 1. First strip everything except for the nodes that retain. Collect pending merges.
HashMap<Digest*, Digest*> merges;
- HashSet<size_t> usedNewOrdinals;
+ HashSet<size_t, WTF::IntHash<size_t>, WTF::UnsignedWithZeroKeyHashTraits<size_t> > usedNewOrdinals;
for (size_t i = 0; i < oldList.size(); ++i) {
if (oldMap[i].first) {
if (!usedNewOrdinals.contains(oldMap[i].second)) {
@@ -320,7 +321,7 @@
}
// Mark retained nodes as used, do not reuse node more than once.
- HashSet<size_t> usedOldOrdinals;
+ HashSet<size_t, WTF::IntHash<size_t>, WTF::UnsignedWithZeroKeyHashTraits<size_t> > usedOldOrdinals;
for (size_t i = 0; i < newList.size(); ++i) {
if (!newMap[i].first)
continue;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
