Commit Graph

301 Commits

Author SHA1 Message Date
Doug Turner
cd42b892d2 Merge 2011-11-04 10:46:58 -07:00
Jim Mathies
65fde858be Bug 577867 - Add CityHash NSIS extension to build. r=rstrong 2011-11-03 09:39:50 -05:00
Jim Mathies
1a67288781 Bug 577867 - Add CityHash NSIS extension Visual Studio project to other-licenses repo. r=rstrong, r=gerv 2011-11-03 09:39:50 -05:00
Doug Turner
9005fea036 Bug 696315 - Remove Quit menu option. r=bnicholson@mozilla.com
--HG--
extra : rebase_source : 27492a24f3c58e71d9df98534612c0f74c05d7e4
2011-11-02 22:32:36 -07:00
Doug Turner
9d7ad87af8 No Bug - Missing wrappers in APKOpen.cpp that were on birch. Verbal r=blassey
--HG--
extra : rebase_source : be760413dbc9a0ffdf6bd4f5b59286fcc6602f00
2011-11-21 11:39:47 -08:00
James Willcox
80e0ac2f8e Rolled up Android plugin fixes including bugs 692988, 694366, 702330, 702334, 702338, 702341, 702614, 702627, 702964
Bug 692988 - anp_system_getApplicationDataDirectory() is just plain wrong
Bug 694366 - Allow Flash to use transparent wmode
Bug 702330 - Revert to drawing Flash plugin with a SurfaceView
Bug 702334 - Fix deadlocks caused by Flash
Bug 702338 - Enable plugins
Bug 702341 - Flash plugins don't respond to panning/zooming changes
Bug 702614 - Flash should use Skia to implement ANPCanvas and similar
interfaces
Bug 702627 - Flash: queue invalidation after async surface request
Bug 702964 - Support subregion lock on plugin surfaces
2011-11-21 02:55:50 -05:00
Mounir Lamouri
2545c63c8e Bug 696038 - (2/3) Boilerplate code to communicate between hal and Android Java code. r=cjones 2011-11-02 16:35:11 +01:00
Brad Lassey
dd3fde0590 no bug - make quit work r=dougt
--HG--
extra : rebase_source : 167f35f6ac7543d3954e8f7c0d641d6e70414ce9
2011-10-19 16:31:31 -04:00
Kartikaya Gupta
d076409347 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
Doug Turner
2084bc10db Backing out the Quit change which is causing bug 696386. r=mfinkle 2011-10-23 21:19:42 -07:00
Brad Lassey
8f858b54f3 no bug - make quit work r=dougt 2011-10-19 16:31:31 -04:00
Doug Turner
7093994409 Merge from mozilla-central 2011-10-14 10:22:33 -07:00
Ed Morley
d959511237 Merge last green changeset of mozilla-inbound to mozilla-central 2011-10-14 10:58:43 +01: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
Doug Turner
f7ffea8082 Patch from https://github.com/snorp/mozilla-central faster branch. 2011-10-10 17:40:17 -07:00
Brad Lassey
5cf7a49da2 Backed out changeset c3a50afc2243 due to large volume of crashes tracked in bug 687367 2011-10-10 10:40:27 -04:00
Matt Brubeck
d53193f383 Back out f7bf7ac18a79 (bug 684826), 3a910924c50c (bug 687367), and 524a6bb8744b (bug 693086) because of Android bustage on a CLOSED TREE 2011-10-10 09:43:58 -07:00
Brad Lassey
ab723a6a51 merge 2011-10-10 10:40:57 -04:00
Brad Lassey
4528a38462 Backed out changeset c3a50afc2243 due to large volume of crashes tracked in bug 687367 2011-10-10 10:40:27 -04:00
Michael Edwards
8d268b37aa Bug 687367 - Make bionic domain name functions thread-safe on pre-3.0 Android, r=dougt 2011-10-06 20:55:50 -07:00
Matt Brubeck
d6af4c95e2 Bug 691054 - Back out bug 667980 (getNetworkLinkType) on Android because of scary permissions [r=dougt] 2011-10-03 16:34:43 -07:00
Brad Lassey
d174ebedad Backed out changeset c3a50afc2243 due to large volume of crashes tracked in bug 687367 2011-10-10 10:40:27 -04:00
Matt Brubeck
eb9465f1a3 Back out f7bf7ac18a79 (bug 684826), 3a910924c50c (bug 687367), and 524a6bb8744b (bug 693086) because of Android bustage on a CLOSED TREE 2011-10-10 09:47:27 -07:00
Mike Hommey
6ed3ac0c23 Bug 690856 - Ensure Instruction and Data cache coherency after extracting libraries from the DEBUG intent r=mwu 2011-09-30 20:42:24 +02:00
Mike Hommey
840a06f55b Bug 702764 part 3 - Add linker initialization and library loading timestamps for nsAppStartup::GetStartupInfo. r=tglek 2011-11-18 08:54:37 +01:00
Mike Hommey
e2cf17b6ba Bug 702764 part 1 - Use RUSAGE_THREAD for library loading time consumption reporting. r=tglek 2011-11-18 08:54:17 +01:00
Mounir Lamouri
5b66ee0ddb Bug 700263 - Add remainingTime support to android backend. r=cjones 2011-11-09 15:13:37 +01:00
Mounir Lamouri
629dc18d52 Bug 699742 - (4/4) battery.level should be a double (android backend). r=cjones 2011-11-09 09:56:37 +01:00
Matt Brubeck
6abf5a179d Merge last green changeset of mozilla-inbound to mozilla-central 2011-10-07 12:06:20 -07:00
Mike Hommey
43ad082aeb Bug 687446 - Allow debug symbols to be found under gdb without extracted libraries. r=mwu 2011-10-07 08:31:29 +02:00
Mike Hommey
253dcacb30 Bug 692381 - Remove one of the Android library extraction code paths. r=mwu 2011-10-07 08:30:32 +02:00
Makoto Kato
760958734d Bug 681202 - Add Android x86 target. r=glandium 2011-09-29 13:39:03 +09:00
Fabrice Desré
710899e3ab Bug 659188 - Android and media parts [r=blassey] [r=cpearce] 2011-09-26 17:25:41 -07:00
Mike Hommey
af8e7baa1b Bug 687147 - Ensure Instruction and Data cache coherency after extracting libraries. r=mwu 2011-09-23 14:31:11 +02:00
Mike Hommey
e9f9b017a8 Bug 686876 - Move libraries at the top level in the apk. r=mfinkle 2011-09-21 18:06:14 +02:00
Jim Chen
c1be77aca6 Bug 687147 - Workaround linker crash when calling .init_array in libmozalloc.so; r=
Bug 687147 - Workaround linker crash when calling .init_array in libmozalloc.so; r=mfinkle r=glandium
2011-09-20 11:16:00 -04:00
Doug Turner
fa4f75d7e3 Bug 630007 - Minimal support NPAPI on ANDROID. Pre-Honeycomb inproccess support only. r=josh. 2011-09-16 14:34:31 -07:00
Ed Morley
00e6fcf8b2 Backout d4bdab069bbc (bug 630007) for qt build bustage and various oranges on other platforms 2011-09-17 00:27:55 +01:00
Doug Turner
0ef3efa1a5 Bug 630007 - Minimal support NPAPI on ANDROID. Pre-Honeycomb inproccess support only. r=josh. 2011-09-16 14:34:31 -07:00
Kyle Huey
614dad33a3 Merge m-c to b-s. 2011-09-07 10:47:50 -04:00
Mike Hommey
43f0a42c79 Bug 684213 - Directly uncompress libraries into the mmap()ed cache files. r=mwu 2011-09-07 07:56:28 +02:00
Mike Hommey
d0a3d1bc2f Backout the backout of e5815c156b6c (bug 683096), 9ca928d8095c (merge), a286edb8ca4b (bug 683875), 61dc35b8f63f (bug 683171), b0741ae44def (bug 683875), 8e01bc314326 + e2697c06468f (bug 677501), 805e28e85577 (bug 680440) 2011-09-03 08:19:06 +02:00
Ed Morley
ed260633c7 Backout e5815c156b6c (bug 683096), 9ca928d8095c (merge), a286edb8ca4b (bug 683875), 61dc35b8f63f (bug 683171), b0741ae44def (bug 683875), 8e01bc314326 + e2697c06468f (bug 677501), 805e28e85577 (bug 680440) for Win opt orange and purple galore, on a CLOSED TREE 2011-09-03 04:35:21 +01:00
Kyle Huey
2fe1065da6 Merge b-s to m-c. 2011-09-02 17:35:11 -04:00
Mike Hommey
cfd3ac70a2 Bug 677501 - Build a mozutils library containing jemalloc and other things. r=khuey
--HG--
rename : memory/jemalloc/Makefile.in => memory/mozutils/Makefile.in
rename : memory/jemalloc/fixcrt.py => memory/mozutils/fixcrt.py
rename : memory/jemalloc/jemalloc.def => memory/mozutils/mozutils.def.in
2011-09-01 14:12:10 +02:00
Mike Hommey
1fbab12774 Bug 680440 - Clean up jemalloc linkage. r=khuey 2011-09-01 14:11:56 +02:00
Kyle Huey
7b7b45a351 Merge m-c to b-s. 2011-08-31 07:52:43 -04:00
Jim Chen
7bcf05e723 Bug 674806 - d. Use char* for pointer arithmetic [r=mwu] 2011-08-30 17:11:37 -07:00
Ed Morley
19a1226d22 Merge last green changeset on m-i to m-c 2011-09-01 08:41:18 +01:00
Atul Aggarwal
31dcf08260 Bug 679612 - Add fclose calls to every exit point in APKOpen.cpp to prevent resource leaks; r=mwu 2011-08-31 16:30:33 +01:00
Kyle Huey
0e655f0dc8 Merge m-c to b-s. 2011-08-24 08:34:27 -04:00
Mike Hommey
35dde42be0 Bug 680373 - Link jemalloc into mozutils instead of mozalloc on Android. r=blassey,r=pbiggar 2011-08-24 12:55:13 +02:00
Mike Hommey
a41c1ed56d Bug 681203 - Bind all symbols when dynamic symbol lookup is not supported. r=mwu 2011-08-23 16:12:44 +02:00
Doug Turner
c6d0970106 Bug 661978 - Android file input activity deadlocks. r=blassey 2011-08-18 19:30:22 -07:00
Mike Hommey
664eff9807 Bug 651889 - Add support for dynamic symbol lookup in the Android dynamic linker. r=mwu 2011-08-09 13:35:52 +02:00
Mike Hommey
910fe37b7c Bug 681588 - Cleanup wrap malloc and its use on Android. r=ted 2011-08-29 19:21:22 +02:00
Doug Turner
0efa167f2b Bug 667980: Expose network connection type to chrome. r=dougt
Add an attribute to nsINetworkLinkService that represents the connection type,
and add code to the android back-end to expose the connection type and notify
when it changes.
2011-07-10 15:24:05 -07:00
Doug Turner
3bdb5635c9 Bug 670201 - Remove most #ifdef DEBUG from custom loader. r=mwu 2011-07-09 19:50:22 -07:00
Mike Hommey
393dc001bc Bug 647288 - Make our Android linker properly load libraries outside the .apk. r=mwu 2011-07-07 16:34:33 +02:00
Mike Hommey
4a5a3c957f Bug 664934 - Add user and system usage in GeckoLibLoad log. r=mwu 2011-06-17 08:59:39 +02:00
Brad Lassey
1868c65dfc bug 660326 - send java exceptions to crash-stats r=dougt 2011-06-01 13:54:53 -04:00
Brian R. Bondy
224e7890aa Bug 698153 - NSIS ApplicationID project build problem fix with resource1.h. r=jimm 2011-10-31 14:10:51 -04:00
Vladimir Vukicevic
32e8962d5a Content processes should not crash on startup when building with --disable-crashreporter, r=mwu 2011-05-25 16:54:30 -04:00
Mike Hommey
e56745d75b Bug 620931 part 3 - Allow GRE and XUL application to use omni.jar independently. r=bsmedberg,r=mwu
We now store two independent locations for an omni.jar, allowing GRE/XRE and
XUL application to each have their own omni.jar. And since xulrunner setups
are very independent from the XUL applications, we implement support for both
omni.jar and non omni.jar cases in the same runtime, with the side effect of
allowing to switch from one to the other manually without rebuilding the
binaries.

We let the mozilla::Omnijar API handle both cases, so that callers don't need
too much work to support them.

We also make the preferences service load the same set of preferences in all
the various cases (unified vs. separate, omni.jar vs. no omni.jar).

The child process launcher for IPC is modified to pass the base directories
needed for the mozilla::Omnijar API initialization in the child process.

Finally, the startupcache file name canonicalization is modified to separate
APP and GRE resources.
2011-02-25 12:53:36 +01:00
Ed Morley
34572d77b2 Bug 654716 - Remove WinCE code from other-licenses/bsdiff/Makefile.in; r=ted 2011-05-09 09:54:40 -07:00
Brad Taylor
2d0ff623b4 Bug 480317 - Provide a way for atk-based plugins to slot into our a11y tree, r=joshmoz, ginn, surkov, trev, patch=btaylor, mcarrion, mgorse 2011-04-27 22:42:18 +09:00
Mike Hommey
bd15cd1113 Bug 561032 - Move Firefox branding into browser/branding/official. r=gavin,r=pike
--HG--
rename : other-licenses/branding/firefox/LICENSE => browser/branding/official/LICENSE
rename : other-licenses/branding/firefox/Makefile.in => browser/branding/official/Makefile.in
rename : other-licenses/branding/firefox/background.png => browser/branding/official/background.png
rename : other-licenses/branding/firefox/branding.nsi => browser/branding/official/branding.nsi
rename : other-licenses/branding/firefox/configure.sh => browser/branding/official/configure.sh
rename : other-licenses/branding/firefox/content/Makefile.in => browser/branding/official/content/Makefile.in
rename : other-licenses/branding/firefox/content/about-logo.png => browser/branding/official/content/about-logo.png
rename : other-licenses/branding/firefox/content/about-wordmark.png => browser/branding/official/content/about-wordmark.png
rename : other-licenses/branding/firefox/content/about.png => browser/branding/official/content/about.png
rename : other-licenses/branding/firefox/content/icon48.png => browser/branding/official/content/icon48.png
rename : other-licenses/branding/firefox/content/icon64.png => browser/branding/official/content/icon64.png
rename : other-licenses/branding/firefox/content/jar.mn => browser/branding/official/content/jar.mn
rename : other-licenses/branding/firefox/default16.png => browser/branding/official/default16.png
rename : other-licenses/branding/firefox/default22.png => browser/branding/official/default22.png
rename : other-licenses/branding/firefox/default24.png => browser/branding/official/default24.png
rename : other-licenses/branding/firefox/default256.png => browser/branding/official/default256.png
rename : other-licenses/branding/firefox/default32.png => browser/branding/official/default32.png
rename : other-licenses/branding/firefox/default48.png => browser/branding/official/default48.png
rename : other-licenses/branding/firefox/disk.icns => browser/branding/official/disk.icns
rename : other-licenses/branding/firefox/document-os2.ico => browser/branding/official/document-os2.ico
rename : other-licenses/branding/firefox/document.icns => browser/branding/official/document.icns
rename : other-licenses/branding/firefox/document.ico => browser/branding/official/document.ico
rename : other-licenses/branding/firefox/document.png => browser/branding/official/document.png
rename : other-licenses/branding/firefox/dsstore => browser/branding/official/dsstore
rename : other-licenses/branding/firefox/firefox-os2.ico => browser/branding/official/firefox-os2.ico
rename : other-licenses/branding/firefox/firefox.icns => browser/branding/official/firefox.icns
rename : other-licenses/branding/firefox/firefox.ico => browser/branding/official/firefox.ico
rename : other-licenses/branding/firefox/locales/Makefile.in => browser/branding/official/locales/Makefile.in
rename : other-licenses/branding/firefox/locales/browserconfig.properties => browser/branding/official/locales/browserconfig.properties
rename : other-licenses/branding/firefox/locales/en-US/brand.dtd => browser/branding/official/locales/en-US/brand.dtd
rename : other-licenses/branding/firefox/locales/en-US/brand.properties => browser/branding/official/locales/en-US/brand.properties
rename : other-licenses/branding/firefox/locales/jar.mn => browser/branding/official/locales/jar.mn
rename : other-licenses/branding/firefox/mozicon128.png => browser/branding/official/mozicon128.png
rename : other-licenses/branding/firefox/pref/firefox-branding.js => browser/branding/official/pref/firefox-branding.js
rename : other-licenses/branding/firefox/splash.bmp => browser/branding/official/splash.bmp
rename : other-licenses/branding/firefox/wizHeader.bmp => browser/branding/official/wizHeader.bmp
rename : other-licenses/branding/firefox/wizHeaderRTL.bmp => browser/branding/official/wizHeaderRTL.bmp
rename : other-licenses/branding/firefox/wizWatermark.bmp => browser/branding/official/wizWatermark.bmp
2011-04-13 09:58:13 +02:00
Mike Hommey
fbcfb57897 Bug 644692 - Fix bsdiff build failure with system bzip2. r=ted 2011-04-13 09:44:23 +02:00
Jory A. Pratt
3ae884f005 Bug 581812 - yacc.py should use hashlib instead of md5 which has been depreciated; r=bsmedberg 2010-08-16 09:39:00 -04:00
Tim Taubert
d9daafd94c Bug 644794 - Remove "browser.panorama.welcome_url" legacy preferences; r=dao 2011-03-24 17:04:00 -04:00
Mike Hommey
48fbd0b2c2 Bug 637316 part 1 - Report whole memory mapping to crash reporter for libraries on Android. r=mwu 2011-03-14 15:23:32 +01:00
Kyle Huey
ee2b740dd2 Merge m-c to bs. 2011-03-04 23:54:03 -05:00
Brad Lassey
41e96455b0 bug 611163 - Fennec doesn't start due a problem with 'ashmem buffer' in DDMS r=taras a=blocking-fennec 2011-03-04 18:08:24 -05:00
Robert Strong
9568a66d1c NSIS plugin for Bug 621873 - Pin to taskbar when setting as default browser on Windows 7. r=vlad, r=jmathies, a=approval2.0 2011-02-09 11:48:46 -08:00
Brad Lassey
f409ccb261 bug 631760 - don't hard code "/data/data/<package name>" r=dougt a=blocking-fennec 2011-02-07 23:40:42 -05:00
Brad Lassey
34e417e9fd bug 611163 - Fennec doesn't start due a problem with "ashmem buffer" in DDMS, patch to add logging r=taras a=blockingfennec 2011-02-07 23:40:42 -05:00
Robert Strong
579aa9797d Bug 631840 - Remove nsProcess plugin and associated code since it is no longer used. r=jimm, a=approval2.0 2011-02-07 18:43:07 -08:00
Mike Hommey
6ef83c9db5 Bug 584474 part 9 - Replace fakelibs with a more sophisticated library expansion system. r=ted 2011-02-25 15:05:08 +01:00
Michael Wu
609cadcef6 Bug 606194 - Use mmap given addresses if necessary, r=taras a=blocking-fennec 2011-02-03 12:10:02 -05:00
Doug Turner
bba386c412 Bug 630595 - Followup. Do not need a dash before the option. Removing unused memory watcher. r=blassey, a=blocking-fennec 2011-02-02 01:00:34 -08:00
Doug Turner
cd8359f6c2 Bug 630133 - Need to unmap files in the non fork case, or we leak libraries. r=blassey a=blocking-fennec
--HG--
extra : rebase_source : b1577150130bbc79fc560bd747f01957900ad9bc
2011-01-31 12:36:35 -08:00
Phil Ringnalda
0f46eddec9 Bug 618541 - Remove long-obsolete contents.rdf in official branding, r=dolske, a=NPOTB 2010-12-11 10:53:38 -08:00
Mike Hommey
d097901939 Bug 628233 part 1 - Make the Android linker stop assuming there is only one read-only PT_LOAD entry. r=mwu,a=sdwilsh 2011-01-28 09:22:58 +01:00
Brad Lassey
a5a9217796 bug 627767 - When starting up fennec, there are two fennec process, don't fork for lib cache when there are no libs to cache r=dougt a=blocking-fennec 2011-01-21 13:28:44 -05:00
Doug Turner
d886cf3236 Bug 624652 - Add memory watcher to reduce the chance of ooming on the Nexus S. r=mwu/cjones. a=blocking-fennec
--HG--
extra : rebase_source : faf23b65fe8b5c64080c1ee3f6d4794e8837097d
2011-01-19 22:14:12 -08:00
Makoto Kato
e30bc616e7 Bug 616075 - HTML5 offline event support for Android. r=mwu a=blocking-fennec 2011-01-20 20:06:13 +09:00
Brad Lassey
c3b167855a bug 623999 - Takes 35s to start up r=dougt f=taras a=blocking-fennec 2011-01-19 17:32:58 -05:00
Gavin Sharp
3712356b2f Bug 616193: only show Charlton trademark attribution in en-US/en-GB, don't make it localizable, r=dolske, a=blocking
--HG--
extra : rebase_source : b8efb750ebbe80e547f06a7e4cc81caa0153aad7
2010-12-02 14:54:58 -05:00
Robert Strong
c70ff82115 Bug 617787 - Stop offering uninstall survey to users. r=mossop, a=blocking2.0-final 2011-01-12 13:09:50 -08:00
Taras Glek
96b1b10db5 Bug 624889 - Useful startup debugging aids on android r=mwu a=mfinkle 2011-01-12 13:08:28 -08:00
Brad Lassey
fc5ace8d13 bug 623598 - avoid repeatedly extracting and deleting libraries r=mbrubeck a=blocking-fennec 2011-01-06 21:02:07 -05:00
Brad Lassey
b195811fd6 Bug 608042 - Add ability to make fat android builds that extract APK to disk r=dougt a=blocking-fennec
--HG--
extra : rebase_source : 60be05d268c70c08a5979e6480e40add3dc72b9d
2011-01-04 15:10:53 -05:00
Michael Wu
ff23778648 bug 620584 - add ANDROID_PACKAGE_NAME rather than hard code org.mozilla.@MOZ_APP_NAME@ r=ted,blassy a=stuart 2010-12-21 15:02:14 -05:00
Steffen Wilberg
4ed3f0f9ef Bug 606289: Fix logo link in about:. r+a=gavin 2010-11-12 21:26:14 +01:00
Michael Wu
f57c62a5e3 Bug 610970 - Round length up to the nearest page when reporting mapped regions, r=ted a=blocking-fennec 2010-11-11 20:51:48 -08:00
Michael Wu
17979f22b9 Bug 609671 - custom Android linker prevents system libraries from being dlopen'd, r=taras a=blocking-fennec 2010-11-10 19:31:16 -08:00
Michael Yoshitaka Erlewine
d8d94abf6e Bug 596075 - Move First-Run Video To Be A Tab Pointing To A Mozilla-Hosted Web Page [r=dolske, a=blocking2.0:betaN+]
--HG--
extra : rebase_source : b05376dd45ebceaadd35b6f628ba28e47037f24e
2010-10-26 17:06:20 -04:00
Michael Wu
402efe298f Bug 607534 - Optimize custom dynamic loader to use less memory, r=cjones a=blocking-fennec 2010-10-29 12:22:28 -07:00
Mark Finkle
c13d5f5238 Bug 608239: Backout changeset 99233ad2ff70 a=fennec-should-load-pages 2010-10-29 10:07:54 -04:00
Michael Wu
bb0cf0f8a4 Bug 607534 - Optimize custom dynamic loader to use less memory, r=cjones a=blocking-fennec 2010-10-28 23:45:46 -07:00
Michael Wu
5e86d3928c bug 607367 - custom lib loader doesn't work on Galaxy S w/2.2 r=vlad a=blocking-fennec 2010-10-26 21:57:54 -04:00
Brad Lassey
8b9c95cf77 bug 601282 - Sometimes fennec's window is black when started the DEBUG intent r=mwu a=blocking-fennec 2010-10-24 19:54:09 -04:00
Kev Needham
02ef2fe17a bug 603298, add bing to the default en-US searchplugins, remove Answers.com and CC, r=stas, a=blocker
--HG--
extra : transplant_source : %3E%10%26%91%8F%180%BC%88%3E%DE%A6%05%18%3F%1Dy4%DC%E6
2010-10-23 17:49:26 +02:00
Michael Wu
53f6429368 Bug 603592 - Report mapping to crash reporter, r=ted a=blocking-fennec 2010-10-20 20:44:03 -04:00
Michael Wu
ddf3ce3ed1 Bug 588607 - 1. Add support for reading libraries out of the apk, r=taras a=blocking-fennec
--HG--
extra : rebase_source : 539f8fea7689fd85cbeb727dcfb09d0b56a3499b
2010-10-15 11:27:57 -07:00
Michael Wu
f71e519090 Bug 588607 - 0. Add bionic linker files, r=lvilla a=blocking-fennec
--HG--
extra : rebase_source : 8ea4efe4309b8fac52ba62cd22a2c69039061755
2010-10-15 11:27:48 -07:00
Justin Dolske
0559ae0908 Bustage fix for landing of bug 579547. a=bustage 2010-09-14 21:18:38 -07:00
Margaret Leibovic
50bfb2a221 Bug 579547 - New About window for Firefox 4 r=gavin ui-r=belzner a=blocking 2010-09-14 16:17:59 -07:00
Gavin Sharp
643806fef8 Official branding bustage fix for bug 590877, a=dbaron 2010-09-10 16:29:33 -04:00
Gavin Sharp
fe3cb2e78d Bug 590877: change default home page to about:home, r=dolske, ui-r=beltzner, a=blocking
--HG--
extra : rebase_source : 3b4de3c582877a4a9a2e2c49bd0fd02722da49fd
2010-09-10 12:05:21 -04:00
Dan Witte
22afbc04f8 Bug 591537 - Freeze UA build id for Firefox branded builds. r=dao/khuey, sr=jst, a=beta5+ 2010-08-28 13:42:04 -07:00
Marco Bonardo
da303449e1 Bug 563723 - Add an about:home page that mimics current start page. r=gavin,mano,dietrich a=blocking 2010-08-26 12:19:37 +02:00
Robert Strong
b855c0578a Bug 571387 - Use the official Unicode UAC and ShellLink distributions. r=jmathies 2010-06-21 18:17:05 -07:00
Robert Strong
69279273eb Bug 485114 - Add plugin for modifying file permissions and move NSIS plugins under other-licenses. r=bsmedberg
--HG--
rename : toolkit/mozapps/installer/windows/nsis/AppAssocReg.dll => other-licenses/nsis/Plugins/AppAssocReg.dll
rename : toolkit/mozapps/installer/windows/nsis/ApplicationID.dll => other-licenses/nsis/Plugins/ApplicationID.dll
rename : toolkit/mozapps/installer/windows/nsis/ShellLink.dll => other-licenses/nsis/Plugins/ShellLink.dll
rename : toolkit/mozapps/installer/windows/nsis/UAC.dll => other-licenses/nsis/Plugins/UAC.dll
rename : toolkit/mozapps/installer/windows/nsis/nsProcess.dll => other-licenses/nsis/Plugins/nsProcess.dll
2010-06-09 16:02:25 -07:00
Robert Sayre
d9e86770e3 Merge mozilla-central to tracemonkey. 2010-06-05 19:13:45 -04:00
Jason Orendorff
d7cbea1f4d Bug 533592, part 1 - Remove uses of and support for xpcnativewrappers=no/yes in manifests. (The default has been yes for some time and we will now only have that behavior.) r=mrbkap.
--HG--
extra : rebase_source : 996d2abecb15f44293abd470a28a3fe2706e130e
2010-05-27 12:33:54 -07:00
Saint Wesonga
32e9aa4b10 Bug 524201 - Move browserconfig.properties to a jar. r=gavin/pike/kev 2010-05-24 11:38:31 +02:00
Jim Mathies
39e2138d31 Bug 521141 - Group running applications properly under shortcuts pinned to the taskbar. r=rstrong. 2010-05-14 19:24:01 -05:00
Michael Kohler
882385621a Bug 260911 - fix 'hierarchy' misspellings. r=timeless
--HG--
extra : rebase_source : ea5fb9d2228966f1bd4eb10d8b5839988a758eaf
2010-04-29 21:01:11 +02:00
Uli Link
86f6901495 Bug 526457. Fix AIX compilation. r=bsmedberg 2010-03-15 14:43:16 +13:00
Gervase Markham
7776cbdb2d Bug 541761 - correct legal text to make it clear Firefox logo files are free in copyright terms, although the image is still a trademark. r=handerson. 2010-03-08 16:31:22 +00:00
Chris Cooper
d5324410be Bug 535369 - fix bsdiff cross-compile bustage on Windows 2010-02-22 22:04:46 -05:00
Chris Cooper
797fff5d7f Bug535369 - Compile bsdiff for host OS rather than target - r=ted.mielczarek 2010-02-19 11:58:45 -05:00
Chris Cooper
f0d6758d41 Bug 535369 - Backed out changeset 20d2d6abd4a2, will wait for tree to stabilize 2010-02-12 15:51:13 -05:00
Chris Cooper
e6131b512a Bug 535369 - Fix bsdiff/libbz2 linking for builds compiled with CROSS_COMPILE - r=ted 2010-02-12 15:47:45 -05:00
Mitchell Field
d25f469072 Bug 542222 - Followup fix for Reduce recursion in makefiles. r=rstrong 2010-02-05 23:25:10 -08:00
Phil Ringnalda
8dcaa9e6ba Bug 536336 - Remove copyright strings in UI, r=gavin,handerson
--HG--
extra : rebase_source : 1192b1774627677a6a5dd9faa800c436361c987d
2009-12-29 14:13:00 -08:00
Gavin Sharp
ef7cd172dd Bug 534871: add mozparam pref for Yahoo Japan search plugins
--HG--
extra : transplant_source : e%28n%A2%B2%A8%60t%C3%24%CB%E9%D7%A1%E7%1F%8D%AFvm
2009-12-23 19:35:56 -05:00
Metal Sonic
4c1b34d634 Bug 507387 - fix copyright holder; Mozilla Corporation -> Mozilla Foundation. r=gerv. 2009-12-21 21:50:30 +00:00
Reed Loden
2eb56202ec Bug 454300 - "Remove locale-specific subdomains from client-generated URLs" [r=gavin] 2009-12-03 00:45:16 -06:00
Robert Strong
3772c296ba Bug 407875 - Unprivileged users are not notified of security updates. r=dtownsend, r=vlad, a=dietrich 2009-11-18 21:50:05 -08:00
Robert Strong
61fbdcb468 Bug 522065 - PCA complains when installer is cancelled (uninstaller fix is bug 569058). r=ted.mielczarek 2010-06-02 12:47:31 -07:00
Phil Ringnalda
44e6f240ea Bug 569057 - Charlton Company trademark attribution in About dialog, r=gavin 2010-05-29 16:38:14 -07:00
Alexander Surkov
162d6d3e9c Bug 512424 - implement IAccessibleTable2, r=marcoz, davidb, sr=neil
--HG--
rename : accessible/src/atk/nsXULTreeAccessibleWrap.h => accessible/src/atk/nsXULTreeGridAccessibleWrap.h
rename : accessible/src/mac/nsXULTreeAccessibleWrap.h => accessible/src/mac/nsXULTreeGridAccessibleWrap.h
rename : accessible/src/msaa/nsXULTreeAccessibleWrap.cpp => accessible/src/msaa/nsXULTreeGridAccessibleWrap.cpp
rename : accessible/src/msaa/nsXULTreeAccessibleWrap.h => accessible/src/msaa/nsXULTreeGridAccessibleWrap.h
rename : accessible/src/other/nsXULTreeAccessibleWrap.h => accessible/src/other/nsXULTreeGridAccessibleWrap.h
rename : accessible/src/xul/nsXULSelectAccessible.cpp => accessible/src/xul/nsXULListboxAccessible.cpp
rename : accessible/src/xul/nsXULSelectAccessible.h => accessible/src/xul/nsXULListboxAccessible.h
rename : accessible/tests/mochitest/test_relations_table.html => accessible/tests/mochitest/test_table_headers.html
rename : accessible/tests/mochitest/test_nsIAccessibleTable_listboxes.xul => accessible/tests/mochitest/test_table_sels_listbox.xul
rename : accessible/tests/mochitest/test_elm_table.html => accessible/tests/mochitest/test_table_struct.html
2009-09-11 09:07:56 +08:00
Justin Dolske
ac40d6a9b8 Bug 502526 - Need splashscreen artwork for Windows CE. artwork=horlander, ui-r=faaborg, r=vladimir 2009-08-20 15:17:29 -07:00
Michael Kohler
404670f1f3 Bug 106386 - Correct misspellings in source code (old); Part 2; r=timeless 2009-07-27 10:47:02 +02:00
Justin Dolske
f6b71e2e04 Bug 504953 - Clean up firefox branding in the build system. r=benjamin
--HG--
rename : browser/app/macbuild/background.png => browser/branding/nightly/background.png
rename : browser/installer/windows/nsis/branding.nsi => browser/branding/nightly/branding.nsi
rename : browser/base/branding/about.png => browser/branding/nightly/content/about.png
rename : browser/base/branding/aboutCredits.png => browser/branding/nightly/content/aboutCredits.png
rename : browser/base/branding/aboutFooter.png => browser/branding/nightly/content/aboutFooter.png
rename : browser/base/branding/icon48.png => browser/branding/nightly/content/icon48.png
rename : browser/base/branding/icon64.png => browser/branding/nightly/content/icon64.png
rename : browser/app/default16.png => browser/branding/nightly/default16.png
rename : browser/app/default32.png => browser/branding/nightly/default32.png
rename : browser/app/default48.png => browser/branding/nightly/default48.png
rename : browser/app/macbuild/disk.icns => browser/branding/nightly/disk.icns
rename : browser/app/document-os2.ico => browser/branding/nightly/document-os2.ico
rename : browser/app/macbuild/document.icns => browser/branding/nightly/document.icns
rename : browser/app/document.ico => browser/branding/nightly/document.ico
rename : browser/app/document.png => browser/branding/nightly/document.png
rename : browser/app/macbuild/dsstore => browser/branding/nightly/dsstore
rename : browser/app/firefox-os2.ico => browser/branding/nightly/firefox-os2.ico
rename : browser/app/macbuild/firefox.icns => browser/branding/nightly/firefox.icns
rename : browser/app/firefox.ico => browser/branding/nightly/firefox.ico
rename : browser/base/content/browserconfig.properties => browser/branding/nightly/locales/browserconfig.properties
rename : browser/locales/en-US/chrome/branding/brand.dtd => browser/branding/nightly/locales/en-US/brand.dtd
rename : browser/locales/en-US/chrome/branding/brand.properties => browser/branding/nightly/locales/en-US/brand.properties
rename : browser/app/mozicon128.png => browser/branding/nightly/mozicon128.png
rename : browser/app/firefox-branding.js => browser/branding/nightly/pref/firefox-branding.js
rename : browser/app/splash.bmp => browser/branding/nightly/splash.bmp
rename : browser/installer/windows/wizHeader.bmp => browser/branding/nightly/wizHeader.bmp
rename : browser/installer/windows/wizHeaderRTL.bmp => browser/branding/nightly/wizHeaderRTL.bmp
rename : browser/installer/windows/wizWatermark.bmp => browser/branding/nightly/wizWatermark.bmp
2009-07-23 17:35:49 -07:00
Justin Dolske
d31edc7f4a Bug 504750 - Add splashscreen support to build system. r=benjamin ui-r=beltzner 2009-07-23 17:35:48 -07:00
Justin Dolske
38ea9246de Bug 499226 - Remove unneeded branding icons for Linux. r=mconnor 2009-07-16 12:36:26 -07:00
Justin Dolske
bf4e52d71d Bug 499810 - Firefox missing app icon on Windows CE. r=vladimir 2009-07-07 21:14:43 -07:00
Peter Weilbacher
b5c02a3e71 [OS/2] Bug 500414: new FF icons, adapted for OS/2 by Stefan Schmohl, r=pweilbacher 2009-07-04 14:17:30 +03:00
Robert Strong
b742a2f908 Bug 496472 - Remove several files from /other-licenses/branding/firefox/. r=mconnor 2009-07-02 10:13:40 -07:00
Peter Weilbacher
5e8524fa73 [OS/2] Bug 500414: new FF icon, adapted for OS/2 by Stefan Schmohl, r=pweilbacher 2009-06-27 17:23:31 +03:00
Alex Faaborg
0646c0e676 b=500033; update firefox icons with new 16x16 artwork 2009-06-23 14:14:03 -07:00
Mike Connor
3af60d783b bug 496734 - refresh document.icns, new image from Boriss 2009-06-11 13:16:51 -07:00
Mike Connor
39586d9f5a bug 473343 - refresh document.ico, new image from Boriss 2009-06-11 13:16:12 -07:00
Mike Connor
afe67259b5 bug 497333 - new firefox 3.5 icon is not displayed on Win2k, new icon from faaborg 2009-06-11 13:12:55 -07:00
Mike Connor
5ea8cd9733 Bug 492431 - Refresh the Application Icon and Product Branding for Firefox 3.5, adding more icon sizes, r+a=mconnor 2009-06-08 13:37:29 -07:00
Mike Connor
88273b62e0 Bug 492431 - Refresh the Application Icon and Product Branding for Firefox 3.5, new icons from faaborg/Boriss, r+a=mconnor 2009-06-08 13:23:05 -07:00
Kev Needham
ae516c5e6d Bug 496409. Change the en-US Yahoo! search plugin fr code. r=beltzner 2009-06-04 21:20:48 -04:00