Skip to content

Commit

Permalink
[xulrunner] Initialize RequestSyncService only if its pref is enabled
Browse files Browse the repository at this point in the history
As this was merged to Gecko 47 add this as a patch. This
patch can be removed once engine reaches Gecko 47 level.

See: https://bugzilla.mozilla.org/show_bug.cgi?id=1253215
  • Loading branch information
rainemak committed Jun 13, 2016
1 parent 8bc26b4 commit 82bc83a
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 0 deletions.
@@ -0,0 +1,29 @@
From d580110f44f0d24b6af62baabc44849cf63a8180 Mon Sep 17 00:00:00 2001
From: Andrea Marchesini <amarchesini@mozilla.com>
Date: Thu, 3 Mar 2016 18:30:16 +0100
Subject: [PATCH 17/17] Bug 1253215 - Initialize RequestSyncService only if its
pref is enabled, r=ehsan

Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
---
dom/requestsync/RequestSyncService.jsm | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/dom/requestsync/RequestSyncService.jsm b/dom/requestsync/RequestSyncService.jsm
index 064912b..7fb61fe 100644
--- a/dom/requestsync/RequestSyncService.jsm
+++ b/dom/requestsync/RequestSyncService.jsm
@@ -76,6 +76,10 @@ this.RequestSyncService = {
init: function() {
debug("init");

+ if (!Services.prefs.getBoolPref("dom.requestSync.enabled")) {
+ return;
+ }
+
this._messages.forEach((function(msgName) {
ppmm.addMessageListener(msgName, this);
}).bind(this));
--
2.7.4

2 changes: 2 additions & 0 deletions rpm/xulrunner-qt5.spec
Expand Up @@ -58,6 +58,7 @@ 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
Patch16: 0016-rpm-Update-build-version.-Contributes-to-JB-35001.patch
Patch17: 0017-Bug-1253215-Initialize-RequestSyncService-only-if-it.patch
BuildRequires: pkgconfig(Qt5Quick)
BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(pango)
Expand Down Expand Up @@ -156,6 +157,7 @@ Tests and misc files for xulrunner.
%patch14 -p1
%patch15 -p1
%patch16 -p1
%patch17 -p1

mkdir -p "%BUILD_DIR"
cp -rf "%BASE_CONFIG" "%BUILD_DIR"/mozconfig
Expand Down

0 comments on commit 82bc83a

Please sign in to comment.