Merge inbound to mozilla-central r=merge a=merge

gfx/layers/ipc/CompositorVsyncScheduler.cpp

@@ -134,13 +134,18 @@ CompositorVsyncScheduler::PostCompositeTask(TimeStamp aCompositeTimestamp)
     mCurrentCompositeTask = task;
     ScheduleTask(task.forget(), 0);
   }
+}
+
+void
+CompositorVsyncScheduler::PostVRTask(TimeStamp aTimestamp)
+{
   MonitorAutoLock lockVR(mCurrentVRListenerTaskMonitor);
   if (mCurrentVRListenerTask == nullptr && VRListenerThreadHolder::Loop()) {
     RefPtr<CancelableRunnable> task = NewCancelableRunnableMethod<TimeStamp>(
       "layers::CompositorVsyncScheduler::DispatchVREvents",
       this,
       &CompositorVsyncScheduler::DispatchVREvents,
-      aCompositeTimestamp);
+      aTimestamp);
     mCurrentVRListenerTask = task;
     MOZ_ASSERT(VRListenerThreadHolder::Loop());
     VRListenerThreadHolder::Loop()->PostDelayedTask(Move(task.forget()), 0);
@@ -230,6 +235,7 @@ CompositorVsyncScheduler::NotifyVsync(TimeStamp aVsyncTimestamp)
   MOZ_ASSERT_IF(XRE_GetProcessType() == GeckoProcessType_GPU, CompositorThreadHolder::IsInCompositorThread());
   MOZ_ASSERT(!NS_IsMainThread());
   PostCompositeTask(aVsyncTimestamp);
+  PostVRTask(aVsyncTimestamp);
   return true;
 }
 

gfx/layers/ipc/CompositorVsyncScheduler.h

@@ -55,6 +55,7 @@ public:
   void ResumeComposition();
   void ComposeToTarget(gfx::DrawTarget* aTarget, const gfx::IntRect* aRect = nullptr);
   void PostCompositeTask(TimeStamp aCompositeTimestamp);
+  void PostVRTask(TimeStamp aTimestamp);
   void Destroy();
   void ScheduleComposition();
   void CancelCurrentCompositeTask();

testing/modules/AppInfo.jsm

@@ -63,6 +63,7 @@ this.newAppInfo = function(options = {}) {
     invalidateCachesOnRestart() {},
     shouldBlockIncompatJaws: false,
     processType: origRuntime.processType,
+    uniqueProcessID: origRuntime.uniqueProcessID,
 
     // nsIWinAppHelper
     get userCanElevate() {

testing/web-platform/meta/MANIFEST.json

@@ -373755,18 +373755,18 @@
      {}
     ]
    ],
-   "webdriver/tests/element_retrieval/find_element_from_elements.py": [
-    [
-     "/webdriver/tests/element_retrieval/find_element_from_elements.py",
-     {}
-    ]
-   ],
    "webdriver/tests/element_retrieval/find_elements.py": [
     [
      "/webdriver/tests/element_retrieval/find_elements.py",
      {}
     ]
    ],
+   "webdriver/tests/element_retrieval/find_elements_from_element.py": [
+    [
+     "/webdriver/tests/element_retrieval/find_elements_from_element.py",
+     {}
+    ]
+   ],
    "webdriver/tests/element_retrieval/get_active_element.py": [
     [
      "/webdriver/tests/element_retrieval/get_active_element.py",
@@ -404023,7 +404023,7 @@
    "testharness"
   ],
   "content-security-policy/securitypolicyviolation/idl.html": [
-   "5f2ff4a87aa476168cf3d13b10a8d81a387b8e42",
+   "fb8f2938d76a29cc68c46fb49a12feebc0031e54",
    "testharness"
   ],
   "content-security-policy/securitypolicyviolation/img-src-redirect-upgrade-reporting.https.html": [
@@ -404179,7 +404179,7 @@
    "testharness"
   ],
   "content-security-policy/style-src/style-src-imported-style-blocked.html": [
-   "e59517d75d3fbc29b701ffa296b7dd007a05c79d",
+   "a7d3453f54478b773e4d5702a7d83f0a38664f19",
    "testharness"
   ],
   "content-security-policy/style-src/style-src-injected-inline-style-allowed.html": [
@@ -576554,14 +576554,14 @@
    "f036ef93adff21a7c83eeb8b131c96b6553b9fcb",
    "wdspec"
   ],
-  "webdriver/tests/element_retrieval/find_element_from_elements.py": [
-   "131c25ffbde611f98e29b778d7c861ae9619b2f6",
-   "wdspec"
-  ],
   "webdriver/tests/element_retrieval/find_elements.py": [
    "2d5c3c98b00e21a36f91e5797bb97835a8b63f2e",
    "wdspec"
   ],
+  "webdriver/tests/element_retrieval/find_elements_from_element.py": [
+   "131c25ffbde611f98e29b778d7c861ae9619b2f6",
+   "wdspec"
+  ],
   "webdriver/tests/element_retrieval/get_active_element.py": [
    "918c6e48047f31a088ec44e9b0d070b0ae3d6077",
    "wdspec"