Back out 2 changesets (bug 1221852, bug 1224825) for Android hangs and desktop RunWatchdog crashes in test_upgrade_insecure_reporting.html

CLOSED TREE

Backed out changeset 6ad589dcf3c1 (bug 1221852)
Backed out changeset e7aadf89146b (bug 1224825)
This commit is contained in:
Phil Ringnalda 2015-11-15 09:56:06 -08:00
Родитель 1f993cf905
Коммит 6e82b3775e
8 изменённых файлов: 11 добавлений и 157 удалений

Просмотреть файл

@ -97,26 +97,6 @@ public:
NS_IMETHOD
Run() override
{
nsresult rv = SendEvent();
NS_WARN_IF(NS_FAILED(rv));
mPort->MaybeClose();
return NS_OK;
}
NS_IMETHOD
Cancel() override
{
mPort = nullptr;
mData = nullptr;
return NS_OK;
}
private:
nsresult
SendEvent()
{
nsCOMPtr<nsIGlobalObject> globalObject;
@ -172,6 +152,15 @@ private:
return NS_OK;
}
NS_IMETHOD
Cancel() override
{
mPort = nullptr;
mData = nullptr;
return NS_OK;
}
private:
~PostMessageRunnable()
{}
@ -292,7 +281,6 @@ MessagePort::MessagePort(nsPIDOMWindow* aWindow)
, mInnerID(0)
, mMessageQueueEnabled(false)
, mIsKeptAlive(false)
, mClosing(false)
{
mIdentifier = new MessagePortIdentifier();
mIdentifier->neutered() = true;
@ -469,12 +457,6 @@ MessagePort::PostMessage(JSContext* aCx, JS::Handle<JS::Value> aMessage,
return;
}
// Just processing pending messages, then closing. This message must be
// ignored.
if (mClosing) {
return;
}
RemoveDocFromBFCache();
// Not entangled yet.
@ -552,12 +534,6 @@ MessagePort::Close()
return;
}
// If we have some messages to send, we cannot close this port immediatelly.
if (!mMessages.IsEmpty()) {
mClosing = true;
return;
}
// We don't care about stopping the sending of messages because from now all
// the incoming messages will be ignored.
mState = eStateDisentangled;
@ -660,7 +636,6 @@ void
MessagePort::MessagesReceived(nsTArray<MessagePortMessage>& aMessages)
{
MOZ_ASSERT(mState == eStateEntangled || mState == eStateDisentangling);
// We cannot have a next-step because this must be processed by Entangled().
MOZ_ASSERT(mNextStep == eNextStepNone);
MOZ_ASSERT(mMessagesForTheOtherPort.IsEmpty());
@ -729,11 +704,6 @@ MessagePort::CloneAndDisentangle(MessagePortIdentifier& aIdentifier)
return;
}
// If Close() has been called.
if (mClosing) {
return;
}
aIdentifier.uuid() = mIdentifier->uuid();
aIdentifier.destinationUuid() = mIdentifier->destinationUuid();
aIdentifier.sequenceId() = mIdentifier->sequenceId() + 1;
@ -926,14 +896,5 @@ MessagePort::ForceClose(const MessagePortIdentifier& aIdentifier)
ForceCloseHelper::ForceClose(aIdentifier);
}
void
MessagePort::MaybeClose()
{
// All the other checks are done in Close():
if (mClosing && mMessages.IsEmpty()) {
Close();
}
}
} // namespace dom
} // namespace mozilla

Просмотреть файл

@ -25,7 +25,6 @@ class DispatchEventRunnable;
class MessagePortChild;
class MessagePortIdentifier;
class MessagePortMessage;
class PostMessageRunnable;
class SharedMessagePortMessage;
namespace workers {
@ -37,7 +36,6 @@ class MessagePort final : public DOMEventTargetHelper
, public nsIObserver
{
friend class DispatchEventRunnable;
friend class PostMessageRunnable;
public:
NS_DECL_NSIIPCBACKGROUNDCHILDCREATECALLBACK
@ -150,8 +148,6 @@ private:
return mIsKeptAlive;
}
void MaybeClose();
nsAutoPtr<workers::WorkerFeature> mWorkerFeature;
RefPtr<DispatchEventRunnable> mDispatchRunnable;
@ -180,7 +176,6 @@ private:
bool mMessageQueueEnabled;
bool mIsKeptAlive;
bool mClosing;
};
} // namespace dom

Просмотреть файл

@ -36,9 +36,6 @@ public:
: mDestinationUUID(aDestinationUUID)
, mSequenceID(1)
, mParent(nullptr)
// By default we don't know the next parent.
, mWaitingForNewParent(true)
, mNextStepCloseAll(false)
{
MOZ_COUNT_CTOR(MessagePortServiceData);
}
@ -65,9 +62,6 @@ public:
FallibleTArray<NextParent> mNextParents;
FallibleTArray<RefPtr<SharedMessagePortMessage>> mMessages;
bool mWaitingForNewParent;
bool mNextStepCloseAll;
};
/* static */ MessagePortService*
@ -119,49 +113,31 @@ MessagePortService::RequestEntangling(MessagePortParent* aParent,
// This is a security check.
if (!data->mDestinationUUID.Equals(aDestinationUUID)) {
MOZ_ASSERT(false, "DestinationUUIDs do not match!");
CloseAll(aParent->ID());
return false;
}
if (aSequenceID < data->mSequenceID) {
MOZ_ASSERT(false, "Invalid sequence ID!");
CloseAll(aParent->ID());
return false;
}
if (aSequenceID == data->mSequenceID) {
if (data->mParent) {
MOZ_ASSERT(false, "Two ports cannot have the same sequenceID.");
CloseAll(aParent->ID());
return false;
}
// We activate this port, sending all the messages.
data->mParent = aParent;
data->mWaitingForNewParent = false;
FallibleTArray<MessagePortMessage> array;
if (!SharedMessagePortMessage::FromSharedToMessagesParent(aParent,
data->mMessages,
array)) {
CloseAll(aParent->ID());
return false;
}
data->mMessages.Clear();
// We can entangle the port.
if (!aParent->Entangled(array)) {
CloseAll(aParent->ID());
return false;
}
// If we were waiting for this parent in order to close this channel, this
// is the time to do it.
if (data->mNextStepCloseAll) {
CloseAll(aParent->ID());
}
return true;
return aParent->Entangled(array);
}
// This new parent will be the next one when a Disentangle request is
@ -169,7 +145,6 @@ MessagePortService::RequestEntangling(MessagePortParent* aParent,
MessagePortServiceData::NextParent* nextParent =
data->mNextParents.AppendElement(mozilla::fallible);
if (!nextParent) {
CloseAll(aParent->ID());
return false;
}
@ -218,7 +193,6 @@ MessagePortService::DisentanglePort(
// We didn't find the parent.
if (!nextParent) {
data->mMessages.SwapElements(aMessages);
data->mWaitingForNewParent = true;
data->mParent = nullptr;
return true;
}
@ -293,20 +267,6 @@ MessagePortService::CloseAll(const nsID& aUUID)
}
nsID destinationUUID = data->mDestinationUUID;
// If we have informations about the other port and that port has some
// pending messages to deliver but the parent has not processed them yet,
// because its entangling request didn't arrive yet), we cannot close this
// channel.
MessagePortServiceData* destinationData;
if (mPorts.Get(destinationUUID, &destinationData) &&
!destinationData->mMessages.IsEmpty() &&
destinationData->mWaitingForNewParent) {
MOZ_ASSERT(!destinationData->mNextStepCloseAll);
destinationData->mNextStepCloseAll = true;
return;
}
mPorts.Remove(aUUID);
CloseAll(destinationUUID);

Просмотреть файл

@ -24,4 +24,3 @@ support-files =
[test_messageChannel_any.html]
[test_messageChannel_forceClose.html]
[test_messageChannel_bug1178076.html]
[test_messageChannel_bug1224825.html]

Просмотреть файл

@ -1,58 +0,0 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=1224825
-->
<head>
<meta charset="utf-8">
<title>Test for Bug 1224825</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1224825">Mozilla Bug 1224825</a>
<div id="content"></div>
<pre id="test">
</pre>
<script type="application/javascript">
var MAX = 100;
function runTest() {
var worker = new Worker('data:javascript,onmessage = function(e) { e.ports[0].onmessage = function(evt) { postMessage(evt.data);}}');
var count = 0;
worker.onmessage = function(e) {
is(e.data, count, "Correct value expected!");
ok(count < MAX,"No count > MAX messages!");
if (++count == MAX) {
SimpleTest.requestFlakyTimeout("Testing an event not happening");
setTimeout(function() {
SimpleTest.finish();
}, 200);
info("All the messages correctly received");
}
}
var mc = new MessageChannel();
worker.postMessage(42, [mc.port2]);
for (var i = 0; i < MAX; ++i) {
mc.port1.postMessage(i);
}
mc.port1.close();
for (var i = 0; i < MAX * 2; ++i) {
mc.port1.postMessage(i);
}
}
SimpleTest.waitForExplicitFinish();
runTest();
</script>
</body>
</html>

Просмотреть файл

@ -136,6 +136,7 @@ SharedWorker::Close()
if (mMessagePort) {
mMessagePort->Close();
mMessagePort = nullptr;
}
}

Просмотреть файл

@ -17,7 +17,6 @@ onconnect = function(evt) {
test: (evtFromPort2.data.type == "connected"),
msg: "The original message received" });
port.postMessage({type: "finish"});
close();
}
}
}

Просмотреть файл

@ -28,9 +28,6 @@ sw1.port.onmessage = function(event) {
}
if (event.data.type == "finish") {
info("Finished!");
ok(sw1.port, "The port still exists");
sw1.port.foo = sw1; // Just a test to see if we leak.
SimpleTest.finish();
}
}