Title: [229614] trunk
- Revision
- 229614
- Author
- [email protected]
- Date
- 2018-03-14 15:20:33 -0700 (Wed, 14 Mar 2018)
Log Message
MessagePort should remove its listeners when being closed
https://bugs.webkit.org/show_bug.cgi?id=183644
Reviewed by Chris Dumez.
Source/WebCore:
Test: http/tests/workers/worker-messageport.html
* dom/MessagePort.cpp:
(WebCore::MessagePort::close):
(WebCore::MessagePort::contextDestroyed):
LayoutTests:
* http/tests/workers/resources/messageport-echo-worker.js: Added.
* http/tests/workers/worker-messageport-expected.txt: Added.
* http/tests/workers/worker-messageport.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (229613 => 229614)
--- trunk/LayoutTests/ChangeLog 2018-03-14 21:47:14 UTC (rev 229613)
+++ trunk/LayoutTests/ChangeLog 2018-03-14 22:20:33 UTC (rev 229614)
@@ -1,3 +1,14 @@
+2018-03-14 Youenn Fablet <[email protected]>
+
+ MessagePort should remove its listeners when being closed
+ https://bugs.webkit.org/show_bug.cgi?id=183644
+
+ Reviewed by Chris Dumez.
+
+ * http/tests/workers/resources/messageport-echo-worker.js: Added.
+ * http/tests/workers/worker-messageport-expected.txt: Added.
+ * http/tests/workers/worker-messageport.html: Added.
+
2018-03-14 Chris Dumez <[email protected]>
Make policy decisions asynchronous
Added: trunk/LayoutTests/http/tests/workers/resources/messageport-echo-worker.js (0 => 229614)
--- trunk/LayoutTests/http/tests/workers/resources/messageport-echo-worker.js (rev 0)
+++ trunk/LayoutTests/http/tests/workers/resources/messageport-echo-worker.js 2018-03-14 22:20:33 UTC (rev 229614)
@@ -0,0 +1,13 @@
+self.addEventListener("message", (event) => {
+ if (!event.ports || !event.ports.length) {
+ self.postMessage("FAIL: Message did not have a MessagePort");
+ return;
+ }
+ event.ports[0]._onmessage_ = echoBack;
+ event.ports[0].start();
+ self.postMessage("ready");
+});
+
+function echoBack(event) {
+ self.postMessage("MessagePort echo: " + event.data);
+}
Added: trunk/LayoutTests/http/tests/workers/worker-messageport-expected.txt (0 => 229614)
--- trunk/LayoutTests/http/tests/workers/worker-messageport-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/workers/worker-messageport-expected.txt 2018-03-14 22:20:33 UTC (rev 229614)
@@ -0,0 +1 @@
+PASS
Added: trunk/LayoutTests/http/tests/workers/worker-messageport.html (0 => 229614)
--- trunk/LayoutTests/http/tests/workers/worker-messageport.html (rev 0)
+++ trunk/LayoutTests/http/tests/workers/worker-messageport.html 2018-03-14 22:20:33 UTC (rev 229614)
@@ -0,0 +1,32 @@
+<html>
+<body>
+<p>Test postMessage and garbage collection.</p>
+<div id=result></div>
+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+}
+
+var worker = new Worker('resources/messageport-echo-worker.js');
+
+worker._onmessage_ = (event) => {
+ if (event.data ="" "ready") {
+ worker.terminate();
+ setTimeout(() => {
+ document.body.innerHTML = "PASS";
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }, 0);
+ }
+}
+
+var channel = new MessageChannel();
+channel.port1._onmessage_ = function(event) {
+}
+
+worker.postMessage("Here is your port", [channel.port2]);
+
+</script>
+</body>
+</html>
Modified: trunk/Source/WebCore/ChangeLog (229613 => 229614)
--- trunk/Source/WebCore/ChangeLog 2018-03-14 21:47:14 UTC (rev 229613)
+++ trunk/Source/WebCore/ChangeLog 2018-03-14 22:20:33 UTC (rev 229614)
@@ -1,3 +1,16 @@
+2018-03-14 Youenn Fablet <[email protected]>
+
+ MessagePort should remove its listeners when being closed
+ https://bugs.webkit.org/show_bug.cgi?id=183644
+
+ Reviewed by Chris Dumez.
+
+ Test: http/tests/workers/worker-messageport.html
+
+ * dom/MessagePort.cpp:
+ (WebCore::MessagePort::close):
+ (WebCore::MessagePort::contextDestroyed):
+
2018-03-14 Chris Dumez <[email protected]>
Drop unnecessary StorageToWebProcessConnection::workerContextProcessConnectionCreated()
Modified: trunk/Source/WebCore/dom/MessagePort.cpp (229613 => 229614)
--- trunk/Source/WebCore/dom/MessagePort.cpp 2018-03-14 21:47:14 UTC (rev 229613)
+++ trunk/Source/WebCore/dom/MessagePort.cpp 2018-03-14 22:20:33 UTC (rev 229614)
@@ -217,12 +217,13 @@
void MessagePort::close()
{
m_mightBeEligibleForGC = true;
+
if (m_closed)
return;
+ m_closed = true;
MessagePortChannelProvider::singleton().messagePortClosed(m_identifier);
-
- m_closed = true;
+ removeAllEventListeners();
}
void MessagePort::contextDestroyed()
@@ -229,10 +230,7 @@
{
ASSERT(m_scriptExecutionContext);
- m_mightBeEligibleForGC = true;
- if (!m_closed)
- close();
-
+ close();
m_scriptExecutionContext = nullptr;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
