Bug 1351148 Part10: nsChainedEventQueue::PutEvent should always put high priority event in mHighQueue. r=smaug.
☠☠ backed out by 67c7b294ee26 ☠ ☠
authorStone Shih <sshih@mozilla.com>
Wed, 26 Jul 2017 10:52:06 +0800
changeset 374237 7755e3c5ce0ad2d0ed9a6cb8477155fd989d6b2d
parent 374236 3e2a441357ca6adb89d5048e50e7b4e913d1f933
child 374238 4b52e1b335fbd2cc0998366ac1666679dfea9b34
push id32318
push userkwierso@gmail.com
push dateFri, 11 Aug 2017 20:16:01 +0000
treeherdermozilla-central@80ff3f300e05 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs1351148
milestone57.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1351148 Part10: nsChainedEventQueue::PutEvent should always put high priority event in mHighQueue. r=smaug. MozReview-Commit-ID: H6TV9bdm6QM
xpcom/threads/nsThread.cpp
--- a/xpcom/threads/nsThread.cpp
+++ b/xpcom/threads/nsThread.cpp
@@ -945,27 +945,17 @@ nsThread::nsChainedEventQueue::PutEvent(
   case nsIRunnablePriority::PRIORITY_INPUT:
     if (mIsInputPrioritizationEnabled) {
       mInputQueue->PutEvent(event.forget(), aProofOfLock);
     } else {
       mNormalQueue->PutEvent(event.forget(), aProofOfLock);
     }
     break;
   case nsIRunnablePriority::PRIORITY_HIGH:
-    if (mIsInputPrioritizationEnabled) {
-      mHighQueue->PutEvent(event.forget(), aProofOfLock);
-    } else {
-      // During startup, ContentParent sends SetXPCOMProcessAttributes to
-      // initialize ContentChild and enable input event prioritization. After
-      // that, ContentParent sends PBrowserConstructor to create PBrowserChild.
-      // To prevent PBrowserConstructor preempt SetXPCOMProcessAttributes and
-      // cause problems, we have to put high priority events in mNormalQueue to
-      // keep the correct order of initialization.
-      mNormalQueue->PutEvent(event.forget(), aProofOfLock);
-    }
+    mHighQueue->PutEvent(event.forget(), aProofOfLock);
     break;
   default:
     MOZ_ASSERT(false);
     break;
   }
 }
 
 //-----------------------------------------------------------------------------