import changes from `dev' branch of rmottola/Arctic-Fox:

- Bug 1249280 - Fix coordinates of APZ-detected gestures when crossing process boundaries. r=kats (090ebc1700)
- Bug 1245016 - b2g build failure in gfx/layers/ipc/LayerAnimationUtils.h r=hiro (a577fdc500)
- 10.5 & 10.6 compatibility (72e2c45a47)
- Bug 1157018 - NsckPuk and PckPuk lock types that should require PUK instead require PIN. r=echen (7a5e5e0fe1)
- Bug 1218721 - Part 1 - Always Insert Name/Number when Providing IccContact Response. r=echen (5348f2b567)
- Bug 1213785 - Fixed test_icc_contact_add.js and test_icc_contact_update.js testcases timeout. r=echen (fb2020a04e)
- Bug 1218721 - Part 2 - Improve Test Coverage. r=echen (124bd4761b)
- Bug 1195273 - Suppress assertion check in ~ErrorResult() if no exception to be thrown. r=echen (c49167db1e)
- Bug 1189884 - Read/Update ANR of SIM Contact Properly. r=echen (037f45bad6)
- Bug 1172873 - Suppress the notification of STK proactive command if there is no Icc detected. r=echen (9099119665)
- var-let (0d751e9ded)
- Bug 1213766 - modify tests to match emulator's new mcc/mnc. r=echen (443412df79)
- Bug 1244480, don't throw when passing random value as the second argument to canvas.getContext, r=bz (892beb551d)
- Bug 591737 - Add pref for details and summary elements. r=bz (20865b31d9)
- remove HTMLSummaryElement binding (c55d1c1e41)
- Bug 1246185 - Do not collapsed <details> when preference off. r=bz (38bba73df0)
- more SummaryElement cleanup (e567f0a554)
- Bug 1176849 - Make the file picker fatally assert if any of the objects returned by the file picker are not nsIDOMBlob objects. r=baku (519cae0e25)
- Bug 1201106 - Make sure that HTMLInputElement.files is always null if the 'directory' attribute is set. r=baku (7a707c3bdc)
- Bug 1239280 - HTMLInputElement::GetFiles should work also if 'directory' attribute is set, r=smaug (fd18ef9377)
- Bug 1207570 - Make HTMLInputElement::GetFilesAndDirectories throw when the type is not file. r=baku (7cf1efc3ec)
- Bug 1238433 - Added telemetry for the proportion of dropped frames. r=cpearce, f=bsmedberg (92af25de66)
- Bug 1240478 - Remove Mutex from MediaStreamSizeListener. r=jesup (b042225707)
- Bug 1240478 - Have MediaStreamSizeListener active immediately, until the initial size is known. r=jesup (6094996687)
- Bug 1241405 - reset mCurrentPlayRangeStart in AbortExistingLoads(). r=jya. (93eb8e67ed)
- Bug 1224936 - AudioChannelAgent should be informed when HTMLMediaElement dispatches an error, r=roc (4f6425922d)
- Bug 1238906 - part1 : check whether audio data is audible. r=jwwang (0ef051dc27)
- Bug 1238906 - part2 : notify audible state from MDSM to ME. r=jwwang (125829a019)
- Bug 1245982 - Added telemetry for the number of uses of HTMLMediaElement.fastSeek(). r=cpearce (34f4bd5490)
- Bug 1233274 - Don't shutdown detached MediaKeys. r=gerald (d73512a2b1)
- Bug 1237616 - Remove the aForceBuffering arugment from MediaDecoder::Resume(). r=cpearce. (97eb603c20)
- Bug 1246521: P1. Add MediaDecoderOwner::HasError method. r=gerald (605905c959)
- Bug 1246521: P2. Add MediaDecoder::OwnerHasError method. r=gerald (0794b84bc2)
- Bug 1246521: [MSE] P3. Only error during Prepare Append algorithm if the media element is in error. r=gerald (5e5f48c50b)
- Bug 1235411 - Remove IsCallerChrome check in HTMLMediaElement::Observe. r=khuey (b68191da8e)

dom/html/HTMLInputElement.cpp

@@ -400,8 +400,8 @@ HTMLInputElement::nsFilePickerShownCallback::Done(int16_t aResult)
     while (NS_SUCCEEDED(iter->HasMoreElements(&hasMore)) && hasMore) {
       iter->GetNext(getter_AddRefs(tmp));
       nsCOMPtr<nsIDOMBlob> domBlob = do_QueryInterface(tmp);
-      NS_WARN_IF_FALSE(domBlob,
-                       "Null file object from FilePicker's file enumerator?");
+      MOZ_ASSERT(domBlob,
+                 "Null file object from FilePicker's file enumerator?");
       if (domBlob) {
         newFiles.AppendElement(static_cast<File*>(domBlob.get()));
       }
@@ -2511,6 +2511,11 @@ HTMLInputElement::GetFiles()
     return nullptr;
   }
 
+  if (Preferences::GetBool("dom.input.dirpicker", false) &&
+      HasAttr(kNameSpaceID_None, nsGkAtoms::directory)) {
+    return nullptr;
+  }
+
   if (!mFileList) {
     mFileList = new FileList(static_cast<nsIContent*>(this));
     UpdateFileList();
@@ -4884,6 +4889,11 @@ HTMLInputElement::ChooseDirectory(ErrorResult& aRv)
 already_AddRefed<Promise>
 HTMLInputElement::GetFilesAndDirectories(ErrorResult& aRv)
 {
+  if (mType != NS_FORM_INPUT_FILE) {
+    aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
+    return nullptr;
+  }
+
   if (mFilesAndDirectoriesPromise) {
     return RefPtr<Promise>(mFilesAndDirectoriesPromise).forget();
   }