Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-26 12:20:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge mozilla-central to autoland. a=merge CLOSED TREE

Browse Source
This commit is contained in:
Noemi Erli 2018-05-07 00:46:24 +03:00
commit 3b95cfc89e
5 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
devtools/client/webconsole/test/mochitest/browser.ini
View File

@ -341,6 +341,7 @@ subsuite = clipboard
[browser_webconsole_sourcemap_invalid.js]
[browser_webconsole_sourcemap_nosource.js]
[browser_webconsole_split.js]
skip-if = os == 'win' && !debug # Bug 1454123 disabled on Win for frequent failures
[browser_webconsole_split_escape_key.js]
[browser_webconsole_split_focus.js]
[browser_webconsole_split_persist.js]

4
dom/events/EventStateManager.cpp
View File

@ -5381,9 +5381,7 @@ EventStateManager::ResetLastOverForContent(
}
void
EventStateManager::ContentRemoved(nsIDocument* aDocument,
nsIContent* aMaybeContainer,
nsIContent* aContent)
EventStateManager::ContentRemoved(nsIDocument* aDocument, nsIContent* aContent)
{
/*
* Anchor and area elements when focused or hovered might make the UI to show

3
dom/events/EventStateManager.h
View File

@ -147,8 +147,7 @@ public:
* affect the return value.
*/
bool SetContentState(nsIContent* aContent, EventStates aState);
void ContentRemoved(nsIDocument* aDocument, nsIContent* aMaybeContainer,
nsIContent* aContent);
void ContentRemoved(nsIDocument* aDocument, nsIContent* aContent);
bool EventStatusOK(WidgetGUIEvent* aEvent);

3
layout/base/PresShell.cpp
View File

@ -4546,8 +4546,7 @@ PresShell::ContentRemoved(nsIContent* aChild, nsIContent* aPreviousSibling)
// Notify the ESM that the content has been removed, so that
// it can clean up any state related to the content.
mPresContext->EventStateManager()
->ContentRemoved(mDocument, aChild->GetParent(), aChild);
mPresContext->EventStateManager()->ContentRemoved(mDocument, aChild);
nsAutoCauseReflowNotifier crNotifier(this);

12
netwerk/base/nsInputStreamPump.cpp
View File

@ -461,11 +461,9 @@ nsInputStreamPump::OnInputStreamReady(nsIAsyncInputStream *stream)
// EnsureWaiting isn't blocked by it.
mProcessingCallbacks = false;
// We must break the loop when we're switching event delivery to another
// thread and the input stream pump is suspended, otherwise
// OnStateStop() might be called off the main thread. See bug 1026951
// comment #107 for the exact scenario.
if (mSuspendCount && mRetargeting) {
// We must break the loop if suspended during one of the previous
// operation.
if (mSuspendCount) {
mState = nextState;
mWaitingForInputStreamReady = false;
break;
@ -473,7 +471,7 @@ nsInputStreamPump::OnInputStreamReady(nsIAsyncInputStream *stream)
// Wait asynchronously if there is still data to transfer, or we're
// switching event delivery to another thread.
if (!mSuspendCount && (stillTransferring || mRetargeting)) {
if (stillTransferring || mRetargeting) {
mState = nextState;
mWaitingForInputStreamReady = false;
nsresult rv = EnsureWaiting();
@ -626,7 +624,7 @@ nsInputStreamPump::OnStateTransfer()
}
// an error returned from Available or OnDataAvailable should cause us to
// abort; however, we must not stomp on mStatus if already canceled.
// abort; however, we must not stop on mStatus if already canceled.
if (NS_SUCCEEDED(mStatus)) {
if (NS_FAILED(rv))