Commit Graph

21273 Commits

Author SHA1 Message Date
Andrzej Hunt
9590f3241f Bug 1300532 - Ensure old and new URL are ordered correctly to show prompt when entering ReaderView r=sebastian
MozReview-Commit-ID: 4Yql0m3JV6M

--HG--
extra : rebase_source : adde15b6f061c6ca64021416e7d6b09c35e2b301
2016-09-06 15:52:09 -07:00
Wes Kocher
ac33516b3c Merge m-c to autoland, a=merge 2016-09-07 18:07:50 -07:00
Wes Kocher
5cbc382303 Merge inbound to m-c a=merge 2016-09-07 17:54:24 -07:00
Carsten "Tomcat" Book
7c6c7db247 Merge mozilla-central to autoland 2016-09-07 17:26:11 +02:00
Carsten "Tomcat" Book
1c61ba654e merge mozilla-inbound to mozilla-central a=merge 2016-09-07 17:20:12 +02:00
Kannan Vijayan
f671b30c0f Backout cbe18f181112 for crashes - bug 1292639 2016-09-07 13:43:40 -04:00
Carsten "Tomcat" Book
d98e95abb8 Merge mozilla-central to autoland 2016-09-08 12:51:52 +02:00
Matthew Wein
cfad685755 Bug 1298178 - Support mozAddonManager on Fennec by importing amWebAPI.js r=rhelmer
MozReview-Commit-ID: GoaYn7oJYAF

--HG--
extra : rebase_source : 3976cf2f2210e4a5c989a806e6f863ec9782547e
2016-09-01 20:50:05 +01:00
Ralph Giles
186cacb131 Bug 1296403 - Update tooltool rustc to 1.11.0. r=mshal
Repacks of upstream builds of rust 1.11.0 stable with std libraries
for the appropriate targets. Remove the separate rust-std package
references since the new repacks include the necessary targets.

Also update clang and hazard builds to the latest toolchain.

MozReview-Commit-ID: K7oBxQZnLPu

--HG--
extra : rebase_source : 9f339ff52e9e2f6c28d4bb7a734b9f0eae43a47a
2016-09-06 13:09:56 -07:00
Andrzej Hunt
ceca466475 Bug 1299524 - Disable FaviconView corner rounding in Activity Stream topsites r=sebastian
We use the FaviconView to fill the majority of the card (i.e. full width, and approx 75% of the height)
- in that scenario rounding the corners looks odd.

MozReview-Commit-ID: 1e5HAwfcV5

--HG--
extra : rebase_source : e6c5168025e1ac3ad941e8fd6207960b37442373
2016-09-06 10:48:26 -07:00
Andrzej Hunt
0bee5d51ae Bug 1299524 - Allow disabling FaviconView corner rounding via enableRoundCorners attribute r=sebastian
MozReview-Commit-ID: 1qtt7xlTsHP

--HG--
extra : rebase_source : e24982d035fb3357eb1efd4a5952b968eb7af3dd
2016-09-06 10:46:47 -07:00
Sebastian Kaspari
a5a657d556 Bug 1300543 - IconDownloader: Use final keyword where appropriate. r=ahunt
MozReview-Commit-ID: DhWIRPZf7rg

--HG--
extra : rebase_source : 797987c944e445a4ea7e00a2373c83c2003c0c1a
2016-09-06 13:58:35 +02:00
Sebastian Kaspari
58d250abaa Bug 1300543 - IconDownloader.downloadAndDecodeImage(): Correctly assign and close stream. r=ahunt
MozReview-Commit-ID: CYEOCCpraOr

--HG--
extra : rebase_source : f0e05c79c531857d73ca5aea3f1dbabedeed6e23
2016-09-06 13:53:02 +02:00
Sebastian Kaspari
10fdd6498e Bug 1300543 - Use palette library instead of BitmapUtils.getDominantColor(). r=ahunt
MozReview-Commit-ID: LTwarAG5NNm

--HG--
extra : rebase_source : 44165c8f04cc5888147c7b6e0f0996f64f99f810
2016-09-06 10:05:32 +02:00
Sebastian Kaspari
e730285a31 Bug 1300543 - FilterMimeTypes: Continue to filter mime types if one of them is empty. r=ahunt
MozReview-Commit-ID: GRFANWF1L2m

--HG--
extra : rebase_source : b4993fdfc01f04397de6c5a2d2729b4de023ce5f
2016-09-05 17:37:13 +02:00
Sebastian Kaspari
f0847016ce Bug 1300543 - LegacyLoader: Only load if there's one icon URL left. r=ahunt
Let's try to load from the legacy loader only if there's one icon left and
the other loads have failed. We will ignore the icon URL anyways and try to
receive the legacy icon URL from the database.

MozReview-Commit-ID: Kr7gHXBuAs7

--HG--
extra : rebase_source : 7fbdd507fa2c0a9aa4223db1da6aa5fbc1aa4907
2016-09-05 16:44:33 +02:00
Sebastian Kaspari
80177742b4 Bug 1300543 - LegacyLoader: Skip loading from legacy storage if network download is permitted. r=ahunt
If we are allowed to load the icon from the network then skip loading from the legacy storage and just
load a fresh icon. This will avoid touching the legacy storage (disk) every time before downloading an
icon.

MozReview-Commit-ID: C9hYqISno6U

--HG--
extra : rebase_source : 6f19839c38d37916deb351b3e080e023e532a83f
2016-09-05 15:38:27 +02:00
Sebastian Kaspari
87a7500078 Bug 1300543 - IconRequestExecutor: Resize image before extracting color. r=ahunt
Running the color extraction algorithm on a smaller image will be much faster.

MozReview-Commit-ID: A42rzuQ3FDQ

--HG--
extra : rebase_source : 560e5e1a6711d8f34f12803e5aabf4f09e769706
2016-09-05 15:25:25 +02:00
Sebastian Kaspari
2df61cba23 Bug 1300543 - IconRequestExecutor: Add custom thread pool executor and thread factory. r=ahunt
The custom executor behaves like the one returned by Executors.newSingleThreadExecutor().
However the created thread will have a unique name ("GeckoIconTask") and this will make
tracing the thread much easier.

MozReview-Commit-ID: 7y0EMGmNLkG

--HG--
extra : rebase_source : 517d329df12ff101816c3a3f8e27f28aeffb6821
2016-09-05 15:24:07 +02:00
Andrzej Hunt
b79a5e8eec Bug 1298968 - Add comment explaining why TOPSITES is handled outside of switch r=sebastian
MozReview-Commit-ID: BFvz2qTm4vL

--HG--
extra : rebase_source : 8d4e77baf5c629c0d16f97c7135fd4c85bf5a5b5
2016-09-06 10:06:58 -07:00
Jan Henning
6afa573825 Bug 1299576 - Part 2 - Cancel edit mode when restoring a recently closed tab. r=sebastian
When restoring a recently closed tab from the corresponding home panel, we normally directly switch to the freshly recreated tab. However if we've entered the home panels through editing mode (as opposed to opening a new tab with about:home), editing mode takes priority and the restored tab is opened in background instead, because we return to the originally selected tab when exiting editing mode.

To fix this inconsistency, we introduce a new parameter for opening tabs from Gecko that cancels editing mode if necessary to allow for directly switching to the new tab.

MozReview-Commit-ID: 4iqPISmtNIx

--HG--
extra : rebase_source : fab9dc911171deef1a984bd96993287d146b370a
2016-09-02 20:43:08 +02:00
Jan Henning
eefcf19c49 Bug 1299576 - Part 1 - Refactor BrowserApp's handleMessage to use a switch statement. r=sebastian
So much nicer than a chain of else ifs.

MozReview-Commit-ID: FbEtD4Odet1

--HG--
extra : rebase_source : 3083434348bdfdfd2e30a5dac212a1993cf40d25
2016-09-02 19:02:16 +02:00
Wes Kocher
819bc41348 Merge m-c to autoland, a=merge 2016-09-08 15:29:04 -07:00
Grigory Kruglov
a582ffa65a Bug 1300230 - Queue up incoming FxA push messages until FxAccountsPush is ready r=nalexander
MozReview-Commit-ID: 8BP7eWfdXte

--HG--
extra : rebase_source : a5ff5fdb848796f17389632c2ea479088098aea7
2016-09-08 14:15:34 -07:00
Sebastian Kaspari
479c995830 Bug 1280112 - LauncherActivity: Remove task flags from incoming intent. r=ahunt
MozReview-Commit-ID: 8ufNtiMc1sj

--HG--
extra : rebase_source : afa106835f508b809294a4af096893ea87980851
2016-09-06 17:58:46 +02:00
John Lin
077d1abae1 Bug 1297307 - Add extra video duration element for EOS sample. r=snorp
MozReview-Commit-ID: 4QUTABCNT06

--HG--
extra : rebase_source : db9a186de79d9fe6a307ffb125f980609224dfdc
2016-08-30 17:40:49 +08:00
Farmer Tseng
480caffe1a Bug 846203 - the user activity timer will be reset when the Wakelock is released(for Android). r=snorp
MozReview-Commit-ID: 8GN81YzNjGM

--HG--
extra : rebase_source : 95477c1560d1969b70d4feb8fe1e878dd7d4a9fe
2016-09-05 16:52:18 +08:00
Thomas Wisniewski
2b28c5e2a9 Bug 1069012 - Unprefix ::placeholder pseudo-element. r=bz 2016-09-07 19:38:38 -04:00
Wes Kocher
1989131fea Merge m-c to inbound, a=merge 2016-09-07 18:07:21 -07:00
Zero One
4473369471 Bug 1292191 - Remove unneccesary check for mShouldRestore. r=mkaply
MozReview-Commit-ID: 3amKuifhpfu

--HG--
extra : rebase_source : a4b31adc09f9f685dccdbebe63ba8a9ae30acd8c
2016-09-07 16:35:26 -05:00
Sylvestre Ledru
b542b9b41a Bug 1292595 - finalize() should be protected in NativeZip r=?sebastian
MozReview-Commit-ID: JFZCfMM6GAk

--HG--
extra : rebase_source : 12f41b06b5a11056d3345a05bdb9c83a079765fd
2016-08-05 17:43:07 +02:00
Sebastian Kaspari
9b9a3bee93 Bug 1300569 - Add palette-v7 support library to build. r=ahunt
MozReview-Commit-ID: F29cOyHsd8B

--HG--
extra : rebase_source : 0c568158a20ae34687b135ce414ccfb5f710d228
2016-09-06 08:39:16 +02:00
Sebastian Kaspari
3cf54d8f48 Bug 1300155 - IconTask: Disable debug logging. r=ahunt
MozReview-Commit-ID: 51pYsDqicNS

--HG--
extra : rebase_source : 5e8912d87f18bdcf9af48ba07e9dfe121a82c92f
2016-09-05 10:32:07 +02:00
Sebastian Kaspari
cde95c1b07 Bug 1300484 - IconResponse: Throw if bitmap is null. r=ahunt
This will crash later anyways but throwing here will allow us to identify code
that creates a response with a null bitmap (This shouldn't happen).

MozReview-Commit-ID: LJMSsW51eXo

--HG--
extra : rebase_source : 22eefdc5ba28d36142b663c03f376045fcc542fd
2016-09-05 11:46:27 +02:00
Sebastian Kaspari
c3c4c19eb4 Bug 1300484 - IconDownloader: Check if best bitmap is not null. r=ahunt
MozReview-Commit-ID: 7A1u6EefKt9

--HG--
extra : rebase_source : 36334c8dd49dcdbdf3f34edc633604d058112fb1
2016-09-05 11:43:00 +02:00
Sebastian Kaspari
14c8e61696 Bug 1300485 - DiskStorage: Re-open cache if it is closed (after clearing). r=ahunt
MozReview-Commit-ID: GX3q4YtRsDw

--HG--
extra : rebase_source : 706671be294f2a216d2932d09507abcbafcc2419
2016-09-05 11:21:21 +02:00
Julian_Chu
f9a272b954 Bug 1296748 - Do not unregister if target does not exist; r=jchen
in create(), only register listener if anchorHandle exits.
in opposite side, only unregister listener in same condition.

MozReview-Commit-ID: HHN23YcmwS

--HG--
extra : rebase_source : bdaa3e7b2a56e8e8d6a7776ff7caf3581e99ff09
2016-08-29 23:56:41 +09:00
Phil Ringnalda
3786ab03f1 Merge m-c to f-t 2016-09-05 17:05:44 -07:00
Phil Ringnalda
66b3a90750 Merge m-i to m-c, a=merge 2016-09-05 13:05:52 -07:00
Andrzej Hunt
9e859c42fc Bug 1297117 - Add documentation to stripAboutReaderUrl r=sebastian
MozReview-Commit-ID: Ibzhnk7LLmh

--HG--
extra : histedit_source : f8460143a4c00238defb68774e96ac99150779aa
2016-09-02 12:35:47 -07:00
Andrzej Hunt
2f3ba414fe Bug 1297117 - Make getUrlFromAboutReader private to avoid erronous usage r=sebastian
getUrlFromAboutReader can return null. There have been crashes caused by not checking this
result in the past. stripAboutReaderFromUrl is a safer version which returns the input URL
if necessary, and is probably what should be used in new code, hence we can make this method
private.

MozReview-Commit-ID: Lg7QWrpSE8F

--HG--
extra : histedit_source : 0964ebab8e9d66e65fc9c3a296031f720219f529
2016-09-02 12:35:08 -07:00
Andrzej Hunt
5b8fbc92f9 Bug 1297117 - Replace unnecessary usage of getUrlFromAboutReader with stripAboutReaderUrl r=sebastian
In some of these cases we're duplicating the work of stripAboutReaderUrl. In the other cases
there is no effective difference, however switching to stripAboutReaderUrl allows us
to make getUrlFromAboutReader private, which should help prevent future errors.

MozReview-Commit-ID: BLeQkve2XIs

--HG--
extra : histedit_source : 1818137ef447b70ca49a783a85cb1a198415df77
2016-09-05 12:56:49 -07:00
Sebastian Kaspari
7d3cd9e160 Bug 1293710 - Add unit tests for highlights query. r=ahunt
MozReview-Commit-ID: DX1AM9wsCMn

--HG--
extra : rebase_source : a713c8bb6b3c87dbec7b3499acc11226bf85202d
2016-09-02 19:31:49 +02:00
Sebastian Kaspari
e8e8706e93 Bug 1293710 - Group activity stream highlights by URL to avoid duplicates. r=ahunt
The same URL could be picked as highlight from history and from bookmarks.

MozReview-Commit-ID: 5vBHluZKfAN

--HG--
extra : rebase_source : 1fee3b2532670d0b9d472518f3648ee5b5bebb8e
2016-09-02 19:52:56 +02:00
Sebastian Kaspari
de0e351a2d Bug 1293710 - Activity Stream Highlights: Only select actual bookmarks (no folders and other special types). r=ahunt
MozReview-Commit-ID: A5oV8vIIyhw

--HG--
extra : rebase_source : 124631db505116eeff4caddc61b5e4ae4b914d41
2016-09-02 19:37:05 +02:00
Sebastian Kaspari
e0879f0149 Bug 1293710 - Activity Stream Highlights: Consider bookmarks without history too. r=ahunt
MozReview-Commit-ID: If6HmIIp7sT

--HG--
extra : rebase_source : 4925672e9e1e5f99e2f24739388c43e42b546f69
2016-09-02 19:26:55 +02:00
Sebastian Kaspari
f8363edb76 Bug 1293710 - Activity Stream Highlights: Load icons and restructured layout. r=ahunt
MozReview-Commit-ID: 1JaFdcFPbIU

--HG--
extra : rebase_source : d9a9e4d15da4c7807d412c234444c530929b0758
2016-09-02 13:10:46 +02:00
Sebastian Kaspari
509e8627f2 Bug 1293710 - Display highlights in activity stream panel. r=ahunt
MozReview-Commit-ID: CnE0Ivq6OXz

--HG--
extra : rebase_source : 5e3431f8a536fba08a4a40c679f83bd07ef97ceb
2016-08-31 19:40:28 +02:00
Sebastian Kaspari
43d2a41065 Bug 1293710 - Obtain a list of "highlights" for the Activity Stream panel. r=ahunt,Grisha
This query resembles how the Activity Stream add-on for desktop Firefox selectes highlights[1].
The desktop version uses the 'rev_host' (reversed host) column to filter the results based
on a blacklist and group results by hostname. This has been omitted here (See bug 1298785 and
bug 1298786).

Additionally the desktop version uses a block list to filter "highlights" that have been removed
manually by the user. This is not added here until needed from the UI side (see bug 1298783).

[1] 9eb9f451b5/addon/PlacesProvider.js (L578)


MozReview-Commit-ID: 9TyIaK21MNJ

--HG--
extra : rebase_source : d6debec1c16b1a1667b0c10fe49e4fcc1dc11bfd
2016-08-29 15:35:17 +02:00
Kershaw Chang
4317633349 Bug 1288297 - Construct PresentationRequest with multiple URLs, r=smaug 2016-09-05 01:17:00 +02:00
Ryan VanderMeulen
1502d18249 Merge inbound to m-c. a=merge 2016-09-03 11:33:28 -04:00
Andrzej Hunt
1c5b9d7220 Bug 1299977 - Add TopSites title to UnusedResourcesUtil r=me 2016-09-02 15:04:10 -07:00
Wes Kocher
fa97b52dd9 Merge m-c to fx-team, a=merge 2016-09-02 13:36:24 -07:00
Wes Kocher
a77698d3d7 Merge fx-team to central, a=merge 2016-09-02 13:32:41 -07:00
Wes Kocher
ee92002ede Merge inbound to m-c a=merge 2016-09-02 13:17:30 -07:00
Andrzej Hunt
253792d078 Bug 1299977 - Update Activity Stream background colour r=sebastian
MozReview-Commit-ID: zyorACyIHe

--HG--
extra : rebase_source : de033f2e3949ec4c5479f199759a3fe70ac00cf8
2016-09-01 16:41:35 -07:00
Andrzej Hunt
9ac761e04f Bug 1299977 - Improve Activity Stream topsites appearance r=sebastian
This patch:
- moves padding, so that the topsites pagers uses the full screen width (otherwise
  topsites cards start disappearing where the padding starts when scrolling,
  which looks odd)
- Adjusts background colour for AS.
- Removes redundant TopSites title
- Adds a divider to the bottom of topsites / above Highlights.

MozReview-Commit-ID: 181COuLECtC

--HG--
extra : rebase_source : d3053e4c0ea31ecb250ddae4448172e4dbaf1e3e
2016-09-01 16:40:33 -07:00
Dylan Roeh
607c18eae8 Bug 1299925 - Override onBackPressed in CustomTabsActivity to finish the activity. r=snorp 2016-09-01 17:17:14 -05:00
Sebastian Kaspari
57614b6b1a Bug 1290014 - Refactor activity stream top sites to use new icon API. r=ahunt
MozReview-Commit-ID: DDzmqNuiqRC

--HG--
extra : rebase_source : 17c247f8a53de782e3626c996847f76081974570
2016-09-01 15:50:31 +02:00
Wes Kocher
ba385e02f2 Merge m-c to fx-team, a=merge 2016-09-01 17:55:15 -07:00
Wes Kocher
c28fdd5c48 Merge inbound to m-c a=merge 2016-09-01 17:51:22 -07:00
Andrzej Hunt
f0f7b67705 Bug 1299224 - pass OnUrlOpenListener into StreamRecyclerAdapter r=sebastian
This has the side effect of enabling click support for topsites.

MozReview-Commit-ID: DW7WX4QDO6n

--HG--
extra : histedit_source : 841fa42364397965d237c36540afc20a86bb2922
2016-08-31 12:53:46 -07:00
Andrzej Hunt
b635c55c15 Bug 1299224 - Pre: remove unnecessary LoaderManager reference from StreamAdapter r=sebastian
I think originally I wanted to fiddle the Loaders from the Adapter, but we don't do that
so this code is unused/unnecessary. We should also make sure we only ever create one adapter,
which we can do by initalising it in the constructor.

MozReview-Commit-ID: MCNBXll1ZX

--HG--
extra : histedit_source : 379bcb165906ab3d79d1676617b19589e3add652%2C4a2d8c786192614a798820a641c2368cffb307ac
2016-09-01 14:40:40 -07:00
Nick Alexander
181481663d Bug 1292762 - Set GRADLE_USER_HOME to avoid sdk-manager-plugin intermittent. r=sebastian
MozReview-Commit-ID: 2Ha0B9xelqm

--HG--
extra : rebase_source : 3cc323454ca207296929482625fee1d3224cc1d8
2016-08-31 11:38:13 -07:00
Ryan VanderMeulen
37b200a0c5 Merge autoland to m-c. a=merge 2016-09-01 12:11:51 -04:00
Ryan VanderMeulen
44f02640c6 Merge fx-team to m-c. a=merge 2016-09-01 11:48:45 -04:00
James Willcox
a34bf3d3ee Bug 1299622 - Delete bogus browser[pending] CSS rule for Fennec r=sebastian a=cherry-pick to fix Fennec tab restore
MozReview-Commit-ID: KdSBXbfYTn1

--HG--
extra : amend_source : d068c0e65f0bad6cd7a0247d09c35d43dbc2ee4f
extra : transplant_source : 1%B4%11vV%B2%D8d%7F%12%B9%9D%C5%EATa%C9%3D%C9%B0
2016-09-01 09:26:25 -05:00
Ryan VanderMeulen
3611a7607d Merge inbound to m-c. a=merge 2016-08-31 22:33:17 -04:00
Kannan Vijayan
e7cae3eb49 Bug 1292639 - Ask user permission before allowing navigator.publishServer. r=mconley r=ehsan r=sebastian 2016-08-31 18:14:24 -04:00
Michael Kaply
42530c3be1 Bug 1299162 - Pass preferences.json to browser.js to avoid disk read. r=rnewman 2016-08-31 15:54:23 -05:00
Michael Kaply
480b0a40c7 Bug 1299350 - If there is a homepage, show it at the end of the wizard. r=rnewman 2016-08-31 15:48:13 -05:00
Sebastian Hengst
77b5bc12c3 Backed out changeset c60fb4ea2674 (bug 1299162) for Android 4.0 build bustage. r=backout 2016-08-31 18:46:01 +02:00
Ryan VanderMeulen
d9f7626454 Merge m-c to inbound. a=merge 2016-09-01 12:15:35 -04:00
James Willcox
e942c4cc04 Bug 1299622 - Delete bogus browser[pending] CSS rule for Fennec r=sebastian 2016-09-01 09:43:56 -05:00
Michael Kaply
25a478327c Bug 1299162 - Pass preferences.json to browser.js to avoid disk read. r=rnewman 2016-08-31 11:17:21 -05:00
Sebastian Kaspari
95fd11b02c Bug 1290014 - DiskStorage: Do not use StandardCharsets.UTF_8. It's only support on API level 19+. r=ahunt
MozReview-Commit-ID: 5wvR4dgiPoJ

--HG--
extra : rebase_source : 863ca9ca14eb7647d2dac314fe4b45deb87da0e6
2016-08-18 18:15:15 +02:00
Sebastian Kaspari
daaeb912aa Bug 1290014 - ResizingProcessor: Do not resize icons loaded from memory. r=ahunt,Grisha
Icons loaded from memory have already gone through the resizing process and have either
the requested size or are resized up to a limit. Without this check a small icon
could be resized multiple times until it matches the target size; even though the icon
is too small. In addition to that we would recycle a bitmap that might still be in use.

MozReview-Commit-ID: K51aBhBcAnj

--HG--
extra : rebase_source : 771c0a88b69e5d3688293ddf27955e01717c8931
2016-08-18 15:52:20 +02:00
Sebastian Kaspari
b05071f783 Bug 1290014 - Add additional unit tests. r=ahunt,Grisha
MozReview-Commit-ID: Ib5OI7eb2sq

--HG--
extra : rebase_source : 03b754f45a92952533e7fe935a30bc97df678bf7
2016-08-18 14:10:49 +02:00
Sebastian Kaspari
fb80b68a08 Bug 1290014 - Move code from the FaviconGenerator class to the IconGenerator in the icons package. r=ahunt,Grisha
The FaviconGenerator is the last class in the old favicons package. As this class is only used by the IconGenerator
let's move the code inside the new class and remove FaviconGenerator.

MozReview-Commit-ID: 7NsJRGdoUWv

--HG--
extra : rebase_source : 703b80560f47220d094de0049cd9b92f8cd524eb
2016-08-17 18:08:51 +02:00
Sebastian Kaspari
2a9ce08987 Bug 1290014 - Move decoders from the favicons to the icons package. r=ahunt,Grisha
The decoders are used by the code in the icons package exclusively. Let's move it
to the new package now.

MozReview-Commit-ID: AAybHpeA71V

--HG--
rename : mobile/android/base/java/org/mozilla/gecko/favicons/decoders/FaviconDecoder.java => mobile/android/base/java/org/mozilla/gecko/icons/decoders/FaviconDecoder.java
rename : mobile/android/base/java/org/mozilla/gecko/favicons/decoders/ICODecoder.java => mobile/android/base/java/org/mozilla/gecko/icons/decoders/ICODecoder.java
rename : mobile/android/base/java/org/mozilla/gecko/favicons/decoders/IconDirectoryEntry.java => mobile/android/base/java/org/mozilla/gecko/icons/decoders/IconDirectoryEntry.java
rename : mobile/android/base/java/org/mozilla/gecko/favicons/decoders/LoadFaviconResult.java => mobile/android/base/java/org/mozilla/gecko/icons/decoders/LoadFaviconResult.java
extra : rebase_source : 3166604d46fcd4736404cc1aa69a98dfbd736072
2016-08-17 17:36:42 +02:00
Sebastian Kaspari
750710c9ca Bug 1290014 - Remove obsolete code. r=ahunt,Grisha
Most of the code in the favicons package is now obsolete and can be
removed. Most of this code still exists in the icons package (in smaller
chunks).

MozReview-Commit-ID: 6J4pgd5doNt

--HG--
extra : rebase_source : fa04223a758483d8440167fb63fe852ea3bde3f8
2016-08-17 17:27:06 +02:00
Rob Wu
73811a0f67 Bug 1298716 - Unify use of ExtensionTestUtils.loadExtension r=billm
MozReview-Commit-ID: DT6rx6KYODl

--HG--
extra : rebase_source : b37924fe255993006fc9a7dfa115d0527d6d0e10
2016-08-28 17:22:03 -07:00
Edouard Oger
7d54172fb4 Bug 1295348 - Send/Handle push messages for send tab to device on Fennec. r=Grisha,sebastian
MozReview-Commit-ID: 1NSMPLQdoXv

--HG--
extra : rebase_source : 4a350317a15d3649a966d8bc4bcd762259cc059a
2016-08-25 16:25:58 -07:00
Ryan VanderMeulen
f2ae8f9bce Merge m-c to autoland. a=merge 2016-08-31 22:34:02 -04:00
Makoto Kato
650d82dba8 Bug 1299400 - Remove WebActivities Android Backend. r=sebastian
WebActivities API has removed by bug 1284455, so we should remove Android backend.

MozReview-Commit-ID: IOYs1bM2u06

--HG--
extra : rebase_source : c6c701159817fe8595c20205c2fc3a2253ffd39f
2016-08-31 17:16:22 +09:00
Sebastian Kaspari
b8f20b1a60 Bug 1290014 - Use new icon framework in UI code. r=ahunt,Grisha
This patch replaces the old favicon code with the new icon code
in the UI code.

MozReview-Commit-ID: 2YdDpYUhb0M

--HG--
extra : rebase_source : 1c07eebdd4d9d873040a60a19b2aa30efc712cb7
2016-08-16 11:44:21 +02:00
Sebastian Kaspari
c7c1345db5 Bug 1290014 - Restructure icon code and use disk lru cache. r=ahunt,Grisha
This patch does multiple things:

1) It restructures the icon code to follow a preparer, loader, processor pattern.
Instead of very long procedures we now have a lot of small components. This patch
includes 90+ tests for those components.

2) It replaces the database storage with the disk lru cache. We still keep the
tables around because we will still load from it as fallback to avoid needing
to migrate all data.

This patch is pretty big but a lot of it is moving code around and breaking it
into smaller chunks. A later commit will remove now obsolete components.

By creating a consistent mapping page URL -> icon URL -> icon data this change
fixes the linked bugs (bug 1269821 and bug 1271634).

MozReview-Commit-ID: 1nkrZn286Gv

--HG--
extra : rebase_source : e8d2902dc8553e43297e9e3f0fd96bf04f28ba3a
2016-08-16 11:36:22 +02:00
Dylan Roeh
d056325bfe Bug 1293299 - Create a class, GeckoViewFragment, which passes GeckoView state between different activities. r=jchen 2016-08-09 21:00:24 -05:00
Ryan VanderMeulen
435c0addca Merge autoland to m-c. a=merge 2016-08-31 09:52:43 -04:00
Wes Kocher
73f495435e Merge m-c to inbound a=merge 2016-08-30 18:14:57 -07:00
Wes Kocher
6536590412 Merge fx-team to central, a=merge 2016-08-30 17:51:54 -07:00
Andrzej Hunt
6651f424e4 Bug 1297127 - show ActivityStream as a HomePanel, replacing TopSites r=sebastian
To avoid having to mess around with the HomePanel configuration machinery, we simply
override the class being loaded for top_sites in HomeAdapter: this is hacky, but
provides a simple temporary solution for showing ActivityStream as a homepanel.

MozReview-Commit-ID: Ga9qUTP3xxA

--HG--
extra : rebase_source : 004e5648ccf74d70f56e66c3ae228bb8071e9756
extra : source : e2d2895a0e678b58336f66fdae01efcd6264954e
2016-08-30 12:18:57 -07:00
Andrzej Hunt
7baca5adbe Bug 1297127 - add ActivityStream.isHomePanel() fake-pref for switching from HomeScreen to HomePanel r=sebastian
This will allow us to more easily switch ActivityStream from being a HomePanel to being a complete
HomePager replacement - this could potentially be extended to read from a preference, but hardcoding
is probably sufficient for now.

MozReview-Commit-ID: HxQg5bOTmdh

--HG--
extra : rebase_source : 99048a0477214c2030cd9072a3e50bb041a18fff
extra : source : 41e5922460ccb2ded3d4e00975eb45f15c1ac4a0
2016-08-30 12:18:36 -07:00
Andrzej Hunt
1eb30f2d16 Bug 1297127 - Move HomeScreen specific code into ActivityStreamHomeScreen r=sebastian
We can keep the general ActivityStream code in the ActivityStream class/widget, allowing
reuse inside a HomePanel (for use in the HomePager). ActivityStreamHomeScreen then
wraps this for use as a HomePager replacement (which is the long-term goal for AS).

MozReview-Commit-ID: 1aWBh1YyARY

--HG--
extra : rebase_source : 8101f445b2aa106a2e06afc097247e849338b95e
extra : source : 155d6001460854ebff20bd1287fcb11c055cea66
2016-08-29 15:33:32 -07:00
Jim Chen
d2272de7cb Bug 1298161 - d. Use application context to prevent BrowserApp leaks; r=sebastian
Use application context for delayed callbacks to prevent leaking the
BrowserApp instance. Also, use application context for accessing
Distribution, to prevent leaking old BrowserApp instances, and to avoid
using a destroyed Context. Finally, attach AudioFocusAgent to the
application context instead of the BrowserApp context to avoid leaking
BrowserApp.
2016-08-30 14:49:38 -04:00
Jim Chen
e6e2011d34 Bug 1298161 - c. Properly remove pref handler in NativePanZoomController; r=rbarker
Properly remove pref handler on destroy to prevent leaking BrowserApp.
2016-08-30 14:49:38 -04:00
Jim Chen
9fe8d04e65 Bug 1298161 - b. Fix BrowserApp leaks in event registration; r=sebastian
Unregister certain events in BrowserApp and GeckoApp to prevent
BrowserApp from leaking. Also, properly unregister event listeners in
PageActionLayout to prevent BrowserApp leaks, because
PageActionLayout.onDestroy never got called before.
2016-08-30 14:49:38 -04:00
Jim Chen
b3038be914 Bug 1298161 - a. Fix BrowserApp leak in GeckoAccessibility; r=sebastian
Move registration of AccessibilityManager listeners to GeckoApplication,
and change all Context references to the application context, so that
GeckoAccessibility doesn't leak old BrowserApp instances as new
BrowserApp instances are created.
2016-08-30 14:49:38 -04:00
Sebastian Kaspari
c9c4bd2110 Bug 1296712 - Move tab strip resources into main resource directory. r=ahunt
MozReview-Commit-ID: KBq6XPEufPj

--HG--
rename : mobile/android/base/resources/color-large-v11/tab_new_tab_strip_colors.xml => mobile/android/base/resources/color/tab_new_tab_strip_colors.xml
rename : mobile/android/base/resources/color-large-v11/tab_strip_item_bg.xml => mobile/android/base/resources/color/tab_strip_item_bg.xml
rename : mobile/android/base/resources/color-large-v11/tab_strip_item_title.xml => mobile/android/base/resources/color/tab_strip_item_title.xml
rename : mobile/android/base/resources/color-large-v11/tabs_counter_text_color.xml => mobile/android/base/resources/color/tabs_counter_text_color.xml
rename : mobile/android/base/resources/drawable-large-v11/tab_strip_button.xml => mobile/android/base/resources/drawable/tab_strip_button.xml
rename : mobile/android/base/resources/drawable-large-v11/tab_strip_divider.xml => mobile/android/base/resources/drawable/tab_strip_divider.xml
rename : mobile/android/base/resources/layout-large-v11/tab_strip.xml => mobile/android/base/resources/layout/tab_strip.xml
rename : mobile/android/base/resources/layout-large-v11/tab_strip_inner.xml => mobile/android/base/resources/layout/tab_strip_inner.xml
rename : mobile/android/base/resources/layout-large-v11/tab_strip_item.xml => mobile/android/base/resources/layout/tab_strip_item.xml
rename : mobile/android/base/resources/layout-large-v11/tab_strip_item_view.xml => mobile/android/base/resources/layout/tab_strip_item_view.xml
extra : rebase_source : 6d4e5fe40d27d43db10956c4491c976c975cea15
2016-08-25 12:34:17 +02:00
Sebastian Kaspari
69f7e10710 Bug 1293650 - NotificationHelper: Create broadcast intent instead of activity intent. r=ahunt
The patches in bug 1075476 refactored our notificaiton code to use broadcasts instead of
bringing the app to the front. However notification actions created via Notifications.jsm
still used activity intents (without any activity listening).

MozReview-Commit-ID: 7ZFMkgBitqw

--HG--
extra : rebase_source : 624538827df97f05657aaf99bc935c9fa7c5d785
2016-08-30 16:52:47 +02:00
James Cheng
42a68e4966 Bug 1299386 - Fix checkstyle error in RemoteManager.java. r=jolin
MozReview-Commit-ID: 4Vh5Kd9YJN6

--HG--
extra : rebase_source : b6c51724c5b7aed8ef5b9b57f737c44e41caab4c
2016-08-31 14:34:43 +08:00
Wes Kocher
81db6ce036 Merge m-c to autoland, a=merge 2016-08-30 18:15:33 -07:00
Grigory Kruglov
14a454f556 Bug 1253111 - Part 2: Add support for batching uploads r=rnewman
- Introduce a new BatchingUploader class to handle storing records and keep track of batches/payloads
- Refactor upload runnable and upload delegate into their own classes
- Introduce Last-Modified and X-I-U-S handling into non-batching mode

MozReview-Commit-ID: 3JLExwQvYzM

--HG--
extra : rebase_source : 4a6a2db595fe72473b033acd4f3180fa799319d4
2016-08-26 14:05:47 -07:00
Andrzej Hunt
3ad7bd7314 Bug 1293790 - Add indicator to topsites pager r=sebastian
MozReview-Commit-ID: 4jhRga5FWLi

--HG--
extra : rebase_source : 8286eebfe672ae563170ac1d9a9b6e928d7a6b0c
2016-08-24 11:25:49 -07:00
Andrzej Hunt
5587b4f363 Bug 1293790 - Increase separation between circles in indicator r=sebastian
MozReview-Commit-ID: 5Ovn3wi4qAr

--HG--
extra : rebase_source : d916ef5fb67924daa32a9fb4fab2739efea6def4
2016-08-24 11:23:27 -07:00
Andrzej Hunt
0c77ca2b74 Bug 1293790 - Import CirclePageIndicator from ViewPagerIndicator library r=sebastian
We only require the CirclePageIndicator, hence I've only imported that portion
of the library. The two resource files have been trimmed to only include values
that are relevant to the CirclepageIndicator.

MozReview-Commit-ID: EPyIf7OJHpe

--HG--
extra : rebase_source : b0a0fac13b619add96ec9d89281f5cec2ca6d51c
2016-08-30 09:42:59 -07:00
Andrzej Hunt
aab7c8b4f0 Bug 1293790 - Implement Paged TopSites View r=sebastian
This uses a ViewPager, with each page containing a grid managed by a separate RecyclerView.
One main adapter splits the data into appropriately sized groups for each RecyclerView
to handle.

MozReview-Commit-ID: 9XGuw0NckD4

--HG--
rename : mobile/android/base/resources/layout/activity_stream_card_top_sites_item.xml => mobile/android/base/resources/layout/activity_stream_topsites_card.xml
extra : rebase_source : cc6ad23ae223b01ab59071d986ab4ad2d41c929c
2016-08-30 09:59:08 -07:00
Andrzej Hunt
8de90ea489 Bug 1293790 - Pre: Extract UpdateViewFaviconLoadedListener to allow reuse r=sebastian
MozReview-Commit-ID: 6ud4pRemi0s

--HG--
extra : rebase_source : 54b41fe13154ec6118af2192b41cf62d8e741784
2016-08-17 10:57:08 -07:00
Andrzej Hunt
d2547754e6 Bug 1293790 - Pre: extract CardView corner workaround into FilledCardView r=sebastian
We'll need this workaround for all the other CardView's we use.

MozReview-Commit-ID: 1B96Y2ZNKrY

--HG--
extra : rebase_source : e32e410045349f3afb7d5766b6dbb2cd80c0fc34
2016-08-23 13:35:46 -07:00
Andrzej Hunt
086e5d1059 Bug 1293790 - Pre: implement AS topsites access r=grisha
MozReview-Commit-ID: 1z30naErciE

--HG--
extra : rebase_source : 5734af99f443a8a040117a02cbe4c582212a051c
2016-08-23 14:04:01 -07:00
Andrzej Hunt
8132366cce Bug 1293790 - Implement getPlainTopSites query r=grisha
ActivityStream's topsites won't support pinned sites for now,
this allows us to use a simpler query that only retrieves topsites
without the complexity of a temporary table to merge pinned sites.

This results in some duplication between the old and new topsites
queries, however eventually we're going to want to get rid
of one of these queries (we don't know whether ActivityStream will
support pinned sites in the future yet, so we definitely want to keep
the pinned query for now - it's also needed for the old topsites panel).

MozReview-Commit-ID: AQyzXHGl3Cf

--HG--
extra : rebase_source : 6830c50d30a326dc7080ce720d4c1890dbab8e32
2016-08-25 12:05:22 -07:00
James Cheng
01f39797f5 Bug 1297969 - Extract class RemoteManager from CodecProxy.java to RemoteManager.java for further usage. r=jolin
MozReview-Commit-ID: Hqm6ZEzv3v1

--HG--
extra : transplant_source : f%B6%AB%92%A6%D8%B1%CA%9D%98%C9%BC1%0Em%7EJ%24c%0A
2016-08-25 15:16:50 +08:00
James Willcox
0e59cdf029 Bug 1296298 - Don't try to add a presentation surface unless Gecko is running r=jchen 2016-08-30 13:26:37 -05:00
James Willcox
3460c674d5 Bug 1294823 - Don't use fullscreen mode for the HLS video view on Android r=sebastian 2016-08-30 13:26:37 -05:00
Grigory Kruglov
29e4dd5c85 Bug 1253111 - Part 1: Introduce new sync stage to handle info/configuration r=rnewman
MozReview-Commit-ID: 7MOgR7A5SOF

--HG--
extra : rebase_source : e029d60a063b2e1dd9061362c4d4a647263dd3ec
2016-08-15 18:35:17 -07:00
Andrzej Hunt
b673568c2b Bug 1293595 - Make doorhanger overlay visible by default, and retrieve it during onCreate r=sebastian
Retrieving the doorhanger during onAttachedToWindow seems to be unreliable, resulting in NPE's when
it doesn't work (the only logical explanation would be that onCreate hasn't been called yet, meaning
we don't have a layout yet). We should instead findViewById() it during onCreate, where the layout
is guaranteed to exist.

Since we show the overlay on all devices now, we can make it visible by default, whereas in the past
we had a condition to only enable it on > 2.3 devices.

MozReview-Commit-ID: 1DGVAPSX0mi

--HG--
extra : rebase_source : 025eb790e3b6c2d27ce10e04d624eb19b889d88d
2016-08-19 10:24:15 -07:00
Sebastian Kaspari
4b882652fe Bug 1281220 - Remove about:accounts telemetry on Fennec. r=liuche
MozReview-Commit-ID: GTKaauQIDKo

--HG--
extra : rebase_source : 8547ccf947b45d23de77e61018ec4de45cc3e329
2016-08-23 16:25:19 +02:00
Ryan VanderMeulen
8880c22504 Merge m-c to autoland. a=merge 2016-08-31 09:55:10 -04:00
Sebastian Kaspari
6e8d16fcc6 Bug 1290014 - Add DiskLruCache library. r=ahunt,Grisha
This patch adds the known and widely used disk LRU cache library by Jake Wharton [1].
It's a standalone version of the disk LRU cache found in the AOSP tree.

The goal is to use a flat file disk cache to avoid the overhead of storing blobs
in a database [2] (and some bugs like bug 1108084).

[1] https://github.com/JakeWharton/DiskLruCache
[2] https://wiki.mozilla.org/Performance/Avoid_SQLite_In_Your_Next_Firefox_Feature

MozReview-Commit-ID: 2ayN7SYVe4W

--HG--
extra : rebase_source : d24907e9ab5563999754bb1f554ed31e5c90d47d
2016-07-27 16:20:00 +02:00
Grigory Kruglov
55435220f1 Bug 1299939 - Use SafeIntent throughout BrowserApp and delegates r=rnewman
MozReview-Commit-ID: gW2gXVWji1

--HG--
extra : rebase_source : 854235b1a3e507cd634b487e500f670cac150bb5
2016-09-01 18:25:05 -07:00
Grigory Kruglov
98ac404dd2 Bug 1299939 - Use SafeIntent to handle incoming intents in the LauncherActivity r=rnewman
MozReview-Commit-ID: 49zDp3A4dnG

--HG--
extra : rebase_source : 4e2828504c97edc3de958758fdd1a1c97d31668e
2016-09-01 16:35:59 -07:00
Kartikaya Gupta
32379a1d17 Bug 1296887 - Prevent a second call to shiftLayerView with the same destination as the first from clearing the resize state prematurely. r=rbarker
MozReview-Commit-ID: 4iMfJ8tsweR

--HG--
extra : rebase_source : 054cb98cddf279f38a4fbea034f8643f3f53e417
2016-09-01 17:27:15 -04:00
Grigory Kruglov
a49ef7731d Bug 1299997 - Can't use API19+ StandardCharsets r=rnewman
MozReview-Commit-ID: 7UH2bJT3re1

--HG--
extra : rebase_source : 0aed7716ae70808ffa03980c318bf37dd93a987f
2016-09-01 18:48:35 -07:00
Wes Kocher
44d99ecda5 Merge m-c to autoland, a=merge 2016-09-01 17:54:52 -07:00
Grigory Kruglov
d2bf1d650a Bug 1294438 - Do not store metadata for private tabs r=sebastian
MozReview-Commit-ID: 6afE9DWmyK7

--HG--
extra : rebase_source : 239b8d8c09a427ce72efafaedc0d6089289dcb0c
2016-08-31 23:02:23 -07:00
Johann Hofmann
f1547c7e17 Bug 1266836 - Part 1 - Fix password manager handling of popup windows in e10s. r=MattN r=liuche
MozReview-Commit-ID: OVsgkHhyg9

--HG--
extra : rebase_source : fb5a56c5e31967636112ae8ce3dcca25d5ebefec
extra : histedit_source : abbb3d0cafc96bf925773443cc28ff26d5895f0f
2016-08-30 15:47:38 +02:00
Ryan VanderMeulen
60c3cb1548 Merge m-c to fx-team. a=merge 2016-08-31 22:37:49 -04:00
Jared Wein
97e69eb233 Bug 336290 - remove --enable-safe-browsing from configure since its used everywhere. r=gcp
MozReview-Commit-ID: Duwu5vZOhtF

--HG--
extra : rebase_source : 564542010fd854c92978defba889b18a73f398f9
2016-08-31 19:28:29 -04:00
Jim Chen
cf1e61cb8d Bug 1291383 - Move Distribution initialization out of GeckoProfile; r=nalexander
Move Distribution initialization (on profile directory creation) from
GeckoProfile to GeckoApplication, by listening to the Profile:Create
event.
2016-09-02 16:49:11 -04:00
Jim Chen
8f665ca47e Bug 1291383 - Dispatch Profile:Create event when creating profile directory; r=nalexander
Dispatch a Profile:Create event when creating a profile directory, so we
can use it to initialize distributions.
2016-09-02 16:49:11 -04:00
Jim Chen
d7ccc9771a Bug 1291383 - Let Java code dispatch events through EventDispatcher; r=sebastian
Add dispatch() methods to EventDispatcher that allow Java code to
dispatch events to Bundle listeners (currently either UI or background
thread listeners).
2016-09-02 16:49:11 -04:00
Ryan VanderMeulen
c0412a3515 Backed out changeset 4542cf942dab (bug 1297969) for Android checkstyle bustage. 2016-08-29 21:32:38 -04:00
Makoto Kato
86b9904afa Bug 1298743 - Remove unused localize resource into mobile/android. r=sebastian
Some resource data is for Fennec/XUL era.  Since these files is unused now, we should remove these from our package.

MozReview-Commit-ID: Dsx3qrSD01h

--HG--
extra : rebase_source : 66b416bcf7933327242bf6b74b88f81d5aac123a
2016-08-29 16:45:37 +09:00
Wes Kocher
08fbeaaf2e Merge m-c to autoland, a=merge 2016-08-29 17:57:01 -07:00
Edouard Oger
3bc966a2e2 Bug 1298727 - Bump FxA device registration version on Fennec. r=eoger
MozReview-Commit-ID: 8NzADM5P7Zc

--HG--
extra : transplant_source : %CENG%8A%FA%8E%CD%D0%9CG%C0%11%10%3B0%D7%EE%89G%ED
2016-08-28 18:05:08 -07:00
James Willcox
f55f874788 Bug 1297751 - Allow E10S to be enabled on Fennec via browser.tabs.remote.force-enable r=sebastian 2016-08-26 16:57:27 -05:00
Geoff Brown
c686d38861 Bug 1271264 - Populate clipboard earlier to avoid intermittent failure in testAccessibleCarets; r=sebastian 2016-08-26 14:34:55 -06:00
Jim Chen
984436a532 Bug 1297807 - Remove old JNI stubs; r=snorp 2016-08-26 12:26:46 -04:00
Jim Chen
ab92abb418 Bug 1296744 - Make cameraCallbackBridge use new native JNI bindings; r=snorp
Make the GeckoAppShell.cameraCallbackBridge callback use the new native
JNI bindings. Also refactor the relevant code in GeckoAppShell and
CameraStreamImpl.
2016-08-26 12:26:46 -04:00
Jim Chen
d924b1c615 Bug 1297836 - Get surface when creating or resuming compositor; r=snorp
Get rid of LayerView.Compositor.getSurface and just pass in the surface
when creating or resuming the compositor. That also lets us get rid of
some synchronization required for getSurface.
2016-08-26 12:25:57 -04:00
Jim Chen
4c8cec0df5 Bug 1297836 - Don't use WindowEvent for LayerViewSupport; r=snorp
Now that nsWindow doesn't own LayerViewSupport, we shouldn't be using
WindowEvent for LayerViewSupport calls. This patch converts the calls
that dispatch to proxy to dispatch directly to Gecko. For
SyncResumeResizeCompositor, it used a proxy to call OnResumedCompositor
on the Gecko thread; this patch makes SyncResumeResizeCompositor post an
event to call OnResumedCompositor directly, without going through the
proxy.
2016-08-26 12:25:57 -04:00
Jim Chen
da50d1a62c Bug 1297462 - Combine Java exception stack code paths; r=snorp
Right now we report Java exception stacks through two code paths:
- GeckoAppShell.reportJavaCrash for exceptions caught by Java code
- jni::HandleUncaughtException for exceptions caught by native code

This patch combines the code for reporting the Java stack trace into
ReportException, to make it easier to add new features such as reporting
OOM exceptions.
2016-08-26 12:25:57 -04:00
Jim Chen
c25482dbd4 Bug 1297462 - Always handle uncaught Java exception in native code if possible; r=snorp
We used to only handle certain exceptions in native code, and otherwise
forward the exception to Java handling code. Handling exceptions in
native code gives us better native stack traces in crash reports, so
this patch makes us always handle uncaught Java exceptions in native
code if possible, and only forward to Java as a fallback.
2016-08-26 12:25:57 -04:00
Michael Kaply
5f7726a793 Bug 1294730 - Send distribution referrers to Adjust. r=rnewman 2016-08-26 09:26:42 -05:00
Ryan VanderMeulen
e1fdfb3b73 Merge inbound to m-c. a=merge 2016-08-26 09:37:03 -04:00
Ryan VanderMeulen
aec08e3182 Merge fx-team to m-c. a=merge 2016-08-26 09:26:49 -04:00
Shih-Chiang Chien
1a2dc51208 Bug 1228526 - Part 2, show devices supported request URL in selection prompt dialog. r=chunmin
MozReview-Commit-ID: FYR2ruFsyGy

--HG--
extra : rebase_source : f0ffe43b6c0f24df6ed55750c7113e758a66710c
2016-08-23 17:57:33 +08:00
Matthew Noorenberghe
3803d21cec Bug 1297905 - Remove usage of getAllDisabledHosts in sanitize implementations. r=liuche,markh
Bug 1058438 moved disabled hosts to the permission manager which are already cleared by these modules.

MozReview-Commit-ID: InprrYLvjMR

--HG--
extra : rebase_source : 806c2542cbab953b74ad82611501ecac32400930
2016-08-24 17:41:10 -07:00
Wes Kocher
f78f2d693b Merge inbound to central, a=merge 2016-08-25 16:59:00 -07:00
Rob Wu
be3652cd57 Bug 1287010 - Make environment of Context explicit. r=billm
- Add `envType` to BaseContext.
 - Pass an explicit envType to all `registerSchemaAPI` invocations.
 - The factories passed to `registerSchemaAPI` will be split up later, so
   that content scripts (`content_child`) and addon pages can share
   common implementations.
 - The factories that implement the addon API will also be split up,
   to separate code running in the main process (`addon_parent`) from
   code running in a child process (`addon_child`).
 - Remove the use of a hardcoded list of `namespaces` from ProxyContext.
   Now `envType` is used to specify whether an API should be activated.

MozReview-Commit-ID: Jiff8HIwG92

--HG--
extra : rebase_source : 946a3c0009a4e3223c2d10044b3099a94c845394
2016-08-16 15:51:50 -07:00