- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-60.4.0esr-8.5-1] Bug 1474659 Part 2 - Add dedicated AllocKinds just for ArrayBufferObjects. r?sfink
by gk＠torproject.org 10 Jan '19

10 Jan '19

commit 4aa3f9efbdfa62123ed657ce27231ff27d36d9d2 Author: Matt Howell <mhowell(a)mozilla.com> Date: Tue Jan 8 09:01:25 2019 +0000 Bug 1474659 Part 2 - Add dedicated AllocKinds just for ArrayBufferObjects. r?sfink The reason for doing this is to get ArrayBufferObjects allocated into their own arenas. The specific enum values were chosen to avoid breaking assumptions about where certain values fall in the list, such as OBJECT_FIRST == FUNCTION. --- js/src/gc/AllocKind.h | 4 ++++ js/src/gc/GC.cpp | 12 ++++++++++++ js/src/gc/GCRuntime.h | 2 +- js/src/gc/ObjectKind-inl.h | 4 ++++ js/src/vm/ArrayBufferObject.cpp | 17 ++++++++++++++++- 5 files changed, 37 insertions(+), 2 deletions(-) diff --git a/js/src/gc/AllocKind.h b/js/src/gc/AllocKind.h index c4f52bc5bf41..a9cee3a34fb4 100644 --- a/js/src/gc/AllocKind.h +++ b/js/src/gc/AllocKind.h @@ -43,12 +43,16 @@ namespace gc { D(OBJECT0_BACKGROUND, Object, JSObject, JSObject_Slots0, true, true) \ D(OBJECT2, Object, JSObject, JSObject_Slots2, false, false) \ D(OBJECT2_BACKGROUND, Object, JSObject, JSObject_Slots2, true, true) \ + D(ARRAYBUFFER4, Object, JSObject, JSObject_Slots4, true, true) \ D(OBJECT4, Object, JSObject, JSObject_Slots4, false, false) \ D(OBJECT4_BACKGROUND, Object, JSObject, JSObject_Slots4, true, true) \ + D(ARRAYBUFFER8, Object, JSObject, JSObject_Slots8, true, true) \ D(OBJECT8, Object, JSObject, JSObject_Slots8, false, false) \ D(OBJECT8_BACKGROUND, Object, JSObject, JSObject_Slots8, true, true) \ + D(ARRAYBUFFER12, Object, JSObject, JSObject_Slots12, true, true) \ D(OBJECT12, Object, JSObject, JSObject_Slots12, false, false) \ D(OBJECT12_BACKGROUND, Object, JSObject, JSObject_Slots12, true, true) \ + D(ARRAYBUFFER16, Object, JSObject, JSObject_Slots16, true, true) \ D(OBJECT16, Object, JSObject, JSObject_Slots16, false, false) \ D(OBJECT16_BACKGROUND, Object, JSObject, JSObject_Slots16, true, true) diff --git a/js/src/gc/GC.cpp b/js/src/gc/GC.cpp index 8eeeb9ce72ff..27504c5e8fc6 100644 --- a/js/src/gc/GC.cpp +++ b/js/src/gc/GC.cpp @@ -467,9 +467,13 @@ static const FinalizePhase BackgroundFinalizePhases[] = { AllocKind::FUNCTION_EXTENDED, AllocKind::OBJECT0_BACKGROUND, AllocKind::OBJECT2_BACKGROUND, + AllocKind::ARRAYBUFFER4, AllocKind::OBJECT4_BACKGROUND, + AllocKind::ARRAYBUFFER8, AllocKind::OBJECT8_BACKGROUND, + AllocKind::ARRAYBUFFER12, AllocKind::OBJECT12_BACKGROUND, + AllocKind::ARRAYBUFFER16, AllocKind::OBJECT16_BACKGROUND } }, @@ -2093,12 +2097,16 @@ static const AllocKind AllocKindsToRelocate[] = { AllocKind::OBJECT0_BACKGROUND, AllocKind::OBJECT2, AllocKind::OBJECT2_BACKGROUND, + AllocKind::ARRAYBUFFER4, AllocKind::OBJECT4, AllocKind::OBJECT4_BACKGROUND, + AllocKind::ARRAYBUFFER8, AllocKind::OBJECT8, AllocKind::OBJECT8_BACKGROUND, + AllocKind::ARRAYBUFFER12, AllocKind::OBJECT12, AllocKind::OBJECT12_BACKGROUND, + AllocKind::ARRAYBUFFER16, AllocKind::OBJECT16, AllocKind::OBJECT16_BACKGROUND, AllocKind::SCRIPT, @@ -2812,12 +2820,16 @@ static const AllocKinds UpdatePhaseObjects { AllocKind::OBJECT0_BACKGROUND, AllocKind::OBJECT2, AllocKind::OBJECT2_BACKGROUND, + AllocKind::ARRAYBUFFER4, AllocKind::OBJECT4, AllocKind::OBJECT4_BACKGROUND, + AllocKind::ARRAYBUFFER8, AllocKind::OBJECT8, AllocKind::OBJECT8_BACKGROUND, + AllocKind::ARRAYBUFFER12, AllocKind::OBJECT12, AllocKind::OBJECT12_BACKGROUND, + AllocKind::ARRAYBUFFER16, AllocKind::OBJECT16, AllocKind::OBJECT16_BACKGROUND }; diff --git a/js/src/gc/GCRuntime.h b/js/src/gc/GCRuntime.h index d6ca9ddc94fc..639481fbda54 100644 --- a/js/src/gc/GCRuntime.h +++ b/js/src/gc/GCRuntime.h @@ -186,7 +186,7 @@ class ChainedIter typedef HashMap<Value*, const char*, DefaultHasher<Value*>, SystemAllocPolicy> RootedValueMap; -using AllocKinds = mozilla::EnumSet<AllocKind>; +using AllocKinds = mozilla::EnumSet<AllocKind, uint64_t>; // A singly linked list of zones. class ZoneList diff --git a/js/src/gc/ObjectKind-inl.h b/js/src/gc/ObjectKind-inl.h index d2cde1da08dc..106fbc012132 100644 --- a/js/src/gc/ObjectKind-inl.h +++ b/js/src/gc/ObjectKind-inl.h @@ -124,15 +124,19 @@ GetGCKindSlots(AllocKind thingKind) case AllocKind::OBJECT2: case AllocKind::OBJECT2_BACKGROUND: return 2; + case AllocKind::ARRAYBUFFER4: case AllocKind::OBJECT4: case AllocKind::OBJECT4_BACKGROUND: return 4; + case AllocKind::ARRAYBUFFER8: case AllocKind::OBJECT8: case AllocKind::OBJECT8_BACKGROUND: return 8; + case AllocKind::ARRAYBUFFER12: case AllocKind::OBJECT12: case AllocKind::OBJECT12_BACKGROUND: return 12; + case AllocKind::ARRAYBUFFER16: case AllocKind::OBJECT16: case AllocKind::OBJECT16_BACKGROUND: return 16; diff --git a/js/src/vm/ArrayBufferObject.cpp b/js/src/vm/ArrayBufferObject.cpp index 0a342a6850c7..ef63b046ea12 100644 --- a/js/src/vm/ArrayBufferObject.cpp +++ b/js/src/vm/ArrayBufferObject.cpp @@ -1160,6 +1160,21 @@ ArrayBufferObject::setFlags(uint32_t flags) setSlot(FLAGS_SLOT, Int32Value(flags)); } +static inline AllocKind +GetArrayBufferGCObjectKind(size_t numSlots) +{ + if (numSlots <= 4) { + return AllocKind::ARRAYBUFFER4; + } + if (numSlots <= 8) { + return AllocKind::ARRAYBUFFER8; + } + if (numSlots <= 12) { + return AllocKind::ARRAYBUFFER12; + } + return AllocKind::ARRAYBUFFER16; +} + ArrayBufferObject* ArrayBufferObject::create(JSContext* cx, uint32_t nbytes, BufferContents contents, OwnsState ownsState /* = OwnsData */, @@ -1220,7 +1235,7 @@ ArrayBufferObject::create(JSContext* cx, uint32_t nbytes, BufferContents content } MOZ_ASSERT(!(class_.flags & JSCLASS_HAS_PRIVATE)); - gc::AllocKind allocKind = GetGCObjectKind(nslots); + gc::AllocKind allocKind = GetArrayBufferGCObjectKind(nslots); AutoSetNewObjectMetadata metadata(cx); Rooted<ArrayBufferObject*> obj(cx,

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Bug 1474659 Part 1 - Add support to EnumSet for more than 32 values. r?sfink
by gk＠torproject.org 10 Jan '19

10 Jan '19

commit f1381907e4a9a586e38c322dcb8f1bd02315d691 Author: Matt Howell <mhowell(a)mozilla.com> Date: Tue Jan 8 09:00:20 2019 +0000 Bug 1474659 Part 1 - Add support to EnumSet for more than 32 values. r?sfink The next patch in this series extends an enum that's used in an EnumSet to 34 values, so we need to extend EnumSet beyond a hardcoded uint32_t storage type. --- mfbt/EnumSet.h | 55 +++++++++++---------- mfbt/tests/TestEnumSet.cpp | 121 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 151 insertions(+), 25 deletions(-) diff --git a/mfbt/EnumSet.h b/mfbt/EnumSet.h index d8c8a2af8b25..2e17a8f55186 100644 --- a/mfbt/EnumSet.h +++ b/mfbt/EnumSet.h @@ -13,21 +13,26 @@ #include "mozilla/Attributes.h" #include <initializer_list> +#include <limits> #include <stdint.h> namespace mozilla { /** - * EnumSet<T> is a set of values defined by an enumeration. It is implemented - * using a 32 bit mask for each value so it will only work for enums with an int - * representation less than 32. It works both for enum and enum class types. + * EnumSet represents a set of multiple values of an enum (or enum class). + * Template parameter T should be the enum you want to represent. + * EnumSet is implemented using a bitmask of all possible values of the enum T, + * and the default type for the bitmask value is uint32_t, so if your enum has + * more than 32 possible values, you should also supply a backing integer type + * as template parameter U which has at least as many bits as the number of + * possible values of enum T. */ -template<typename T> +template<typename T, typename U = uint32_t> class EnumSet { public: - typedef uint32_t serializedType; + typedef U serializedType; EnumSet() : mBitField(0) @@ -84,9 +89,9 @@ public: /** * Add an element */ - EnumSet<T> operator+(T aEnum) const + EnumSet<T,U> operator+(T aEnum) const { - EnumSet<T> result(*this); + EnumSet<T,U> result(*this); result += aEnum; return result; } @@ -94,7 +99,7 @@ public: /** * Union */ - void operator+=(const EnumSet<T> aEnumSet) + void operator+=(const EnumSet<T,U> aEnumSet) { incVersion(); mBitField |= aEnumSet.mBitField; @@ -103,9 +108,9 @@ public: /** * Union */ - EnumSet<T> operator+(const EnumSet<T> aEnumSet) const + EnumSet<T,U> operator+(const EnumSet<T,U> aEnumSet) const { - EnumSet<T> result(*this); + EnumSet<T,U> result(*this); result += aEnumSet; return result; } @@ -122,9 +127,9 @@ public: /** * Remove an element */ - EnumSet<T> operator-(T aEnum) const + EnumSet<T,U> operator-(T aEnum) const { - EnumSet<T> result(*this); + EnumSet<T,U> result(*this); result -= aEnum; return result; } @@ -132,7 +137,7 @@ public: /** * Remove a set of elements */ - void operator-=(const EnumSet<T> aEnumSet) + void operator-=(const EnumSet<T,U> aEnumSet) { incVersion(); mBitField &= ~(aEnumSet.mBitField); @@ -141,9 +146,9 @@ public: /** * Remove a set of elements */ - EnumSet<T> operator-(const EnumSet<T> aEnumSet) const + EnumSet<T,U> operator-(const EnumSet<T,U> aEnumSet) const { - EnumSet<T> result(*this); + EnumSet<T,U> result(*this); result -= aEnumSet; return result; } @@ -160,7 +165,7 @@ public: /** * Intersection */ - void operator&=(const EnumSet<T> aEnumSet) + void operator&=(const EnumSet<T,U> aEnumSet) { incVersion(); mBitField &= aEnumSet.mBitField; @@ -169,9 +174,9 @@ public: /** * Intersection */ - EnumSet<T> operator&(const EnumSet<T> aEnumSet) const + EnumSet<T,U> operator&(const EnumSet<T,U> aEnumSet) const { - EnumSet<T> result(*this); + EnumSet<T,U> result(*this); result &= aEnumSet; return result; } @@ -179,7 +184,7 @@ public: /** * Equality */ - bool operator==(const EnumSet<T> aEnumSet) const + bool operator==(const EnumSet<T,U> aEnumSet) const { return mBitField == aEnumSet.mBitField; } @@ -198,7 +203,7 @@ public: uint8_t size() const { uint8_t count = 0; - for (uint32_t bitField = mBitField; bitField; bitField >>= 1) { + for (serializedType bitField = mBitField; bitField; bitField >>= 1) { if (bitField & 1) { count++; } @@ -224,7 +229,7 @@ public: class ConstIterator { - const EnumSet<T>* mSet; + const EnumSet<T,U>* mSet; uint32_t mPos; #ifdef DEBUG uint64_t mVersion; @@ -236,7 +241,7 @@ public: } public: - ConstIterator(const EnumSet<T>& aSet, uint32_t aPos) + ConstIterator(const EnumSet<T,U>& aSet, uint32_t aPos) : mSet(&aSet), mPos(aPos) { #ifdef DEBUG @@ -308,11 +313,11 @@ public: } private: - static uint32_t bitFor(T aEnum) + static serializedType bitFor(T aEnum) { uint32_t bitNumber = (uint32_t)aEnum; MOZ_ASSERT(bitNumber < kMaxBits); - return 1U << bitNumber; + return (serializedType)1 << bitNumber; } void incVersion() { @@ -321,7 +326,7 @@ private: #endif } - static const size_t kMaxBits = 32; + static const size_t kMaxBits = std::numeric_limits<serializedType>::digits; serializedType mBitField; #ifdef DEBUG diff --git a/mfbt/tests/TestEnumSet.cpp b/mfbt/tests/TestEnumSet.cpp index 801295fd67dc..903b74c5b834 100644 --- a/mfbt/tests/TestEnumSet.cpp +++ b/mfbt/tests/TestEnumSet.cpp @@ -33,6 +33,65 @@ enum SeaBird AUK }; +enum DeepSeaFish +{ + FLATFISH, + HAGFISH, + EELPOUT, + GREENEYE_EEL, + STRINGRAY, + LUMPFISH, + BATFISH, + RATTAIL, + BROTULA, + BRISTLEMOUTH, + ANGLERFISH, + FANGTOOTH, + VIPERFISH, + BLACK_SWALLOWER, + TELESCOPEFISH, + HAMMERJAW, + DAGGERTOOTH, + BARRACUDINA, + SCABBARDFISH, + BOBTAIL_SNIPE_EEL, + UNICORN_CRESTFISH, + PELICAN_EEL, + FLABBY_WHALEFISH, + LANTERNFISH, + OPAH, + LANCEFISH, + BARRELEYE, + RIDGEHEAD, + SABRETOOTH, + STOPLIGHT_LOOSEJAW, + HATCHETFISH, + DOLPHINFISH, + POMFRET, + BARRACUDA, + SNAGGLETOOTH, + BLACKSMELT, + TAPIRFISH, + GRENADIER, + SLICKHEAD, + OREODORY, + SPIDERFISH, +}; + +enum Mollusc +{ + SNAIL, + SLUG, + CLAM, + OYSTER, + SCALLOP, + GEODUCK, + MUSSEL, + SQUID, + OCTOPUS, + CUTTLEFISH +}; + class EnumSetSuite { public: @@ -62,6 +121,8 @@ public: testDuplicates(); testIteration(); testInitializerListConstuctor(); + testLargeEnum(); + testSmallEnum(); } private: @@ -273,6 +334,66 @@ private: MOZ_RELEASE_ASSERT(someBirds.contains(BOOBY)); } + void testLargeEnum() + { + typedef EnumSet<DeepSeaFish, uint64_t> FishSet; + FishSet fishes {}; + MOZ_RELEASE_ASSERT(fishes.size() == 0); + MOZ_RELEASE_ASSERT(fishes.isEmpty()); + + fishes += ANGLERFISH; + fishes += SPIDERFISH; + fishes += GRENADIER; + fishes += FLATFISH; + + MOZ_RELEASE_ASSERT(fishes.size() == 4); + MOZ_RELEASE_ASSERT(fishes.contains(ANGLERFISH)); + MOZ_RELEASE_ASSERT(fishes.contains(SPIDERFISH)); + MOZ_RELEASE_ASSERT(fishes.contains(GRENADIER)); + MOZ_RELEASE_ASSERT(fishes.contains(FLATFISH)); + + Vector<DeepSeaFish> vec; + for (auto fish : fishes) { + MOZ_RELEASE_ASSERT(vec.append(fish)); + } + + MOZ_RELEASE_ASSERT(vec.length() == 4); + MOZ_RELEASE_ASSERT(vec[0] == FLATFISH); + MOZ_RELEASE_ASSERT(vec[1] == ANGLERFISH); + MOZ_RELEASE_ASSERT(vec[2] == GRENADIER); + MOZ_RELEASE_ASSERT(vec[3] == SPIDERFISH); + } + + void testSmallEnum() + { + typedef EnumSet<Mollusc, uint16_t> MolluscSet; + MolluscSet molluscs {}; + MOZ_RELEASE_ASSERT(molluscs.size() == 0); + MOZ_RELEASE_ASSERT(molluscs.isEmpty()); + + molluscs += OYSTER; + molluscs += SQUID; + molluscs += SNAIL; + molluscs += CUTTLEFISH; + + MOZ_RELEASE_ASSERT(molluscs.size() == 4); + MOZ_RELEASE_ASSERT(molluscs.contains(OYSTER)); + MOZ_RELEASE_ASSERT(molluscs.contains(SQUID)); + MOZ_RELEASE_ASSERT(molluscs.contains(SNAIL)); + MOZ_RELEASE_ASSERT(molluscs.contains(CUTTLEFISH)); + + Vector<Mollusc> vec; + for (auto mollusc : molluscs) { + MOZ_RELEASE_ASSERT(vec.append(mollusc)); + } + + MOZ_RELEASE_ASSERT(vec.length() == 4); + MOZ_RELEASE_ASSERT(vec[0] == SNAIL); + MOZ_RELEASE_ASSERT(vec[1] == OYSTER); + MOZ_RELEASE_ASSERT(vec[2] == SQUID); + MOZ_RELEASE_ASSERT(vec[3] == CUTTLEFISH); + } + EnumSet<SeaBird> mAlcidae; EnumSet<SeaBird> mDiomedeidae; EnumSet<SeaBird> mPetrelProcellariidae;

1 0

[tor-browser-build/maint-8.0] Update NoScript to version 10.2.1
by gk＠torproject.org 30 Dec '18

30 Dec '18

commit b35cea6792f294d0a625fde5595f1c96a8a2a72a Author: Georg Koppen <gk(a)torproject.org> Date: Sun Dec 30 13:14:50 2018 +0000 Update NoScript to version 10.2.1 The NoScript update fixes #28873 and #28720 on our side. --- projects/tor-browser/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 1a37ea1..3823552 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -71,9 +71,9 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 23c7783eecabeb044aa1e38c93d43ce7c41957b1ea031016d39737712729c81d + sha256sum: 3c16519f834863e74711950db386f326501a4bed79b55c24cc731df130443877 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop'

1 0

[tor-browser-build/master] Update NoScript to version 10.1.2
by gk＠torproject.org 30 Dec '18

30 Dec '18

commit b32e182633bba7733b635bc5dd0fcbd55436f4d7 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Dec 30 13:14:50 2018 +0000 Update NoScript to version 10.1.2 The NoScript update fixes #28873 and #28720 on our side. --- projects/tor-browser/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 6199954..c4f25ff 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -89,9 +89,9 @@ input_files: enable: '[% c("var/snowflake") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 23c7783eecabeb044aa1e38c93d43ce7c41957b1ea031016d39737712729c81d + sha256sum: 3c16519f834863e74711950db386f326501a4bed79b55c24cc731df130443877 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop'

1 0

[tor-browser-build/master] Bug 28784: Pass --force --delete_unversioned_trees --reset to "gclient sync".
by gk＠torproject.org 20 Dec '18

20 Dec '18

commit 1b7e0de3690364bfdd29889676f5ff8ec6b1cd3b Author: David Fifield <david(a)bamsoftware.com> Date: Thu Dec 20 03:17:25 2018 +0000 Bug 28784: Pass --force --delete_unversioned_trees --reset to "gclient sync". This is supposed to remove and reset modified or unversioned files. This ought to work around the problem with versioning of src/testing/gmock and src/testing/gtest across upgrades. $ gclient help sync -f, --force force update even for unchanged modules -D, --delete_unversioned_trees Deletes from the working copy any dependencies that have been removed since the last sync, as long as there are no local modifications. When used with --force, such dependencies are removed even if they have local modifications. When used with --reset, all untracked directories are removed from the working copy, excluding those which are explicitly ignored in the repository. -R, --reset resets any local changes before updating (git only) --- projects/webrtc/config | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/projects/webrtc/config b/projects/webrtc/config index 2955095..37b4615 100644 --- a/projects/webrtc/config +++ b/projects/webrtc/config @@ -102,11 +102,8 @@ steps: git config diff.ignoreSubmodules all cd .. fi - # Delete the unversioned gmock and gtest directories, which cause "gclient sync" - # to fail when upgrading between webrtc branch-heads/58 and branch-heads/64. - rm -rf src/testing/gmock src/testing/gtest # "gclient" is part of depot_tools. This download takes a long time the first time. - gclient sync --no-history --with_branch_heads -r [% c("var/webrtc_tag") %] + gclient sync --force --delete_unversioned_trees --reset --no-history --with_branch_heads -r [% c("var/webrtc_tag") %] cd .. tar --exclude .git -czf [% dest_dir _ '/' _ c('filename') %] webrtc input_files:

1 0

[tor-browser-build/master] Bug 28752: Don't download tor-android-binary resources during build
by gk＠torproject.org 19 Dec '18

19 Dec '18

commit 9b0b7b5159e670e04d5705350f33f8b2aa056634 Author: sisbell <shane.isbell(a)gmail.com> Date: Sun Dec 16 12:57:25 2018 -0800 Bug 28752: Don't download tor-android-binary resources during build --- projects/firefox/build | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/projects/firefox/build b/projects/firefox/build index da82862..b9d9d5a 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -99,9 +99,14 @@ mv -f $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig [% IF c("var/android") %] export GRADLE_MAVEN_REPOSITORIES="file:///var/tmp/gradle-dependencies" + gradle_repo=/var/tmp/gradle-dependencies # Move Gradle Repo to hard-coded location. This location is embedded in the file # chrome/toolkit/content/global/buildconfig.html so needs to be standard for reproducibility - mv $rootdir/[% c('input_files_by_name/gradle-dependencies') %] /var/tmp/gradle-dependencies + mv $rootdir/[% c('input_files_by_name/gradle-dependencies') %] $gradle_repo + # The download script assumes the artifact package name is the complete URL path. + # In some cases this is incorrect, so copy those artifacts to the correct location + cp -r $gradle_repo/guardianproject/gpmaven/master/* $gradle_repo + # Move orbot files so they will be included in the apk during the build cp $rootdir/[% c('input_files_by_name/orbot') %]/* mobile/android/app # Prepare building the multi-locale .apk mkdir -p /var/tmp/dist/locales

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Bug 28640 - Reload distribution preferences on update
by gk＠torproject.org 14 Dec '18

14 Dec '18

commit 3c43ec1e862040767030bb5104c41265823ec8a5 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Nov 29 20:33:14 2018 +0000 Bug 28640 - Reload distribution preferences on update --- .../mozilla/gecko/distribution/Distribution.java | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java b/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java index ea9534bfd741..2e2d07d58914 100644 --- a/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java +++ b/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java @@ -43,7 +43,9 @@ import org.mozilla.gecko.EventDispatcher; import org.mozilla.gecko.GeckoAppShell; import org.mozilla.gecko.GeckoApplication; import org.mozilla.gecko.GeckoSharedPrefs; +import org.mozilla.gecko.preferences.DistroSharedPrefsImport; import org.mozilla.gecko.Telemetry; +import org.mozilla.gecko.preferences.GeckoPreferences; import org.mozilla.gecko.util.FileUtils; import org.mozilla.gecko.util.GeckoBundle; import org.mozilla.gecko.util.HardwareUtils; @@ -247,6 +249,18 @@ public class Distribution { data = new GeckoBundle(1); data.putString("preferences", preferencesJSON); + // Only overwrite the current preferences if we upgraded. + // This isn't the best behavior because if the user + // changed one of the preferences, then this overwrites + // it. What we really want is a feature where we can + // set a new preference if the current value wasn't + // user-modified. This implementation doesn't support + // something like that. #28842 + final SharedPreferences settings = distribution.getSharedPreferences(); + if (!AppConstants.MOZ_APP_BUILDID.equals(settings.getString(GeckoPreferences.PREFS_APP_UPDATE_LAST_BUILD_ID, null))) { + DistroSharedPrefsImport.importPreferences(distribution.context, distribution); + } + } catch (IOException e) { Log.e(LOGTAG, "Error getting distribution descriptor file.", e); } @@ -498,6 +512,13 @@ public class Distribution { // We've done the work once; don't do it again. if (this.state == STATE_SET) { + // If this is a new version of the app, then copy the + // distribution files from the APK + if (!AppConstants.MOZ_APP_BUILDID.equals(settings.getString(GeckoPreferences.PREFS_APP_UPDATE_LAST_BUILD_ID, null))) { + Log.i(LOGTAG, "Copying APK distribution file because the build ID changed."); + copyAndCheckAPKDistribution(); + } + // Note that we don't compute the distribution directory. // Call `ensureDistributionDir` if you need it. runReadyQueue();

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Bug 28640 - Try showing the homepage after the Distribution loads
by gk＠torproject.org 14 Dec '18

14 Dec '18

commit b507541d50f3831c847be2104e5baec3104df2ba Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Nov 29 23:44:43 2018 +0000 Bug 28640 - Try showing the homepage after the Distribution loads --- .../base/java/org/mozilla/gecko/BrowserApp.java | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index 814b46f24295..9330a6ba9838 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -3155,6 +3155,29 @@ public class BrowserApp extends GeckoApp // Don't show any onFinish actions when hiding from this Activity. mFirstrunAnimationContainer.registerOnFinishListener(null); mFirstrunAnimationContainer.hide(); + + // This is a little hacky, but this ensures about:tor (or whichever homepage + // is configured) shows when the user closes the FirstRun panels. + String homepageUrl = Tabs.getHomepage(BrowserApp.this); + + // If the homepage is already open in one of the tabs, then switch to that tab. + int homepage_index = Tabs.getInstance().isOpen(homepageUrl); + if (homepage_index != Tabs.INVALID_TAB_ID) { + Tabs.getInstance().selectTab(homepage_index); + return true; + } + + // Open in the currently selected tab by default + int tab_flags = Tabs.LOADURL_NONE; + + // If there's more than one tab open, then the user opened at least one of them. + // Don't modify their tabs and open a new tab for the homepage. + if (Tabs.getInstance().getDisplayCount() > 1) { + tab_flags = Tabs.LOADURL_NEW_TAB; + } + + Tabs.getInstance().loadUrl(homepageUrl, tab_flags); + return true; }

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Bug 28507 - Don't call Push and Sync services during Sanitize
by gk＠torproject.org 14 Dec '18

14 Dec '18

commit a3754ec3a532e489207ce12781a4b6fb5a1daa37 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Nov 30 04:51:05 2018 +0000 Bug 28507 - Don't call Push and Sync services during Sanitize --- mobile/android/modules/Sanitizer.jsm | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/mobile/android/modules/Sanitizer.jsm b/mobile/android/modules/Sanitizer.jsm index 3782c92172f9..6b26e709df0a 100644 --- a/mobile/android/modules/Sanitizer.jsm +++ b/mobile/android/modules/Sanitizer.jsm @@ -124,18 +124,9 @@ Sanitizer.prototype = { sss.clearAll(); // Clear push subscriptions - yield new Promise((resolve, reject) => { - let push = Cc["@mozilla.org/push/Service;1"] - .getService(Ci.nsIPushService); - push.clearForDomain("*", status => { - if (Components.isSuccessCode(status)) { - resolve(); - } else { - reject(new Error("Error clearing push subscriptions: " + - status)); - } - }); - }); + // Avoid throwing an error because Ci.nsIPushService isn't implemented + // All other clearing actions should succeed if we arrive here. + Promise.resolve(); TelemetryStopwatch.finish("FX_SANITIZE_SITESETTINGS", refObj); }), @@ -344,11 +335,8 @@ Sanitizer.prototype = { }, canClear: function(aCallback) { - Accounts.anySyncAccountsExist().then(aCallback) - .catch(function(err) { - Cu.reportError("Java-side synced tabs clearing failed: " + err); - aCallback(false); - }); + // We can't clear syncedTabs because Sync is non-functional + aCallback(false); } }

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Revert "Bug 28640 - Push notifications are disabled, so don't clear them"
by gk＠torproject.org 14 Dec '18

14 Dec '18

commit 0b36c3e8a59bf675ac6bd1ae36d38f16c4748884 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Dec 14 20:05:58 2018 +0000 Revert "Bug 28640 - Push notifications are disabled, so don't clear them" This reverts commit 1d5d94a68d95f675c108f377a1b9e02ee16b15bb. --- mobile/android/modules/Sanitizer.jsm | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/mobile/android/modules/Sanitizer.jsm b/mobile/android/modules/Sanitizer.jsm index 2940dd81b217..3782c92172f9 100644 --- a/mobile/android/modules/Sanitizer.jsm +++ b/mobile/android/modules/Sanitizer.jsm @@ -124,23 +124,18 @@ Sanitizer.prototype = { sss.clearAll(); // Clear push subscriptions - // Avoid throwing an error because nsIPushService isn't implemented yield new Promise((resolve, reject) => { - reject(new Error("Error clearing push subscriptions")); + let push = Cc["@mozilla.org/push/Service;1"] + .getService(Ci.nsIPushService); + push.clearForDomain("*", status => { + if (Components.isSuccessCode(status)) { + resolve(); + } else { + reject(new Error("Error clearing push subscriptions: " + + status)); + } + }); }); - - //yield new Promise((resolve, reject) => { - // let push = Cc["@mozilla.org/push/Service;1"] - // .getService(Ci.nsIPushService); - // push.clearForDomain("*", status => { - // if (Components.isSuccessCode(status)) { - // resolve(); - // } else { - // reject(new Error("Error clearing push subscriptions: " + - // status)); - // } - // }); - //}); TelemetryStopwatch.finish("FX_SANITIZE_SITESETTINGS", refObj); }),

1 0