- tbb-commits - lists.torproject.org

[tor-browser/esr24] Bug 986843 - Replace AutoHoldZone with AutoCompartmentRooter. r=terrence, a=lsblakk
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit dcaf26b42bbfbb61c7ed1df992c3919052fa82a9 Author: Jon Coppeard <jcoppeard(a)mozilla.com> Date: Mon Mar 24 21:45:23 2014 +0000 Bug 986843 - Replace AutoHoldZone with AutoCompartmentRooter. r=terrence, a=lsblakk --- js/src/gc/RootMarking.cpp | 2 +- js/src/gc/Zone.cpp | 11 ++++++++++- js/src/gc/Zone.h | 4 ++-- js/src/jsapi.cpp | 29 ++++++++++++++++++----------- js/src/jscompartment.cpp | 2 +- js/src/jscompartment.h | 2 +- js/src/jsgc.cpp | 8 +++++--- 7 files changed, 38 insertions(+), 20 deletions(-) diff --git a/js/src/gc/RootMarking.cpp b/js/src/gc/RootMarking.cpp index 861c2d6..88574f3 100644 --- a/js/src/gc/RootMarking.cpp +++ b/js/src/gc/RootMarking.cpp @@ -744,7 +744,7 @@ js::gc::MarkRuntime(JSTracer *trc, bool useSavedRoots) #endif for (CompartmentsIter c(rt); !c.done(); c.next()) - c->mark(trc); + c->markRoots(trc); /* The embedding can register additional roots here. */ for (size_t i = 0; i < rt->gcBlackRootTracers.length(); i++) { diff --git a/js/src/gc/Zone.cpp b/js/src/gc/Zone.cpp index 5625b99..e1f0147 100644 --- a/js/src/gc/Zone.cpp +++ b/js/src/gc/Zone.cpp @@ -23,7 +23,6 @@ using namespace js::gc; JS::Zone::Zone(JSRuntime *rt) : rt(rt), allocator(this), - hold(false), ionUsingBarriers_(false), active(false), gcScheduled(false), @@ -227,3 +226,13 @@ Zone::discardJitCode(FreeOp *fop, bool discardConstraints) } #endif } + +bool +Zone::hasMarkedCompartments() +{ + for (CompartmentsInZoneIter comp(this); !comp.done(); comp.next()) { + if (comp->marked) + return true; + } + return false; +} diff --git a/js/src/gc/Zone.h b/js/src/gc/Zone.h index 73e7043..d740306 100644 --- a/js/src/gc/Zone.h +++ b/js/src/gc/Zone.h @@ -108,8 +108,6 @@ struct Zone : private JS::shadow::Zone, js::CompartmentVector compartments; - bool hold; - private: bool ionUsingBarriers_; @@ -300,6 +298,8 @@ struct Zone : private JS::shadow::Zone, void sweep(js::FreeOp *fop, bool releaseTypes); + bool hasMarkedCompartments(); + private: void sweepBreakpoints(js::FreeOp *fop); }; diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp index 3632a74..68b6afa 100644 --- a/js/src/jsapi.cpp +++ b/js/src/jsapi.cpp @@ -3171,23 +3171,32 @@ JS_GetObjectId(JSContext *cx, JSObject *obj, jsid *idp) return JS_TRUE; } -class AutoHoldZone +class AutoCompartmentRooter : private JS::CustomAutoRooter { public: - explicit AutoHoldZone(Zone *zone - MOZ_GUARD_OBJECT_NOTIFIER_PARAM) - : holdp(&zone->hold) + explicit AutoCompartmentRooter(JSContext *cx, JSCompartment *comp + MOZ_GUARD_OBJECT_NOTIFIER_PARAM) + : CustomAutoRooter(cx), compartment(comp) { MOZ_GUARD_OBJECT_NOTIFIER_INIT; - *holdp = true; } - ~AutoHoldZone() { - *holdp = false; + operator JSCompartment *() { + return compartment; + } + + JSCompartment *operator->() { + return compartment; + } + + protected: + virtual void trace(JSTracer *trc) + { + compartment->mark(); } private: - bool *holdp; + JSCompartment *compartment; MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER }; @@ -3209,7 +3218,7 @@ JS_NewGlobalObject(JSContext *cx, JSClass *clasp, JSPrincipals *principals, else zone = ((JSObject *)options.zoneSpec)->zone(); - JSCompartment *compartment = NewCompartment(cx, zone, principals, options); + AutoCompartmentRooter compartment(cx, NewCompartment(cx, zone, principals, options)); if (!compartment) return NULL; @@ -3218,8 +3227,6 @@ JS_NewGlobalObject(JSContext *cx, JSClass *clasp, JSPrincipals *principals, rt->systemZone->isSystem = true; } - AutoHoldZone hold(compartment->zone()); - Rooted<GlobalObject *> global(cx); { AutoCompartment ac(cx, compartment); diff --git a/js/src/jscompartment.cpp b/js/src/jscompartment.cpp index c448e10..2e66253 100644 --- a/js/src/jscompartment.cpp +++ b/js/src/jscompartment.cpp @@ -488,7 +488,7 @@ JSCompartment::markAllCrossCompartmentWrappers(JSTracer *trc) } void -JSCompartment::mark(JSTracer *trc) +JSCompartment::markRoots(JSTracer *trc) { #ifdef JS_ION if (ionCompartment_) diff --git a/js/src/jscompartment.h b/js/src/jscompartment.h index 6cc1bc8..1ef2ed8 100644 --- a/js/src/jscompartment.h +++ b/js/src/jscompartment.h @@ -293,7 +293,7 @@ struct JSCompartment WrapperEnum(JSCompartment *c) : js::WrapperMap::Enum(c->crossCompartmentWrappers) {} }; - void mark(JSTracer *trc); + void markRoots(JSTracer *trc); bool isDiscardingJitCode(JSTracer *trc); void sweep(js::FreeOp *fop, bool releaseTypes); void sweepCrossCompartmentWrappers(); diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp index 53a636e..0db550f 100644 --- a/js/src/jsgc.cpp +++ b/js/src/jsgc.cpp @@ -2541,8 +2541,10 @@ SweepZones(FreeOp *fop, bool lastGC) while (read < end) { Zone *zone = *read++; - if (!zone->hold && zone->wasGCStarted()) { - if (zone->allocator.arenas.arenaListsAreEmpty() || lastGC) { + if (zone->wasGCStarted()) { + if ((zone->allocator.arenas.arenaListsAreEmpty() && !zone->hasMarkedCompartments()) || + lastGC) + { zone->allocator.arenas.checkEmptyFreeLists(); if (callback) callback(zone); @@ -2723,7 +2725,7 @@ BeginMarkPhase(JSRuntime *rt) } zone->scheduledForDestruction = false; - zone->maybeAlive = zone->hold; + zone->maybeAlive = false; zone->setPreservingCode(false); }

1 0

[tor-browser/esr24] Bug 980537 - Only store FakeBackstagePass instances in mThisObjects. r=khuey, a=sledru
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 00d381db6844041ac1a6e3b8b6a9e2e1829c56fc Author: Bobby Holley <bobbyholley(a)gmail.com> Date: Sun Apr 6 12:32:39 2014 -0700 Bug 980537 - Only store FakeBackstagePass instances in mThisObjects. r=khuey, a=sledru --- js/xpconnect/loader/mozJSComponentLoader.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/js/xpconnect/loader/mozJSComponentLoader.cpp b/js/xpconnect/loader/mozJSComponentLoader.cpp index 06e3a30..ddc74ef 100644 --- a/js/xpconnect/loader/mozJSComponentLoader.cpp +++ b/js/xpconnect/loader/mozJSComponentLoader.cpp @@ -614,7 +614,9 @@ mozJSComponentLoader::NoteSubScript(HandleScript aScript, HandleObject aThisObje MOZ_CRASH(); } - mThisObjects.Put(aScript, aThisObject); + if (js::GetObjectJSClass(aThisObject) == &kFakeBackstagePassJSClass) { + mThisObjects.Put(aScript, aThisObject); + } } // Some stack based classes for cleaning up on early return @@ -1024,7 +1026,10 @@ mozJSComponentLoader::ObjectForLocation(nsIFile *aComponentFile, MOZ_ASSERT(tableScript); } - mThisObjects.Put(tableScript, obj); + if (js::GetObjectJSClass(obj) == &kFakeBackstagePassJSClass) { + MOZ_ASSERT(mReuseLoaderGlobal); + mThisObjects.Put(tableScript, obj); + } uint32_t oldopts = JS_GetOptions(cx); JS_SetOptions(cx, oldopts | (aPropagateExceptions ? JSOPTION_DONT_REPORT_UNCAUGHT : 0));

1 0

[tor-browser/esr24] No bug, Automated HSTS preload list update from host bld-linux64-spot-126 - a=hsts-update
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit cd05cbc3690324f656e43ff3b5ba2d5a0ae37514 Author: ffxbld <none@none> Date: Sat Apr 5 03:15:28 2014 -0700 No bug, Automated HSTS preload list update from host bld-linux64-spot-126 - a=hsts-update --- security/manager/boot/src/nsSTSPreloadList.errors | 2 +- security/manager/boot/src/nsSTSPreloadList.inc | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/security/manager/boot/src/nsSTSPreloadList.errors b/security/manager/boot/src/nsSTSPreloadList.errors index ec727af..342aec9 100644 --- a/security/manager/boot/src/nsSTSPreloadList.errors +++ b/security/manager/boot/src/nsSTSPreloadList.errors @@ -34,7 +34,6 @@ email.lookout.com: could not connect to host emailprivacytester.com: did not receive HSTS header encrypted.google.com: did not receive HSTS header espra.com: could not connect to host -factor.cc: could not connect to host fatzebra.com.au: did not receive HSTS header fj.simple.com: did not receive HSTS header get.zenpayroll.com: did not receive HSTS header @@ -45,6 +44,7 @@ googleplex.com: could not connect to host goto.google.com: did not receive HSTS header greplin.com: did not receive HSTS header groups.google.com: did not receive HSTS header +haste.ch: could not connect to host history.google.com: did not receive HSTS header hostedtalkgadget.google.com: did not receive HSTS header id.atlassian.com: did not receive HSTS header diff --git a/security/manager/boot/src/nsSTSPreloadList.inc b/security/manager/boot/src/nsSTSPreloadList.inc index b0d59de9..2f909b9 100644 --- a/security/manager/boot/src/nsSTSPreloadList.inc +++ b/security/manager/boot/src/nsSTSPreloadList.inc @@ -8,7 +8,7 @@ /*****************************************************************************/ #include "mozilla/StandardInteger.h" -const PRTime gPreloadListExpirationTime = INT64_C(1406973929143000); +const PRTime gPreloadListExpirationTime = INT64_C(1407578787593000); class nsSTSPreload { @@ -130,6 +130,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "p.linode.com", false }, { "packagist.org", false }, { "passwd.io", true }, + { "passwordbox.com", false }, { "paste.linode.com", false }, { "pastebin.linode.com", false }, { "pay.gigahost.dk", true },

1 0

[tor-browser/esr24] Bug 981030 - Create platform specific mozharness files for storing test harness options, r=aki, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 28a5504d154c0dece36db3ca97c21e9b90380d6f Author: Andrew Halberstadt <ahalberstadt(a)mozilla.com> Date: Fri Mar 21 12:39:07 2014 -0400 Bug 981030 - Create platform specific mozharness files for storing test harness options, r=aki, a=test-only --- testing/config/mozharness/android_arm_config.py | 37 +++++++++ testing/config/mozharness/android_panda_config.py | 86 +++++++++++++++++++++ testing/config/mozharness/android_x86_config.py | 37 +++++++++ testing/config/mozharness/b2g_desktop_config.py | 18 +++++ testing/config/mozharness/b2g_emulator_config.py | 48 ++++++++++++ testing/config/mozharness/linux_config.py | 34 ++++++++ testing/config/mozharness/mac_config.py | 34 ++++++++ testing/config/mozharness/windows_config.py | 34 ++++++++ testing/config/mozharness_config.py | 28 ------- 9 files changed, 328 insertions(+), 28 deletions(-) diff --git a/testing/config/mozharness/android_arm_config.py b/testing/config/mozharness/android_arm_config.py new file mode 100644 index 0000000..06ec34a --- /dev/null +++ b/testing/config/mozharness/android_arm_config.py @@ -0,0 +1,37 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +config = { + "suite_definitions": { + "mochitest": { + "run_filename": "runtestsremote.py", + "options": ["--autorun", "--close-when-done", "--dm_trans=sut", + "--console-level=INFO", "--app=%(app)s", "--remote-webserver=%(remote_webserver)s", + "--xre-path=%(xre_path)s", "--utility-path=%(utility_path)s", + "--deviceIP=%(device_ip)s", "--devicePort=%(device_port)s", + "--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s", + "--certificate-path=%(certs_path)s", "--symbols-path=%(symbols_path)s" + ], + }, + "reftest": { + "run_filename": "remotereftest.py", + "options": [ "--app=%(app)s", "--ignore-window-size", + "--bootstrap", "--enable-privilege", + "--remote-webserver=%(remote_webserver)s", "--xre-path=%(xre_path)s", + "--utility-path=%(utility_path)s", "--deviceIP=%(device_ip)s", + "--devicePort=%(device_port)s", "--http-port=%(http_port)s", + "--ssl-port=%(ssl_port)s", "--httpd-path", "reftest/components", + "--symbols-path=%(symbols_path)s", + ], + }, + "xpcshell": { + "run_filename": "remotexpcshelltests.py", + "options": ["--deviceIP=%(device_ip)s", "--devicePort=%(device_port)s", + "--xre-path=%(xre_path)s", "--testing-modules-dir=%(modules_dir)s", + "--apk=%(installer_path)s", "--no-logfiles", + "--symbols-path=%(symbols_path)s", + ], + }, + }, # end suite_definitions +} diff --git a/testing/config/mozharness/android_panda_config.py b/testing/config/mozharness/android_panda_config.py new file mode 100644 index 0000000..2bafcc7 --- /dev/null +++ b/testing/config/mozharness/android_panda_config.py @@ -0,0 +1,86 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +config = { + "mochitest_options": [ + "--deviceIP=%(device_ip)s", + "--xre-path=../hostutils/xre", + "--utility-path=../hostutils/bin", "--certificate-path=certs", + "--app=%(app_name)s", "--console-level=INFO", + "--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s", + "--run-only-tests=android.json", "--symbols-path=%(symbols_path)s" + ], + "reftest_options": [ + "--deviceIP=%(device_ip)s", + "--xre-path=../hostutils/xre", + "--utility-path=../hostutils/bin", + "--app=%(app_name)s", + "--ignore-window-size", "--bootstrap", + "--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s", + "--symbols-path=%(symbols_path)s", + "reftest/tests/layout/reftests/reftest.list" + ], + "crashtest_options": [ + "--deviceIP=%(device_ip)s", + "--xre-path=../hostutils/xre", + "--utility-path=../hostutils/bin", + "--app=%(app_name)s", + "--enable-privilege", "--ignore-window-size", "--bootstrap", + "--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s", + "--symbols-path=%(symbols_path)s", + "reftest/tests/testing/crashtest/crashtests.list" + ], + "jsreftest_options": [ + "--deviceIP=%(device_ip)s", + "--xre-path=../hostutils/xre", + "--utility-path=../hostutils/bin", + "--app=%(app_name)s", + "--enable-privilege", "--ignore-window-size", "--bootstrap", + "--extra-profile-file=jsreftest/tests/user.js", "jsreftest/tests/jstests.list", + "--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s", + "--symbols-path=%(symbols_path)s" + ], + "robocop_options": [ + "--deviceIP=%(device_ip)s", + "--xre-path=../hostutils/xre", + "--utility-path=../hostutils/bin", + "--certificate-path=certs", + "--app=%(app_name)s", "--console-level=INFO", + "--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s", + "--symbols-path=%(symbols_path)s", + "--robocop=mochitest/robocop.ini" + ], + "xpcshell_options": [ + "--deviceIP=%(device_ip)s", + "--xre-path=../hostutils/xre", + "--manifest=xpcshell/tests/xpcshell_android.ini", + "--build-info-json=xpcshell/mozinfo.json", + "--testing-modules-dir=modules", + "--local-lib-dir=../fennec", + "--apk=../%(apk_name)s", + "--no-logfiles", + "--symbols-path=%(symbols_path)s" + ], + "jittest_options": [ + "bin/js", + "--remote", + "-j", "1", + "--deviceTransport=sut", + "--deviceIP=%(device_ip)s", + "--localLib=../tests/bin", + "--no-slow", + "--no-progress", + "--tinderbox", + "--tbpl" + ], + "cppunittest_options": [ + "--symbols-path=%(symbols_path)s", + "--xre-path=tests/bin", + "--dm_trans=SUT", + "--deviceIP=%(device_ip)s", + "--localBinDir=../tests/bin", + "--apk=%(apk_path)s", + "--skip-manifest=../tests/cppunittests/android_cppunittest_manifest.txt" + ], +} diff --git a/testing/config/mozharness/android_x86_config.py b/testing/config/mozharness/android_x86_config.py new file mode 100644 index 0000000..06ec34a --- /dev/null +++ b/testing/config/mozharness/android_x86_config.py @@ -0,0 +1,37 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +config = { + "suite_definitions": { + "mochitest": { + "run_filename": "runtestsremote.py", + "options": ["--autorun", "--close-when-done", "--dm_trans=sut", + "--console-level=INFO", "--app=%(app)s", "--remote-webserver=%(remote_webserver)s", + "--xre-path=%(xre_path)s", "--utility-path=%(utility_path)s", + "--deviceIP=%(device_ip)s", "--devicePort=%(device_port)s", + "--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s", + "--certificate-path=%(certs_path)s", "--symbols-path=%(symbols_path)s" + ], + }, + "reftest": { + "run_filename": "remotereftest.py", + "options": [ "--app=%(app)s", "--ignore-window-size", + "--bootstrap", "--enable-privilege", + "--remote-webserver=%(remote_webserver)s", "--xre-path=%(xre_path)s", + "--utility-path=%(utility_path)s", "--deviceIP=%(device_ip)s", + "--devicePort=%(device_port)s", "--http-port=%(http_port)s", + "--ssl-port=%(ssl_port)s", "--httpd-path", "reftest/components", + "--symbols-path=%(symbols_path)s", + ], + }, + "xpcshell": { + "run_filename": "remotexpcshelltests.py", + "options": ["--deviceIP=%(device_ip)s", "--devicePort=%(device_port)s", + "--xre-path=%(xre_path)s", "--testing-modules-dir=%(modules_dir)s", + "--apk=%(installer_path)s", "--no-logfiles", + "--symbols-path=%(symbols_path)s", + ], + }, + }, # end suite_definitions +} diff --git a/testing/config/mozharness/b2g_desktop_config.py b/testing/config/mozharness/b2g_desktop_config.py new file mode 100644 index 0000000..772566c --- /dev/null +++ b/testing/config/mozharness/b2g_desktop_config.py @@ -0,0 +1,18 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +config = { + "mochitest_options": [ + "--console-level=INFO", "%(test_manifest)s", + "--total-chunks=%(total_chunks)s", "--this-chunk=%(this_chunk)s", + "--profile=%(gaia_profile)s", "--app=%(application)s", "--desktop", + "--utility-path=%(utility_path)s", "--certificate-path=%(cert_path)s", + "--symbols-path=%(symbols_path)s", + ], + + "reftest_options": [ + "--desktop", "--profile=%(gaia_profile)s", "--appname=%(application)s", + "--symbols-path=%(symbols_path)s", "%(test_manifest)s", + ] +} diff --git a/testing/config/mozharness/b2g_emulator_config.py b/testing/config/mozharness/b2g_emulator_config.py new file mode 100644 index 0000000..d20c5f8 --- /dev/null +++ b/testing/config/mozharness/b2g_emulator_config.py @@ -0,0 +1,48 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +config = { + "jsreftest_options": [ + "--adbpath=%(adbpath)s", "--b2gpath=%(b2gpath)s", "--emulator=%(emulator)s", + "--emulator-res=800x1000", "--logcat-dir=%(logcat_dir)s", + "--remote-webserver=%(remote_webserver)s", "--ignore-window-size", + "--xre-path=%(xre_path)s", "--symbols-path=%(symbols_path)s", "--busybox=%(busybox)s", + "--total-chunks=%(total_chunks)s", "--this-chunk=%(this_chunk)s", + "--extra-profile-file=jsreftest/tests/user.js", + "%(test_manifest)s", + ], + + "mochitest_options": [ + "--adbpath=%(adbpath)s", "--b2gpath=%(b2gpath)s", "--console-level=INFO", + "--emulator=%(emulator)s", "--logcat-dir=%(logcat_dir)s", + "--remote-webserver=%(remote_webserver)s", "%(test_manifest)s", + "--xre-path=%(xre_path)s", "--symbols-path=%(symbols_path)s", "--busybox=%(busybox)s", + "--total-chunks=%(total_chunks)s", "--this-chunk=%(this_chunk)s", + ], + + "reftest_options": [ + "--adbpath=%(adbpath)s", "--b2gpath=%(b2gpath)s", "--emulator=%(emulator)s", + "--emulator-res=800x1000", "--logcat-dir=%(logcat_dir)s", + "--remote-webserver=%(remote_webserver)s", "--ignore-window-size", + "--xre-path=%(xre_path)s", "--symbols-path=%(symbols_path)s", "--busybox=%(busybox)s", + "--total-chunks=%(total_chunks)s", "--this-chunk=%(this_chunk)s", + "%(test_manifest)s", + ], + + "crashtest_options": [ + "--adbpath=%(adbpath)s", "--b2gpath=%(b2gpath)s", "--emulator=%(emulator)s", + "--emulator-res=800x1000", "--logcat-dir=%(logcat_dir)s", + "--remote-webserver=%(remote_webserver)s", "--ignore-window-size", + "--xre-path=%(xre_path)s", "--symbols-path=%(symbols_path)s", "--busybox=%(busybox)s", + "--total-chunks=%(total_chunks)s", "--this-chunk=%(this_chunk)s", + "%(test_manifest)s", + ], + + "xpcshell_options": [ + "--adbpath=%(adbpath)s", "--b2gpath=%(b2gpath)s", "--emulator=%(emulator)s", + "--logcat-dir=%(logcat_dir)s", "--manifest=%(test_manifest)s", "--use-device-libs", + "--testing-modules-dir=%(modules_dir)s", "--symbols-path=%(symbols_path)s", + "--busybox=%(busybox)s", "--total-chunks=%(total_chunks)s", "--this-chunk=%(this_chunk)s", + ], +} diff --git a/testing/config/mozharness/linux_config.py b/testing/config/mozharness/linux_config.py new file mode 100644 index 0000000..bba4f61 --- /dev/null +++ b/testing/config/mozharness/linux_config.py @@ -0,0 +1,34 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +config = { + "reftest_options": [ + "--appname=%(binary_path)s", "--utility-path=tests/bin", + "--extra-profile-file=tests/bin/plugins", "--symbols-path=%(symbols_path)s" + ], + "mochitest_options": [ + "--appname=%(binary_path)s", "--utility-path=tests/bin", + "--extra-profile-file=tests/bin/plugins", "--symbols-path=%(symbols_path)s", + "--certificate-path=tests/certs", "--autorun", "--close-when-done", + "--console-level=INFO", "--setpref=webgl.force-enabled=true" + ], + "xpcshell_options": [ + "--symbols-path=%(symbols_path)s", + "--test-plugin-path=%(test_plugin_path)s" + ], + "cppunittest_options": [ + "--symbols-path=%(symbols_path)s", + "--xre-path=%(abs_app_dir)s" + ], + "jittest_options": [ + "tests/bin/js", + "--no-slow", + "--no-progress", + "--tinderbox", + "--tbpl" + ], + "mozbase_options": [ + "-b", "%(binary_path)s" + ], +} diff --git a/testing/config/mozharness/mac_config.py b/testing/config/mozharness/mac_config.py new file mode 100644 index 0000000..73fa299 --- /dev/null +++ b/testing/config/mozharness/mac_config.py @@ -0,0 +1,34 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +config = { + "reftest_options": [ + "--appname=%(binary_path)s", "--utility-path=tests/bin", + "--extra-profile-file=tests/bin/plugins", "--symbols-path=%(symbols_path)s" + ], + "mochitest_options": [ + "--appname=%(binary_path)s", "--utility-path=tests/bin", + "--extra-profile-file=tests/bin/plugins", "--symbols-path=%(symbols_path)s", + "--certificate-path=tests/certs", "--autorun", "--close-when-done", + "--console-level=INFO" + ], + "xpcshell_options": [ + "--symbols-path=%(symbols_path)s", + "--test-plugin-path=%(test_plugin_path)s" + ], + "cppunittest_options": [ + "--symbols-path=%(symbols_path)s", + "--xre-path=%(abs_app_dir)s" + ], + "jittest_options": [ + "tests/bin/js", + "--no-slow", + "--no-progress", + "--tinderbox", + "--tbpl" + ], + "mozbase_options": [ + "-b", "%(binary_path)s" + ], +} diff --git a/testing/config/mozharness/windows_config.py b/testing/config/mozharness/windows_config.py new file mode 100644 index 0000000..73fa299 --- /dev/null +++ b/testing/config/mozharness/windows_config.py @@ -0,0 +1,34 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +config = { + "reftest_options": [ + "--appname=%(binary_path)s", "--utility-path=tests/bin", + "--extra-profile-file=tests/bin/plugins", "--symbols-path=%(symbols_path)s" + ], + "mochitest_options": [ + "--appname=%(binary_path)s", "--utility-path=tests/bin", + "--extra-profile-file=tests/bin/plugins", "--symbols-path=%(symbols_path)s", + "--certificate-path=tests/certs", "--autorun", "--close-when-done", + "--console-level=INFO" + ], + "xpcshell_options": [ + "--symbols-path=%(symbols_path)s", + "--test-plugin-path=%(test_plugin_path)s" + ], + "cppunittest_options": [ + "--symbols-path=%(symbols_path)s", + "--xre-path=%(abs_app_dir)s" + ], + "jittest_options": [ + "tests/bin/js", + "--no-slow", + "--no-progress", + "--tinderbox", + "--tbpl" + ], + "mozbase_options": [ + "-b", "%(binary_path)s" + ], +} diff --git a/testing/config/mozharness_config.py b/testing/config/mozharness_config.py deleted file mode 100644 index 1f8e36a..0000000 --- a/testing/config/mozharness_config.py +++ /dev/null @@ -1,28 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -"""The config defined in this module is read by mozharness, which is a -tool used to run many of the tests reporting to TBPL. This file is -primarily useful for pushing custom test harness configurations to try. - -For example you can define a custom mochitest configuration by adding: - "mochitest_options": [ - "--appname=%(binary_path)s", "--utility-path=tests/bin", - "--extra-profile-file=tests/bin/plugins", "--symbols-path=%(symbols_path)s", - "--certificate-path=tests/certs", "--autorun", "--close-when-done", - "--console-level=INFO", "--setpref=webgl.force-enabled=true" - ], - -Be warned that these values will be picked up by all platforms and changing them -may result in unexpected behaviour. For example, the above will break B2G -mochitests. - -You must also provide the complete command line to avoid errors. The official -configuration files containing the default values live in: - https://hg.mozilla.org/build/mozharness/configs -""" - -config = { - # Add custom mozharness config options here -}

1 0

[tor-browser/esr24] Bug 982909 - Consistently use inner window when calling OpenJS. r=jst, r=mrbkap, a=lsblakk
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit cf2d009c8aba6ffd168d87efb99e0f684b71759d Author: Olli Pettay <Olli.Pettay(a)helsinki.fi> Date: Thu Mar 13 15:44:25 2014 -0400 Bug 982909 - Consistently use inner window when calling OpenJS. r=jst, r=mrbkap, a=lsblakk --- content/html/document/src/nsHTMLDocument.cpp | 2 +- dom/base/nsGlobalWindow.cpp | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/content/html/document/src/nsHTMLDocument.cpp b/content/html/document/src/nsHTMLDocument.cpp index 6608154..6e3635f 100644 --- a/content/html/document/src/nsHTMLDocument.cpp +++ b/content/html/document/src/nsHTMLDocument.cpp @@ -1416,7 +1416,7 @@ nsHTMLDocument::Open(JSContext* /* unused */, NS_ASSERTION(nsContentUtils::CanCallerAccess(static_cast<nsIDOMHTMLDocument*>(this)), "XOW should have caught this!"); - nsCOMPtr<nsIDOMWindow> window = GetWindow(); + nsCOMPtr<nsIDOMWindow> window = GetInnerWindow(); if (!window) { rv.Throw(NS_ERROR_DOM_INVALID_ACCESS_ERR); return nullptr; diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp index bc6ecc4..7b6707a 100644 --- a/dom/base/nsGlobalWindow.cpp +++ b/dom/base/nsGlobalWindow.cpp @@ -426,6 +426,14 @@ nsGlobalWindow::DOMMinTimeoutValue() const { } \ PR_END_MACRO +#define NS_ENSURE_OUTER_WINDOW_OR_ACTIVE_DOCUMENT \ + NS_ENSURE_TRUE(!IsInnerWindow() || \ + (mOuterWindow && \ + ((mOuterWindow->GetCurrentInnerWindow() == this) || \ + (mOuterWindow->GetCurrentInnerWindow() && \ + mOuterWindow->GetCurrentInnerWindow()->GetDoc() == mDoc))),\ + NS_ERROR_NOT_INITIALIZED); + // CIDs static NS_DEFINE_CID(kXULControllersCID, NS_XULCONTROLLERS_CID); @@ -6425,6 +6433,7 @@ NS_IMETHODIMP nsGlobalWindow::OpenJS(const nsAString& aUrl, const nsAString& aName, const nsAString& aOptions, nsIDOMWindow **_retval) { + NS_ENSURE_OUTER_WINDOW_OR_ACTIVE_DOCUMENT return OpenInternal(aUrl, aName, aOptions, false, // aDialog false, // aContentModal @@ -7742,6 +7751,7 @@ nsGlobalWindow::ShowModalDialog(const nsAString& aURI, nsIVariant *aArgs_, const nsAString& aOptions, uint8_t aArgc, nsIVariant **aRetVal) { + NS_ENSURE_OUTER_WINDOW_OR_ACTIVE_DOCUMENT FORWARD_TO_OUTER(ShowModalDialog, (aURI, aArgs_, aOptions, aArgc, aRetVal), NS_ERROR_NOT_INITIALIZED);

1 0

[tor-browser/esr24] Bug 982957 - Fix crash if ConstraintTypeSet::sweep or TypeObject::sweep OOMs. r=bhackett, a=lsblakk
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 3fb3184b540fcd82899c6e8d565941b12372ed72 Author: Jan de Mooij <jdemooij(a)mozilla.com> Date: Thu Mar 13 18:15:25 2014 -0400 Bug 982957 - Fix crash if ConstraintTypeSet::sweep or TypeObject::sweep OOMs. r=bhackett, a=lsblakk --- js/src/jsinfer.cpp | 51 ++++++++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/js/src/jsinfer.cpp b/js/src/jsinfer.cpp index d43974f..e961f11 100644 --- a/js/src/jsinfer.cpp +++ b/js/src/jsinfer.cpp @@ -6172,6 +6172,15 @@ JSCompartment::getLazyType(JSContext *cx, Class *clasp, TaggedProto proto) // Tracing ///////////////////////////////////////////////////////////////////// +static void +CrashAtUnhandlableOOM(const char *reason) +{ + char msgbuf[1024]; + JS_snprintf(msgbuf, sizeof(msgbuf), "[unhandlable oom] %s", reason); + MOZ_ReportAssertionFailure(msgbuf, __FILE__, __LINE__); + MOZ_CRASH(); +} + void TypeSet::sweep(Zone *zone) { @@ -6196,10 +6205,9 @@ TypeSet::sweep(Zone *zone) TypeObjectKey **pentry = HashSetInsert<TypeObjectKey *,TypeObjectKey,TypeObjectKey> (zone->types.typeLifoAlloc, objectSet, objectCount, object); - if (pentry) - *pentry = object; - else - zone->types.setPendingNukeTypes(); + if (!pentry) + CrashAtUnhandlableOOM("OOM in ConstraintTypeSet::sweep"); + *pentry = object; } } setBaseObjectCount(objectCount); @@ -6279,19 +6287,17 @@ TypeObject::sweep(FreeOp *fop) Property *prop = oldArray[i]; if (prop && prop->types.ownProperty(false)) { Property *newProp = typeLifoAlloc.new_<Property>(*prop); - if (newProp) { - Property **pentry = - HashSetInsert<jsid,Property,Property> - (typeLifoAlloc, propertySet, propertyCount, prop->id); - if (pentry) { - *pentry = newProp; - newProp->types.sweep(zone()); - } else { - zone()->types.setPendingNukeTypes(); - } - } else { - zone()->types.setPendingNukeTypes(); - } + if (!newProp) + CrashAtUnhandlableOOM("OOM in TypeObject::sweep"); + + Property **pentry = + HashSetInsert<jsid,Property,Property> + (typeLifoAlloc, propertySet, propertyCount, prop->id); + if (!pentry) + CrashAtUnhandlableOOM("OOM in TypeObject::sweep"); + + *pentry = newProp; + newProp->types.sweep(zone()); } } setBasePropertyCount(propertyCount); @@ -6299,12 +6305,11 @@ TypeObject::sweep(FreeOp *fop) Property *prop = (Property *) propertySet; if (prop->types.ownProperty(false)) { Property *newProp = typeLifoAlloc.new_<Property>(*prop); - if (newProp) { - propertySet = (Property **) newProp; - newProp->types.sweep(zone()); - } else { - zone()->types.setPendingNukeTypes(); - } + if (!newProp) + CrashAtUnhandlableOOM("OOM in TypeObject::sweep"); + + propertySet = (Property **) newProp; + newProp->types.sweep(zone()); } else { propertySet = NULL; setBasePropertyCount(0);

1 0

[tor-browser/esr24] Bug 940714 - Add a RAII class to make synchronous decoding safer. r=tn, a=abillings
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 164ccdf7911a3d54b8d14643539e01a9da7a680c Author: Seth Fowler <seth(a)mozilla.com> Date: Wed Nov 20 17:21:51 2013 -0800 Bug 940714 - Add a RAII class to make synchronous decoding safer. r=tn, a=abillings --- image/src/Decoder.h | 44 +++++++++++++++++++++++++++++++++++++++----- image/src/RasterImage.cpp | 40 +++++++++++++++++----------------------- image/src/RasterImage.h | 2 +- 3 files changed, 57 insertions(+), 29 deletions(-) diff --git a/image/src/Decoder.h b/image/src/Decoder.h index 463e473..705cb36 100644 --- a/image/src/Decoder.h +++ b/image/src/Decoder.h @@ -92,11 +92,6 @@ public: mSizeDecode = aSizeDecode; } - void SetSynchronous(bool aSynchronous) - { - mSynchronous = aSynchronous; - } - bool IsSynchronous() const { return mSynchronous; @@ -242,6 +237,17 @@ protected: bool mDataError; private: + // Decode in synchronous mode. This is unsafe off-main-thread since it may + // attempt to allocate frames. To ensure that we never accidentally leave the + // decoder in synchronous mode, this should only be called by + // AutoSetSyncDecode. + void SetSynchronous(bool aSynchronous) + { + mSynchronous = aSynchronous; + } + + friend class AutoSetSyncDecode; + uint32_t mFrameCount; // Number of frames, including anything in-progress nsIntRect mInvalidRect; // Tracks an invalidation region in the current frame. @@ -281,6 +287,34 @@ private: bool mSynchronous; }; +// A RAII helper class to automatically pair a call to SetSynchronous(true) +// with a call to SetSynchronous(false), since failing to do so can lead us +// to try to allocate frames off-main-thread, which is unsafe. Synchronous +// decoding may only happen within the scope of an AutoSetSyncDecode. Nested +// AutoSetSyncDecode's are OK. +class AutoSetSyncDecode +{ +public: + AutoSetSyncDecode(Decoder* aDecoder) + : mDecoder(aDecoder) + { + MOZ_ASSERT(NS_IsMainThread()); + MOZ_ASSERT(mDecoder); + + mOriginalValue = mDecoder->IsSynchronous(); + mDecoder->SetSynchronous(true); + } + + ~AutoSetSyncDecode() + { + mDecoder->SetSynchronous(mOriginalValue); + } + +private: + nsRefPtr<Decoder> mDecoder; + bool mOriginalValue; +}; + } // namespace image } // namespace mozilla diff --git a/image/src/RasterImage.cpp b/image/src/RasterImage.cpp index 695df7b..65f8169 100644 --- a/image/src/RasterImage.cpp +++ b/image/src/RasterImage.cpp @@ -1713,10 +1713,11 @@ RasterImage::AddSourceData(const char *aBuffer, uint32_t aCount) // write the data directly to the decoder. (If we haven't gotten the size, // we'll queue up the data and write it out when we do.) if (!StoringSourceData() && mHasSize) { - mDecoder->SetSynchronous(true); - rv = WriteToDecoder(aBuffer, aCount); - mDecoder->SetSynchronous(false); - CONTAINER_ENSURE_SUCCESS(rv); + { + AutoSetSyncDecode syncDecode(mDecoder); + rv = WriteToDecoder(aBuffer, aCount); + CONTAINER_ENSURE_SUCCESS(rv); + } // We're not storing source data, so this data is probably coming straight // from the network. In this case, we want to display data as soon as we @@ -2084,7 +2085,7 @@ RasterImage::StoringSourceData() const { // Sets up a decoder for this image. It is an error to call this function // when decoding is already in process (ie - when mDecoder is non-null). nsresult -RasterImage::InitDecoder(bool aDoSizeDecode, bool aIsSynchronous /* = false */) +RasterImage::InitDecoder(bool aDoSizeDecode) { // Ensure that the decoder is not already initialized NS_ABORT_IF_FALSE(!mDecoder, "Calling InitDecoder() while already decoding!"); @@ -2152,7 +2153,6 @@ RasterImage::InitDecoder(bool aDoSizeDecode, bool aIsSynchronous /* = false */) mDecoder->SetObserver(mDecodeRequest->mStatusTracker->GetDecoderObserver()); mDecoder->SetSizeDecode(aDoSizeDecode); mDecoder->SetDecodeFlags(mFrameDecodeFlags); - mDecoder->SetSynchronous(aIsSynchronous); if (!aDoSizeDecode) { // We already have the size; tell the decoder so it can preallocate a // frame. By default, we create an ARGB frame with no offset. If decoders @@ -2435,14 +2435,8 @@ RasterImage::RequestDecodeCore(RequestDecodeType aDecodeType) // to finish decoding. if (!mDecoded && !mInDecoder && mHasSourceData && aDecodeType == SYNCHRONOUS_NOTIFY_AND_SOME_DECODE) { PROFILER_LABEL_PRINTF("RasterImage", "DecodeABitOf", "%s", GetURIString().get()); - mDecoder->SetSynchronous(true); - + AutoSetSyncDecode syncDecode(mDecoder); DecodePool::Singleton()->DecodeABitOf(this); - - // DecodeABitOf can destroy mDecoder. - if (mDecoder) { - mDecoder->SetSynchronous(false); - } return NS_OK; } @@ -2520,15 +2514,17 @@ RasterImage::SyncDecode() // If we don't have a decoder, create one if (!mDecoder) { - rv = InitDecoder(/* aDoSizeDecode = */ false, /* aIsSynchronous = */ true); + rv = InitDecoder(/* aDoSizeDecode = */ false); CONTAINER_ENSURE_SUCCESS(rv); - } else { - mDecoder->SetSynchronous(true); } - // Write everything we have - rv = DecodeSomeData(mSourceData.Length() - mBytesDecoded); - CONTAINER_ENSURE_SUCCESS(rv); + { + AutoSetSyncDecode syncDecode(mDecoder); + + // Write everything we have + rv = DecodeSomeData(mSourceData.Length() - mBytesDecoded); + CONTAINER_ENSURE_SUCCESS(rv); + } // When we're doing a sync decode, we want to get as much information from the // image as possible. We've send the decoder all of our data, so now's a good @@ -2541,11 +2537,9 @@ RasterImage::SyncDecode() rv = FinishedSomeDecoding(); CONTAINER_ENSURE_SUCCESS(rv); - + + // If our decoder's still open, there's still work to be done. if (mDecoder) { - mDecoder->SetSynchronous(false); - - // If our decoder's still open, there's still work to be done. DecodePool::Singleton()->RequestDecode(this); } diff --git a/image/src/RasterImage.h b/image/src/RasterImage.h index cb51c68..420a470 100644 --- a/image/src/RasterImage.h +++ b/image/src/RasterImage.h @@ -750,7 +750,7 @@ private: // data // Decoding nsresult WantDecodedFrames(); nsresult SyncDecode(); - nsresult InitDecoder(bool aDoSizeDecode, bool aIsSynchronous = false); + nsresult InitDecoder(bool aDoSizeDecode); nsresult WriteToDecoder(const char *aBuffer, uint32_t aCount); nsresult DecodeSomeData(uint32_t aMaxBytes); bool IsDecodeFinished();

1 0

[tor-browser/esr24] Bug 982906 - No free lunches! r=bzbarsky, a=lsblakk
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 98514d2707597dca05a7318e3887b97c3b0b8857 Author: Blake Kaplan <mrbkap(a)gmail.com> Date: Thu Mar 13 18:55:13 2014 -0400 Bug 982906 - No free lunches! r=bzbarsky, a=lsblakk --- dom/base/nsGlobalWindow.cpp | 30 +++++++++++++++--------------- dom/base/nsGlobalWindow.h | 5 ++--- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp index 7b6707a..f2192d6 100644 --- a/dom/base/nsGlobalWindow.cpp +++ b/dom/base/nsGlobalWindow.cpp @@ -10829,14 +10829,12 @@ nsGlobalWindow::GetScrollFrame() nsresult nsGlobalWindow::BuildURIfromBase(const char *aURL, nsIURI **aBuiltURI, - bool *aFreeSecurityPass, JSContext **aCXused) { nsIScriptContext *scx = GetContextInternal(); JSContext *cx = nullptr; *aBuiltURI = nullptr; - *aFreeSecurityPass = false; if (aCXused) *aCXused = nullptr; @@ -10877,17 +10875,14 @@ nsGlobalWindow::BuildURIfromBase(const char *aURL, nsIURI **aBuiltURI, if (!sourceWindow) { sourceWindow = do_QueryInterface(NS_ISUPPORTS_CAST(nsIDOMWindow *, this)); - *aFreeSecurityPass = true; } - if (sourceWindow) { - nsCOMPtr<nsIDOMDocument> domDoc; - sourceWindow->GetDocument(getter_AddRefs(domDoc)); - nsCOMPtr<nsIDocument> doc(do_QueryInterface(domDoc)); - if (doc) { - baseURI = doc->GetDocBaseURI(); - charset = doc->GetDocumentCharacterSet(); - } + nsCOMPtr<nsIDOMDocument> domDoc; + sourceWindow->GetDocument(getter_AddRefs(domDoc)); + nsCOMPtr<nsIDocument> doc(do_QueryInterface(domDoc)); + if (doc) { + baseURI = doc->GetDocBaseURI(); + charset = doc->GetDocumentCharacterSet(); } if (aCXused) @@ -10899,17 +10894,22 @@ nsresult nsGlobalWindow::SecurityCheckURL(const char *aURL) { JSContext *cxUsed; - bool freePass; nsCOMPtr<nsIURI> uri; - if (NS_FAILED(BuildURIfromBase(aURL, getter_AddRefs(uri), &freePass, &cxUsed))) + if (NS_FAILED(BuildURIfromBase(aURL, getter_AddRefs(uri), &cxUsed))) { return NS_ERROR_FAILURE; + } + + if (!cxUsed) { + return NS_OK; + } AutoPushJSContext cx(cxUsed); - if (!freePass && NS_FAILED(nsContentUtils::GetSecurityManager()-> - CheckLoadURIFromScript(cx, uri))) + if (NS_FAILED(nsContentUtils::GetSecurityManager()-> + CheckLoadURIFromScript(cx, uri))) { return NS_ERROR_FAILURE; + } return NS_OK; } diff --git a/dom/base/nsGlobalWindow.h b/dom/base/nsGlobalWindow.h index aab2253..613dd2b 100644 --- a/dom/base/nsGlobalWindow.h +++ b/dom/base/nsGlobalWindow.h @@ -950,9 +950,8 @@ protected: already_AddRefed<nsIBaseWindow> GetTreeOwnerWindow(); already_AddRefed<nsIWebBrowserChrome> GetWebBrowserChrome(); nsresult SecurityCheckURL(const char *aURL); - nsresult BuildURIfromBase(const char *aURL, - nsIURI **aBuiltURI, - bool *aFreeSecurityPass, JSContext **aCXused); + nsresult BuildURIfromBase(const char *aURL, nsIURI **aBuiltURI, + JSContext **aCXused); bool PopupWhitelisted(); PopupControlState RevisePopupAbuseLevel(PopupControlState); void FireAbuseEvents(bool aBlocked, bool aWindow,

1 0

[tor-browser/esr24] Bug 896268 - Use a stateless approach to synchronous image decoding. r=jdm, a=abillings
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit dcbe26ea5f1021f44632b086df0b9e8c07142b12 Author: Seth Fowler <seth(a)mozilla.com> Date: Tue Dec 17 14:04:24 2013 -0800 Bug 896268 - Use a stateless approach to synchronous image decoding. r=jdm, a=abillings --- image/decoders/nsBMPDecoder.cpp | 2 +- image/decoders/nsBMPDecoder.h | 2 +- image/decoders/nsGIFDecoder2.cpp | 2 +- image/decoders/nsGIFDecoder2.h | 2 +- image/decoders/nsICODecoder.cpp | 18 +++++++------- image/decoders/nsICODecoder.h | 4 +-- image/decoders/nsIconDecoder.cpp | 2 +- image/decoders/nsIconDecoder.h | 2 +- image/decoders/nsJPEGDecoder.cpp | 9 +++++-- image/decoders/nsJPEGDecoder.h | 2 +- image/decoders/nsPNGDecoder.cpp | 2 +- image/decoders/nsPNGDecoder.h | 2 +- image/src/DecodeStrategy.h | 36 +++++++++++++++++++++++++++ image/src/Decoder.cpp | 16 +++++++----- image/src/Decoder.h | 50 +++----------------------------------- image/src/RasterImage.cpp | 42 +++++++++++++++----------------- image/src/RasterImage.h | 10 +++++--- 17 files changed, 103 insertions(+), 100 deletions(-) diff --git a/image/decoders/nsBMPDecoder.cpp b/image/decoders/nsBMPDecoder.cpp index 8f7b5ad..704c8fc 100644 --- a/image/decoders/nsBMPDecoder.cpp +++ b/image/decoders/nsBMPDecoder.cpp @@ -189,7 +189,7 @@ NS_METHOD nsBMPDecoder::CalcBitShift() } void -nsBMPDecoder::WriteInternal(const char* aBuffer, uint32_t aCount) +nsBMPDecoder::WriteInternal(const char* aBuffer, uint32_t aCount, DecodeStrategy) { NS_ABORT_IF_FALSE(!HasError(), "Shouldn't call WriteInternal after error!"); diff --git a/image/decoders/nsBMPDecoder.h b/image/decoders/nsBMPDecoder.h index a212ec8..51f4140 100644 --- a/image/decoders/nsBMPDecoder.h +++ b/image/decoders/nsBMPDecoder.h @@ -45,7 +45,7 @@ public: // for 32BPP bitmaps. Only use after the bitmap has been processed. bool HasAlphaData() const; - virtual void WriteInternal(const char* aBuffer, uint32_t aCount); + virtual void WriteInternal(const char* aBuffer, uint32_t aCount, DecodeStrategy aStrategy); virtual void FinishInternal(); private: diff --git a/image/decoders/nsGIFDecoder2.cpp b/image/decoders/nsGIFDecoder2.cpp index 269837c..66bfd65 100644 --- a/image/decoders/nsGIFDecoder2.cpp +++ b/image/decoders/nsGIFDecoder2.cpp @@ -544,7 +544,7 @@ static void ConvertColormap(uint32_t *aColormap, uint32_t aColors) } void -nsGIFDecoder2::WriteInternal(const char *aBuffer, uint32_t aCount) +nsGIFDecoder2::WriteInternal(const char *aBuffer, uint32_t aCount, DecodeStrategy) { NS_ABORT_IF_FALSE(!HasError(), "Shouldn't call WriteInternal after error!"); diff --git a/image/decoders/nsGIFDecoder2.h b/image/decoders/nsGIFDecoder2.h index d056607..328e499 100644 --- a/image/decoders/nsGIFDecoder2.h +++ b/image/decoders/nsGIFDecoder2.h @@ -26,7 +26,7 @@ public: nsGIFDecoder2(RasterImage &aImage); ~nsGIFDecoder2(); - virtual void WriteInternal(const char* aBuffer, uint32_t aCount); + virtual void WriteInternal(const char* aBuffer, uint32_t aCount, DecodeStrategy aStrategy); virtual void FinishInternal(); virtual Telemetry::ID SpeedHistogram(); diff --git a/image/decoders/nsICODecoder.cpp b/image/decoders/nsICODecoder.cpp index 395965c..8ef2e9a 100644 --- a/image/decoders/nsICODecoder.cpp +++ b/image/decoders/nsICODecoder.cpp @@ -209,13 +209,13 @@ nsICODecoder::SetHotSpotIfCursor() { } void -nsICODecoder::WriteInternal(const char* aBuffer, uint32_t aCount) +nsICODecoder::WriteInternal(const char* aBuffer, uint32_t aCount, DecodeStrategy aStrategy) { NS_ABORT_IF_FALSE(!HasError(), "Shouldn't call WriteInternal after error!"); if (!aCount) { if (mContainedDecoder) { - WriteToContainedDecoder(aBuffer, aCount); + WriteToContainedDecoder(aBuffer, aCount, aStrategy); } return; } @@ -337,7 +337,7 @@ nsICODecoder::WriteInternal(const char* aBuffer, uint32_t aCount) mContainedDecoder->InitSharedDecoder(mImageData, mImageDataLength, mColormap, mColormapSize, mCurrentFrame); - if (!WriteToContainedDecoder(mSignature, PNGSIGNATURESIZE)) { + if (!WriteToContainedDecoder(mSignature, PNGSIGNATURESIZE, aStrategy)) { return; } } @@ -345,7 +345,7 @@ nsICODecoder::WriteInternal(const char* aBuffer, uint32_t aCount) // If we have a PNG, let the PNG decoder do all of the rest of the work if (mIsPNG && mContainedDecoder && mPos >= mImageOffset + PNGSIGNATURESIZE) { - if (!WriteToContainedDecoder(aBuffer, aCount)) { + if (!WriteToContainedDecoder(aBuffer, aCount, aStrategy)) { return; } @@ -423,7 +423,7 @@ nsICODecoder::WriteInternal(const char* aBuffer, uint32_t aCount) PostDataError(); return; } - if (!WriteToContainedDecoder((const char*)bfhBuffer, sizeof(bfhBuffer))) { + if (!WriteToContainedDecoder((const char*)bfhBuffer, sizeof(bfhBuffer), aStrategy)) { return; } @@ -444,7 +444,7 @@ nsICODecoder::WriteInternal(const char* aBuffer, uint32_t aCount) } // Write out the BMP's bitmap info header - if (!WriteToContainedDecoder(mBIHraw, sizeof(mBIHraw))) { + if (!WriteToContainedDecoder(mBIHraw, sizeof(mBIHraw), aStrategy)) { return; } @@ -492,7 +492,7 @@ nsICODecoder::WriteInternal(const char* aBuffer, uint32_t aCount) toFeed = aCount; } - if (!WriteToContainedDecoder(aBuffer, toFeed)) { + if (!WriteToContainedDecoder(aBuffer, toFeed, aStrategy)) { return; } @@ -568,9 +568,9 @@ nsICODecoder::WriteInternal(const char* aBuffer, uint32_t aCount) } bool -nsICODecoder::WriteToContainedDecoder(const char* aBuffer, uint32_t aCount) +nsICODecoder::WriteToContainedDecoder(const char* aBuffer, uint32_t aCount, DecodeStrategy aStrategy) { - mContainedDecoder->Write(aBuffer, aCount); + mContainedDecoder->Write(aBuffer, aCount, aStrategy); if (mContainedDecoder->HasDataError()) { mDataError = mContainedDecoder->HasDataError(); } diff --git a/image/decoders/nsICODecoder.h b/image/decoders/nsICODecoder.h index 733d353..73576b8 100644 --- a/image/decoders/nsICODecoder.h +++ b/image/decoders/nsICODecoder.h @@ -37,7 +37,7 @@ public: return mDirEntry.mHeight == 0 ? 256 : mDirEntry.mHeight; } - virtual void WriteInternal(const char* aBuffer, uint32_t aCount); + virtual void WriteInternal(const char* aBuffer, uint32_t aCount, DecodeStrategy aStrategy); virtual void FinishInternal(); virtual bool NeedsNewFrame() const; virtual nsresult AllocateFrame(); @@ -45,7 +45,7 @@ public: private: // Writes to the contained decoder and sets the appropriate errors // Returns true if there are no errors. - bool WriteToContainedDecoder(const char* aBuffer, uint32_t aCount); + bool WriteToContainedDecoder(const char* aBuffer, uint32_t aCount, DecodeStrategy aStrategy); // Processes a single dir entry of the icon resource void ProcessDirEntry(IconDirEntry& aTarget); diff --git a/image/decoders/nsIconDecoder.cpp b/image/decoders/nsIconDecoder.cpp index f5c9d33..29abc09 100644 --- a/image/decoders/nsIconDecoder.cpp +++ b/image/decoders/nsIconDecoder.cpp @@ -30,7 +30,7 @@ nsIconDecoder::~nsIconDecoder() { } void -nsIconDecoder::WriteInternal(const char *aBuffer, uint32_t aCount) +nsIconDecoder::WriteInternal(const char *aBuffer, uint32_t aCount, DecodeStrategy) { NS_ABORT_IF_FALSE(!HasError(), "Shouldn't call WriteInternal after error!"); diff --git a/image/decoders/nsIconDecoder.h b/image/decoders/nsIconDecoder.h index 31bf2e0..4fcffcd 100644 --- a/image/decoders/nsIconDecoder.h +++ b/image/decoders/nsIconDecoder.h @@ -41,7 +41,7 @@ public: nsIconDecoder(RasterImage &aImage); virtual ~nsIconDecoder(); - virtual void WriteInternal(const char* aBuffer, uint32_t aCount); + virtual void WriteInternal(const char* aBuffer, uint32_t aCount, DecodeStrategy aStrategy); uint8_t mWidth; uint8_t mHeight; diff --git a/image/decoders/nsJPEGDecoder.cpp b/image/decoders/nsJPEGDecoder.cpp index fa580d5..24b9fd3 100644 --- a/image/decoders/nsJPEGDecoder.cpp +++ b/image/decoders/nsJPEGDecoder.cpp @@ -179,15 +179,20 @@ nsJPEGDecoder::FinishInternal() * XXXbholley - It seems wrong that this should be necessary, but at the * moment I'm just folding the contents of Flush() into Close() so that * we can get rid of it. + * + * XXX(seth): It'd be great to get rid of this. For now, we treat this as a + * write to a synchronous decoder, which means that this must be called only + * on the main thread. (That's asserted in Decoder::Finish and + * Decoder::FinishSharedDecoder.) */ if ((mState != JPEG_DONE && mState != JPEG_SINK_NON_JPEG_TRAILER) && (mState != JPEG_ERROR) && !IsSizeDecode()) - this->Write(nullptr, 0); + this->Write(nullptr, 0, DECODE_SYNC); } void -nsJPEGDecoder::WriteInternal(const char *aBuffer, uint32_t aCount) +nsJPEGDecoder::WriteInternal(const char *aBuffer, uint32_t aCount, DecodeStrategy) { mSegment = (const JOCTET *)aBuffer; mSegmentLen = aCount; diff --git a/image/decoders/nsJPEGDecoder.h b/image/decoders/nsJPEGDecoder.h index 00409f3..82ec3bb 100644 --- a/image/decoders/nsJPEGDecoder.h +++ b/image/decoders/nsJPEGDecoder.h @@ -55,7 +55,7 @@ public: virtual ~nsJPEGDecoder(); virtual void InitInternal(); - virtual void WriteInternal(const char* aBuffer, uint32_t aCount); + virtual void WriteInternal(const char* aBuffer, uint32_t aCount, DecodeStrategy aStrategy); virtual void FinishInternal(); virtual Telemetry::ID SpeedHistogram(); diff --git a/image/decoders/nsPNGDecoder.cpp b/image/decoders/nsPNGDecoder.cpp index 23003ea..48ed981 100644 --- a/image/decoders/nsPNGDecoder.cpp +++ b/image/decoders/nsPNGDecoder.cpp @@ -286,7 +286,7 @@ nsPNGDecoder::InitInternal() } void -nsPNGDecoder::WriteInternal(const char *aBuffer, uint32_t aCount) +nsPNGDecoder::WriteInternal(const char *aBuffer, uint32_t aCount, DecodeStrategy) { NS_ABORT_IF_FALSE(!HasError(), "Shouldn't call WriteInternal after error!"); diff --git a/image/decoders/nsPNGDecoder.h b/image/decoders/nsPNGDecoder.h index 51f2ebd..b8c63a7 100644 --- a/image/decoders/nsPNGDecoder.h +++ b/image/decoders/nsPNGDecoder.h @@ -28,7 +28,7 @@ public: virtual ~nsPNGDecoder(); virtual void InitInternal(); - virtual void WriteInternal(const char* aBuffer, uint32_t aCount); + virtual void WriteInternal(const char* aBuffer, uint32_t aCount, DecodeStrategy aStrategy); virtual Telemetry::ID SpeedHistogram(); void CreateFrame(png_uint_32 x_offset, png_uint_32 y_offset, diff --git a/image/src/DecodeStrategy.h b/image/src/DecodeStrategy.h new file mode 100644 index 0000000..44c64b6 --- /dev/null +++ b/image/src/DecodeStrategy.h @@ -0,0 +1,36 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +/** @file + * An enumeration used by RasterImage and Decoder to specify which 'strategy' to + * use for image decoding - synchronous or asynchronous. + */ + +#ifndef mozilla_imagelib_DecodeStrategy_h_ +#define mozilla_imagelib_DecodeStrategy_h_ + +namespace mozilla { +namespace image { + +enum DecodeStrategy { + // DECODE_SYNC requests a synchronous decode, which will continue decoding + // frames as long as it has more source data. It returns to the caller only + // once decoding is complete (or until it needs more source data before + // continuing). Because DECODE_SYNC can involve allocating new imgFrames, it + // can only be run on the main thread. + DECODE_SYNC, + + // DECODE_ASYNC requests an asynchronous decode, which will continue decoding + // until it either finishes a frame or runs out of source data. Because + // DECODE_ASYNC does not allocate new imgFrames, it can be safely run off the + // main thread. (And hence workers in the decode pool always use it.) + DECODE_ASYNC +}; + +} // namespace image +} // namespace mozilla + +#endif diff --git a/image/src/Decoder.cpp b/image/src/Decoder.cpp index 5fa835d..85845f6 100644 --- a/image/src/Decoder.cpp +++ b/image/src/Decoder.cpp @@ -28,7 +28,6 @@ Decoder::Decoder(RasterImage &aImage) , mSizeDecode(false) , mInFrame(false) , mIsAnimated(false) - , mSynchronous(false) { } @@ -85,9 +84,10 @@ Decoder::InitSharedDecoder(uint8_t* imageData, uint32_t imageDataLength, } void -Decoder::Write(const char* aBuffer, uint32_t aCount) +Decoder::Write(const char* aBuffer, uint32_t aCount, DecodeStrategy aStrategy) { PROFILER_LABEL("ImageDecoder", "Write"); + MOZ_ASSERT(NS_IsMainThread() || aStrategy == DECODE_ASYNC); // We're strict about decoder errors NS_ABORT_IF_FALSE(!HasDecoderError(), @@ -103,16 +103,16 @@ Decoder::Write(const char* aBuffer, uint32_t aCount) } // Pass the data along to the implementation - WriteInternal(aBuffer, aCount); + WriteInternal(aBuffer, aCount, aStrategy); // If we're a synchronous decoder and we need a new frame to proceed, let's // create one and call it again. - while (mSynchronous && NeedsNewFrame() && !HasDataError()) { + while (aStrategy == DECODE_SYNC && NeedsNewFrame() && !HasDataError()) { nsresult rv = AllocateFrame(); if (NS_SUCCEEDED(rv)) { // Tell the decoder to use the data it saved when it asked for a new frame. - WriteInternal(nullptr, 0); + WriteInternal(nullptr, 0, aStrategy); } } } @@ -120,6 +120,8 @@ Decoder::Write(const char* aBuffer, uint32_t aCount) void Decoder::Finish(RasterImage::eShutdownIntent aShutdownIntent) { + MOZ_ASSERT(NS_IsMainThread()); + // Implementation-specific finalization if (!HasError()) FinishInternal(); @@ -185,6 +187,8 @@ Decoder::Finish(RasterImage::eShutdownIntent aShutdownIntent) void Decoder::FinishSharedDecoder() { + MOZ_ASSERT(NS_IsMainThread()); + if (!HasError()) { FinishInternal(); } @@ -274,7 +278,7 @@ Decoder::SetSizeOnImage() */ void Decoder::InitInternal() { } -void Decoder::WriteInternal(const char* aBuffer, uint32_t aCount) { } +void Decoder::WriteInternal(const char* aBuffer, uint32_t aCount, DecodeStrategy aStrategy) { } void Decoder::FinishInternal() { } /* diff --git a/image/src/Decoder.h b/image/src/Decoder.h index 705cb36..285cf59 100644 --- a/image/src/Decoder.h +++ b/image/src/Decoder.h @@ -9,6 +9,7 @@ #include "RasterImage.h" #include "imgDecoderObserver.h" #include "mozilla/RefPtr.h" +#include "DecodeStrategy.h" #include "ImageMetadata.h" namespace mozilla { @@ -48,7 +49,7 @@ public: * * Notifications Sent: TODO */ - void Write(const char* aBuffer, uint32_t aCount); + void Write(const char* aBuffer, uint32_t aCount, DecodeStrategy aStrategy); /** * Informs the decoder that all the data has been written. @@ -92,11 +93,6 @@ public: mSizeDecode = aSizeDecode; } - bool IsSynchronous() const - { - return mSynchronous; - } - void SetObserver(imgDecoderObserver* aObserver) { MOZ_ASSERT(aObserver); @@ -175,7 +171,7 @@ protected: * only these methods. */ virtual void InitInternal(); - virtual void WriteInternal(const char* aBuffer, uint32_t aCount); + virtual void WriteInternal(const char* aBuffer, uint32_t aCount, DecodeStrategy aStrategy); virtual void FinishInternal(); /* @@ -237,17 +233,6 @@ protected: bool mDataError; private: - // Decode in synchronous mode. This is unsafe off-main-thread since it may - // attempt to allocate frames. To ensure that we never accidentally leave the - // decoder in synchronous mode, this should only be called by - // AutoSetSyncDecode. - void SetSynchronous(bool aSynchronous) - { - mSynchronous = aSynchronous; - } - - friend class AutoSetSyncDecode; - uint32_t mFrameCount; // Number of frames, including anything in-progress nsIntRect mInvalidRect; // Tracks an invalidation region in the current frame. @@ -284,35 +269,6 @@ private: bool mSizeDecode; bool mInFrame; bool mIsAnimated; - bool mSynchronous; -}; - -// A RAII helper class to automatically pair a call to SetSynchronous(true) -// with a call to SetSynchronous(false), since failing to do so can lead us -// to try to allocate frames off-main-thread, which is unsafe. Synchronous -// decoding may only happen within the scope of an AutoSetSyncDecode. Nested -// AutoSetSyncDecode's are OK. -class AutoSetSyncDecode -{ -public: - AutoSetSyncDecode(Decoder* aDecoder) - : mDecoder(aDecoder) - { - MOZ_ASSERT(NS_IsMainThread()); - MOZ_ASSERT(mDecoder); - - mOriginalValue = mDecoder->IsSynchronous(); - mDecoder->SetSynchronous(true); - } - - ~AutoSetSyncDecode() - { - mDecoder->SetSynchronous(mOriginalValue); - } - -private: - nsRefPtr<Decoder> mDecoder; - bool mOriginalValue; }; } // namespace image diff --git a/image/src/RasterImage.cpp b/image/src/RasterImage.cpp index 65f8169..8b066434 100644 --- a/image/src/RasterImage.cpp +++ b/image/src/RasterImage.cpp @@ -1714,8 +1714,7 @@ RasterImage::AddSourceData(const char *aBuffer, uint32_t aCount) // we'll queue up the data and write it out when we do.) if (!StoringSourceData() && mHasSize) { { - AutoSetSyncDecode syncDecode(mDecoder); - rv = WriteToDecoder(aBuffer, aCount); + rv = WriteToDecoder(aBuffer, aCount, DECODE_SYNC); CONTAINER_ENSURE_SUCCESS(rv); } @@ -2261,7 +2260,7 @@ RasterImage::ShutdownDecoder(eShutdownIntent aIntent) // Writes the data to the decoder, updating the total number of bytes written. nsresult -RasterImage::WriteToDecoder(const char *aBuffer, uint32_t aCount) +RasterImage::WriteToDecoder(const char *aBuffer, uint32_t aCount, DecodeStrategy aStrategy) { mDecodingMonitor.AssertCurrentThreadIn(); @@ -2271,7 +2270,7 @@ RasterImage::WriteToDecoder(const char *aBuffer, uint32_t aCount) // Write nsRefPtr<Decoder> kungFuDeathGrip = mDecoder; mInDecoder = true; - mDecoder->Write(aBuffer, aCount); + mDecoder->Write(aBuffer, aCount, aStrategy); mInDecoder = false; CONTAINER_ENSURE_SUCCESS(mDecoder->GetDecoderError()); @@ -2435,8 +2434,7 @@ RasterImage::RequestDecodeCore(RequestDecodeType aDecodeType) // to finish decoding. if (!mDecoded && !mInDecoder && mHasSourceData && aDecodeType == SYNCHRONOUS_NOTIFY_AND_SOME_DECODE) { PROFILER_LABEL_PRINTF("RasterImage", "DecodeABitOf", "%s", GetURIString().get()); - AutoSetSyncDecode syncDecode(mDecoder); - DecodePool::Singleton()->DecodeABitOf(this); + DecodePool::Singleton()->DecodeABitOf(this, DECODE_SYNC); return NS_OK; } @@ -2518,13 +2516,9 @@ RasterImage::SyncDecode() CONTAINER_ENSURE_SUCCESS(rv); } - { - AutoSetSyncDecode syncDecode(mDecoder); - - // Write everything we have - rv = DecodeSomeData(mSourceData.Length() - mBytesDecoded); - CONTAINER_ENSURE_SUCCESS(rv); - } + // Write everything we have + rv = DecodeSomeData(mSourceData.Length() - mBytesDecoded, DECODE_SYNC); + CONTAINER_ENSURE_SUCCESS(rv); // When we're doing a sync decode, we want to get as much information from the // image as possible. We've send the decoder all of our data, so now's a good @@ -2861,7 +2855,7 @@ RasterImage::RequestDiscard() // Flushes up to aMaxBytes to the decoder. nsresult -RasterImage::DecodeSomeData(uint32_t aMaxBytes) +RasterImage::DecodeSomeData(uint32_t aMaxBytes, DecodeStrategy aStrategy) { // We should have a decoder if we get here NS_ABORT_IF_FALSE(mDecoder, "trying to decode without decoder!"); @@ -2873,7 +2867,7 @@ RasterImage::DecodeSomeData(uint32_t aMaxBytes) // passing it a null buffer. if (mDecodeRequest->mAllocatedNewFrame) { mDecodeRequest->mAllocatedNewFrame = false; - nsresult rv = WriteToDecoder(nullptr, 0); + nsresult rv = WriteToDecoder(nullptr, 0, aStrategy); if (NS_FAILED(rv) || mDecoder->NeedsNewFrame()) { return rv; } @@ -2889,7 +2883,8 @@ RasterImage::DecodeSomeData(uint32_t aMaxBytes) uint32_t bytesToDecode = std::min(aMaxBytes, mSourceData.Length() - mBytesDecoded); nsresult rv = WriteToDecoder(mSourceData.Elements() + mBytesDecoded, - bytesToDecode); + bytesToDecode, + aStrategy); return rv; } @@ -3245,7 +3240,7 @@ RasterImage::DecodePool::RequestDecode(RasterImage* aImg) } void -RasterImage::DecodePool::DecodeABitOf(RasterImage* aImg) +RasterImage::DecodePool::DecodeABitOf(RasterImage* aImg, DecodeStrategy aStrategy) { MOZ_ASSERT(NS_IsMainThread()); aImg->mDecodingMonitor.AssertCurrentThreadIn(); @@ -3257,7 +3252,7 @@ RasterImage::DecodePool::DecodeABitOf(RasterImage* aImg) } } - DecodeSomeOfImage(aImg); + DecodeSomeOfImage(aImg, aStrategy); aImg->FinishedSomeDecoding(); @@ -3325,7 +3320,7 @@ RasterImage::DecodePool::DecodeJob::Run() type = DECODE_TYPE_UNTIL_TIME; } - DecodePool::Singleton()->DecodeSomeOfImage(mImage, type, mRequest->mBytesToDecode); + DecodePool::Singleton()->DecodeSomeOfImage(mImage, DECODE_ASYNC, type, mRequest->mBytesToDecode); uint32_t bytesDecoded = mImage->mBytesDecoded - oldByteCount; @@ -3370,7 +3365,9 @@ RasterImage::DecodePool::DecodeUntilSizeAvailable(RasterImage* aImg) } } - nsresult rv = DecodeSomeOfImage(aImg, DECODE_TYPE_UNTIL_SIZE); + // We use DECODE_ASYNC here because we just want to get the size information + // here and defer the rest of the work. + nsresult rv = DecodeSomeOfImage(aImg, DECODE_ASYNC, DECODE_TYPE_UNTIL_SIZE); if (NS_FAILED(rv)) { return rv; } @@ -3388,6 +3385,7 @@ RasterImage::DecodePool::DecodeUntilSizeAvailable(RasterImage* aImg) nsresult RasterImage::DecodePool::DecodeSomeOfImage(RasterImage* aImg, + DecodeStrategy aStrategy, DecodeType aDecodeType /* = DECODE_TYPE_UNTIL_TIME */, uint32_t bytesToDecode /* = 0 */) { @@ -3407,7 +3405,7 @@ RasterImage::DecodePool::DecodeSomeOfImage(RasterImage* aImg, // If we're doing synchronous decodes, and we're waiting on a new frame for // this image, get it now. - if (aImg->mDecoder->IsSynchronous() && aImg->mDecoder->NeedsNewFrame()) { + if (aStrategy == DECODE_SYNC && aImg->mDecoder->NeedsNewFrame()) { MOZ_ASSERT(NS_IsMainThread()); aImg->mDecoder->AllocateFrame(); @@ -3456,7 +3454,7 @@ RasterImage::DecodePool::DecodeSomeOfImage(RasterImage* aImg, (aImg->mDecodeRequest && aImg->mDecodeRequest->mAllocatedNewFrame)) { chunkCount++; uint32_t chunkSize = std::min(bytesToDecode, maxBytes); - nsresult rv = aImg->DecodeSomeData(chunkSize); + nsresult rv = aImg->DecodeSomeData(chunkSize, aStrategy); if (NS_FAILED(rv)) { aImg->DoError(); return rv; diff --git a/image/src/RasterImage.h b/image/src/RasterImage.h index 420a470..87d7286 100644 --- a/image/src/RasterImage.h +++ b/image/src/RasterImage.h @@ -27,6 +27,7 @@ #include "nsTArray.h" #include "imgFrame.h" #include "nsThreadUtils.h" +#include "DecodeStrategy.h" #include "DiscardTracker.h" #include "nsISupportsImpl.h" #include "mozilla/LinkedList.h" @@ -314,6 +315,8 @@ public: eShutdownIntent_AllCount = 3 }; + // Decode strategy + private: imgStatusTracker& CurrentStatusTracker() { @@ -417,7 +420,7 @@ private: * Decode aImg for a short amount of time, and post the remainder to the * queue. */ - void DecodeABitOf(RasterImage* aImg); + void DecodeABitOf(RasterImage* aImg, DecodeStrategy aStrategy); /** * Ask the DecodePool to stop decoding this image. Internally, we also @@ -458,6 +461,7 @@ private: * UNTIL_DONE_BYTES, decode until all bytesToDecode bytes are decoded. */ nsresult DecodeSomeOfImage(RasterImage* aImg, + DecodeStrategy aStrategy, DecodeType aDecodeType = DECODE_TYPE_UNTIL_TIME, uint32_t bytesToDecode = 0); @@ -751,8 +755,8 @@ private: // data nsresult WantDecodedFrames(); nsresult SyncDecode(); nsresult InitDecoder(bool aDoSizeDecode); - nsresult WriteToDecoder(const char *aBuffer, uint32_t aCount); - nsresult DecodeSomeData(uint32_t aMaxBytes); + nsresult WriteToDecoder(const char *aBuffer, uint32_t aCount, DecodeStrategy aStrategy); + nsresult DecodeSomeData(uint32_t aMaxBytes, DecodeStrategy aStrategy); bool IsDecodeFinished(); TimeStamp mDrawStartTime;

1 0

[tor-browser/esr24] Bug 983344. r=sfink, a=dveditz
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 16a2781a8c683c5d10fee560baee00e6da2f055b Author: Jeff Walden <jwalden(a)mit.edu> Date: Fri Mar 14 20:01:37 2014 -0400 Bug 983344. r=sfink, a=dveditz --- js/src/jstypedarray.cpp | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/js/src/jstypedarray.cpp b/js/src/jstypedarray.cpp index b8cf614..1630c5a 100644 --- a/js/src/jstypedarray.cpp +++ b/js/src/jstypedarray.cpp @@ -2335,6 +2335,10 @@ class TypedArrayTemplate copyFromArray(JSContext *cx, HandleObject thisTypedArrayObj, HandleObject ar, uint32_t len, uint32_t offset = 0) { + // Exit early if nothing to copy, to simplify loop conditions below. + if (len == 0) + return true; + JS_ASSERT(thisTypedArrayObj->isTypedArray()); JS_ASSERT(offset <= length(thisTypedArrayObj)); JS_ASSERT(len <= length(thisTypedArrayObj) - offset); @@ -2344,34 +2348,47 @@ class TypedArrayTemplate const Value *src = NULL; NativeType *dest = static_cast<NativeType*>(viewData(thisTypedArrayObj)) + offset; - // The only way the code below can GC is if nativeFromValue fails, but - // in that case we return false immediately, so we do not need to root - // |src| and |dest|. These SkipRoots are to protect from the - // unconditional MaybeCheckStackRoots done by ToNumber. + // These SkipRoots are to protect from the unconditional + // MaybeCheckStackRoots done by ToNumber. SkipRoot skipDest(cx, &dest); SkipRoot skipSrc(cx, &src); +#ifdef DEBUG + JSRuntime *runtime = cx->runtime(); + uint64_t gcNumber = runtime->gcNumber; +#endif + if (ar->isArray() && !ar->isIndexed() && ar->getDenseInitializedLength() >= len) { JS_ASSERT(ar->getArrayLength() == len); src = ar->getDenseElements(); - for (uint32_t i = 0; i < len; ++i) { + uint32_t i = 0; + do { NativeType n; if (!nativeFromValue(cx, src[i], &n)) return false; dest[i] = n; - } + } while (++i < len); + JS_ASSERT(runtime->gcNumber == gcNumber); } else { RootedValue v(cx); - for (uint32_t i = 0; i < len; ++i) { + uint32_t i = 0; + do { if (!JSObject::getElement(cx, ar, ar, i, &v)) return false; NativeType n; if (!nativeFromValue(cx, v, &n)) return false; + + len = Min(len, length(thisTypedArrayObj)); + if (i >= len) + break; + + // Compute every iteration in case getElement acts wacky. + dest = static_cast<NativeType*>(viewData(thisTypedArrayObj)) + offset; dest[i] = n; - } + } while (++i < len); } return true;

1 0