Brad Lassey
66213ceda2
merge for stuff that landed since I updated
2011-10-25 13:57:14 -04:00
Kartikaya Gupta
32f767413d
Bug 695170 - Implement visited link styles [r=blassey]
...
Provide an IHistory interface implementation from the android widgets
rather than using the one in Places. This allows the Link class to get
history information from the android code. The IHistory implementation
talks to the Android browser history database via JNI.
The Java-side implementation attempts to batch-process the requests coming
in, and keeps an in-memory cache of the visited links to avoid multiple
hits to the database. The in-memory cache is guaranteed to be cleared
by the VM before an OOMs get thrown.
The current implementation does not consider external events that might
update the history database, and so the visited link information
provided to Gecko might not reflect the latest information in the
Android browser history database.
2011-10-25 11:39:32 -04:00
Brad Lassey
efa5b07fa8
merge from mozilla-central
2011-10-25 10:54:54 -04:00
Geoff Lankow
a0596c9180
Bug 693714 - Bootstrapped addons have uninstall & install called on Firefox update; r=dtownsend
2011-10-25 01:39:45 +01:00
Taras Glek
f8512b4688
Include enabled addons + persona in telemetry r=Mossop
2011-10-24 16:04:04 -07:00
Taras Glek
5313c0cd56
Bug 690585 - Report startup interruptions r=glandium
2011-10-24 14:38:39 -07:00
Fabrice Desré
d2ac38299b
Don't harcode the appID in nsAndroidStartup.cpp [r=ted]
2011-10-24 13:07:33 -07:00
Doug Turner
05f2dd0d67
Merge from m-c
2011-10-24 11:11:26 -07:00
Doug Turner
2084bc10db
Backing out the Quit change which is causing bug 696386. r=mfinkle
2011-10-23 21:19:42 -07:00
Ed Morley
38af1a8516
Merge mozilla-central and mozilla-inbound
2011-10-23 17:16:21 +01:00
Tim Taubert
4c37cfb21a
merge the last green changeset on m-c to fx-team
2011-10-22 21:07:26 +02:00
Marco Bonardo
5a3249e076
Backout cb50e96dbee0 (Bug 677079) for Win PGO mochitests failures.
2011-10-22 11:03:26 +02:00
Doug Turner
3e7bc8f86c
Bug 695699 - Work around to produce valid aus links. r=fabrice.
2011-10-21 22:33:57 -07:00
Jared Wein
e5634fa501
Bug 692640 - Video statistics text overlaps itself on small dimension videos. r=dolske
2011-10-21 16:07:18 -04:00
Marco Bonardo
d7a35dbad7
Bug 696158 - Adapt expiration aggressivity to the distance from the history limit.
...
r=dietrich
2011-10-20 22:51:13 +02:00
Bill McCloskey
222d42bf92
Bug 677079 - Remove jscntxt.h from INSTALLED_HEADERS (r=Waldo)
2011-10-20 10:14:24 -07:00
Dan Williams
f82fd87f72
Bug 639959 - Support NetworkManager 0.9.0; r=bz
2011-10-21 21:33:31 +01:00
Daniel Holbert
dadc8670dd
back out 15e15fead382 (Bug 693743) for timeouts in Linux crashtest, jsreftest, and reftest suites
2011-10-21 12:58:46 -07:00
Dave Townsend
5e00f0298a
Bug 693743: Some 3rd party add-ons are getting installed into the profile and are not disabled on start-up. r=Unfocused
2011-10-21 11:11:42 -07:00
Brad Lassey
8f858b54f3
no bug - make quit work r=dougt
2011-10-19 16:31:31 -04:00
Geoff Lankow
4f0b71d3e8
Bug 581065 - Allow searching for incompatible add-ons if compatibility checks are disabled. r=dtownsend
2011-10-19 11:38:58 +13:00
Fabrice Desré
feb73eb8df
Bug 695405 - Re-enable add-on support [r=mossop]
2011-10-18 11:34:11 -07:00
Nathan Froyd
dbe15049c2
Bug 681535 - XUL reflow telemetry; r=dbaron
2011-10-17 12:49:57 -04:00
Dave Townsend
810957e943
Bug 693743: Some 3rd party add-ons are getting installed into the profile and are not disabled on start-up. r=Unfocused
2011-10-22 11:37:15 -07:00
Ed Morley
72f2f2abfe
Fix bustage on non-android platforms; r=fabrice
2011-10-15 22:57:57 +01:00
Fabrice Desré
39a5e34d1b
Missed the fix to nsNavHistory for places
2011-10-14 17:02:14 -07:00
Fabrice Desré
3a92928e56
Try to not bust non-android builds
2011-10-14 16:44:47 -07:00
Jeff Muizelaar
3f12aea599
Bug 694039. Work around OpenGL quirks in the plugin process. r=bgirard
...
We do the same in the main process so that we get the right
bundle id on in Nightly and Aurora
--HG--
extra : rebase_source : 6545f4a54d83a086e09e6b67a23aba1af9ec31ea
2011-10-14 15:22:11 -04:00
Doug Turner
7093994409
Merge from mozilla-central
2011-10-14 10:22:33 -07:00
Gian-Carlo Pascutto
87affb2741
Fix libs being included twice in APK. (Faulty merge of bug 686876) r=mfinkle
2011-10-14 17:52:50 +02:00
Ehsan Akhgari
6662a5197b
Merge the last green changeset on mozilla-inbound to mozilla-central
2011-10-14 10:37:35 -04:00
Henri Sivonen
f0d03766ac
Bug 677050 - Return NS_ERROR_DOM_INVALID_STATE_ERR if fragment parsing is invoked re-entrantly. r=bzbarsky.
2011-10-14 13:39:19 +03:00
Ed Morley
d959511237
Merge last green changeset of mozilla-inbound to mozilla-central
2011-10-14 10:58:43 +01:00
John Hopkins
f75b31ef55
Bug 685442 - Mac nightly builders keep failing (typically upload_symbols step). r=ted
2011-10-13 22:48:32 -07:00
Makoto Kato
2bb839d096
Bug 692689 - XRE_SendTestShellCommand returns NS_ERROR_FAILURE. r=bsmedberg
2011-10-14 11:23:12 +09:00
Rob Campbell
33252f7dd8
merge fx-team to m-c
2011-10-13 13:40:01 -03:00
Dave Townsend
36c709e086
Bug 694595: Some settings for add-ons aren't being migrated when we change database schemas. r=Unfocused
2011-10-20 09:55:57 -07:00
Dave Townsend
91b528511d
Bug 693698: 3rd Party add-ons from the application folder are not disabled on upgrade. r=Unfocused
2011-10-20 09:55:16 -07:00
Rob Campbell
abf84621d6
merge m-c to fx-team
2011-10-13 10:35:04 -03:00
Jeff Hammel
ecd567d8cd
Bug 676078 Remove unused mozmill code from mozilla-central r=ctalbert
...
--HG--
rename : testing/mozmill/simplejson-2.1.1/CHANGES.txt => other-licenses/simplejson-2.1.1/CHANGES.txt
rename : testing/mozmill/simplejson-2.1.1/LICENSE.txt => other-licenses/simplejson-2.1.1/LICENSE.txt
rename : testing/mozmill/simplejson-2.1.1/PKG-INFO => other-licenses/simplejson-2.1.1/PKG-INFO
rename : testing/mozmill/simplejson-2.1.1/conf.py => other-licenses/simplejson-2.1.1/conf.py
rename : testing/mozmill/simplejson-2.1.1/docs/_sources/index.txt => other-licenses/simplejson-2.1.1/docs/_sources/index.txt
rename : testing/mozmill/simplejson-2.1.1/docs/_static/contents.png => other-licenses/simplejson-2.1.1/docs/_static/contents.png
rename : testing/mozmill/simplejson-2.1.1/docs/_static/default.css => other-licenses/simplejson-2.1.1/docs/_static/default.css
rename : testing/mozmill/simplejson-2.1.1/docs/_static/doctools.js => other-licenses/simplejson-2.1.1/docs/_static/doctools.js
rename : testing/mozmill/simplejson-2.1.1/docs/_static/file.png => other-licenses/simplejson-2.1.1/docs/_static/file.png
rename : testing/mozmill/simplejson-2.1.1/docs/_static/interface.js => other-licenses/simplejson-2.1.1/docs/_static/interface.js
rename : testing/mozmill/simplejson-2.1.1/docs/_static/jquery.js => other-licenses/simplejson-2.1.1/docs/_static/jquery.js
rename : testing/mozmill/simplejson-2.1.1/docs/_static/minus.png => other-licenses/simplejson-2.1.1/docs/_static/minus.png
rename : testing/mozmill/simplejson-2.1.1/docs/_static/navigation.png => other-licenses/simplejson-2.1.1/docs/_static/navigation.png
rename : testing/mozmill/simplejson-2.1.1/docs/_static/plus.png => other-licenses/simplejson-2.1.1/docs/_static/plus.png
rename : testing/mozmill/simplejson-2.1.1/docs/_static/pygments.css => other-licenses/simplejson-2.1.1/docs/_static/pygments.css
rename : testing/mozmill/simplejson-2.1.1/docs/_static/rightsidebar.css => other-licenses/simplejson-2.1.1/docs/_static/rightsidebar.css
rename : testing/mozmill/simplejson-2.1.1/docs/_static/searchtools.js => other-licenses/simplejson-2.1.1/docs/_static/searchtools.js
rename : testing/mozmill/simplejson-2.1.1/docs/_static/sphinxdoc.css => other-licenses/simplejson-2.1.1/docs/_static/sphinxdoc.css
rename : testing/mozmill/simplejson-2.1.1/docs/_static/stickysidebar.css => other-licenses/simplejson-2.1.1/docs/_static/stickysidebar.css
rename : testing/mozmill/simplejson-2.1.1/docs/_static/traditional.css => other-licenses/simplejson-2.1.1/docs/_static/traditional.css
rename : testing/mozmill/simplejson-2.1.1/docs/genindex.html => other-licenses/simplejson-2.1.1/docs/genindex.html
rename : testing/mozmill/simplejson-2.1.1/docs/index.html => other-licenses/simplejson-2.1.1/docs/index.html
rename : testing/mozmill/simplejson-2.1.1/docs/objects.inv => other-licenses/simplejson-2.1.1/docs/objects.inv
rename : testing/mozmill/simplejson-2.1.1/docs/search.html => other-licenses/simplejson-2.1.1/docs/search.html
rename : testing/mozmill/simplejson-2.1.1/docs/searchindex.js => other-licenses/simplejson-2.1.1/docs/searchindex.js
rename : testing/mozmill/simplejson-2.1.1/docs/searchindex.json => other-licenses/simplejson-2.1.1/docs/searchindex.json
rename : testing/mozmill/simplejson-2.1.1/ez_setup.py => other-licenses/simplejson-2.1.1/ez_setup.py
rename : testing/mozmill/simplejson-2.1.1/index.rst => other-licenses/simplejson-2.1.1/index.rst
rename : testing/mozmill/simplejson-2.1.1/scripts/make_docs.py => other-licenses/simplejson-2.1.1/scripts/make_docs.py
rename : testing/mozmill/simplejson-2.1.1/setup.cfg => other-licenses/simplejson-2.1.1/setup.cfg
rename : testing/mozmill/simplejson-2.1.1/setup.py => other-licenses/simplejson-2.1.1/setup.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/__init__.py => other-licenses/simplejson-2.1.1/simplejson/__init__.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/_speedups.c => other-licenses/simplejson-2.1.1/simplejson/_speedups.c
rename : testing/mozmill/simplejson-2.1.1/simplejson/decoder.py => other-licenses/simplejson-2.1.1/simplejson/decoder.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/encoder.py => other-licenses/simplejson-2.1.1/simplejson/encoder.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/ordered_dict.py => other-licenses/simplejson-2.1.1/simplejson/ordered_dict.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/scanner.py => other-licenses/simplejson-2.1.1/simplejson/scanner.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/__init__.py => other-licenses/simplejson-2.1.1/simplejson/tests/__init__.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_check_circular.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_check_circular.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_decimal.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_decimal.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_decode.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_decode.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_default.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_default.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_dump.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_dump.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_encode_basestring_ascii.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_encode_basestring_ascii.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_encode_for_html.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_encode_for_html.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_fail.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_fail.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_float.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_float.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_indent.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_indent.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_pass1.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_pass1.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_pass2.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_pass2.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_pass3.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_pass3.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_recursion.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_recursion.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_scanstring.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_scanstring.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_separators.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_separators.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_speedups.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_speedups.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_unicode.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_unicode.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tool.py => other-licenses/simplejson-2.1.1/simplejson/tool.py
rename : testing/mozmill/virtualenv/MANIFEST.in => other-licenses/virtualenv/MANIFEST.in
rename : testing/mozmill/virtualenv/PKG-INFO => other-licenses/virtualenv/PKG-INFO
rename : testing/mozmill/virtualenv/docs/_build/_sources/index.txt => other-licenses/virtualenv/docs/_build/_sources/index.txt
rename : testing/mozmill/virtualenv/docs/_build/_sources/license.txt => other-licenses/virtualenv/docs/_build/_sources/license.txt
rename : testing/mozmill/virtualenv/docs/_build/_sources/news.txt => other-licenses/virtualenv/docs/_build/_sources/news.txt
rename : testing/mozmill/virtualenv/docs/index.txt => other-licenses/virtualenv/docs/index.txt
rename : testing/mozmill/virtualenv/docs/license.txt => other-licenses/virtualenv/docs/license.txt
rename : testing/mozmill/virtualenv/docs/news.txt => other-licenses/virtualenv/docs/news.txt
rename : testing/mozmill/virtualenv/scripts/virtualenv => other-licenses/virtualenv/scripts/virtualenv
rename : testing/mozmill/virtualenv/setup.cfg => other-licenses/virtualenv/setup.cfg
rename : testing/mozmill/virtualenv/setup.py => other-licenses/virtualenv/setup.py
rename : testing/mozmill/virtualenv/virtualenv.py => other-licenses/virtualenv/virtualenv.py
rename : testing/mozmill/virtualenv/virtualenv_support/__init__.py => other-licenses/virtualenv/virtualenv_support/__init__.py
rename : testing/mozmill/virtualenv/virtualenv_support/distribute-0.6.8.tar.gz => other-licenses/virtualenv/virtualenv_support/distribute-0.6.8.tar.gz
rename : testing/mozmill/virtualenv/virtualenv_support/pip-0.7.1.tar.gz => other-licenses/virtualenv/virtualenv_support/pip-0.7.1.tar.gz
rename : testing/mozmill/virtualenv/virtualenv_support/setuptools-0.6c11-py2.4.egg => other-licenses/virtualenv/virtualenv_support/setuptools-0.6c11-py2.4.egg
rename : testing/mozmill/virtualenv/virtualenv_support/setuptools-0.6c11-py2.5.egg => other-licenses/virtualenv/virtualenv_support/setuptools-0.6c11-py2.5.egg
rename : testing/mozmill/virtualenv/virtualenv_support/setuptools-0.6c11-py2.6.egg => other-licenses/virtualenv/virtualenv_support/setuptools-0.6c11-py2.6.egg
2011-10-13 16:27:33 -07:00
Marco Bonardo
9a95341bfe
Merge mozilla-central to mozilla-inbound
2011-10-14 01:07:46 +02:00
Doug Turner
e1eb20d0a5
We disabled places by returning early when making the db connect. The link code is a very loud/frequent caller into places. Here we also bail early to avoid lots of getService calls and lots of debug spew.
2011-10-11 00:23:36 -07:00
Doug Turner
f7ffea8082
Patch from https://github.com/snorp/mozilla-central faster branch.
2011-10-10 17:40:17 -07:00
Jacek Caban
59d6924638
Bug 686110 - TestDllInterceptor.cpp fails to compile on mingw r=glandium
2011-10-13 16:01:52 +02:00
Daniel Holbert
6b4f1fa31d
Back out 52b481205766 (Bug 429592) for Linux64 opt orange
2011-10-24 11:25:04 -07:00
Justin Lebar
78e45869f0
Bug 693404 - Part 2: On Mac, purge MADV_FREE'd pages before reading RSS. r=khuey
2011-10-24 13:24:02 -04:00
Justin Lebar
849fa684fe
Back out bug 693404 (2f7668cd67bc, 3db099ca452a) due to red.
2011-10-24 14:02:16 -04:00
Justin Lebar
1850e75880
Bug 693404 - Part 2: On Mac, purge MADV_FREE'd pages before reading RSS. r=khuey
...
--HG--
extra : rebase_source : c0f1f82aba30d32166e17d7d4216017475c9c09a
2011-10-24 13:24:02 -04:00
Benjamin Smedberg
6859a1f2f5
Bug 429592 part A - allow AnnotateCrashReport to be called from off the main thread in the chrome process, r?ted
...
--HG--
extra : rebase_source : 542b5a9b0474360a4c380ac1fa978c3eeaa1810a
2011-10-06 16:33:21 -04:00
Justin Lebar
72783f7f69
Bug 682437 - Add memory reporter for History::mObservers. r=bz
...
--HG--
extra : rebase_source : f280a6beefd32319816ff8720f7bf65c04343b1e
2011-09-14 17:37:45 -07:00