- Revision
- 127380
- Author
- [email protected]
- Date
- 2012-09-01 12:42:46 -0700 (Sat, 01 Sep 2012)
Log Message
fast/events/message-port-clone.html hits ASSERT in Debug (usually in later tests)
https://bugs.webkit.org/show_bug.cgi?id=85811
Patch by Li Yin <[email protected]> on 2012-09-01
Reviewed by Kenneth Rohde Christiansen.
Source/WebCore:
When MessagePort invoked close function, the close status is needed to set,
regardless of whether the port is cloned or not.
Tests: fast/events/message-port-clone.html
fast/events/message-port-close.html
* dom/MessagePort.cpp:
(WebCore::MessagePort::close): Must set m_closed to be true.
LayoutTests:
* platform/gtk/TestExpectations:
* platform/mac/Skipped:
* platform/qt-4.8/TestExpectations:
* platform/qt-mac/TestExpectations:
* platform/qt/TestExpectations:
* platform/win/Skipped:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (127379 => 127380)
--- trunk/LayoutTests/ChangeLog 2012-09-01 19:26:50 UTC (rev 127379)
+++ trunk/LayoutTests/ChangeLog 2012-09-01 19:42:46 UTC (rev 127380)
@@ -1,3 +1,17 @@
+2012-09-01 Li Yin <[email protected]>
+
+ fast/events/message-port-clone.html hits ASSERT in Debug (usually in later tests)
+ https://bugs.webkit.org/show_bug.cgi?id=85811
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ * platform/gtk/TestExpectations:
+ * platform/mac/Skipped:
+ * platform/qt-4.8/TestExpectations:
+ * platform/qt-mac/TestExpectations:
+ * platform/qt/TestExpectations:
+ * platform/win/Skipped:
+
2012-09-01 Xianzhu Wang <[email protected]>
[Chromium-Android] Upstream layout test expectations (Part 4)
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (127379 => 127380)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2012-09-01 19:26:50 UTC (rev 127379)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2012-09-01 19:42:46 UTC (rev 127380)
@@ -443,8 +443,6 @@
BUGWK74297 DEBUG : http/tests/security/cross-origin-xsl-redirect-BLOCKED.html = CRASH PASS
-BUGWK85811 DEBUG : fast/events/message-port-close.html = CRASH PASS
-
BUGWK86443 : plugins/npruntime/delete-plugin-within-getProperty.html = CRASH
BUGWK86443 DEBUG : plugins/npruntime/delete-plugin-within-invoke.html = CRASH
Modified: trunk/LayoutTests/platform/mac/Skipped (127379 => 127380)
--- trunk/LayoutTests/platform/mac/Skipped 2012-09-01 19:26:50 UTC (rev 127379)
+++ trunk/LayoutTests/platform/mac/Skipped 2012-09-01 19:42:46 UTC (rev 127380)
@@ -872,10 +872,6 @@
fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgba4444.html
fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgba5551.html
-# Asserts in MessagePort::contextDestroyed
-# https://bugs.webkit.org/show_bug.cgi?id=85811
-fast/events/message-port-clone.html
-
# Times out without keyboard interaction
# https://bugs.webkit.org/show_bug.cgi?id=87748
fast/forms/select/optgroup-clicking.html
Modified: trunk/LayoutTests/platform/qt/TestExpectations (127379 => 127380)
--- trunk/LayoutTests/platform/qt/TestExpectations 2012-09-01 19:26:50 UTC (rev 127379)
+++ trunk/LayoutTests/platform/qt/TestExpectations 2012-09-01 19:42:46 UTC (rev 127380)
@@ -123,8 +123,6 @@
BUGWK91379 : http/tests/security/contentSecurityPolicy/policy-does-not-affect-child.html = TEXT PASS
BUGWK91379 : http/tests/security/contentSecurityPolicy/object-src-none-allowed.html = TEXT PASS
-BUGWK85811 DEBUG : fast/events/message-port-close.html = CRASH
-
// Needs rebaseline after https://bugs.webkit.org/show_bug.cgi?id=80219
BUGWK80219 : compositing/overflow/clip-descendents.html = TEXT
Modified: trunk/LayoutTests/platform/qt-4.8/TestExpectations (127379 => 127380)
--- trunk/LayoutTests/platform/qt-4.8/TestExpectations 2012-09-01 19:26:50 UTC (rev 127379)
+++ trunk/LayoutTests/platform/qt-4.8/TestExpectations 2012-09-01 19:42:46 UTC (rev 127380)
@@ -163,8 +163,6 @@
BUGWK91379 : http/tests/security/contentSecurityPolicy/policy-does-not-affect-child.html = TEXT PASS
BUGWK91379 : http/tests/security/contentSecurityPolicy/object-src-none-allowed.html = TEXT PASS
-BUGWK85811 DEBUG : fast/events/message-port-close.html = CRASH
-
// Needs rebaseline after https://bugs.webkit.org/show_bug.cgi?id=80219
BUGWK80219 : compositing/overflow/clip-descendents.html = TEXT
Modified: trunk/LayoutTests/platform/qt-mac/TestExpectations (127379 => 127380)
--- trunk/LayoutTests/platform/qt-mac/TestExpectations 2012-09-01 19:26:50 UTC (rev 127379)
+++ trunk/LayoutTests/platform/qt-mac/TestExpectations 2012-09-01 19:42:46 UTC (rev 127380)
@@ -163,8 +163,6 @@
BUGWK91379 : http/tests/security/contentSecurityPolicy/policy-does-not-affect-child.html = TEXT PASS
BUGWK91379 : http/tests/security/contentSecurityPolicy/object-src-none-allowed.html = TEXT PASS
-BUGWK85811 DEBUG : fast/events/message-port-close.html = CRASH
-
// Needs rebaseline after https://bugs.webkit.org/show_bug.cgi?id=80219
BUGWK80219 : compositing/overflow/clip-descendents.html = TEXT
Modified: trunk/LayoutTests/platform/win/Skipped (127379 => 127380)
--- trunk/LayoutTests/platform/win/Skipped 2012-09-01 19:26:50 UTC (rev 127379)
+++ trunk/LayoutTests/platform/win/Skipped 2012-09-01 19:42:46 UTC (rev 127380)
@@ -1867,10 +1867,6 @@
# https://bugs.webkit.org/show_bug.cgi?id=88150
compositing/geometry/clipping-foreground.html
-# Asserts in MessagePort::contextDestroyed
-# https://bugs.webkit.org/show_bug.cgi?id=85811
-fast/events/message-port-clone.html
-
# Require rebaseline after bug 88171
# https://bugs.webkit.org/show_bug.cgi?id=88171
fast/block/float/independent-align-positioning.html
Modified: trunk/Source/WebCore/ChangeLog (127379 => 127380)
--- trunk/Source/WebCore/ChangeLog 2012-09-01 19:26:50 UTC (rev 127379)
+++ trunk/Source/WebCore/ChangeLog 2012-09-01 19:42:46 UTC (rev 127380)
@@ -1,3 +1,19 @@
+2012-09-01 Li Yin <[email protected]>
+
+ fast/events/message-port-clone.html hits ASSERT in Debug (usually in later tests)
+ https://bugs.webkit.org/show_bug.cgi?id=85811
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ When MessagePort invoked close function, the close status is needed to set,
+ regardless of whether the port is cloned or not.
+
+ Tests: fast/events/message-port-clone.html
+ fast/events/message-port-close.html
+
+ * dom/MessagePort.cpp:
+ (WebCore::MessagePort::close): Must set m_closed to be true.
+
2012-09-01 Andreas Kling <[email protected]>
Share inline style between cloned Nodes (copy on write.)
Modified: trunk/Source/WebCore/dom/MessagePort.cpp (127379 => 127380)
--- trunk/Source/WebCore/dom/MessagePort.cpp 2012-09-01 19:26:50 UTC (rev 127379)
+++ trunk/Source/WebCore/dom/MessagePort.cpp 2012-09-01 19:42:46 UTC (rev 127380)
@@ -133,9 +133,8 @@
void MessagePort::close()
{
- if (!isEntangled())
- return;
- m_entangledChannel->close();
+ if (isEntangled())
+ m_entangledChannel->close();
m_closed = true;
}
