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

- reapply  Bug 1574573 - Disambiguate a use of Handle in XPCShellEnvironment.cpp r=Ehsan (a674c4b006)
- re-create --disable-applemedia option (needed for pre-10.7 Mac) in new configure ssytem (28e2fd5fee)
- Bug 1255707 - Part 2. Remove ScreenSizeChanged. r=snorp (3a93e4e768)
- Bug 1250418 - Remove the assertion check of mCanSend in CompositorCh ld::ActorDestroy, r=nical (14bb402a1d)
- Bug 1250718 - Improve layer logging for preserve-3d layers. r=thinker (f373a50040)
- Bug 1232042 - Addendum: Add comment for mLayerManager check. r=jrmuizel (2b69aa784a)
- Bug 1239861. Skip composite if vsync time is before force composite time. r=kats (5ee4038157)
- Bug 1241678 - Fix low-volume null-deref crash. r=BenWa (b28d944615)
- Rename PCompositor to PCompositorBridge. (bug 1258479 part 2, r=mattwoodrow) (dd535a9bdd)
- Bug 1238160 - Set frame type on TabContext. r=billm,mayhemer (54424d792b)
- bits of 1240471 (fb34a97806)
- Bug 1238160 - Test mozbrowser APIs to ensure no content exposure. r=bz (17a0ac611c)
- Bug 1238160 - Enable mozbrowser frames on desktop. r=bz (5b42b5403d)
- Bug 1197461 - Implement Permissions.revoke. r=poiru,baku (306712f9ca)
- Bug 1197461 - e10s support for Permissions.revoke. r=poiru (bbda5df25d)
- Bug 1220184 - Eliminate Gingerbread compatibility. r=froydnj, r=nalexander (dce9e4f9e8)
- Bug 1238160 - Set docshell isolation mode. r=smaug (6ac2c21d1d)
- fix of Bug 1238160 (786a554a6a)
- Bug 1237364 - nsFrameLoader.cpp can set the userContextId directly using nsIDocShell, r=smaug (fea166caa3)
- Bug 1227861 - Add OriginAttributes getter/setter into nsIDocShell. r=smaug, sicking (4f8ac4f8ce)
- Bug 1246956 - Add originURI to Sessionstore. r=bz,Yoric,mfinkle (a1dcd44194)
- Bug 1246956 - Add loadReplace to session history. r=yoric r=mfinkle (662e66ad7e)
- Bug 1252811 - remove mIsInIsolatedMozBrowser from nsDocShell. r=smaug (b5927775b7)
- Bug 1250917 - Remove NS_SUCCESS_I_DID_SOMETHING; r=bholley (9dd6fe351b)
- Bug 1225053 - use null principal in gfxSVGGlyphs.cpp r=edwin (597d10fd4e)
- Bug 1226120 - add test for unknownContentType.xul and file types with a default handler but always ask set, r=mconley (dd95e18fd9)
- Bug 1254118 - Web protocol handlers need more testing coverage, r=felipe. (4fb6949d10)
- Bug 1253307 - Use a better function to load web handler apps in e10s. r=billm/mconley (28695be154)
- Bug 1155241: Check mInstanceOwner for nullptr in nsObjectLoadingContent::PluginDestroyed; r=smaug (ad60991e3e)
- Bug 1229220 - Update the scrollbar visibility prefs when initializing a TabChild; r=smaug (28997e0a6d)
- Bug 1252262 - Don't combine the client offset into the outer rect for the child process. r=jimm (f415c0418e)
- Bug 1249943 - Make test_basic_pan work on Fennec and Linux as well. r=botond (657c940be1)
- bit of bug 1245765 part 5 (82463f7eaa)
- Bug 1207512 - Remove the JS_IsRunning call in nsObjectLoadingContent::ScriptRequestPluginInstance; r=bholley (76047284a6)
- minor cleanup and Telemetry pieces (2765a1408d)
- Bug 1239463 - Do not assert when notifying an inactive document about changed content from the plugin crash notification. r=bz (03bf38a683)
- Bug 1192450 - Remove PlayPreview registration from Shumway. r=jet (9b6e131876)
- Bug 1200602 - Use the alternate content for <applet>. r=kmachulis (843fccf0aa)
- Bug 1236900 - Remove useless null check since mOwnerContent cannot be null. r=jst (a7e2d4b95c)
- bug 1257287 - add nsIDocShell::GetEdItingSession() (abd9022426)
- bug 1257287 - add nsIDocShell.tabChild r=smaug (6fe910c2b8)
- Bug 1256626: P1. Add NotifyBenchmarkResult ipc methods. r=jimm (02ab9cb0f6)
- Bug 1256626: P2. Use NotifyBenchmarkResult to save VP9 result. r=jimm (877277768c)
- Bug 1256626. Workaround Microsoft macro silliness. r=me (070e5a8cf0)
- Bug 1183915 - Put images dragged from content processes in the drag data in the parent. r=smaug (72906fab07)
- Bug 1228652 - Check for window.closed after flushing messages in navigateAndRestore. r=mossop (fd9d2b7d42)
- Bug 1217517 - nullcheck consumers for gKeywordURIFixup, r=jaws (adf6388856)
- Bug 951695 - Rename 'Character Encoding' to 'Text Encoding'. r=jaws (046e9644c2)
- Bug 1088710 - part 2: make it work on e10s, r=mconley (479366cba8)
- Bug 1147720 - Fix intermittent waitForDocLoadAndStopIt() timeouts by keeping a strong reference to the progress listener r=mak (4e9fa3f8c2)
- Bug 1228754, r=mak,bz (a33bc4da9c)
- Bug 1250482 - r=mak (0f69dd5f69)
- Bug 798249 - track when we're 'inside' a loadURI call when dealing with Stop() calls resulting from the same, r=mconley (e06b5b44e9)
- Bug 1254657 - change how we send Content:LoadURIResult to avoid upsetting RemoteWebProgress.jsm, r=mconley (915e7a1be6)
- 1253584 - Fix and enable browser_NetworkPrioritizer.js for e10s. r=mconley (9757c53ab6)
- Bug 1254522 - Make remote-browser.xml and browser.xml not depend on Firefox's browser.js. r=mconley (0a15acf7cc)
- Bug 621158 - make appcache use messaging for quota management, r=mayhemer,jaws (7e69707327)
- Bug 1255511 - Skip beforeunload prompts once nsIAppStartup shuttingDown returns true. r=Gijs (66bb2ce055)
- Bug 884355 - Warn about closing multiple tabs when "Never remember history" is enabled" r=gavin (7e61149b88)
- Bug 1228754 - bustage followup, rs=me,bustage Bug 1228754 - correct comments from bustage fix, rs=me, DONTBUILD (ef4d053a24)
- Bug 985777 - add a whitelist for URLs that we can switch to/from private browsing windows, r=ehsan (dc799a2213)
- Bug 963945 - Add about:addons URI as whitelisted so that it can be refocused instead of opening duplicate tabs in private browsing. r=jdm (8d5770a31c)
- reshuffle misspatch (8d2f7c2924)
- Bug 1236126 - fix oversight in principal handling for dialogs with host-less principals, r=aryx (1827672cae)
- align some stuff (256ffe50fa)
- Bug 1252239: Trap errors thrown by speculativeConnect. r=ttaubert (726d890a7b)
- Bug 1093153: enabled and re-factored browser_aboutHome.js to work correctly in e10s mode. r=mak (90518a9742)
- Bug 1239671 - Don't let session store override persistent cookies, r=ehsan (ee5b04fc97)
- Bug 1255685 - SessionStorage.jsm should use origin attributes from docshell. r=sicking (1f055f6ab2)
- Bug 1234021 - Catch exceptions raised by storage.length in SessionStorage.jsm, r=mconley (85ed6cf819)
- Bug 1192394 - Force an image load whenever the thumbnail file changes. r=adw (c194d868f9)
- let-var (f5e9a53170)
- Bug 529899 - Purge cookies on clean shutdown with "Keep cookies until I close Firefox" r=Yoric (1a15abd5f3)
- Bug 1071104 - Remove legacy "hasWrittenState" flag from SessionWorker r=yoric (484e1ac5b1)
- Bug 1198898 - Determining number of tabs/windows restored by Session Restore;r=mconley (5bda3ecc88)
- Bug 1245891 - Changing Session Restore Talos tests to include the time to restore actual tabs;r=mconley (d7c5957192)
- Bug 1210940 - New Browser Component: Newtab r=Mardak (a59fd6c88e)
- Bug 1219454 - Replace 'show' with 'receive' in about:permissions and control center for consistent messaging around notifications and to account for new Push permission. r=MattN (60cc4211ec)
- align (b7bc52abef)
- Bug 868711 - Remove confusing expression in _trackSlowStartup. r=gavin (b2d5609496)
- Bug 1231112 - work around tab groups migration issue in safe mode, r=ttaubert (e71ceebd3f)
- Bug 1249608 - Don't run UI migration steps with new profiles. r=gijs (b6f92e45ba)
- Bug 910431 - Electrolysis: Permission code followup. f=felipe (1bf556eeea)
- align some e10s (05aa76a560)
- Bug 1250109 - Change DOMEventTargetHelper subclasses to not assume that GetOwner() is non-null, since it can be nulled out by navigation. r=bzbarsky (deb440c2a4)
- Bug 908277 - Prevent permission UI errors when PopupNotifications is not available. r=dolske (dcefc44921)
- Bug 1199805 - Fix displayURI typo on site permission prompts. r=bgrins (78dbd44c98)
- Bug 1246028 Implement chrome.commands.getAll. r=kmag (b263fbe137)
- Bug 1242557 - Import missing commands API schema file. r=kmag (b930a95b2f)
- Bug 1249689 - replace bootstrapScope with an activeAddons Map() that contains it r=mossop (00bef48286)
- Bug 1249689 - generate and provide a Symbol for each add-on on startup r=mossop (bd7b936bcb)
- Bug 685155: Treat symbolic links the same as proxy files in the Add-on Manager. r=Mossop (4f458140df)
- Bug 1244248: Test that the certificate database is cached. r=rhelmer (a5cc6e8d75)
- Bug 1250784: Part 1 - [webext] Add support for options_ui via inline browsers in the Add-on Manager. r=Mossop (62b6efe654)
- Bug 1250784: Part 2 - [webext] Fix some issues that cause noisy tests. r=Mossop (4ada262435)
- Bug 1252250 - Implement browser.bookmarks.removeTree(), r=kmag r=mak (7e67b5ccf1)
- Bug 1253652 - Fix browser.bookmarks.move() and add tests for it. r=kmag, r=mak (151a8bf09a)
- Bug 1250784: Follow-up: Fix merge conflict in bookmarks API. r=me (3db6ea04ea)
- Bug 1251269 - Implement browser.bookmarks.getRecent(), r=kmag r=mak (d4564d6aee)
- Bug 1246614 - Check if system add-ons directory exists before trying to clean it. r=mossop (c2d59f34a8)
- Bug 1041514 - Don't show default browser prompt if a user opts out in the installer. r=jimm (b2ccf151f7)
- use ArcticFoxHTML and ArcticFoxURL keys, not to mix with Firefox (e6d36fdd78)
- Bug 1207784 - skip permission hooks in createOffer when called from hiddenWindow (add-ons). r=mt (b90a4c940f)
- Bug 1209766 - Update validation message before showing notification. r=khuey (8c9a865969)
- Bug 1206560 - Show the site favicon in XUL notifications. r=jaws (e5bad6ea20)
- Bug 1248497 창 Add promise support to the sendMessage APIs. r=billm (e26a805c92)
- Bug 911216 - Part 1: Add tests directly testing content Promise constructor resolved with chrome Promise. r=bz (1b2f1ec6b8)
- Bug 911216 - Part 2: Add self-hosting intrinsic for calling wrapped functions without wrapper security checks. r=efaust,bholley (de086e8422)
- Bug 911216 - Part 3: Allow wrapped self-hosted functions and intrinsics in the callFunction debug check. r=efaust (c02e6337fe)
- Bug 1251921 - Do not call debugger hooks with half-initialized frame if InterpeterFrame::prologue fails. (r=jorendorff) (9873720345)
- Bug 1256342. Fix typed array iteration to work correctly over Xrays. r=till (6a7f5c12c6)
- Bug 1256376. Fix forEach on typed arrays to work over Xrays from web extension sandboxes. r=till (ab19703ab5)
- Bug 1253436 - Add __repr__ to BaseLibrary and BaseProgram; r=glandium (a04a16f2ac)
- Bug 1238064 - Update docs to reflect new workflow. r=mossop (c7670ac086)
- Bug 911216 - Part 4: Add self-hosting intrinsic for creating arrays in other compartments. r=efaust (37b14521fb)
- Bug 1233497 - Temporarily allow unsafe CPOWs in Promise-backend.js and Task.jsm. r=billm (d2672a456a)
- Bug 1225041 - Implement ES6 Annex B.3.5 for direct eval. (r=jorendorff) (daf24f0e34)
- Bug 1254185 - Deal with missing arguments assigned to block bindings. (r=jimb) (3ce53dcd06)
- Bug 1250506 - check if node is acceptable as a child before creating an accessible for it, r=davidb (5960ba726d)
- Bug 1251941 - aria::GetRoleMap should take element, r=davidb (e9ee4e20ea)
- Bug 1251944 - get rid of nsCoreUtils::GetRoleContent, r=davidb (a2bf199bb4)
- Bug 1257030 - Add support for supplying preexisting stack instead of capturing one for use as the async parent stack of CallbackObject. r=bz,tromey (a4ddb41fac)
- Bug 1232291 - Non-used header in MessagePortService.*, r=smaug (1e2398e314)
- Bug 1255655 - Const-ify sWAIRoleMaps. r=tbsaunde. (09653e44af)
- align (24667f7952)
- Bug 1253438 - Expose Push observer notification topics. r=markh (b62a068d4b)

dom/base/nsObjectLoadingContent.cpp

@@ -557,6 +557,11 @@ IsPluginEnabledByExtension(nsIURI* uri, nsCString& mimeType)
     return false;
   }
 
+  // Disables any native SWF plugins, when internal SWF player is enabled.
+  if (ext.EqualsIgnoreCase("swf") && nsContentUtils::IsSWFPlayerEnabled()) {
+    return false;
+  }
+
   RefPtr<nsPluginHost> pluginHost = nsPluginHost::GetInst();
 
   if (!pluginHost) {
@@ -2648,8 +2653,8 @@ nsObjectLoadingContent::NotifyStateChanged(ObjectType aOldType,
   EventStates newState = ObjectState();
 
   if (newState != aOldState) {
+    NS_ASSERTION(thisContent->IsInComposedDoc(), "Something is confused");
     // This will trigger frame construction
-    NS_ASSERTION(InActiveDocument(thisContent), "Something is confused");
     EventStates changedBits = aOldState ^ newState;
 
     {
@@ -2657,6 +2662,7 @@ nsObjectLoadingContent::NotifyStateChanged(ObjectType aOldType,
       doc->ContentStateChanged(thisContent, changedBits);
     }
     if (aSync) {
+      NS_ASSERTION(InActiveDocument(thisContent), "Something is confused");
       // Make sure that frames are actually constructed immediately.
       doc->FlushPendingNotifications(Flush_Frames);
     }
@@ -2690,6 +2696,13 @@ nsObjectLoadingContent::GetTypeOfContent(const nsCString& aMIMEType)
     return eType_Document;
   }
 
+  // Faking support of the SWF content as a document for EMBED tags
+  // when internal SWF player is enabled.
+  if (aMIMEType.LowerCaseEqualsLiteral("application/x-shockwave-flash") &&
+      nsContentUtils::IsSWFPlayerEnabled()) {
+    return eType_Document;
+  }
+
   if ((caps & eSupportDocuments) && IsSupportedDocument(aMIMEType)) {
     return eType_Document;
   }
@@ -2752,8 +2765,10 @@ nsObjectLoadingContent::PluginDestroyed()
   // plugins in plugin host. Invalidate instance owner / prototype but otherwise
   // don't take any action.
   TeardownProtoChain();
-  mInstanceOwner->Destroy();
-  mInstanceOwner = nullptr;
+  if (mInstanceOwner) {
+    mInstanceOwner->Destroy();
+    mInstanceOwner = nullptr;
+  }
   return NS_OK;
 }
 
@@ -2814,8 +2829,7 @@ nsObjectLoadingContent::ScriptRequestPluginInstance(JSContext* aCx,
                 aCx == nsContentUtils::GetCurrentJSContext());
   bool callerIsContentJS = (nsContentUtils::GetCurrentJSContext() &&
                             !nsContentUtils::IsCallerChrome() &&
-                            !nsContentUtils::IsCallerContentXBL() &&
-                            JS_IsRunning(aCx));
+                            !nsContentUtils::IsCallerContentXBL());
 
   nsCOMPtr<nsIContent> thisContent =
     do_QueryInterface(static_cast<nsIImageLoadingContent*>(this));
@@ -2947,7 +2961,8 @@ nsObjectLoadingContent::LoadFallback(FallbackType aType, bool aNotify) {
     aType = eFallbackAlternate;
   }
 
-  if (thisContent->IsHTMLElement(nsGkAtoms::object) &&
+  if ((thisContent->IsHTMLElement(nsGkAtoms::object) ||
+       thisContent->IsHTMLElement(nsGkAtoms::applet)) &&
       (aType == eFallbackUnsupported ||
        aType == eFallbackDisabled ||
        aType == eFallbackBlocklisted))