Doug Turner
3405de188d
Backout of 8a5cc33141a3
2011-12-17 21:33:44 -08:00
Doug Turner
5c14206d26
Backout of f39dab2d2adb
2011-12-17 21:32:48 -08:00
Doug Turner
50ebb61b52
Backout of 74277c18e7ce
2011-12-17 21:32:24 -08:00
James Willcox
215d32a09a
Bug 670930 - Use asynchronous direct texturing on Android when available
2011-12-16 16:40:58 -05:00
Mark Finkle
57eedcd517
Bug 701374 - Show go or search icon in awesomescreen field, as appropriate [r=lucasr a=android-only]
2011-12-13 11:31:35 -05:00
Ben Turner
6e5ac8e11d
Bug 703660 - IndexedDB: Compress structured clone data with Snappy. r=sicking+khuey.
2011-12-07 15:24:20 -08:00
Phil Ringnalda
26f6d8a9de
Back out 8941e2b7a0bf (bug 703660) for Windows PGO build failures
2011-12-07 08:41:02 -08:00
Ben Turner
e7415db369
Bug 703660 - IndexedDB: Compress structured clone data with Snappy. r=sicking+khuey.
...
--HG--
extra : transplant_source : 55%9D%86m%D8%18%87J%5C%E1%E3%93P%AF.%B7%D0%8EQ
2011-12-07 00:10:13 -08:00
Brad Lassey
8221758c4c
merge birch to mozilla-central
...
--HG--
rename : embedding/android/GeckoBatteryManager.java => mobile/android/base/GeckoBatteryManager.java
2011-12-06 13:55:36 -05:00
Brad Lassey
b25cb3f85a
backout some changes we don't want to land from birch
2011-12-06 01:56:04 -05:00
Brad Lassey
e6e954cf8c
bug 704022 - PlaceholderLayerClient OOM at ByteBuffer.allocateDirect r=dougt
2011-11-30 21:28:04 -05:00
Doug Turner
3efc2cfcbd
Merge with mozilla-central 95bca70369ef
...
--HG--
rename : embedding/android/AndroidManifest.xml.in => mobile/android/base/AndroidManifest.xml.in
rename : embedding/android/GeckoApp.java => mobile/android/base/GeckoApp.java
rename : embedding/android/GeckoAppShell.java => mobile/android/base/GeckoAppShell.java
rename : embedding/android/GeckoEvent.java => mobile/android/base/GeckoEvent.java
rename : embedding/android/GeckoSmsManager.java => mobile/android/base/GeckoSmsManager.java
rename : embedding/android/Makefile.in => mobile/android/base/Makefile.in
2011-11-29 20:58:39 -08:00
Mounir Lamouri
ff4a7f0cf3
Bug 674725 - Part O - Receiving SMS: Android backend. r=cjones
2011-11-24 14:10:20 +01:00
Steve Workman
86d2741529
Bug 694325: Add files for DNS Multithreading on Android; avoid undefined, unexposed libc symbols r=mwu
2011-12-05 10:41:11 -08:00
Doug Turner
fc6550a16b
Merge mozilla-central 0ea84b44a7f1
2011-11-23 12:29:40 -08:00
Lucas Rocha
9e70bdc431
Bug 701374 - Add native method to check creation of fixup URIs (r=dougt)
...
--HG--
extra : rebase_source : fd623dc1db9b110f8f0085ca0377c29697331093
2011-11-23 09:48:00 -08:00
Lucas Rocha
33ff7db957
Bug 701374 - Add macros for wrappers with return value (r=dougt)
...
--HG--
extra : rebase_source : 9fbc2c264d08fea75542471370db6e228dba6226
2011-11-23 09:46:26 -08:00
Doug Turner
f18b339bad
Bug 694325 - Backout of bfb56029f4bd due to crashes on android tablets. r=sworkman
2011-11-22 14:58:25 -08:00
Ed Morley
3cb05bb8cc
Backout 7634808d94af (bug 703660) for Linux64 PGO build failures; a=khuey
2011-11-22 11:54:50 +00:00
Doug Turner
c8f4a9803c
merge with mozilla-central a9a0abc25480
2011-11-22 15:00:45 -08:00
Doug Turner
3640ceaf27
Merge with mozilla-central 6f998cc964be
...
--HG--
rename : embedding/android/GeckoApp.java => mobile/android/base/GeckoApp.java
2011-11-22 12:48:22 -08:00
Ben Turner
07b4d70b2e
Bug 703660 - IndexedDB: Compress structured clone data with Snappy. r=sicking+khuey.
...
--HG--
extra : transplant_source : /%A2p%D8.%08%B3%FC%B3%1E%1B%90e%F3%D1%804.8%8C
2011-11-21 20:18:29 -08:00
Ed Morley
870b8d7d2c
Merge mozilla-central to mozilla-inbound
2011-11-22 02:42:27 +00:00
Steve Workman
1e492d58a1
Bug 694325: Add threadsafe getaddrinfo to libmozutils; restore multi-threading to nsHostResolver for DNS requests. r=mwu
2011-11-21 18:21:21 -08:00
Brad Lassey
11be33cd8f
merged mozilla-central to birch
...
--HG--
rename : gfx/thebes/GLContextProviderEGL.cpp => gfx/gl/GLContextProviderEGL.cpp
rename : embedding/android/AndroidManifest.xml.in => mobile/android/base/AndroidManifest.xml.in
2011-11-21 01:21:42 -05:00
Brad Lassey
5b287056e8
Bug 702614 - Use Skia to implement the Android canvas plugin APIs r=blassey
...
--HG--
rename : dom/plugins/base/android/ANPCanvas.cpp => other-licenses/skia-npapi/ANPCanvas.cpp
rename : dom/plugins/base/android/ANPPaint.cpp => other-licenses/skia-npapi/ANPPaint.cpp
rename : dom/plugins/base/android/ANPPath.cpp => other-licenses/skia-npapi/ANPPath.cpp
rename : dom/plugins/base/android/ANPTypeface.cpp => other-licenses/skia-npapi/ANPTypeface.cpp
2011-11-15 18:05:23 -05:00
Doug Turner
e717fb795f
Merge.
2011-11-15 01:09:26 -08:00
Patrick Walton
d20e174b9a
Bug 695448 - Implement a Java compositor, and use it to scroll. r=?
2011-11-09 17:39:29 -08:00
Matt Brubeck
3b6926c9b5
Revert to addb9a82a6b8 (undo my failed backouts)
2011-11-09 17:31:09 -08:00
Matt Brubeck
7267c6f214
Back out 150b57fca97c, 22f16ec4052a, 03c53ee42fc9
...
* * *
Back out 03c53ee42fc9 on suspicion of causing talos failures
2011-11-09 16:06:20 -08:00
Doug Turner
5e91e54024
backing out the backout of the landing of the patrick patch queue. lets try this again in the morning with fresh eyes and fresh coffee
2011-11-07 23:54:21 -08:00
Doug Turner
c971b7be6d
Removing use strict from a hosed merge
2011-11-07 20:54:50 -08:00
Patrick Walton
7d0b84a62b
Back out birch-pan-zoom patch queue due to crashes on mochitests. no bug, r=mfinkle
2011-11-07 17:04:44 -08:00
Patrick Walton
129c7c71ff
* * *
...
try: -b do -p linux-android -u none -t none
2011-11-07 14:15:58 -08:00
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