Commit Graph

20665 Commits

Author SHA1 Message Date
Wes Kocher
59c25d40ac Merge m-c to fx-team, a=merge 2016-07-05 17:13:25 -07:00
Kartikaya Gupta
8296f93061 Bug 1283582 - Stop displaying the context menu in Fennec if web content did a preventDefault on the event. r=margaret
MozReview-Commit-ID: 4JQwXNfJxip
2016-07-05 10:09:38 -04:00
Jim Chen
dbbc213968 Bug 1280446 - Create PushService if needed; r=snorp
If PushService has not been created when getInstance is called, create
the PushService instead of throwing an error. This fixes a possible race
condition between initializing PushService and receiving a push message,
where we can receive a push message first.
2016-07-05 14:34:57 -04:00
Grigory Kruglov
b4787fd138 Bug 1278644 - Stable getItemID implementation for ClientsAdapter r=sebastian
MozReview-Commit-ID: AH0wgVKBMYo

--HG--
extra : rebase_source : 34e97821cbcf4211ebd87317435be8e5dfeec58a
2016-06-28 17:18:23 -07:00
Grigory Kruglov
10457d8050 Bug 1278644 - Stable getItemId implementation for VisitedAdapter r=sebastian
MozReview-Commit-ID: AwiwGAVRA3k

--HG--
extra : rebase_source : 2af8f4e2b77977b2d634c8f013aaa5ef5b3ee517
2016-06-28 16:04:09 -07:00
Grigory Kruglov
76dad02030 Bug 1278644 - Stable getItemId implementation for CombinedHistoryAdapter r=sebastian
MozReview-Commit-ID: EylBNeI9Xwp

--HG--
extra : rebase_source : 2da5ae91c3f8cc13078a6b1b252463cf2681d2e7
2016-06-28 15:16:59 -07:00
Carsten "Tomcat" Book
3a42c363cc merge mozilla-inbound to mozilla-central a=merge 2016-06-30 12:33:41 +02:00
James Willcox
dfd9e9a816 Bug 1280666 - Expose velocity (speed) from StackScroller and use in APZC r=rbarker 2016-06-29 17:09:55 -07:00
James Willcox
75d5558c2f Bug 1280666 - Use StackScroller from Chrome for fling animations r=rbarker 2016-06-29 17:09:55 -07:00
James Willcox
718f23f9d0 Bug 1280666 - Allow class annotations to set defaults for members when generating Java bindings r=jchen 2016-06-29 17:09:55 -07:00
Matthew Wein
569e667c08 Bug 1270742 - Add support for default_icon in chrome.pageAction r=kmag
MozReview-Commit-ID: D9uR0JUXJwx

--HG--
extra : transplant_source : %FC%FBu%0Cboh%DFv%BB%8D%AC%20%ED%A5%E1%3E%DE%126
2016-05-23 15:59:33 -07:00
Cykesiopka
9533a3d17b Bug 1281661 - Ensure input to NSSDialogService prompt messages are HTML escaped to avoid HTML injection. r=kats,keeler
As of the writing of this patch, NSSDialogService pops up a prompter on
Android as follows (assuming at least one label is requested):
1. NSSDialogService.js calls Prompt.jsm methods and eventually requests the
   prompt be displayed.
2. Prompt.jsm sends a messages to the Java side.
3. The Java side receives the message and eventually calls
   org.mozilla.gecko.prompts.PromptInput.LabelInput.getView().
4. LabelInput.getView() calls android.text.Html.fromHtml().

At no point is any HTML injection prevention done, so in theory NSSDialogService
could be an injection vector.

In practice, it appears that fromHtml() doesn't actually allow anything malicious
to be done. This patch introduces HTML escaping at the NSSDialogService
level just to be safe.

MozReview-Commit-ID: LhHuZKSqx01

--HG--
extra : transplant_source : l%C9%A2%95%9A.%05%1F%CF%5D%02%5E%12N%C1%B7O%7C%1B%8B
2016-06-29 18:48:49 -07:00
Jonathan Almeida (:jonalmeida)
7126808eeb Bug 1268608 - Toolbar hiding should be a snappy, constant speed r=sebastian
By changing the Interpolator to be linear instead of decelerating, we should
see an animation with constant speed. I've also reduced the animation time
from 250 milliseconds to 150 to give it a snappier feel.

MozReview-Commit-ID: LBsdxG0lyvX

--HG--
extra : rebase_source : ef2f1fb0d9e18ce4f23932355e40888355411b36
extra : amend_source : f9f1a0763ac785c4e115a5be78fddb7a83000270
2016-06-23 08:16:51 -07:00
Grigory Kruglov
5291e6bd1b Bug 1280409 - Guard against cursor failures while migrating data from HistoryExtensionsDB r=sebastian
MozReview-Commit-ID: 138SK46rgfi

--HG--
extra : rebase_source : 5c135250a81088bb5c838a4abd352fbbe80ae8d7
2016-06-23 06:04:59 -07:00
Grigory Kruglov
c45d52c91f Bug 1278301 - Exclude history items from Top Sites which were not visited locally r=sebastian
MozReview-Commit-ID: 7wFOwvIz4k4

--HG--
extra : rebase_source : 5cba7d932f4ff4e2fd8d4868500e0071f4b2b3fa
2016-06-28 17:33:21 -07:00
SUN Haitao
bacd8f992e Bug 1282222 - Make the PersistentNotificationHandler handle 'persistent-notification-close' ;r=kitcambridge
MozReview-Commit-ID: 4S4ijAQV2tG

--HG--
extra : transplant_source : %40%9F%F3%B0%9C%E8u%CB%CAv%2AN%144%97%D3%FD%C5nt
2016-06-25 23:58:03 +08:00
SUN Haitao
e4f71beba8 Bug 1282222 - Add a 'deleteIntent' parameter to the 'NotificationClient.add' method ;r=jchen
MozReview-Commit-ID: GOwCi2LkFTm

--HG--
extra : transplant_source : %20%5E%ABJ%3Ey%B7C%91%82%B8T%E2%A7%EF%1A8%EE%E3%9C
2016-06-25 23:17:50 +08:00
SUN Haitao
3f32818ede Bug 1282222 - Clean up 'NotificationClient.java' ;r=jchen
MozReview-Commit-ID: 141QdoXyWaf

--HG--
extra : transplant_source : %E8G%D7M%EFKu%8C%90%F3oGe%9BO%40%FA%F0%01P
2016-06-26 11:41:11 +08:00
Michael Comella
90db3fb96b Bug 1280405 - Add windowActionBar to theme in base configuration. r=ahunt
MozReview-Commit-ID: GCCzveppDDl

--HG--
extra : rebase_source : dcaa7a5138439e4aa0ef91f8c560b469fe4a0200
extra : source : 1abbe06c608ed0c8e83c17f9aeb803de1510eefd
2016-06-27 15:40:33 -07:00
Grigory Kruglov
006cafb26b Bug 1282621 - Let GeckoAppShell queue up network state events if GeckoThread isn't in RUNNING state r=sebastian
When launching fennec while device is offline, we would often not send these events to Gecko,
and it wouldn't know to load tabs from cache. sendEventToGecko would queue up our events for us if GeckoThread isn't
in the RUNNING state, so let's rely on that mechanism instead. It's possible that we will have a succession of network
state events which aren't valid by the time they're actually sent, but as long as event queue is FIFO, it should be ok.

MozReview-Commit-ID: BCiO2EozUnx

--HG--
extra : rebase_source : 3935444f69be9171aa60a8f4b3e5db29035ecb6c
2016-06-27 17:29:25 -07:00
Grigory Kruglov
62bfd62453 Bug 1282621 - Pre: correctly treat results of registerReceiver call r=sebastian
registerReceiver returns the first sticky intent which matches our filter, or null
if there aren't any. Remove the log statement about "failed registration", since null just
means that we haven't had any sticky broadcasts for this filter yet.

MozReview-Commit-ID: KA2Rxt2fk2T

--HG--
extra : rebase_source : 37adcb2a240f36466a95bc34c904dece422e9bbd
2016-06-27 17:24:18 -07:00
Andrzej Hunt
9530eee446 Bug 1228593 - Save session store data when quitting fennec r=janh
MozReview-Commit-ID: 13zaHfYgB3U

--HG--
extra : rebase_source : d30d975ca6bfd6e0a9e63fadc526c34cf3f85324
2016-06-07 13:48:19 -07:00
Carsten "Tomcat" Book
bd81760f9c Merge mozilla-central to fx-team 2016-06-28 16:14:58 +02:00
Carsten "Tomcat" Book
261fe13dcd merge mozilla-inbound to mozilla-central a=merge 2016-06-28 16:09:05 +02:00
Carsten "Tomcat" Book
faeec86517 merge fx-team to mozilla-central a=merge 2016-06-28 16:06:34 +02:00
Carsten "Tomcat" Book
c1cb5a12bd Backed out changeset 00312b136937 (bug 968273) for causing regressions 2016-06-28 10:03:25 +02:00
Sebastian Kaspari
e3ba50f742 Bug 1266369 - FloatingToolbarTextSelection: Add an offset to the content rect to avoid overlap. r=ahunt
MozReview-Commit-ID: HNkTOAS7toJ

--HG--
extra : rebase_source : abac9b07dc349624139b241dfaed708be7b0b6f6
2016-06-27 13:47:32 +02:00
Sebastian Kaspari
788773e232 Bug 1266369 - (Pre) FloatingToolbarTextSelection: Add final keyword where feasible. r=ahunt
MozReview-Commit-ID: DF7qmGXMfEy

--HG--
extra : rebase_source : b6f80574151901304755cc114bd3e136cac25bb0
2016-06-27 11:51:32 +02:00
Andrzej Hunt
ac79e826e2 Bug 1280539 - don't open topsites into reader view if stored as offline reader-view page r=sebastian
By default, i.e. for most lists in the homepanels, we want to open the offline reader-view version
of a page if the page is stored as an offline reader-view bookmark (TwoLinePageRow shows the bookmark
and offline status for pages, not only in bookmarks, but also in the list of top sites, awesomescreen
results, and history). The only exception is the topsites grid, where we don't offer any indication
of the bookmark or offline status of a page. For now the expectation is that topsites open the
normal version of a page, so we need to bypass the usual flow for that case.

(It's possible the UI around this would change in future, but with the current UI this is probably
 the most obvious / least frustrating behaviour.)

MozReview-Commit-ID: BMpGG4KQ62w

--HG--
extra : rebase_source : a223304451e46e1c0429c5b3bcd9be6d43bf9428
extra : amend_source : 462ea5b54781fd8c534a4a4a484fd60714e3f40d
2016-06-27 22:23:08 +02:00
Wes Kocher
c73d13f1bb Merge m-c to fx-team, a=merge 2016-06-27 14:09:55 -07:00
Andrzej Hunt
c44bdd8061 Bug 1235599 - Add basic UrlMetadata tests r=mcomella
MozReview-Commit-ID: J7zSI7E9jb7

--HG--
extra : rebase_source : c94250f0bdff18c7f1b1dc4fe3de3a5daaab03e9
2016-06-06 13:08:55 -07:00
Andrzej Hunt
2d9c9a3ae2 Bug 1235599 - Make UrlMetadataTable.CONTENT_URI public to allow using in tests r=mcomella
MozReview-Commit-ID: EFDX4uihBqz

--HG--
extra : rebase_source : 94016bc76e857681b3cf223038617223d8e13056
2016-06-06 13:06:43 -07:00
Grigory Kruglov
fb7d509986 Bug 1278980 - Add OPENED_FROM_TABS_TRAY event, and use it to trigger "offline version" snackbar r=sebastian
For now, this event is only going to be used to cover a narrow edge case around
display of the "Showing offline version" snackbar, so let's not overthink it.

MozReview-Commit-ID: Cd9q7kwnjjQ

--HG--
extra : rebase_source : ebf8656565fef1b6969fb89de20fdd62a64e5043
2016-06-24 18:06:55 -07:00
Sebastian Kaspari
b5e1002bdb Bug 1282423 - browser.js: Fix wrong open search expression. r=margaret
MozReview-Commit-ID: KUXP4qcV7sM

--HG--
extra : rebase_source : ac0a1c618445621e779f04d721b9192d8ea2c84e
2016-06-27 15:33:35 +02:00
Thomas Nguyen
6075feb383 Bug 1025965 - Migrate browser.safebrowsing.enabled to browser.safebrowsing.phishing.enabled. r=paolo.mozmail
MozReview-Commit-ID: KFWofvaZuw7
2016-06-23 12:25:32 +08:00
Andrzej Hunt
ba3a5ca06f Bug 1282372 - Remove tab count transparency/flickering workaround r=sebastian
This issue has been fixed in the latest Android N preview, we should
remove the workaround to simplify the code.

MozReview-Commit-ID: 6xwIA5QzzhQ

--HG--
extra : rebase_source : dc84f80591ffe2fe779c1649f15376cc29d32662
2016-06-27 10:22:18 +02:00
Phil Ringnalda
98d7a9d9c5 Merge m-i to m-c, a=merge 2016-06-25 16:23:43 -07:00
Grigory Kruglov
26648ad110 Bug 1277467 - Add OfflineTabStatusDelegate for displaying tab-is-offline notifiations when appropriate r=sebastian
- Use Content:PageShow event to inform Tabs that they were actively loaded from cache
- Move offline notification logic away from browser.js and into a delegate, which displays notifications when
tab in question is user-visible

MozReview-Commit-ID: 2qCACHyWOlp

--HG--
extra : rebase_source : 457a42ebba5cfc32ab7dabce0a8a11d6511b9c08
2016-06-24 16:56:04 -07:00
Grigory Kruglov
c09864a3eb Bug 1277467 - Pre: Add ForegroundAwareDelegate to help track if Gecko tabs are user-visible r=sebastian
MozReview-Commit-ID: KZavLxL4u8V

--HG--
extra : rebase_source : 9c19cd72e0dc19d5c80bb1bf7fd2177c14862056
2016-06-22 06:31:27 -07:00
Wes Kocher
bf02c9e2f4 Merge m-c to fx-team, a=merge 2016-06-24 13:41:56 -07:00
Wes Kocher
ef24c234ed Merge inbound to central, a=merge 2016-06-24 13:37:12 -07:00
Sebastian Hengst
2e51abafdb Backed out changeset 1008f5b88e6b (bug 1270742) for failing browser_ext_browserAction_context.js. r=backout 2016-06-24 13:00:31 +02:00
Cykesiopka
577a05865b Bug 307081 - Make nsIClientAuthDialogs::ChooseCertificate() pass an nsIArray of nsIX509Certs, not strings. r=kats,keeler
This provides implementations of ChooseCertificate() with more flexibility, and
allows callers of ChooseCertificate() to be less complex.

A portion of this work involves reimplementing
nsNSSCertificate::FormatUIStrings() in JS and improving UI strings for l10n.

MozReview-Commit-ID: CE7Uc2ntwmZ

--HG--
extra : transplant_source : R%A8eC%CEO2%DC%20%F7%B4V%F3g%E6h%EB%D5%8D3
2016-06-24 00:12:16 -07:00
Cykesiopka
313db6b516 Bug 307081 - Clean up nsIClientAuthDialogs.idl and implementations. r=kats,keeler
This fixes the following in the IDL:
1. Misleading or unclear parameter names in the IDL. |cn| in practice is the
   concatenation of the CN of the server cert and the port of the server, and
   |issuer| is the Organization of the issuer cert of the server cert.
2. Use of the |wstring| type. |AString| is generally preferred, and has the
   benefit of letting implementations skip null checks due to the use of
   references.
3. Using an explicit |canceled| outparam instead of just setting a return type.
   There is no need for the outparam if the return type can be used.
4. Using |long| (int32_t) for |selectedIndex|. |unsigned long| (uint32_t) is
   more logical, and paves the way for future changes.

This fixes the following in the Android implementation:
1. Lack of checks to ensure the QueryInterface() call succeeded. In practice,
   the call will always succeed, but it's good practice to check anyways.
2. Setting a variable to an nsIPrefService instance initially, then later
   setting it to a pref branch instance later on. This is confusing and
   unnecessary.

This fixes the following in the desktop implementation:
1. Lack of null pointer checking.
2. Trying to get a parent window ref off a context that doesn't actually support
   doing so.
3. Setting a variable to an nsIPrefService instance initially, then later
   setting it to a pref branch instance later on. This is confusing and
   unnecessary.
4. Abusal of the CAPS bundle.
5. Unnecessary variables.
6. Variables declared far away from where they are used.
7. Variable shadowing.
8. Style issues.
9. Lack of documentation.

This also fixes the following:
1. Lack of localisation notes.

MozReview-Commit-ID: FTc6XecJd6h

--HG--
extra : transplant_source : %ABQ%8F%E6%A3%25%FE%94%E4%D6X%3D%28%2C%05%5E%FB%84.-
2016-06-24 00:12:11 -07:00
Cykesiopka
a9d0602102 Bug 307081 - Fix buggy Android implementation of nsIClientAuthDialogs::ChooseCertificate(). r=kats
This fixes two issues:
1. Passing a literal 1 as the |length| argument to formatStringFromName(). This
   is obviously incorrect and should instead be the length of the given arg
   list.
2. Directly setting the |selectedIndex| outparam to a number. XPIDL outparams
   on the JS side are actually objects that wrap the true outparam value, which
   must be accessed via |.value|.

MozReview-Commit-ID: BJObQfcV5G7

--HG--
extra : transplant_source : %11%B2TD%F5%C3%84%BD%C1%7B%3B%1Em%EC%CA%CAu%E5%3Dq
2016-06-24 00:12:01 -07:00
Jonathan Almeida (:jonalmeida)
e5b695ac3d Bug 1075476 - Removing download notification restarts Firefox r=sebastian
MozReview-Commit-ID: 35pn1nntcsV

--HG--
extra : rebase_source : 0b8725fcebf7bb2e64c2e0326b0c7cae2e6e23b4
2016-05-25 14:18:10 -07:00
Krishna
069781cf8d Bug 1280769 - Add Hyphenation Dictionary as separate kind. r=sebastian
MozReview-Commit-ID: G2JLzqpZ1wa

--HG--
extra : transplant_source : %27%C3%08%AF%C7%C0YC%23v%E4%97%CC%B7%7D%12qkTm
2016-06-21 02:06:35 +08:00
Matthew Wein
48b0f752e6 Bug 1270742 - Add support for default_icon in chrome.pageAction. r=kmag
MozReview-Commit-ID: D9uR0JUXJwx

--HG--
extra : transplant_source : %D2%EEUA%D1%C7Yp%88E%851%200n%90%D7%8F%0C%F4
2016-05-23 15:59:33 -07:00
J. Ryan Stinnett
c91928a953 Bug 1253399 - Avoid crashes by checking for QR scanner app. r=sebastian
MozReview-Commit-ID: 6bFrYyt4pzX
2016-06-23 11:59:57 -05:00
Nicholas Rosbrook
9dcffb4d88 Bug 1264835 - Updated DefaultDoorHanger so that the default CheckBox state could be specified as an option. r=sebastian 2016-06-17 18:29:15 -07:00