Commit 8f00e720 authored by sigbjornf's avatar sigbjornf Committed by Commit bot

Revert ExtendableMessageEvent same heap verification.

Revert r440390's debug instrumentation of ExtendableMessageEvent.

R=
BUG=655926

Review-Url: https://codereview.chromium.org/2623273004
Cr-Commit-Position: refs/heads/master@{#443299}
parent 861d6ea9
......@@ -117,17 +117,8 @@ ExtendableMessageEvent::ExtendableMessageEvent(
else if (initializer.source().isMessagePort())
m_sourceAsMessagePort = initializer.source().getAsMessagePort();
}
if (initializer.hasPorts()) {
// TODO(sof): remove the extra same-heap checks once crbug.com/655926
// has been resolved.
const MessagePortArray& ports = initializer.ports();
m_ports = new MessagePortArray;
m_ports->reserveInitialCapacity(ports.size());
for (const auto& port : ports) {
CHECK(ThreadState::current()->isOnThreadHeap(port.get()));
m_ports->push_back(port);
}
}
if (initializer.hasPorts())
m_ports = new MessagePortArray(initializer.ports());
}
ExtendableMessageEvent::ExtendableMessageEvent(
......@@ -144,14 +135,6 @@ ExtendableMessageEvent::ExtendableMessageEvent(
m_ports(ports) {
if (m_serializedData)
m_serializedData->registerMemoryAllocatedWithCurrentScriptContext();
// TODO(sof): remove the same-heap verification once crbug.com/655926 has
// been resolved.
if (m_ports) {
for (const auto& port : *m_ports) {
CHECK(ThreadState::current()->isOnThreadHeap(port.get()));
}
}
}
} // namespace blink
......@@ -71,8 +71,7 @@ class MODULES_EXPORT ExtendableMessageEvent final : public ExtendableEvent {
Member<ServiceWorkerClient> m_sourceAsClient;
Member<ServiceWorker> m_sourceAsServiceWorker;
Member<MessagePort> m_sourceAsMessagePort;
// TODO(sof): remove once crbug.com/655926 has been addressed.
SameThreadCheckedMember<MessagePortArray> m_ports;
Member<MessagePortArray> m_ports;
};
} // namespace blink
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment