Merge branch 'jb33061' into 'nemo_embedlite_38'

[rpm] Add patch with pinching to panning transition. Fixes JB#33061



See merge request !15

rpm/0001-Configure-system-sqlite-to-use-jemalloc.patch

@@ -1,7 +1,7 @@
-From c05c12e2b1dbf5415ad37baf7f7cac097d60c595 Mon Sep 17 00:00:00 2001
+From 9c65a6c4e37b784a3e47987b9544fc152d2d82ef Mon Sep 17 00:00:00 2001
 From: Raine Makelainen <raine.makelainen@jolla.com>
 Date: Mon, 12 Oct 2015 16:18:14 +0300
-Subject: [PATCH 01/14] Configure system sqlite to use jemalloc
+Subject: [PATCH 01/15] Configure system sqlite to use jemalloc
 
 See bug JB25229
 

rpm/0002-Workaround-for-bug-977015.patch

@@ -1,7 +1,7 @@
-From d2379e312103766ae9adac25f82761fadb3105dc Mon Sep 17 00:00:00 2001
+From 60dd5c37c6fe1a3b988804eee80f311bf8b07aef Mon Sep 17 00:00:00 2001
 From: Dmitry Rozhkov <dmitry.rozhkov@jolla.com>
 Date: Mon, 11 May 2015 13:01:34 +0300
-Subject: [PATCH 02/14] Workaround for bug 977015
+Subject: [PATCH 02/15] Workaround for bug 977015
 
 See bug JB16252
 

rpm/0003-Workaround-wrong-viewport-in-wikipedia.patch

@@ -1,7 +1,7 @@
-From c460f842ba854543bb1a41b03ff073a5f00a176a Mon Sep 17 00:00:00 2001
+From 6dc27489ff8ba2953e39413c39bd7d9e8ec642c0 Mon Sep 17 00:00:00 2001
 From: Dmitry Rozhkov <dmitry.rozhkov@jolla.com>
 Date: Mon, 11 May 2015 13:03:43 +0300
-Subject: [PATCH 03/14] Workaround wrong viewport in wikipedia
+Subject: [PATCH 03/15] Workaround wrong viewport in wikipedia
 
 See bug JB11251
 

rpm/0004-Supply-source-uri-to-gstreamer-pipeline.patch

@@ -1,7 +1,7 @@
-From 26f60c514fafa02f6c1da15f777f81d70a373f46 Mon Sep 17 00:00:00 2001
+From ced18180febf8e307727b55bf0c44c67ab42f3a6 Mon Sep 17 00:00:00 2001
 From: Dmitry Rozhkov <dmitry.rozhkov@jolla.com>
 Date: Mon, 11 May 2015 13:10:46 +0300
-Subject: [PATCH 04/14] Supply source uri to gstreamer pipeline
+Subject: [PATCH 04/15] Supply source uri to gstreamer pipeline
 
 See bug JB19511
 
@@ -212,7 +212,7 @@ index 3c92e53..c07fa15 100644
    GstCaps *caps =
      GStreamerFormatHelper::ConvertFormatsToCaps(mDecoder->GetResource()->GetContentType().get(),
 diff --git a/dom/media/gstreamer/GStreamerReader.h b/dom/media/gstreamer/GStreamerReader.h
-index d455954..8746198 100644
+index d455954..8746198c 100644
 --- a/dom/media/gstreamer/GStreamerReader.h
 +++ b/dom/media/gstreamer/GStreamerReader.h
 @@ -118,6 +118,15 @@ private:

rpm/0005-Workaround-for-late-access-message-loop.patch

@@ -1,7 +1,7 @@
-From efebb20a80c2f36a25cc9b4d4e09d2e76c559147 Mon Sep 17 00:00:00 2001
+From a3fad14d003cb7859f15bc1736e722dae57b15af Mon Sep 17 00:00:00 2001
 From: Dmitry Rozhkov <dmitry.rozhkov@jolla.com>
 Date: Mon, 11 May 2015 13:12:04 +0300
-Subject: [PATCH 05/14] Workaround for late access message loop.
+Subject: [PATCH 05/15] Workaround for late access message loop.
 
 See bug JB10381
 

rpm/0006-Define-HAS_NEMO_RESOURCE-in-config.patch

@@ -1,7 +1,7 @@
-From fa9086636cc227e50e55e016cd2b20d42cb59361 Mon Sep 17 00:00:00 2001
+From 5ea80922ac07161eb8bf4e76303eeaecb00b798d Mon Sep 17 00:00:00 2001
 From: Dmitry Rozhkov <dmitry.rozhkov@jolla.com>
 Date: Mon, 11 May 2015 13:13:03 +0300
-Subject: [PATCH 06/14] Define HAS_NEMO_RESOURCE in config
+Subject: [PATCH 06/15] Define HAS_NEMO_RESOURCE in config
 
 See bugs JB10947, JB30305, and JB30517
 

rpm/0007-Don-t-decode-all-images-on-shell-activation-if-decod.patch

@@ -1,7 +1,7 @@
-From ea34db8dc26f0e80c01e8ac98dc5296c77938ad9 Mon Sep 17 00:00:00 2001
+From 99e5da5d69b1dfbd8ae728e8dd40af416c59d094 Mon Sep 17 00:00:00 2001
 From: Piotr Tworek <piotr.tworek@jollamobile.com>
 Date: Fri, 3 Jul 2015 14:12:32 +0200
-Subject: [PATCH 07/14] Don't decode all images on shell activation if
+Subject: [PATCH 07/15] Don't decode all images on shell activation if
  decodeondraw is enabled. Fixes JB#25287
 
 Currently if the page contains a lot images in nsDocument::mImageTracker

rpm/0008-Limit-surface-area-rather-than-width-and-height.patch

@@ -1,7 +1,7 @@
-From 01bc5cc98194796afb4e88b535414188ac28ce15 Mon Sep 17 00:00:00 2001
+From f7aa36252cc5e7995981abcc7ed93729eccf6bf2 Mon Sep 17 00:00:00 2001
 From: Dmitry Rozhkov <dmitry.rozhkov@jolla.com>
 Date: Mon, 11 May 2015 13:17:36 +0300
-Subject: [PATCH 08/14] Limit surface area rather than width and height
+Subject: [PATCH 08/15] Limit surface area rather than width and height
 
 See bug JB26935
 

rpm/0009-Make-TextureImageEGL-hold-a-reference-to-GLContext.-.patch

@@ -1,7 +1,7 @@
-From b2919651ada218aa52dcf0186c55f5fc70b71e7b Mon Sep 17 00:00:00 2001
+From 3b925765c521eea1b2bb8211db1d7933e7f83c78 Mon Sep 17 00:00:00 2001
 From: Piotr Tworek <piotr.tworek@jollamobile.com>
 Date: Wed, 8 Jul 2015 16:13:11 +0200
-Subject: [PATCH 09/14] Make TextureImageEGL hold a reference to GLContext.
+Subject: [PATCH 09/15] Make TextureImageEGL hold a reference to GLContext.
  Fixes JB#30109.
 
 Due to rather non standard view shutdown procedure of EmbedLite port

rpm/0010-Limit-maximum-scale-to-4x.-Fixes-JB-25377.patch

@@ -1,7 +1,7 @@
-From a482bc98e1930f76f98feaa8adc8b30edb75ddd1 Mon Sep 17 00:00:00 2001
+From 5ba554e87aebfd70b0d02bbd425a172a651d60df Mon Sep 17 00:00:00 2001
 From: Raine Makelainen <raine.makelainen@jolla.com>
 Date: Mon, 12 Oct 2015 16:22:59 +0300
-Subject: [PATCH 10/14] Limit maximum scale to 4x. Fixes JB#25377
+Subject: [PATCH 10/15] Limit maximum scale to 4x. Fixes JB#25377
 
 The default zoom contraints now matches to the EmbedContentController.
 

rpm/0011-Bug-1209446-Make-sure-mFrameInProgress-flag-is-set-t.patch

@@ -1,7 +1,7 @@
-From 6776211a3cb46214c1f634bac4147f16436494e2 Mon Sep 17 00:00:00 2001
+From 3d41c93556ece1dcadabde6c7c40f5691bb127e7 Mon Sep 17 00:00:00 2001
 From: Piotr Tworek <tworaz666@gmail.com>
 Date: Tue, 29 Sep 2015 08:18:00 +0200
-Subject: [PATCH 11/14] Bug 1209446 - Make sure mFrameInProgress flag is set to
+Subject: [PATCH 11/15] Bug 1209446 - Make sure mFrameInProgress flag is set to
  true only when we actually begin drawing new frame. r=nical
 
 --HG--

rpm/0012-Adapt-LoginManager-to-EmbedLite.-Fixes-JB21980.patch

@@ -1,7 +1,7 @@
-From f383941e546ecbac49ba7a6b3217f4044c1a1b3c Mon Sep 17 00:00:00 2001
+From 49607e9a03df9a2063ccbbfb9c4190b12e75fb55 Mon Sep 17 00:00:00 2001
 From: Dmitry Rozhkov <dmitry.rozhkov@jolla.com>
 Date: Wed, 28 Oct 2015 16:07:36 +0200
-Subject: [PATCH 12/14] Adapt LoginManager to EmbedLite. Fixes JB21980
+Subject: [PATCH 12/15] Adapt LoginManager to EmbedLite. Fixes JB21980
 
 Signed-off-by: Dmitry Rozhkov <dmitry.rozhkov@jolla.com>
 ---

rpm/0013-Bug-1207205-Remove-fGetActiveUniformName.-r-jrmuizel.patch

@@ -1,7 +1,7 @@
-From 5de0d09b244fe0ca95da684c2335f4759f6acb1d Mon Sep 17 00:00:00 2001
+From 317ba8b98e828a994f23ecba1fbddf4ff6a403ce Mon Sep 17 00:00:00 2001
 From: Dan Glastonbury <dglastonbury@mozilla.com>
 Date: Wed, 30 Sep 2015 14:04:17 +1300
-Subject: [PATCH 13/14] Bug 1207205 - Remove fGetActiveUniformName. r=jrmuizel
+Subject: [PATCH 13/15] Bug 1207205 - Remove fGetActiveUniformName. r=jrmuizel
 
 Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
 ---

rpm/0014-Revert-patchset-for-bug-1114594.-Contributes-JB32870.patch

@@ -1,7 +1,7 @@
-From ed6e0c20cd907e474826d0526912e8a0dc7bae7f Mon Sep 17 00:00:00 2001
+From f61b773e51ecf16909d018ad1e5af527ba92153d Mon Sep 17 00:00:00 2001
 From: Dmitry Rozhkov <dmitry.rozhkov@jolla.com>
 Date: Thu, 5 Nov 2015 17:28:02 +0200
-Subject: [PATCH 14/14] Revert patchset for bug 1114594. Contributes JB32870
+Subject: [PATCH 14/15] Revert patchset for bug 1114594. Contributes JB32870
 
 WIP drop nsHelperAppDlg.js
 ---

rpm/0015-Add-transition-from-pinching-to-panning.patch

@@ -0,0 +1,73 @@
+From ca6654640087304e9d6bfe776807457a573d907a Mon Sep 17 00:00:00 2001
+From: Dmitry Rozhkov <dmitry.rozhkov@jolla.com>
+Date: Tue, 10 Nov 2015 14:36:10 +0200
+Subject: [PATCH 15/15] Add transition from pinching to panning
+
+---
+ gfx/layers/apz/src/AsyncPanZoomController.cpp | 13 +++++++++++++
+ gfx/layers/apz/src/GestureEventListener.cpp   | 15 ++++++++++++++-
+ 2 files changed, 27 insertions(+), 1 deletion(-)
+
+diff --git a/gfx/layers/apz/src/AsyncPanZoomController.cpp b/gfx/layers/apz/src/AsyncPanZoomController.cpp
+index ceb7f6c..9ff04b4 100644
+--- a/gfx/layers/apz/src/AsyncPanZoomController.cpp
++++ b/gfx/layers/apz/src/AsyncPanZoomController.cpp
+@@ -1432,6 +1432,19 @@ nsEventStatus AsyncPanZoomController::OnScaleEnd(const PinchGestureInput& aEvent
+     UpdateSharedCompositorFrameMetrics();
+   }
+
++  // Non-negative focus point would indicate that one finger is still down
++  if (aEvent.mFocusPoint.x != -1 && aEvent.mFocusPoint.y != -1) {
++    mPanDirRestricted = false;
++    mX.StartTouch(aEvent.mFocusPoint.x, aEvent.mTime);
++    mY.StartTouch(aEvent.mFocusPoint.y, aEvent.mTime);
++    if (nsRefPtr<GeckoContentController> controller = GetGeckoContentController()) {
++      controller->NotifyAPZStateChange(
++        GetGuid(), APZStateChange::StartTouch,
++        CurrentTouchBlock()->GetOverscrollHandoffChain()->CanBePanned(this));
++    }
++    SetState(TOUCHING);
++  }
++
+   return nsEventStatus_eConsumeNoDefault;
+ }
+
+diff --git a/gfx/layers/apz/src/GestureEventListener.cpp b/gfx/layers/apz/src/GestureEventListener.cpp
+index 76a8b5d..d63da0e 100644
+--- a/gfx/layers/apz/src/GestureEventListener.cpp
++++ b/gfx/layers/apz/src/GestureEventListener.cpp
+@@ -100,6 +100,13 @@ nsEventStatus GestureEventListener::HandleInputEvent(const MultiTouchInput& aEve
+     }
+     break;
+   case MultiTouchInput::MULTITOUCH_MOVE:
++    for (size_t i = 0; i < aEvent.mTouches.Length(); i++) {
++      for (size_t j = 0; j < mTouches.Length(); j++) {
++        if (aEvent.mTouches[i].mIdentifier == mTouches[j].mIdentifier) {
++          mTouches[j].mScreenPoint = aEvent.mTouches[i].mScreenPoint;
++        }
++      }
++    }
+     rv = HandleInputTouchMove();
+     break;
+   case MultiTouchInput::MULTITOUCH_END:
+@@ -367,10 +374,16 @@ nsEventStatus GestureEventListener::HandleInputTouchEnd()
+   case GESTURE_PINCH:
+     if (mTouches.Length() < 2) {
+       SetState(GESTURE_NONE);
++      ScreenPoint point(-1, -1);
++      if (mTouches.Length() == 1) {
++        // As user still keeps one finger down the event's focus point should
++        // contain meaningful data.
++        point = mTouches[0].mScreenPoint;
++      }
+       PinchGestureInput pinchEvent(PinchGestureInput::PINCHGESTURE_END,
+                                    mLastTouchInput.mTime,
+                                    mLastTouchInput.mTimeStamp,
+-                                   ScreenPoint(),
++                                   point,
+                                    1.0f,
+                                    1.0f,
+                                    mLastTouchInput.modifiers);
+-- 
+2.1.4
+

rpm/xulrunner-qt5.spec

@@ -56,6 +56,7 @@ Patch11:    0011-Bug-1209446-Make-sure-mFrameInProgress-flag-is-set-t.patch
 Patch12:    0012-Adapt-LoginManager-to-EmbedLite.-Fixes-JB21980.patch
 Patch13:    0013-Bug-1207205-Remove-fGetActiveUniformName.-r-jrmuizel.patch
 Patch14:    0014-Revert-patchset-for-bug-1114594.-Contributes-JB32870.patch
+Patch15:    0015-Add-transition-from-pinching-to-panning.patch
 BuildRequires:  pkgconfig(Qt5Quick)
 BuildRequires:  pkgconfig(Qt5Network)
 BuildRequires:  pkgconfig(pango)
@@ -148,6 +149,7 @@ Tests and misc files for xulrunner.
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 mkdir -p "%BUILD_DIR"
 cp -rf "%BASE_CONFIG" "%BUILD_DIR"/mozconfig