Commit Graph

13550 Commits

Author SHA1 Message Date
Jim Blandy
7e20285e70 Bug 914753: Make Emacs file variable header lines correct, or at least consistent. DONTBUILD r=ehsan
The -*- file variable lines -*- establish per-file settings that Emacs will
pick up. This patch makes the following changes to those lines (and touches
nothing else):

 - Never set the buffer's mode.

   Years ago, Emacs did not have a good JavaScript mode, so it made sense
   to use Java or C++ mode in .js files. However, Emacs has had js-mode for
   years now; it's perfectly serviceable, and is available and enabled by
   default in all major Emacs packagings.

   Selecting a mode in the -*- file variable line -*- is almost always the
   wrong thing to do anyway. It overrides Emacs's default choice, which is
   (now) reasonable; and even worse, it overrides settings the user might
   have made in their '.emacs' file for that file extension. It's only
   useful when there's something specific about that particular file that
   makes a particular mode appropriate.

 - Correctly propagate settings that establish the correct indentation
   level for this file: c-basic-offset and js2-basic-offset should be
   js-indent-level. Whatever value they're given should be preserved;
   different parts of our tree use different indentation styles.

 - We don't use tabs in Mozilla JS code. Always set indent-tabs-mode: nil.
   Remove tab-width: settings, at least in files that don't contain tab
   characters.

 - Remove js2-mode settings that belong in the user's .emacs file, like
   js2-skip-preprocessor-directives.
2014-06-24 22:12:07 -07:00
Geoff Brown
8cc0c86186 Bug 979600 - Disable testSessionOOMRestore on Android 2.3 (for aws); no review 2014-06-24 20:33:31 -06:00
Geoff Brown
3302686f62 Bug 995696 - Disable testNewTab on Android 2.3 (for aws); no review 2014-06-24 20:33:31 -06:00
Wes Kocher
0fc14e9e28 Merge m-c to inbound a=merge on a CLOSED TREE 2014-06-24 18:39:27 -07:00
Wes Kocher
330cda24c9 Merge inbound to m-c a=merge 2014-06-24 18:13:38 -07:00
Nathan Froyd
c3ea6db0ae Bug 728600 - define TARGET_XPCOM_ABI in mozilla-config.h; r=glandium 2014-06-23 15:06:48 -04:00
Ed Morley
955f6cc057 Merge mozilla-central and inbound 2014-06-24 17:18:28 +01:00
Ed Morley
4c3f72e562 Merge latest green fx-team changeset and mozilla-central; a=merge 2014-06-24 17:02:56 +01:00
Wes Kocher
3b9ac5186f Merge m-c to fx-team a=merge 2014-06-23 19:07:22 -07:00
Wes Kocher
fda21c3dd1 Merge fx-team to m-c a=merge 2014-06-23 17:56:11 -07:00
Margaret Leibovic
943fb5aa9a Bug 1026715 - Add "Open all" item to recent tabs lists. r=lucasr 2014-06-23 14:13:05 -07:00
Michael Comella
5672fbf298 Bug 1002303 - Part 3: Update empty private tabs panel description. r=eedens 2014-06-23 11:35:03 -07:00
Ethan Pransky
d25df89d4a Bug 1019009 - Make MatrixBlobCursor complain if its Cursors are not properly closed. r=gcp 2014-06-24 17:32:28 +02:00
Michael Comella
f535e3d2d1 Bug 1028337 - Fix crash when closing all private tabs. r=margaret 2014-06-23 11:01:37 -07:00
Michael Comella
bd961893dc Bug 979600 - Increase verifyPageTitle wait timeout. r=gbrown 2014-06-23 10:54:57 -07:00
Gian-Carlo Pascutto
92f57710e7 Bug 1018928 - Fix getUserMedia device selection on Android. r=blassey 2014-06-24 10:22:50 +02:00
Kartikaya Gupta
1cfb0fc6fc Bug 1020778 - Reduce opacity of low-res buffer on B2G by half when compositing it to the screen. r=jrmuizel 2014-06-23 12:00:18 -04:00
Margaret Leibovic
99121ef2e2 Bug 1004850 - (Part 7) Update robocop tests to account for new panel. r=mcomella 2014-06-22 16:26:50 -04:00
Margaret Leibovic
b25f0d2647 Bug 1004850 - (Part 6) Add HomeConfigPrefsBackend migration to add recent tabs panel. r=lucasr 2014-06-22 16:26:50 -04:00
Margaret Leibovic
3a48004b06 Bug 1004850 - (Part 5) Add recently closed tabs to RecentTabsPanel. r=lucasr,bnicholson 2014-06-22 16:26:49 -04:00
Margaret Leibovic
8315c8b7f8 Bug 1004850 - (Part 4) Update RecentTabsAdapter to be a MultiTypeCursorAdapter. r=lucasr 2014-06-22 16:26:49 -04:00
Margaret Leibovic
b5484b5435 Bug 1004850 - (Part 3) Create RecentTabsPanel from existing LastTabsPanel. r=lucasr
--HG--
rename : mobile/android/base/home/LastTabsPanel.java => mobile/android/base/home/RecentTabsPanel.java
rename : mobile/android/base/resources/layout/home_last_tabs_panel.xml => mobile/android/base/resources/layout/home_recent_tabs_panel.xml
2014-06-22 16:26:49 -04:00
Margaret Leibovic
fd3de6d19e Bug 1004850 - (Part 2) Rename MostRecentPanel to HistoryPanel. r=lucasr
--HG--
rename : mobile/android/base/home/MostRecentPanel.java => mobile/android/base/home/HistoryPanel.java
rename : mobile/android/base/resources/layout/home_most_recent_panel.xml => mobile/android/base/resources/layout/home_history_panel.xml
2014-06-22 16:26:48 -04:00
Margaret Leibovic
57027544e4 Bug 1004850 - (Part 1) Replace HistoryPanel with MostRecentPanel. r=lucasr 2014-06-22 16:26:48 -04:00
Nick Alexander
3dea37b470 Bug 1022749 - Show custom server URLs in setup activities. r=rnewman
========

cf613656fe
Author: Nick Alexander <nalexander@mozilla.com>
    Bug 1022749 - Part 2: Show custom server URLs in status activity.

========

91268a261f
Author: Nick Alexander <nalexander@mozilla.com>
    Bug 1022749 - Part 1: Show custom server URLs in setup activities.
2014-06-09 17:31:58 -07:00
Nick Alexander
0371bd2e8e Bug 1022748 - Part 2: Use custom server URLs in setup activities. r=rnewman
========

2582a39b7f
Author: Nick Alexander <nalexander@mozilla.com>
    Bug 1022748 - Review comments.

========

8c9a8df84f
Author: Nick Alexander <nalexander@mozilla.com>
    Bug 1022748 - Part 4: Don't show Get Started activity when custom server URLs are passed.

    The Get Started activity provides no feedback about custom URLs, and it
    just gets in the way of power users, so skip it entirely.

========

2701a9ea52
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Mon Jun 9 17:25:51 2014 -0700

    Bug 1022748 - Part 3: Pass through server details to update credentials activity.

    This information can be extracted from the AndroidFxAccount object in
    the activity, but feeding the information through extras keeps the
    processing and display pipeline uniform across all setup activities.

========

b9dd884764
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Mon Jun 9 17:17:57 2014 -0700

    Bug 1022748 - Part 2: Use custom server URLs passed through extras in setup activities.

========

be8284ea25
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Mon Jun 9 15:06:03 2014 -0700

    Bug 1022748 - Part 1: Pass extras through setup activities.

    This also passes the password button's show/hide state between create
    and set up.
2014-06-21 16:21:41 -07:00
Nick Alexander
3cc13e1e56 Bug 1022748 - Part 1: Pass extras through Accounts.launchSetup. r=rnewman 2014-06-22 12:01:15 -07:00
Nick Alexander
f718c2014c Bug 1019793 - Avoid UnsupportedOperationException in TestHealthReportPruneService. r=mcomella
========

ce21e7f19a
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Wed Jun 4 14:15:09 2014 -0700

    Bug 1019793 - Always upload in TestHealthReportUploadService.

========

e4c7393c6f
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Tue Jun 3 15:47:33 2014 -0700

    Bug 1019793 - Don't create storage in TestHealthReportPruneService.

    Creating real storage requires a valid Context, and in this test, we
    only have MockContext.
2014-06-21 15:42:44 -07:00
Nick Alexander
1cc245ea64 Bug 993134 - Make TestAccountPickler tolerate multiple accounts. r=mcomella
========

872d926e32
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Wed Jun 4 14:21:17 2014 -0700

    Bug 993134 - Part 5: Work around Android intermittent issue.

========

c76bb53901
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Tue Jun 3 17:02:15 2014 -0700

    Bug 993134 - Part 4: Make fxa.TestAccountPickler robust.

    This tested extracting data from an AndroidFxAccount before, and another
    after, backed by different Android Accounts.  Unfortunately, one Account
    replaced the other, but had the same name, leading to a race
    condition (between reading and deleting the first account).  To address
    this, we extract all the data before deleting, and then compare it to
    the data from the newly pickled account.

========

bd32978f7b
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Tue Jun 3 15:34:09 2014 -0700

    Bug 993134 - Part 3: Use AndroidSyncTestCaseWithAccounts to make fxa.TestAccountPickler when accounts exist.

========

ec7d910187
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Tue Jun 3 15:33:29 2014 -0700

    Bug 993134 - Part 2: Extract AndroidSyncTestCaseWithAccounts.

========

6563ad7bd8
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Tue Jun 3 15:30:15 2014 -0700

    Bug 993134 - Part 1: Make getApplicationContext return getTargetContext.

    I was finding that repeated instrumentation-test runs were returning a
    null application context, indicating a race between test start-up and
    target instantiation.  This works well for me on two test devices.
2014-06-21 15:42:38 -07:00
Nick Alexander
fd0bc71e4a Bug 993136 - Fix TestSyncConfiguration. r=mcomella
========

306fb330a9
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Tue Jun 3 15:29:55 2014 -0700

    Bug 993136 - Fix TestSyncConfiguration.
2014-06-21 15:42:31 -07:00
Richard Newman
c375af7e83 Bug 1023451 - Part 2: apply basic heuristics for locale usability. r=mcomella 2014-06-20 14:31:53 -07:00
Richard Newman
bcfbbf867a Bug 1023451 - Part 1: introduce a hook for determining whether a locale should be included in the list. r=mcomella 2014-06-20 14:31:53 -07:00
Mark Finkle
1d834efa96 Bug 1028004 - UI Telemetry events with null methods are ignored r=rnewman 2014-06-20 13:39:33 -04:00
Hathibelagal A
bc2a0aa8c3 Bug 1027831 - Switch from deprecated FILL_PARENT to MATCH_PARENT in Java and XML. r=bnicholson 2014-06-20 09:21:31 -07:00
Richard Newman
8527f749ba Bug 1016611 - Part 5: be resilient against failed insertions. r=margaret 2014-06-20 07:41:05 -07:00
Richard Newman
ebf9dddb75 Bug 1016611 - Part 4: fix testBookmarksPanel. r=margaret 2014-06-20 07:41:05 -07:00
Richard Newman
fd91cfd45a Bug 1016611 - Part 3: basic thread safety in GeckoProfile. r=margaret 2014-06-20 07:41:05 -07:00
Richard Newman
2db7bdeda5 Bug 1016611 - Part 2: further cleanup. r=margaret 2014-06-20 07:41:04 -07:00
Richard Newman
e587539993 Bug 1016611 - Part 1: don't process distribution files for webapp profiles. r=margaret 2014-06-16 16:07:43 -07:00
Brian Nicholson
ca2bc12a80 Bug 1027139 - Fix ArrowPopup positioning for anchors on right side of screen. r=margaret 2014-06-19 14:30:17 -07:00
Brian Nicholson
2aeed4707c Bug 1024127 - Popup cleanup. r=margaret 2014-06-19 14:30:16 -07:00
Ed Morley
736101e1e8 Merge mozilla-central and fx-team 2014-06-24 17:24:53 +01:00
Paolo Amadini
9fde0e4ab8 Bug 1023484 - Improvements and test for the initial requestAutocomplete stub. r=MattN
--HG--
rename : toolkit/components/formautofill/AutofillController.js => toolkit/components/formautofill/FormAutofillContentService.js
rename : toolkit/components/formautofill/nsIAutofillController.idl => toolkit/components/formautofill/nsIFormAutofillContentService.idl
2014-06-24 12:15:02 +01:00
Ryan VanderMeulen
bee8ae28a0 Merge m-c to inbound. 2014-06-23 10:57:40 -04:00
Geoff Brown
2ee5918413 Bug 946656 - Disable testAboutHomeVisibility on Android 2.3; r=me 2014-06-23 08:35:53 -06:00
Geoff Brown
d18998dbdf Bug 1028929 - Disable testDoorHanger on Android 2.3; r=me 2014-06-23 08:35:53 -06:00
Geoff Brown
944663b4ae Bug 836818 - Disable testOverscroll on Android 2.3; r=me 2014-06-23 08:35:53 -06:00
Geoff Brown
56eea485ba Bug 945395 - Disable testSessionOOMSave on Android 2.3; r=me 2014-06-23 08:35:52 -06:00
Kartikaya Gupta
e1ac0ad31b Bug 1021085 - Fix up the Fennec code path as well. r=Cwiiis 2014-06-23 08:42:53 -04:00
Danny Chen
7e653b38ca Bug 1005031 - Video controls are displayed in the middle of the video. r=wesj 2014-06-19 13:28:00 +02:00