Граф коммитов

16604 Коммитов

Автор SHA1 Сообщение Дата
Margaret Leibovic 1ce23ed88e Bug 1272348 - Remove insecure login doorhanger. r=sebastian
MozReview-Commit-ID: 2wQbyL13BrC

--HG--
extra : rebase_source : 80ce4d78b8033f43654051dc04978121cd5b7323
2016-06-20 11:57:32 -04:00
SUN Haitao afa7290190 Bug 1264815 - Add a component to handle 'persisent-notification-click'. r=kcambridge 2016-05-12 09:28:46 +08:00
tarek 25f7d15998 Bug 1280855 - Read original metadata from attachment key; r=sebastian
MozReview-Commit-ID: Kgdc6Nl6hho

--HG--
extra : rebase_source : eeadee4d0e996e14b02fe939caf7cc366b856533
2016-06-22 18:32:03 +02:00
Chih-Yi Leu 8733310923 Bug 1221730 - Change GamepadServiceTest into webidl. r=qdot, r=baku
--HG--
extra : rebase_source : 8e04725e80467a17d1a1a775f791782abe842c1b
2016-06-28 00:26:00 +02:00
Joel Maher c9103dfcd9 backout Bug 1174206 (3e53a0aae914 and 6b992274233a) for gecko decision task route conflict
MozReview-Commit-ID: 3PrHGAqtpLj
2016-06-28 10:59:19 +03:00
Wes Kocher 8c38ca1410 Merge m-c to inbound, a=merge 2016-06-24 13:41:15 -07:00
Dylan Roeh 8c31110735 Bug 1257454 - Remove shouldUpdateThumbnail() entirely, always call processThumbnail(). r=snorp 2016-06-24 09:25:29 -05:00
SUN Haitao 9b7b1f5140 Bug 1264815 - Add a 'showPersistentAlertNotification' method to GeckoAppShell. r=kcambridge 2016-04-17 21:18:20 +08:00
SUN Haitao 3e75c63fbd Bug 1264815 - Add a 'data' parameter to GeckoThread.createServices; r=jchen 2016-04-16 14:19:37 +08:00
Dylan Roeh 20f64ce5b6 Bug 1257454: Capture thumbnails for tabs even if tab overview is not currently shown. r=snorp 2016-06-17 16:00:45 +01:00
Dylan Roeh 35f22f7ca8 Bug 1280594 - Pause the compositor directly instead of bouncing off the Gecko thread. r=snorp 2016-06-17 16:03:57 +01:00
Sebastian Kaspari 5ef86607af Bug 1279488 - GeckoAppShell.uncaughtException(): Update state check. r=jchen
MozReview-Commit-ID: 3RhHEhYIwQU

--HG--
extra : rebase_source : af05df5ed4feba86ca69421bc43d4110ab0122ee
2016-06-14 13:39:31 +01:00
Kartikaya Gupta 33be75d853 Bug 1247280 - Bump the APZ content response timeout so that we get 99% accuracy. r=botond
MozReview-Commit-ID: FpmuxUcnmpZ

--HG--
extra : rebase_source : d35d82b1790ad3ac66fbca6db90784e47d104e13
2016-06-14 20:30:13 -04:00
Dylan Roeh ff804e75cf Bug 1280369 - Check surface validity in GLController.resumeCompositor r=snorp 2016-06-16 09:57:30 +01:00
Kim Moir 6613300846 Bug 1174206 - Migrate Android x86 builds to TaskCluster and make Tier 2 r=gbrown 2016-06-27 13:16:52 -04:00
Andrea Marchesini c7264cb3ac Bug 1269162 - part 3 - Move XHR code into dom/xhr, r=smaug
--HG--
rename : dom/workers/XMLHttpRequestUploadWorker.cpp => dom/xhr/XMLHttpRequestUploadWorker.cpp
rename : dom/workers/XMLHttpRequestUploadWorker.h => dom/xhr/XMLHttpRequestUploadWorker.h
rename : dom/workers/XMLHttpRequestWorker.cpp => dom/xhr/XMLHttpRequestWorker.cpp
rename : dom/workers/XMLHttpRequestWorker.h => dom/xhr/XMLHttpRequestWorker.h
rename : dom/base/nsIXMLHttpRequest.idl => dom/xhr/nsIXMLHttpRequest.idl
rename : dom/base/nsXMLHttpRequest.cpp => dom/xhr/nsXMLHttpRequest.cpp
rename : dom/base/nsXMLHttpRequest.h => dom/xhr/nsXMLHttpRequest.h
rename : dom/base/test/echo.sjs => dom/xhr/tests/echo.sjs
rename : dom/base/test/file_XHRDocURI.html => dom/xhr/tests/file_XHRDocURI.html
rename : dom/base/test/file_XHRDocURI.html^headers^ => dom/xhr/tests/file_XHRDocURI.html^headers^
rename : dom/base/test/file_XHRDocURI.sjs => dom/xhr/tests/file_XHRDocURI.sjs
rename : dom/base/test/file_XHRDocURI.text => dom/xhr/tests/file_XHRDocURI.text
rename : dom/base/test/file_XHRDocURI.text^headers^ => dom/xhr/tests/file_XHRDocURI.text^headers^
rename : dom/base/test/file_XHRDocURI.xml => dom/xhr/tests/file_XHRDocURI.xml
rename : dom/base/test/file_XHRDocURI.xml^headers^ => dom/xhr/tests/file_XHRDocURI.xml^headers^
rename : dom/base/test/file_XHRResponseURL.js => dom/xhr/tests/file_XHRResponseURL.js
rename : dom/base/test/file_XHRResponseURL.sjs => dom/xhr/tests/file_XHRResponseURL.sjs
rename : dom/base/test/file_XHRResponseURL.text => dom/xhr/tests/file_XHRResponseURL.text
rename : dom/base/test/file_XHRResponseURL.text^headers^ => dom/xhr/tests/file_XHRResponseURL.text^headers^
rename : dom/base/test/file_XHRResponseURL_nocors.text => dom/xhr/tests/file_XHRResponseURL_nocors.text
rename : dom/base/test/file_XHRSendData.sjs => dom/xhr/tests/file_XHRSendData.sjs
rename : dom/base/test/file_XHRSendData_doc.xml => dom/xhr/tests/file_XHRSendData_doc.xml
rename : dom/base/test/file_XHRSendData_doc.xml^headers^ => dom/xhr/tests/file_XHRSendData_doc.xml^headers^
rename : dom/base/test/file_XHR_anon.sjs => dom/xhr/tests/file_XHR_anon.sjs
rename : dom/base/test/file_XHR_binary1.bin => dom/xhr/tests/file_XHR_binary1.bin
rename : dom/base/test/file_XHR_binary1.bin^headers^ => dom/xhr/tests/file_XHR_binary1.bin^headers^
rename : dom/base/test/file_XHR_binary2.bin => dom/xhr/tests/file_XHR_binary2.bin
rename : dom/base/test/file_XHR_fail1.txt => dom/xhr/tests/file_XHR_fail1.txt
rename : dom/base/test/file_XHR_fail1.txt^headers^ => dom/xhr/tests/file_XHR_fail1.txt^headers^
rename : dom/base/test/file_XHR_fail1b.txt => dom/xhr/tests/file_XHR_fail1b.txt
rename : dom/base/test/file_XHR_header.sjs => dom/xhr/tests/file_XHR_header.sjs
rename : dom/base/test/file_XHR_pass1.xml => dom/xhr/tests/file_XHR_pass1.xml
rename : dom/base/test/file_XHR_pass2.txt => dom/xhr/tests/file_XHR_pass2.txt
rename : dom/base/test/file_XHR_pass3.txt => dom/xhr/tests/file_XHR_pass3.txt
rename : dom/base/test/file_XHR_pass3.txt^headers^ => dom/xhr/tests/file_XHR_pass3.txt^headers^
rename : dom/base/test/file_XHR_system_redirect.html => dom/xhr/tests/file_XHR_system_redirect.html
rename : dom/base/test/file_XHR_system_redirect.html^headers^ => dom/xhr/tests/file_XHR_system_redirect.html^headers^
rename : dom/base/test/file_XHR_timeout.sjs => dom/xhr/tests/file_XHR_timeout.sjs
rename : dom/base/test/file_html_in_xhr.html => dom/xhr/tests/file_html_in_xhr.html
rename : dom/base/test/file_html_in_xhr.sjs => dom/xhr/tests/file_html_in_xhr.sjs
rename : dom/base/test/file_html_in_xhr2.html => dom/xhr/tests/file_html_in_xhr2.html
rename : dom/base/test/file_html_in_xhr3.html => dom/xhr/tests/file_html_in_xhr3.html
rename : dom/base/test/progressserver.sjs => dom/xhr/tests/progressserver.sjs
rename : dom/workers/test/relativeLoad_import.js => dom/xhr/tests/relativeLoad_import.js
rename : dom/workers/test/relativeLoad_worker.js => dom/xhr/tests/relativeLoad_worker.js
rename : dom/workers/test/relativeLoad_worker2.js => dom/xhr/tests/relativeLoad_worker2.js
rename : dom/base/test/responseIdentical.sjs => dom/xhr/tests/responseIdentical.sjs
rename : dom/workers/test/subdir/relativeLoad_sub_import.js => dom/xhr/tests/subdir/relativeLoad_sub_import.js
rename : dom/workers/test/subdir/relativeLoad_sub_worker.js => dom/xhr/tests/subdir/relativeLoad_sub_worker.js
rename : dom/workers/test/subdir/relativeLoad_sub_worker2.js => dom/xhr/tests/subdir/relativeLoad_sub_worker2.js
rename : dom/workers/test/terminateSyncXHR_worker.js => dom/xhr/tests/terminateSyncXHR_worker.js
rename : dom/base/test/test_XHR.html => dom/xhr/tests/test_XHR.html
rename : dom/base/test/test_XHRDocURI.html => dom/xhr/tests/test_XHRDocURI.html
rename : dom/base/test/test_XHRResponseURL.html => dom/xhr/tests/test_XHRResponseURL.html
rename : dom/base/test/test_XHRSendData.html => dom/xhr/tests/test_XHRSendData.html
rename : dom/base/test/test_XHR_anon.html => dom/xhr/tests/test_XHR_anon.html
rename : dom/base/test/test_XHR_header.html => dom/xhr/tests/test_XHR_header.html
rename : dom/base/test/test_XHR_onuploadprogress.html => dom/xhr/tests/test_XHR_onuploadprogress.html
rename : dom/base/test/test_XHR_parameters.html => dom/xhr/tests/test_XHR_parameters.html
rename : dom/base/test/test_XHR_system.html => dom/xhr/tests/test_XHR_system.html
rename : dom/base/test/test_XHR_timeout.html => dom/xhr/tests/test_XHR_timeout.html
rename : dom/base/test/test_XHR_timeout.js => dom/xhr/tests/test_XHR_timeout.js
rename : dom/base/test/test_html_in_xhr.html => dom/xhr/tests/test_html_in_xhr.html
rename : dom/workers/test/test_relativeLoad.html => dom/xhr/tests/test_relativeLoad.html
rename : dom/base/test/test_sync_xhr_timer.xhtml => dom/xhr/tests/test_sync_xhr_timer.xhtml
rename : dom/workers/test/test_terminateSyncXHR.html => dom/xhr/tests/test_worker_terminateSyncXHR.html
rename : dom/workers/test/test_xhr.html => dom/xhr/tests/test_worker_xhr.html
rename : dom/workers/test/test_xhr2.html => dom/xhr/tests/test_worker_xhr2.html
rename : dom/workers/test/test_xhrAbort.html => dom/xhr/tests/test_worker_xhrAbort.html
rename : dom/workers/test/test_xhr_3rdparty.html => dom/xhr/tests/test_worker_xhr_3rdparty.html
rename : dom/workers/test/test_xhr_cors_redirect.html => dom/xhr/tests/test_worker_xhr_cors_redirect.html
rename : dom/workers/test/test_xhr_headers.html => dom/xhr/tests/test_worker_xhr_headers.html
rename : dom/workers/test/test_xhr_implicit_cancel.html => dom/xhr/tests/test_worker_xhr_implicit_cancel.html
rename : dom/workers/test/test_xhr_parameters.html => dom/xhr/tests/test_worker_xhr_parameters.html
rename : dom/workers/test/test_xhr_parameters.js => dom/xhr/tests/test_worker_xhr_parameters.js
rename : dom/workers/test/test_xhr_responseURL.html => dom/xhr/tests/test_worker_xhr_responseURL.html
rename : dom/workers/test/test_xhr_system.html => dom/xhr/tests/test_worker_xhr_system.html
rename : dom/workers/test/test_xhr_system.js => dom/xhr/tests/test_worker_xhr_system.js
rename : dom/workers/test/test_xhr_timeout.html => dom/xhr/tests/test_worker_xhr_timeout.html
rename : dom/base/test/test_xhr_abort_after_load.html => dom/xhr/tests/test_xhr_abort_after_load.html
rename : dom/base/test/test_xhr_forbidden_headers.html => dom/xhr/tests/test_xhr_forbidden_headers.html
rename : dom/base/test/test_xhr_overridemimetype_throws_on_invalid_state.html => dom/xhr/tests/test_xhr_overridemimetype_throws_on_invalid_state.html
rename : dom/base/test/test_xhr_progressevents.html => dom/xhr/tests/test_xhr_progressevents.html
rename : dom/base/test/test_xhr_send.html => dom/xhr/tests/test_xhr_send.html
rename : dom/base/test/test_xhr_send_readystate.html => dom/xhr/tests/test_xhr_send_readystate.html
rename : dom/base/test/test_xhr_withCredentials.html => dom/xhr/tests/test_xhr_withCredentials.html
rename : dom/workers/test/file_getcookie.sjs => dom/xhr/tests/worker_file_getcookie.sjs
rename : dom/workers/test/terminateSyncXHR_frame.html => dom/xhr/tests/worker_terminateSyncXHR_frame.html
rename : dom/workers/test/testXHR.txt => dom/xhr/tests/worker_testXHR.txt
rename : dom/workers/test/xhr_cors_redirect.js => dom/xhr/tests/worker_xhr_cors_redirect.js
rename : dom/workers/test/xhr_cors_redirect.sjs => dom/xhr/tests/worker_xhr_cors_redirect.sjs
rename : dom/workers/test/xhr_headers_server.sjs => dom/xhr/tests/worker_xhr_headers_server.sjs
rename : dom/workers/test/xhr_headers_worker.js => dom/xhr/tests/worker_xhr_headers_worker.js
rename : dom/workers/test/xhr2_worker.js => dom/xhr/tests/xhr2_worker.js
rename : dom/workers/test/xhrAbort_worker.js => dom/xhr/tests/xhrAbort_worker.js
rename : dom/workers/test/xhr_implicit_cancel_worker.js => dom/xhr/tests/xhr_implicit_cancel_worker.js
rename : dom/workers/test/xhr_worker.js => dom/xhr/tests/xhr_worker.js
2016-06-27 19:13:40 +02:00
Kim Moir 7f85dca70f Bug 1174206 - Migrate Android x86 builds to TaskCluster and make Tier 2 r=gbrown 2016-06-29 11:10:30 -04:00
Chenxia Liu 995e1d45af Bug 1279807 - History panel smartfolder icons are much too big on HDPI devices. r=JanH
MozReview-Commit-ID: 3QzOl0Fh4Cm

--HG--
extra : rebase_source : 5a8056d4d61002a0de899539276a7f44dafcbee0
2016-06-15 11:26:07 +01:00
Carsten "Tomcat" Book 58167fd092 merge mozilla-inbound to mozilla-central a=merge 2016-06-15 06:24:33 +01:00
Jan Henning 5c94369e27 Bug 1279273 - Use correct synchronization object for session data parsing. r=sebastian
If the main thread has to wait for the session data parsing to finish - which is more likely when you've got many tabs open, meaning a large sessionstore.js file - it does so on "this", i.e. GeckoApp.
The session data parsing itself is done from within a Runnable, so we need to qualify "this" there if we want it to refer to GeckoApp itself, so we can successfully release any waiting threads through notifyAll().

MozReview-Commit-ID: 3LhJsI5rNU3

--HG--
extra : transplant_source : %27%27X%9CTm%A6%88%3F%1B%8Cm%0E4%F1%9D%9B%E5%F2%28
2016-06-12 19:45:50 +02:00
Sebastian Kaspari 42d21c59e5 Bug 1276696 - Put custom tabs support behind a build flag. r=mcomella
MozReview-Commit-ID: 44wtCsZWZv2

--HG--
extra : rebase_source : 2ab062e4f5155225d6f5fcd686cd7a0b974679f1
2016-05-30 16:48:45 +02:00
Sebastian Kaspari 2e5288b993 Bug 1276696 - Add dummy service for custom tabs. r=mcomella
Currently this service does not implement any of the callbacks. However it is
necessary to be detected as an app supporting custom tabs.

MozReview-Commit-ID: Hz99Gp9aQCX

--HG--
extra : rebase_source : b73730f5c4d497e4fef5ed9bab3ae1c50e43de61
2016-05-25 19:31:10 +02:00
Sebastian Kaspari fbfb7a9f62 Bug 1276696 - Add CustomTabsActivity based on GeckoApp. r=mcomella
This activity doesn't do much yet and just has a layout including a GeckoView.
Some basic behavior from GeckoApp is working though: Context menus, floating
text selection, snackbars.

MozReview-Commit-ID: C6SJeYz609h

--HG--
extra : rebase_source : c65d8657ed795365b81c9bfeda41ac814760db8d
2016-05-25 19:58:17 +02:00
Sebastian Kaspari 38f5ea7b19 Bug 1276696 - Add custom tabs support library. r=mcomella
MozReview-Commit-ID: LXie1GiV4gV

--HG--
extra : rebase_source : 7316ebbe6512db64364c0a4f450e0758f79fcc5c
2016-06-10 11:01:11 +02:00
Kris Maglione a1dac7caad Bug 1279392: [webext] Move API permission definitions to the schemas. r=aswan
MozReview-Commit-ID: 8m7wJrAbFwS

--HG--
extra : source : a00cf073f5c00380d4e42b13bc0cd3146b708845
extra : amend_source : d74ef90e88acbe62e33af3b5b9cf870d5c0a9d3e
2016-06-09 17:44:47 -07:00
Sebastian Hengst f8035f62a8 Backed out changeset a00cf073f5c0 (bug 1279392) for failing mochitest test_ext_contentscript_create_iframe.html at least on Linux x64 opt. r=backout 2016-06-14 13:37:52 +02:00
Kris Maglione b465305345 Bug 1279392: [webext] Move API permission definitions to the schemas. r=aswan
MozReview-Commit-ID: 8m7wJrAbFwS

--HG--
extra : rebase_source : cba877c0ef400917b0b7e5913895e64ebefb34b9
extra : amend_source : 6e943015e3e00854c431cbd653994a6734e66ce4
2016-06-09 17:44:47 -07:00
Sebastian Kaspari 281fbb76c7 Bug 1276696 - Introduce new LauncherActivity that will handle all incoming Intents. r=mcomella
We will need to dispatch Intent objects to different destinations (Browser, Custom Tab and eventually
progressive web apps).

The logic of TabQueueDispatcher is folded into this new activity.

MozReview-Commit-ID: 3P4eIvtAKEW

--HG--
extra : rebase_source : 3d7604a7bdbd2ea80602313e7bc66212a089994b
2016-05-15 14:25:12 +02:00
Sebastian Kaspari 99a05c4022 Bug 1279137 - Update media notification icons. r=ahunt
MozReview-Commit-ID: pGSX3yRhtQ

--HG--
extra : rebase_source : ce3c4db4cc36887dbf3d055029f515471d0adeb7
2016-06-10 17:18:57 +02:00
Mike Hommey c5caa62fdf Bug 1278456 - Add the tooltool GCC library directory to LD_LIBRARY_PATH on Linux builds. r=mshal
Build slaves on automation are based on Centos 6, which doesn't have a
recent enough version of libstdc++ for our new requirements. But since
we're building with a recent GCC or clang with its own libstdc++, we do
have such a libstdc++ available somewhere, and the compiler picks it
when invoking the linker.

Problems start happening when we execute some of the built programs
during the build, like host tools (e.g. nsinstall), or target programs
(xpcshell, during packaging). In that case, we need the compiler's
libstdc++ to be used. Which required adding the GCC or clang library
directory to LD_LIBRARY_PATH.

Unconveniently enough, the clang 3.5 tooltool package we're using for
ASAN builds until we can update to at least 3.8 (bug 1278718) doesn't
contain libstdc++.so. So for those builds, pull the GCC package from
tooltool as well, and pick libstdc++ from there.
2016-06-12 18:52:15 +09:00
Kevin Lam e730d38cc4 Bug 1245952 - Corrected comment in localization note to reference the corresponding string. r=mcomella 2016-06-08 18:08:00 +02:00
Andrzej Hunt 9bc92c22aa Bug 1279598 - Fix checkstyle trailing space issues r=me 2016-06-10 12:26:32 -07:00
Kit Cambridge d7d8f3175e Bug 1279306 - Use the production push server URL on Android. r=margaret
MozReview-Commit-ID: Fy347g00Lx0

--HG--
extra : rebase_source : afc91bac255bdd21811c7e381c17477f6608fd7c
2016-06-09 17:13:39 -07:00
Michael Comella db493df167 Bug 1261494 - Block Gecko from screwing with the client ID file by resetting the cache at the last minute. r=grisha
MozReview-Commit-ID: EZYrk8IiRiF

--HG--
extra : rebase_source : 420c4e802c6d234a594b9f17670791e0029e237e
2016-06-07 15:32:04 -07:00
Andrzej Hunt a957702d89 Bug 1278221 - Manually find the toolbar in order to show options menu r=sebastian
Workaround for an Android support library bug

MozReview-Commit-ID: GD023N7tEWu

--HG--
extra : amend_source : 32aedac981aed488b144e67b74d41f5c89fa2218
2016-06-06 14:16:35 -07:00
Andrzej Hunt 780866f050 Bug 1278725 - Restore original "up" arrow scaling r=liuche
Before introducing the folder count, the bookmark folder icon
was set as the drawable on a TextView. This actually resulted
in scaling that doesn't preserve the aspect ratio. To reproduce
this in the new ImageView (added when we switched to a two-line
folder layout), we simply need to set the icon size explicitly
and scale to fit the whole area (as opposed to setting two
constraints and fitting while preserving aspect ratio).

The folder/reading-list icons are unaffected as they already
have the expected aspect-ratio, the back-arrow is now scaled
as expected.

MozReview-Commit-ID: Fl5JY3Lznau

--HG--
extra : amend_source : f3ad6cddd9a162953913b3161b9a5ceea6d3e15e
2016-06-09 10:32:24 -07:00
Carsten "Tomcat" Book 48d4127667 Merge mozilla-central to fx-team 2016-06-10 15:42:51 +02:00
Carsten "Tomcat" Book 4ee1ed2b8f merge mozilla-inbound to central a=merge
--HG--
extra : amend_source : 10247ace8885c608987dcf31d47368e0dec09b19
2016-06-10 15:39:23 +02:00
Andrzej Hunt 78fcdad415 Bug 1279332 - Backed out 97074800423c since it depends on a commit breaking background runnables r=sebastian
MozReview-Commit-ID: 6jYh8ipOw3q

--HG--
extra : amend_source : 4f555ee43fd63f66d533d7822c3659ba466096b1
2016-06-10 04:30:26 -07:00
Andrzej Hunt ccaf1e0177 Bug 1279332 - Backed out 61442f7ad442 for breaking background runnables r=sebastian
MozReview-Commit-ID: SxRbixXO6i
2016-06-10 04:29:34 -07:00
Sebastian Kaspari cecda1d1a1 Bug 1227538 - Reset site identity after entering new URL. r=margaret
MozReview-Commit-ID: oOPYDUPVq9

--HG--
extra : amend_source : f12a0204a2e17a5c5cd6d5a62a1d11561e44dbc4
2016-06-07 16:54:13 +02:00
Sebastian Hengst 7b6fdf9c59 Backed out changeset 50b1d3506786 (bug 1279332) for various Android robocop failures. r=backout 2016-06-10 10:29:43 +02:00
Sebastian Hengst e7404c9b70 Backed out changeset 6a35c7a791a6 (bug 1279332) 2016-06-10 10:29:03 +02:00
Sebastian Hengst 668c8a3010 Backed out changeset 59fbde27dc99 (bug 1279332) 2016-06-10 10:28:59 +02:00
dlim@mozilla.com d232e864de Bug 1270124 - "Make Firefox Default Browser" option is missing from Tablet. r=grisha
MozReview-Commit-ID: EpJWTJUdu6I

--HG--
extra : transplant_source : T%FFx%8F_%27%29%0B%94%D9%0Bu%11ko%05%1A%EF%DFu
2016-06-07 09:55:23 -07:00
Andrzej Hunt 13b79044fe Bug 1279332 - Post: remove unrelated whitespace to pacify checkstyle r=me
MozReview-Commit-ID: 3FjBkueZ45z

--HG--
extra : rebase_source : d8c2467166622c44ed4916dd4ef595f3f5b1479a
2016-06-09 16:01:51 -07:00
Andrzej Hunt ca8ea28ccc Bug 1279332 - Document that onTargetSelected should be run on the UI thread r=grisha
MozReview-Commit-ID: IJ7UItFhvtE

--HG--
extra : rebase_source : 21c8447deae4c7fee221ecfb7cc73076f88f0c26
2016-06-09 15:59:48 -07:00
Andrzej Hunt 0e9eacd33c Bug 1279332 - Perform UI callback on UI thread to avoid crashing the background thread r=grisha
We're now calling setIntent on the background thread. The onTargetSelected callback expects
to be run on the UI thread, and it looks like Android hangs up when we call UI methods
on the background thread. This in turn means the entire background thread gets locked up
(we execute tasks on the background thread sequentially) and no further background runnables
are executed. This breaks anything else requiring use of the background thread, e.g.
favicon generation, search, permissions doorhangers, etc.

MozReview-Commit-ID: CoYUOMqNX0m

--HG--
extra : rebase_source : 84a4dcc8a8aad590f02ba9f8d8b2564922787d17
2016-06-09 15:58:43 -07:00
Chenxia Liu 83a8bff8c3 Bug 1279336 - Explicitly do not scale smartfolder icons. r=jonalmeida
MozReview-Commit-ID: 9TEiecbLoy8

--HG--
extra : rebase_source : 83cfb4710dc0c3a6bf605901ed1ba004e4937430
2016-06-09 13:59:02 -07:00
Michael Comella 880da0b4f9 Bug 1241685 - Add brief javadoc to assist with testing. r=ahunt
MozReview-Commit-ID: 3epPlVfJSLx

--HG--
extra : rebase_source : 567fea8c61f8cb7bb01feb4d3e4e3f4a03ef4cfc
2016-06-08 17:21:45 -07:00
Michael Comella 8de14c09db Bug 1241685 - Hook up TelemetryPreferences for telemetry server url. r=ahunt
In this patch, I move the telemetry server preference from app preferences
to per-profile preferences. We never allowed the user to set the preference
so this should cause no issues.

MozReview-Commit-ID: 7D5y58R2ejd

--HG--
extra : rebase_source : 3b4214968cac48150f6a3f873967cb43c7952b1b
2016-06-08 16:53:50 -07:00
Michael Comella dbd6e16080 Bug 1241685 - Add TelemetryPreferences. r=ahunt
MozReview-Commit-ID: 5Tw0GUX0tmW

--HG--
extra : rebase_source : 627a1ae0df2923dcc64f186453e46cc70579a080
2016-06-08 17:20:31 -07:00
Michael Comella b053ea4034 Bug 1279045 - Remove broadcastHealthReport* and its call sites. r=ahunt
MozReview-Commit-ID: G5Pz9l5GAi3

--HG--
extra : rebase_source : fc0d120dee707668981a3e65afd57dc582892484
2016-06-08 13:50:12 -07:00
Carsten "Tomcat" Book 733a4f6de5 merge mozilla-inbound to mozilla-central a=merge 2016-06-09 11:58:06 +02:00
Wes Kocher e0c9a7bf97 Merge m-c to fx-team, a=merge 2016-06-08 17:13:46 -07:00
Wes Kocher 07d01350a8 Merge fx-team to central, a=merge 2016-06-08 17:06:18 -07:00
Michael Comella 8af3a21e3c Bug 1244316 - Don't upload in restricted profiles when admin disables FHR. r=sebastian
Edge case: the admin profile can disable health report upload for themselves
but (I assume) the new profile won't automatically match these settings. While
I'm not sure if this is even possible, it's outside the scope of this bug.

MozReview-Commit-ID: 1SkXhL7B5xb

--HG--
extra : rebase_source : 95540b8b76f7014544022c7cb0880791ac536721
2016-06-07 14:04:06 -07:00
Andrzej Hunt 346739a504 Bug 1264489 - Avoid DB access in UI thread from onPrepareOptionsMenu r=mcomella
DB access happens deep in the internals of setting a new Intent for our
ActionProvider. Posting this to a background thread here seems to be the simplest
option to ensure correct threading.

MozReview-Commit-ID: 3iS8w5Cxf02

--HG--
extra : rebase_source : 48c90e5fa47a470d3360dbd44dc97111aac5ff3e
2016-06-06 10:42:12 -07:00
Andrzej Hunt 4c8562527c Bug 1264489 - Pre: assert DB access is on background thread in debug builds r=mcomella
It's possible there are more UI-thread DB accesses lurking. To avoid maintenance burden
we should therefore enable this assert only in debug builds - releases will be
unaffected, but we can still notice incorrect DB access during development.

MozReview-Commit-ID: Kgzf1L3WjIE

--HG--
extra : rebase_source : b1f9f01ea746c005a038693aaa5eddb2bb103a2b
2016-06-07 08:57:19 -07:00
Kit Cambridge 22e7cd6527 Bug 1278689 - Remove push subscriptions when clearing site settings on Android. r=margaret
MozReview-Commit-ID: BrOjKzswY1F

--HG--
extra : rebase_source : 8230eecf5fd5caaaceb1784c4a61967c46430a3a
2016-06-07 14:02:55 -07:00
Justin D'Arcangelo 26ebe8e651 Bug 1272102 - FlyWeb Android UI. r=sebastian
--HG--
extra : amend_source : b1bac8800988d31790a64a293403336375e5effd
2016-06-08 21:37:06 -04:00
Matthew Wein 395d540421 Part 2: Implement {set|get}Popup for chrome.pageAction (Bug 1264118) r=kmag
MozReview-Commit-ID: 1ZyQgs8ktic

--HG--
extra : rebase_source : 43777c1dc4d6196215d0ae5ded00adc51fe8300f
extra : histedit_source : 22104c8d20405429f271b91439395d13f0846768
2016-05-30 19:42:03 -07:00
Matthew Wein 494256ef31 Part 1: Implement default_popup for chrome.pageAction (Bug 1264118) r=kmag
MozReview-Commit-ID: BrV0v66BhBz

--HG--
extra : rebase_source : ec0b567c7ea3860960fb7d25f089cc053bae39b0
extra : histedit_source : d0a4e4bc6b60454eccdf017bd48ced992b87c5f9
2016-06-02 16:14:20 -04:00
Dylan Roeh 26e9a5cd2f Bug 1136364 - Move EGLSurface creation out of GLController.java. r=snorp 2016-06-08 08:38:45 -05:00
Dustin J. Mitchell 62577b229f Bug 1275409: move legacy taskcluster-related scripts to taskcluster/scripts; r=wcosta
MozReview-Commit-ID: 7ilVJkNAPvE

--HG--
rename : testing/taskcluster/scripts/builder/build-emulator-x86.sh => taskcluster/scripts/builder/build-emulator-x86.sh
rename : testing/taskcluster/scripts/builder/build-emulator.sh => taskcluster/scripts/builder/build-emulator.sh
rename : testing/taskcluster/scripts/builder/build-haz-linux.sh => taskcluster/scripts/builder/build-haz-linux.sh
rename : testing/taskcluster/scripts/builder/build-linux.sh => taskcluster/scripts/builder/build-linux.sh
rename : testing/taskcluster/scripts/builder/build-mulet-haz-linux.sh => taskcluster/scripts/builder/build-mulet-haz-linux.sh
rename : testing/taskcluster/scripts/builder/build-mulet-linux.sh => taskcluster/scripts/builder/build-mulet-linux.sh
rename : testing/taskcluster/scripts/builder/build-simulator.sh => taskcluster/scripts/builder/build-simulator.sh
rename : testing/taskcluster/scripts/builder/build-sm-package.sh => taskcluster/scripts/builder/build-sm-package.sh
rename : testing/taskcluster/scripts/builder/build-sm.sh => taskcluster/scripts/builder/build-sm.sh
rename : testing/taskcluster/scripts/builder/desktop-setup.sh => taskcluster/scripts/builder/desktop-setup.sh
rename : testing/taskcluster/scripts/builder/gaia_props.py => taskcluster/scripts/builder/gaia_props.py
rename : testing/taskcluster/scripts/builder/get-objdir.py => taskcluster/scripts/builder/get-objdir.py
rename : testing/taskcluster/scripts/builder/hazard-analysis.sh => taskcluster/scripts/builder/hazard-analysis.sh
rename : testing/taskcluster/scripts/builder/install-packages.sh => taskcluster/scripts/builder/install-packages.sh
rename : testing/taskcluster/scripts/builder/pull-gaia.sh => taskcluster/scripts/builder/pull-gaia.sh
rename : testing/taskcluster/scripts/builder/setup-ccache.sh => taskcluster/scripts/builder/setup-ccache.sh
rename : testing/taskcluster/scripts/builder/sm-tooltool-config.sh => taskcluster/scripts/builder/sm-tooltool-config.sh
rename : testing/taskcluster/scripts/copy.sh => taskcluster/scripts/copy.sh
rename : testing/taskcluster/scripts/misc/build-cctools.sh => taskcluster/scripts/misc/build-cctools.sh
rename : testing/taskcluster/scripts/misc/build-clang-linux.sh => taskcluster/scripts/misc/build-clang-linux.sh
rename : testing/taskcluster/scripts/misc/build-gcc-linux.sh => taskcluster/scripts/misc/build-gcc-linux.sh
rename : testing/taskcluster/scripts/misc/minidump_stackwalk.sh => taskcluster/scripts/misc/minidump_stackwalk.sh
rename : testing/taskcluster/scripts/misc/repackage-jdk-centos.sh => taskcluster/scripts/misc/repackage-jdk-centos.sh
rename : testing/taskcluster/scripts/phone-builder/build-dolphin.sh => taskcluster/scripts/phone-builder/build-dolphin.sh
rename : testing/taskcluster/scripts/phone-builder/build-phone-ota.sh => taskcluster/scripts/phone-builder/build-phone-ota.sh
rename : testing/taskcluster/scripts/phone-builder/build-phone.sh => taskcluster/scripts/phone-builder/build-phone.sh
rename : testing/taskcluster/scripts/phone-builder/post-build.sh => taskcluster/scripts/phone-builder/post-build.sh
rename : testing/taskcluster/scripts/phone-builder/pre-build.sh => taskcluster/scripts/phone-builder/pre-build.sh
rename : testing/taskcluster/scripts/tester/harness-test-linux.sh => taskcluster/scripts/tester/harness-test-linux.sh
rename : testing/taskcluster/scripts/tester/test-b2g.sh => taskcluster/scripts/tester/test-b2g.sh
rename : testing/taskcluster/scripts/tester/test-linux.sh => taskcluster/scripts/tester/test-linux.sh
extra : rebase_source : 647914c181227d78a0694cf1417fbfe466a5c20d
2016-06-04 22:57:41 +00:00
Carsten "Tomcat" Book 6439e7004c merge mozilla-inbound to mozilla-central a=merge 2016-06-08 11:57:53 +02:00
Carsten "Tomcat" Book 1bd67fd288 merge fx-team to mozilla-central a=merge 2016-06-08 11:56:38 +02:00
Carsten "Tomcat" Book c1439093ab Merge mozilla-central to mozilla-inbound 2016-06-07 15:34:15 +02:00
Carsten "Tomcat" Book c6d661cfe2 merge mozilla-inbound to mozilla-central a=merge 2016-06-07 15:23:03 +02:00
James Willcox d3795e0f2c Bug 1273968 - Disable fading tiles experiment on Nightly r=me 2016-06-08 00:26:09 -05:00
dlim@mozilla.com 9507ce53f1 Bug 1263726 - Settings title remains as "Language" after switching locale and returning to "General Settings". r=grisha
MozReview-Commit-ID: L4hPzJ7kRc5

--HG--
extra : transplant_source : %3D%EB%24M%FA%16%C0dek%C7%E8%83%88_%1F%1B%BE%BE%17
2016-06-06 16:59:09 -07:00
Chenxia Liu a80b935123 Bug 1277999 - Regression: History smartfolder icons are too big. r=jonalmeida
MozReview-Commit-ID: JPanaJHt8s4

--HG--
extra : rebase_source : b556784160c825a34ef43cc6d8b3618fc8de5c62
2016-06-07 16:47:47 -07:00
Michael Comella 1c4fa9bc4c Bug 1261494 - Add logging before each test to help debug intermittent. r=grisha
MozReview-Commit-ID: LBC49xtrgkl

--HG--
extra : rebase_source : 4f8507e1cde254106c77e3e79d29d6e780a0550b
2016-06-03 14:56:51 -07:00
Michael Comella 73357cf396 Bug 1261494 - Add assertions & logging to resetTest for sanity checking. r=grisha
MozReview-Commit-ID: 2WDk0IJokL9

--HG--
extra : rebase_source : c8d2280dbc8d4d01931a2b2c619e50b873984599
2016-06-07 15:19:20 -07:00
Michael Comella d20c9a4e0b Bug 1261494 - Remove outdated comment regarding disabling upload service. r=grisha
MozReview-Commit-ID: 5yfHwMjvcZR

--HG--
extra : rebase_source : 9ea5a502837938f56ea771dfc29b96a9e97a312b
2016-06-03 14:47:34 -07:00
Grigory Kruglov 9d75983121 Bug 1264057 - Post: remove unnecessary import statements r=grisha
MozReview-Commit-ID: LL6lIhAf5pD

--HG--
extra : rebase_source : 3c529ba91d08b46a2940938b0e46a0683b36ceff
extra : amend_source : 9186ec93d4ecbd58a1b1138d976393e17ce0b00a
2016-06-07 15:21:40 -07:00
Grigory Kruglov eb1418d36a Bug 1264057 - Don't show stale clients on the History Panel r=margaret
Currently we might have old (aka stale) clients appear on the History panel, which could be confusing.
This patch modifies underlying query to select only those clients whose LAST_MODIFIED timestamp
is newer than three weeks ago.

MozReview-Commit-ID: JsZJwNONDJG

--HG--
extra : rebase_source : 777c077669139e4d163e765dbe344ad8011db88b
2016-06-07 14:48:16 -07:00
Kit Cambridge 55b7ef53d9 Bug 1207743 - Track recent push messages to avoid duplicate notifications on reconnect. r=dragana
MozReview-Commit-ID: KezPfa0yyO1

--HG--
extra : rebase_source : 86c3b0d78f2772369ebedd11d640a8b05e46d24f
extra : histedit_source : 531a495b7b3b3d8d4bf8b399f6beebf0805ac3bc
2016-06-04 13:17:12 -07:00
Jan Henning c37347cd35 Bug 1251362 - Part 19 - Remove code and resources for the old Recent Tabs panel. r=liuche
MozReview-Commit-ID: FQJ7j8YlV6E

--HG--
extra : transplant_source : H%B7Ul%94%E3%C9%9A%C3m%A7%E7At%84%D4%B3%85%5BY
2016-05-26 17:40:19 +02:00
James Andreou 14c6b15018 Bug 1277357 - Remove nsDocShell:SetUsePrivateBrowsing cpp consumers and some JS consumers r=jdm 2016-06-06 07:42:00 +02:00
Kim Moir 825acb86c4 revert Bug 1186522 - force per checkin and release desktop firefox builds to require signed add-ons on beta 47 r=mshal DONTBUILD 2016-06-07 14:45:21 -04:00
Kim Moir 94aee01d99 Bug 1186522 - force per checkin and release desktop firefox builds to require signed add-ons on beta 47 r=mshal DONTBUILD 2016-06-07 14:28:26 -04:00
Dylan Roeh b36a748d2f Bug 1271103 - Backs out the patch for Bug 1136364 and related patches. r=snorp 2016-06-07 09:25:26 -05:00
Jan Henning 17fe927454 Bug 1251362 - Part 18 - Migrate (customised) home panel configurations. r=liuche
For people with customised home panels, we need to explicitly remove the Recent Tabs panel. We also unhide the Combined History panel if it was previously hidden and additionally turn it into the default panel if the Recent Tabs panel was the previous default panel.

MozReview-Commit-ID: 5CSJUTRysQU

--HG--
extra : transplant_source : A.%23%F5%5D%CE%09%E4%F1%BE%24%7E%13Q%1B%0Bx%15e%91
2016-05-21 14:39:15 +02:00
Jan Henning b3e0d8a8bb Bug 1251362 - Part 17 - Turn reading list panel migration function into a generic panel removal function. r=liuche
By passing the panel types to be removed/set as new default panel as arguments instead of hard coding them, we can reuse that function for our own home panel config migration.

MozReview-Commit-ID: BsMxcbInRbX

--HG--
extra : transplant_source : %89zh6%85%F9r%D5%BDu%3E%80%86%AB%7C%1D%B6P%8E%0B
2016-05-21 18:27:55 +02:00
Wes Kocher 807cf956d8 Merge m-c to inbound, a=merge 2016-06-06 17:14:49 -07:00
Michael Comella 6d3f083818 Bug 1277339 - Remove unnecessary null reference to API 11+ resources. r=jonalmeida
MozReview-Commit-ID: 5veGI8JCLbD

--HG--
extra : rebase_source : 299c7ba38a3aabb9cfb5544c0a56b91db8540364
2016-06-01 14:56:56 -07:00
Michael Comella c0d31e280b Bug 1277553 - Specify adjust sandbox token if not beta or release build. r=sebastian
I didn't include nalexander's MOZ_INSTALL_TRACKING suggestion because my make
skills are too shaky to make this worthwhile. Specifying a keyfile when
MOZ_INSTALL_TRACKING is disabled isn't harmful afaik (though it's a little
spammy).

Also, added code comment duplicated for emphasis:

# (bug 1277553) In Aurora -> Beta simulation builds, no update channel is
# specified, causing an assertion to throw that MOZ_INSTALL_TRACKING is
# specified but the keyfile is not. In this case, we add a default keyfile.
# This has the disadvantage that if our beta/release checks above ever
# fail, we'll come to this default case and the compile-time check to
# specify a valid keyfile will be broken. I don't have any better
# alternatives.

MozReview-Commit-ID: 7tmemvpDaW8

--HG--
extra : rebase_source : 96930d595ebc22c06dadea1d28782ec6a2c023c2
2016-06-03 17:10:40 -07:00
Michael Comella ca777086bc Bug 1277407 - Add docs about using adjust sandbox & updating outdated info. r=sebastian
MozReview-Commit-ID: DW4ZflT8FrZ

--HG--
extra : rebase_source : 1a474e3506c180e6c7403a377594203a96b41675
2016-06-03 17:00:38 -07:00
Michael Comella 8caf7ab0d1 Bug 1277407 - Add Adjust sandbox keyfile to tree. r=sebastian
Additionally, we add this file to the tree so it can be used by bug 1277553.

The following commit will add the docs explaining how to use the file I
added.

The added file contents are slurped directly into
AdjustConstants.MOZ_INSTALL_TRACKING_ADJUST_SDK_APP_TOKEN. We get the sandbox
token from the previously working value in [1].

An alternative solution would be to remove the assertion that
`--with-adjust-sdk-keyfile` is specified and provide a default value if the key
is not specified. However, after investigating bug 1277553, I dislike this
approach because we lose the compile-time checks that a key file is specified,
which is dangerous for release/beta builds where the key file may not be valid,
we push a release, and we don't get the data we expect.

Ideally, we specify `--with-adjust-sdk-keyfile` for non-MOZILLA_OFFICIAL
builds, but I don't know how to do that.

[1]: https://hg.mozilla.org/mozilla-central/rev/ac75f8f4c01d#l1.26

MozReview-Commit-ID: HPNgiwfzU5p

--HG--
extra : rebase_source : 6ee6cf869624b2274338d76b63072d13cc3c8432
2016-06-03 16:55:51 -07:00
Andrew Swan bbff6c938b Bug 1277965 Enable MOZ_ADDON_SIGNING r=kmag
MozReview-Commit-ID: L6VXf9veakc

--HG--
extra : rebase_source : 8f48e2a829ee597120b1d0d6926c3dc3c7e54001
2016-06-06 12:23:14 -07:00
Carsten "Tomcat" Book 2777857538 Merge mozilla-central to fx-team 2016-06-06 12:03:36 +02:00
Carsten "Tomcat" Book 4aea0165dc merge mozilla-inbound to mozilla-central a=merge 2016-06-06 11:55:56 +02:00
Andrzej Hunt 10696994a2 Bug 1265708 - Post: query topsites metadata by URL without ref too r=sebastian
MozReview-Commit-ID: KzbKJjRm4Za

--HG--
extra : rebase_source : 07ac0500a230464c873a25b0675892d4205d7d51
extra : source : 67c37ed1a25f92cac6294cb70af97e95515c30e2
2016-06-03 14:05:42 -07:00
Andrzej Hunt 5c6bab28a8 Bug 1265708 - Set URL metadata based on URL without ref r=sebastian
MozReview-Commit-ID: DNiKYFJiXjY

--HG--
extra : rebase_source : d0a0e3ff5b6be338690dfe287a1e41adfc15476f
extra : source : 10fa130289d70f0adb8ad8379d3454976c922049
2016-06-02 14:41:47 -07:00
Andrzej Hunt 75679153e9 Bug 1265708 - Strip ref from URL when adding homescreen icons r=sebastian
We add URL metadata based on the base URL, we should retrieve it this way too.

MozReview-Commit-ID: ICP54V5vRgv

--HG--
extra : rebase_source : 967cf4843572b85b425735486700cd6f6c24887c
extra : source : e994f70de0490e77a2309793852434f2f1641ad7
2016-06-03 14:05:29 -07:00
Andrzej Hunt 376379fd5c Bug 1265708 - Pre: make getForURLs arguments more generic r=sebastian
MozReview-Commit-ID: IkPiLVB5mop

--HG--
extra : rebase_source : 209fc8cf05e3f91392f6944914e260483900b967
extra : source : 047961bdb4adf91179be3b8a983cffc0d8e9debb
2016-06-02 14:25:05 -07:00
Andrzej Hunt ef186c7689 Bug 1265708 - Pre: Implement StringUtils.stripRef r=sebastian
MozReview-Commit-ID: AO25iiUMXLE

--HG--
extra : rebase_source : 92282861ec7ab119cf104fd5aa7d904008cc5d75
extra : source : 974090a524da56fad3b8045b19461e9ae6817529
2016-06-05 17:37:12 -07:00
Andrzej Hunt 1468a97d80 Bug 1265708 - Pre: remove unused variable r=sebastian
We already pass the URL inside the JSON object.

MozReview-Commit-ID: J4RjxLAzdI

--HG--
extra : rebase_source : 49932580b5a34032e072b4b4e905ebe6daeb964a
extra : source : f685593ac3cc4ea3b8d6545e42eb7d225095161a
2016-06-02 13:51:52 -07:00
Carsten "Tomcat" Book e8d8c705a1 Backed out changeset 490d3460a197 (bug 1230462) for test failures in test_modal_prompts.html
--HG--
rename : toolkit/components/prompts/test/test_subresources_prompts.html => toolkit/components/prompts/test/test_bug625187.html
2016-06-05 11:26:57 +02:00