import change from rmottola/Arctic-Fox:

- Bug 1138527 part 1 - Make ruby annotations have the same font inflation as its containing ruby frame. (088bbf5bc)
- Bug 1138527 part 2 - Reftest for application of font inflation to ruby. (41ae8c811)
- Bug 1097468 - Part1: expose |homescreen-webapps-manage| in Apps.webidl (b182f49b7)
- Bug 1097468 - Part 2: test for permission |homescreen-webapps-manage|. (1b097c139)
- Bug 943537 - In the GeckoContentController interface, take the modifiers for tap events in 'widget modifier' format rather than 'DOM modifier' format (4b7de6b31)
- Bug 943537 - Handle modifiers on tap events in RemoteContentController and ChromeProcessController. (2bbe91961)
- Bug 1130455 - Remove the ScrollingBehavior code to propagate APZ and use gfxPrefs instead. (09a0c8e61)
- Bug 1139258 - Use ScreenIntSize in PBrowser::Show/UpdateDimensions (2189f8921)
- Bug 1139575 - Don't set the fast motion flag on multitouch blocks. (5155bfd13)
- Bug 1137267 - Enable event-regions automatically when APZ is enabled, and allow the APZ code to assume event-regions are enabled always. (29d7e7d1c)
- Bug 1137267 - Remove unneeded flags to track touch listeners and touch caret. (cb6cc1139)
- Bug 1036967 - Use ScaleFactors2D instead of ScaleFactor where appropriate in APZ and surrounding code. (09ce986a9)
- Bug 1036967 - Remove ScaleFactor::ScaleFactor(float, float). (87d13024c)
- Bug 1036967 - Followup to fix debug logging. (d01fca6e4)
- Bug 1036967 - Follow-up to fix debug logging. (776b4b65e)
- Bug 1149060. Fix dev pixels per CSS pixel and presshell resolution layer dumping after bug 1036967. (6d26e4d3c)
- Bug 1130982 - Reftest for this bug. (00bff9489)
-  Bug 1130982 - Ensure the clip rect is appropriately adjusted for multi-framemetrics layers. (211d15a4d)
-  Bug 1130982 - Fix a reftest so an element that's supposed to be scrollable actually is. (71dc992e2)
- Bug 1130982 - With multi-FrameMetrics on APZ platforms, do not apply clips to scroll ports of frames other than the bottom-most one on the layout side. (4d9342324)
- Fix APZ using incorrect scroll wheel deltas. (bug 1141728) (cad854639)
- Bug 1139675 - Update JS callers of nsIDOMWindowUtils.setResolution and getResolution in accessibility code. (28dffc78d)
- Bug 1136914 - Don't lose scale from parent document when descending into subdocument. (0d3cef358)
- Bug 1139283 - Move some properties from nsStyleDisplay to nsStylePosition. (ff61201ae)
- Bug 1125767. Centralize code into nsStylePosition::IsFixedPosContainingBlock. (f256191f4)
- temporary override -> MOZ_OVERRIDE again (ed8caa82d)
- Bug 1139675 - Add a couple of operator overloads to BaseSize. (a214c0eab)
- Bug 927995 - Handle antialias+preserveDrawingBuffer properly. (9ceaf6d0a)
- Bug 1142926 - Only notify the docshell of state changes when moving in and out of a transforming state across all APZCs. (153054d1e)
- Bug 1116806: Enable dom.ipc.plugins.asyncInit by default; (bf0e3464d)
- Bug 1143789. Remove unnecessary cast to BasicLayerManager. (fd30ade6c)

gfx/layers/client/ClientLayerManager.cpp

@@ -212,10 +212,8 @@ ClientLayerManager::BeginTransactionWithTarget(gfxContext* aTarget)
   // Desktop does not support async zoom yet, so we ignore this for those
   // platforms.
 #if defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_GONK)
-  if (mWidget) {
-    if (dom::TabChild* window = mWidget->GetOwningTabChild()) {
-      mCompositorMightResample = window->IsAsyncPanZoomEnabled();
-    }
+  if (mWidget && mWidget->GetOwningTabChild()) {
+    mCompositorMightResample = gfxPrefs::AsyncPanZoomEnabled();
   }
 #endif
 
@@ -789,7 +787,7 @@ ClientLayerManager::ProgressiveUpdateCallback(bool aHasPendingNewThebesContent,
   MOZ_ASSERT(aMetrics.IsScrollable());
   // This is derived from the code in
   // gfx/layers/ipc/CompositorParent.cpp::TransformShadowTree.
-  CSSToLayerScale paintScale = aMetrics.LayersPixelsPerCSSPixel();
+  CSSToLayerScale paintScale = aMetrics.LayersPixelsPerCSSPixel().ToScaleFactor();
   const CSSRect& metricsDisplayPort =
     (aDrawingCritical && !aMetrics.GetCriticalDisplayPort().IsEmpty()) ?
       aMetrics.GetCriticalDisplayPort() : aMetrics.GetDisplayPort();
@@ -801,7 +799,7 @@ ClientLayerManager::ProgressiveUpdateCallback(bool aHasPendingNewThebesContent,
     aHasPendingNewThebesContent, displayPort, paintScale.scale, aDrawingCritical,
     scrollOffset, zoom);
   aMetrics.SetScrollOffset(scrollOffset / zoom);
-  aMetrics.SetZoom(zoom);
+  aMetrics.SetZoom(CSSToParentLayerScale2D(zoom));
   return ret;
 #else
   return false;