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

- Bug 1047713, fix leak of SelectParentHelper, r=felipe (9a9bbddeb3)
- Bug 1128162 - Scale the select popup's text to match the page zoom r=mconley (2b4499b4c5)
- Bug 1179478 - Support tooltips for option elements in e10s r=mconley (124c923d47)
- Bug 1168691 - Preserve the text direction for the select element itself r=mconley (77a4638216)
- var-let (4514fc8c5f)
- Bug 1197927 - Sanitize throws exception if browser goes away too quickly. r=felipe (5da1d9f6d3)
- Bug 1186398, perform correct check when comparing if the select value has changed, r=felipe (f50b9fea06)
- Bug 1191820, handle case of optgroup tag properly so that options appear properly, r=felipe (c1a6591543)
- Bug 1195931, use option.text instead of option.textContent so that spaces get handled properly in select lists, r=felipe (10a18b6f11)
- Bug 1191897, add a flag for popups which allow shortcut keys to not be consumed, fixes shortcuts not working when an e10s select popup is open, r=neil (c3d788f65c)
- Bug 1181897 - Do not scale down <img> elements passed to setDragImage. r=roc (b9db4b2c2f)
- Bug 1204442 nsIDragService::FireDragEventAtSource() shouldn't be available from script because it takes a value of mozilla::EventMessage r=smaug, sr=smaug (6d357d54a7)
- Bug 1202176, adjust coordinates from device to css pixels when drag popup moves, r=tn (d6fa56dc59)
- Bug 1204944, convert drag position coordinates properly, r=mstange (0ff3b815b4)
- Bug 1205511 - Make nsBaseDragService::mImage[X|Y] strongly typed. r=enn (47d68b017a)
- Bug 1205511 - Make nsMenuPopupFrame::MoveTo()'s arguments strongly typed. r=enn (c29c16b9ce)
- Bug 1205511 - Give nsPresContext a method that returns the CSS to device pixel scale. r=dbaron (e91a754991)
- Bug 1205511 - Add overloaded operators for multiplying and dividing an IntPointTyped by a ScaleFactor[2D]. r=kats (f857857c94)
- Bug 1188172 - Don't update the resolution/SPCSPS for meta-viewport changes before the first-paint. r=botond (0d7eeda1c8)
- Bug 1168487 - Update the last use site of ScrollbarAreaToExcludeFromCompositionBoundsFor to use LD pixels. r=tn (af1d65d14a)
- Bug 1197592 - Don't set an SPCSPS in the mobile viewport manager if APZ zooming is not enabled. r=botond (eb2b3d3bf3)
- Bug 1180267 - Don't set root displayport margins from the mobile viewport manager unless the C++ APZ is enabled. r=botond (982b57a6f3)
- Bug 976616 - Part 1: Call ProcessViewportInfo when meta viewport is changed. r=bholley (0df9aaad5c)
- Bug 976616 - Part 2: Update mobile viewport on DOMMetaChanged event. r=kats (97244f0a2f)
- Bug 976616 - Part 3: Enable meta viewport tests for Fennec. r=kats (16de4304dc)
- Bug 976616 - Part 4: Add test for dynamic meta viewport updates. r=kats (c3af1ba028)
- Bug 1198839 - Don't update the displayport from the MVM unless there is already on the content. r=botond (a86c335313)
- Bug 1205511 - Document that nsIDragService.dragMoved() takes its arguments in LayoutDevice pixels. r=enn IGNORE IDL (comment change only) (ea1f24c65e)
- Bug 1180267 - Ensure that the desktop-mode viewport for Fennec is based on a 980 CSS pixel width rather than the screen size. r=snorp (365c12249c)
- Bug 1200402 - Ignore desktop mode for about: pages. r=snorp,khuey (3d64772abe)
- Bug 1197824 - Remove unused state and normalize others. r=botond (58ed2bb53b)
- Bug 1197824 - Allow zooming in desktop mode. r=botond (dbded0fdf7)
- Bug 1200303 - Support meta-viewport changes in ZoomConstraintsClient as well. r=miketaylr (bb5ebee8ed)
- Bug 1197824 - Support the browser.ui.zoom.force-user-scalable pref in the gecko zoom-constraints codepath. r=botond (0292f794c6)
- Bug 1197824 - Constrain the min/max zoom if zooming is not allowed. r=botond (26ae1656ba)
- Bug 1197824 - Remove the mAllowDoubleTapZoom field from nsViewportInfo as it is not needed. r=botond (00455cf30c)
- Bug 1189837 - Subtract scrollbars in LD pixels rather than CSS pixels. r=mstange (8801383234)
- Bug 1210399 - IonMonkey: MIPS: Safe for races. r=lth (5be49e2198)
- Bug 1202367 - reinitialize expected value in CAS loop. patch=hev, r=sstangl, push=lth (438272bb96)
- Bug 1210733 - Record source filenames independently of the script coverage. r=terrence (3a90b1a660)
- Bug 1211546 - Unbreak the non-unified build. (r=sfink, r=nbp, r=shu) (4b290fffac)
- Bug 977338 - Remove AtomicOperations-inl.h, r=lth (0015c7a398)
- Bug 1202713 - Fix the CSS viewport dimensions for desktop mode. r=snorp (763a55b6aa)
- Bug 1024343: The document should not stop animations when it is being swapped. r=smaug (ba2d43f308)
- Bug 1200093 - Don't rely on finding the widget for a document in order to get the css-to-ld scale. r=botond (bf359f6c76)
- Bug 1205511 - Use nsPresContext::DevToCSSPixelScale() where appropriate. r=kats (631a8fe6ae)
- Bug 1204994 - part 0 - separate debugging use counters check from value check; r=bz (d8771157eb)
- Bug 1204994 - part 1 - add *CONTENT_DOCUMENTS_DESTROYED histograms; r=bz,vladan (1663026e4f)
- Bug 1204994 - part 2 - rename all USE_COUNTER_* histograms to USE_COUNTER2_* histograms; r=bz,vladan (8a86ee4560)
- Bug 1202895 - Fix shift-reload check for setting up service worker. r=bkelly (61309332e6)
- let-var (315a834c4d)
- Bug 1193469 - Make mozSettings more defensive. r=gwagner (9c4aeb2721)
- Bug 1187419 - Make sure SettingsRequestManager is only loaded in parent. r=gwagner (98bfca7a44)
- Bug 1156231 - enable data registration recovery. r=hsinyi (f886c81ce3)
- Bug 1159591 - Part 1: Add MMI tests for call barring, call waiting, clip, clir, pin2, puk2 and ussd. r=aknow (96ba4e4a89)
- Bug 1149433 - Set hangUpLocal in rejectCall. r=hsinyi (43aec5ea64)
- Bug 1147842 - Fix defect of setting call started time. r=hsinyi (dbf6a5516a)
- Bug 1145079 - Fix defect for calling isEmergencyOnly. r=hsinyi (8ba883d37e)

docshell/base/nsDocShell.cpp

@@ -10974,10 +10974,7 @@ nsDocShell::DoChannelLoad(nsIChannel* aChannel,
 
   // If the user pressed shift-reload, then do not allow ServiceWorker
   // interception to occur. See step 12.1 of the SW HandleFetch algorithm.
-  if (mLoadType == LOAD_RELOAD_BYPASS_CACHE ||
-      mLoadType == LOAD_RELOAD_BYPASS_PROXY ||
-      mLoadType == LOAD_RELOAD_BYPASS_PROXY_AND_CACHE ||
-      mLoadType == LOAD_RELOAD_ALLOW_MIXED_CONTENT) {
+  if (IsForceReloadType(mLoadType)) {
     nsCOMPtr<nsIHttpChannelInternal> internal = do_QueryInterface(aChannel);
     if (internal) {
       internal->ForceNoIntercept();
@@ -11266,11 +11263,7 @@ nsDocShell::OnNewURI(nsIURI* aURI, nsIChannel* aChannel, nsISupports* aOwner,
    * for the page. Save the new cacheKey in Session History.
    * see bug 90098
    */
-  if (aChannel &&
-      (aLoadType == LOAD_RELOAD_BYPASS_CACHE ||
-       aLoadType == LOAD_RELOAD_BYPASS_PROXY ||
-       aLoadType == LOAD_RELOAD_BYPASS_PROXY_AND_CACHE ||
-       aLoadType == LOAD_RELOAD_ALLOW_MIXED_CONTENT)) {
+  if (aChannel && IsForceReloadType(aLoadType)) {
     NS_ASSERTION(!updateSHistory,
                  "We shouldn't be updating session history for forced"
                  " reloads!");