Commit Graph

19988 Commits

Author SHA1 Message Date
Carsten "Tomcat" Book
e41e2a34ce Merge mozilla-central to mozilla-inbound 2016-04-23 10:51:51 +02:00
Grigory Kruglov
22abdf585b Bug 1266232 - be extra careful and mindful of performance when migrating visits r=mcomella
1) Use prepared SQL insert statement for insertions
1.2) Use ON CONFLICT IGNORE for our inserts, to avoid failing on possible data clashes
2) Don't synthesize "visits since last sync" - it's bound to cause problems, for not much benefit
3) Fix up some minor issues, cleanup code and add sanity checks
4) If there's evidence Sync was enabled at some point, mark synthsized visits as remote. Otherwise, as local.

MozReview-Commit-ID: Gd94A6r4rW

--HG--
extra : rebase_source : e4f74e3d1d286e1107e5a1764ae8ea3fd5ff3ff2
2016-04-22 23:18:04 -07:00
Michael Comella
029b25ac6a Bug 1266820 - Disable Screenshot in Bookmarks feature. r=grisha r=grisha
See code comment (and related bug) for details.

MozReview-Commit-ID: EDzIBftjJRU

--HG--
extra : rebase_source : 94721323a4372010941dcce034093d3f0d1ac95c
2016-04-22 11:23:36 -07:00
Mark Capella
d720d7d792 Bug 1257843 - Probe to measure when user enters text selection UI, r=sebastian 2016-04-22 16:44:47 -04:00
Grigory Kruglov
24a83ce171 Bug 1265979 - missing call to provider.shutdown() causing test failures r=sebastian
MozReview-Commit-ID: 3jJTDKGtXok
2016-04-22 13:34:31 -07:00
Ting-Yu Lin
58b43c50d0 Bug 1266715 - Fix space between blinking cursor/selection highlight and the caret. r=snorp
MozReview-Commit-ID: 42ceKrat7WI

--HG--
extra : rebase_source : 83b456e67dd6e71392e869425df996a582b78a40
2016-04-22 20:36:05 +08:00
Chris Manchester
c2a2f2b51f Bug 1257958 - Move MOZ_ANDROID_APZ to Python configure. r=nalexander
MozReview-Commit-ID: EPhThmQjKXF
2016-04-22 13:01:22 -07:00
Chris Manchester
783f8c96b4 Bug 1257958 - Move MOZ_SWITCHBOARD to Python configure. r=nalexander
MozReview-Commit-ID: CRWP2JugKeA
2016-04-22 13:01:22 -07:00
Chris Manchester
04dce3d8f2 Bug 1257958 - Move MOZ_ANDROID_DOWNLOAD_CONTENT_SERVICE to Python configure. r=nalexander
MozReview-Commit-ID: 3ijJ6b7hxPf
2016-04-22 13:01:22 -07:00
Chris Manchester
d3e163bb6c Bug 1257958 - Move MOZ_ANDROID_MLS_STUMBLER to Python configure. r=nalexander
MozReview-Commit-ID: IFyL9mirNyt
2016-04-22 13:01:22 -07:00
Chris Manchester
e45d29aa24 Bug 1257958 - Move MOZ_ANDROID_SEARCH_ACTIVITY to Python configure. r=nalexander
MozReview-Commit-ID: blxsCpUK1m
2016-04-22 13:01:22 -07:00
Chris Manchester
1f291036d3 Bug 1257958 - Move MOZ_ANDROID_BEAM to Python configure. r=nalexander
MozReview-Commit-ID: DrJSWZwaC5d
2016-04-22 13:01:21 -07:00
Chris Manchester
ca89af719c Bug 1257958 - Move MOZ_ANDROID_DOWNLOADS_INTEGRATION to Python configure. r=nalexander
MozReview-Commit-ID: Alu8Qbtm4U3
2016-04-22 13:01:21 -07:00
Chris Manchester
303634f7fa Bug 1257958 - Move MOZ_ANDROID_GCM to Python configure. r=nalexander
MozReview-Commit-ID: 90vbYKB8rHJ
2016-04-22 13:01:21 -07:00
Chris Manchester
0a92603b8c Bug 1257958 - Move MOZ_LOCALE_SWITCHER to Python configure. r=nalexander
MozReview-Commit-ID: XcUdSQgVIg
2016-04-22 13:01:21 -07:00
Chris Manchester
394425a743 Bug 1257958 - Move MOZ_ANDROID_EXCLUDE_FONTS to Python configure. r=nalexander
MozReview-Commit-ID: 1bzIu2MA9qu
2016-04-22 13:01:21 -07:00
Nicholas Hurley
65e701bed3 Bug 1122642 - Have an error page for H2 INADEQUATE_SECURITY r=mcmanus,bz 2016-04-22 09:56:42 -07:00
Carsten "Tomcat" Book
24969b7621 Merge mozilla-central to mozilla-inbound 2016-04-22 15:57:43 +02:00
Carsten "Tomcat" Book
461379e456 merge mozilla-inbound to mozilla-central a=merge 2016-04-22 15:56:10 +02:00
Sebastian Kaspari
4d4e8baaee Bug 1266668 - Remove Nightly flags from new ActionBar and floating text selection. r=capella
MozReview-Commit-ID: KpIJeCn2Gj4

--HG--
extra : amend_source : 66eb4430e2bde29b50a15d7183c5c28dff442ce5
2016-04-22 12:19:23 +02:00
Carsten "Tomcat" Book
72c1e6f5ac Backed out changeset 2271b0c11307 (bug 1033450) for crashtest failures
--HG--
extra : rebase_source : 47e1b5bf38d1d8e531e6c341c2d1c1051fd5c58d
2016-04-22 10:37:40 +02:00
Carsten "Tomcat" Book
c5e089ec4e Backed out changeset 1b5ef8bb25d8 (bug 1259598) for bustage 2016-04-22 06:57:05 +02:00
Ting-Yu Lin
87d7ee9f5c Bug 1262755 - Enlarge caret touch target by 59% for Fennec. r=capella,snorp
Enlarge the touch target of the caret to the left, bottom, and right by
59% (13px) per bug 1262755 comment 7.

Since the touch target becomes larger, the carets on the <input> in
previous test might cause the next test to fail on <textarea> because it
will press on the caret when trying to focus on <textarea>. Add <br>
elements to testAccessibleCarets.html to separate these test fields.

MozReview-Commit-ID: JIwmuHJ2QsQ

--HG--
extra : rebase_source : 6fbfede7cc0e395402b5858d74480dcdd5606c35
2016-04-22 18:23:47 +08:00
Ting-Yu Lin
bcbf8175b8 Bug 1249201 Part 2 - Show carets continuously when panning or zooming. r=mats,sebastian
Add a pref "layout.accessiblecaret.always_show_when_scrolling" defaults
to true on all platforms except b2g. When it is set to false, the carets
will be hidden during scrolling, which is the current behavior before
applying this change.

The pref "layout.accessiblecaret.extendedvisibility" was added for
Fennec to keep ActionBar open when carets temporarily hiding during
panning or zooming. Now we make carets always show by default, so the
pref can be removed. However, the floating toolbar still need to be
notified when the scrolling begins, so we dispatch "scroll" instead.

In gtest, the preference changes were in the middle of the test
function. To make the preference change clearer, I add new pref changes
or move the existing ones to the beginning of the test functions.

The 250ms transition effect added in ua.css is per request of UX
designer in bug 1249201 comment 12.

MozReview-Commit-ID: 8NGvDLPbtNY

--HG--
extra : rebase_source : 3f7a9ebdf4c70b0282dbf9e8f18cbe5cca656dbe
2016-04-21 16:53:40 +08:00
dimi
e56e41f353 Bug 1033450 - consolidate safebrowsing prefs in all.js. r=francois
MozReview-Commit-ID: IKQ1wPHOY17

--HG--
extra : rebase_source : 62bce62fcb9781b6e99c1c43f15ee13e27d77e5e
2016-04-14 15:49:17 +08:00
Carsten "Tomcat" Book
23bcfcba57 Backed out changeset f71acdbd0d45 (bug 1033450) for wrong patch landed
--HG--
extra : rebase_source : a8c1947330e0f156410b6095ff91e0c723f6b50e
2016-04-22 06:01:11 +02:00
Sebastian Kaspari
46b5b88e2d Bug 1261836 - Content notifications: Check if new content is already in history. r=mcomella,mfinkle
If the URL of new content is already in the user's history then we won't show a notification
for it.

MozReview-Commit-ID: B26SBvXOnxY

--HG--
extra : rebase_source : 5fe3d6ad40939bfe5e842d075c1b0abc1226ac10
2016-04-13 13:01:52 +02:00
Margaret Leibovic
32cd130e13 Bug 1257513 - Remove bookmark-history-menu experiment, show menu items by default. r=liuche
MozReview-Commit-ID: 9mT8eOABokH

--HG--
extra : rebase_source : 055a65ca06f81f833ace46a2726cbbded619e083
2016-04-19 18:35:50 -04:00
Carsten "Tomcat" Book
55fea48a3f Backed out changeset 637e80ab4fca (bug 1262755) for rc4 android perma failures
--HG--
extra : rebase_source : 26893c1afaa1c4fc23808b92d8738d847d9ff5f3
2016-04-22 09:12:50 +02:00
Victor Ng [:vng] [:crankycoder]
fe18320467 Bug 1259598 - "Add new information fields to geolocation stumbles". r=michelangelo sr=hschlichting 2016-04-09 05:34:00 +02:00
Wes Kocher
6d4a2cf6c0 Merge m-c to fx-team, a=merge
MozReview-Commit-ID: m0xI0OSGys
2016-04-21 15:03:13 -07:00
Wes Kocher
aac511837d Merge inbound to m-c a=merge
MozReview-Commit-ID: GW9vcSRPgYc
2016-04-21 14:41:08 -07:00
Chenxia Liu
1810ec6aad Bug 1262343 - Add reference to remote tabs empty layout for future use. r=sebastian
MozReview-Commit-ID: LUnrurHtdlY

--HG--
extra : rebase_source : d4203987e8f9de50a9f837c2de1246955b1f8f9c
extra : histedit_source : ec8b1c5b177b55c1a7886c05097b4f2dcad517a3
2016-04-20 17:28:53 -07:00
Chenxia Liu
27a0c4c5ee Bug 1262343 - Remove old Synced panel code. r=sebastian
MozReview-Commit-ID: FjRaX14gJ17

--HG--
extra : rebase_source : a5648748db28e6f2618bf8b0e447225b2ff371ee
extra : histedit_source : 5db443112959057f8e27f70891540cc26c9180da
2016-04-20 11:55:48 -07:00
Chenxia Liu
499725892b Bug 1262343 - Remove old History panel code. r=sebastian
MozReview-Commit-ID: LZX264R3H35

--HG--
extra : rebase_source : 9fd38cb4682055bf20ce6c5786ad6cb0a98b820d
extra : histedit_source : d72847bb324ac14026fbe16b678616279c34472a
2016-04-20 11:41:49 -07:00
Chenxia Liu
f0fb70d663 Bug 1263941 - History is not displayed in the 3-dot menu if History panel is set as default after it was hidden. r=sebastian
MozReview-Commit-ID: 1hSKJd0r0fv

--HG--
extra : rebase_source : a9e9a1e75b36d3e40523b9ca7f16785e0ab5a67f
2016-04-20 11:03:35 -07:00
Margaret Leibovic
260d62a846 Bug 1246988 - Update Bing icon for Search. r=sebastian
MozReview-Commit-ID: 77BPBznFeYG

--HG--
extra : rebase_source : ffaa54cb489b474d84d6b3f643be180f1209880d
2016-04-20 10:52:22 -04:00
Wes Kocher
c65b052530 Merge m-c to inbound, a=merge
MozReview-Commit-ID: Aas4kEyBseh
2016-04-20 14:19:25 -07:00
Nathan Froyd
681b252385 Bug 1266197 - fix robocop warning about nsIDOMWindowInternal; r=gbrown
The warning message tells us to just use nsIDOMWindow, so let's do that.
Less warning spam is a win.
2016-04-20 16:32:15 -04:00
Jim Chen
983f3c49d1 Bug 1252650 - Send event response even if GeckoApp is not active; r=me
Enable sending event response when Gecko state is PROFILE_READY. This
happens when Gecko is loaded in the background and GeckoApp is not
active. This is safe because it's only a response to an event from
Gecko, so there is definitely a listener for the response on the Gecko
side already. r=me for a trivial change.
2016-04-20 15:06:13 -04:00
Jim Chen
4018bd63a8 Bug 1252650 - Use GeckoService to launch Gecko for incoming push messages; r=nalexander
Use GeckoService to launch Gecko using the correct profile and load push
service, if necessary.
2016-04-20 15:06:13 -04:00
Jim Chen
99c7d96804 Bug 1252650 - Add GeckoThread.canUseProfile; r=snorp
canUseProfile returns whether we're currently using the given profile or
we can potentially start Gecko with the given profile.
2016-04-20 15:06:13 -04:00
Jim Chen
dc18692d89 Bug 1252650 - Add intent to create XPCOM services in GeckoService; r=snorp
Add support for Intents that launch GeckoService and create services
based on a category registered with the category manager.
2016-04-20 15:06:13 -04:00
Andrzej Hunt
9187edc788 Bug 1264381 - Add comment explaining lack of SQLite forward-compatibility r=mcomella
MozReview-Commit-ID: J84s62BsoPJ

--HG--
extra : rebase_source : 024fbb89590f35beeec577028e4f199a363d836e
2016-04-13 11:16:51 -07:00
dimi
8cd19f9a1f Bug 1033450 - Consolidate safebrowsing prefs in all.js. r=francois
MozReview-Commit-ID: EA2H08dlCLl

--HG--
extra : rebase_source : 9dfa4af8b71b48c7841b3d5d07c106e24ae0ee05
2016-04-20 00:44:52 -07:00
Grigory Kruglov
c48450bfbd Bug 1265971 - Style fix to make checkstyle happy r=grisha
MozReview-Commit-ID: FjqK8T5IcEt

--HG--
extra : transplant_source : %E3%A8L%3C%AE%0E%00%052T%8D%E9%1Bx%A7%7B%95V%E6%A1
2016-04-19 23:12:27 -07:00
Mathieu Leplatre
93af383736 Bug 1257556 - Generalize Kinto blocklist client to addons/plugins/gfx. r=MattN
MozReview-Commit-ID: DkiNF78QTId

--HG--
extra : transplant_source : %90K%5D%89%3AZW%CC%97%FE%BF%D9%CD%A5%F8%18%08%85%B02
2016-04-18 11:38:25 +02:00
Grigory Kruglov
53f2edfa45 Bug 1046709 - Post: remove dead code r=nalexander
MozReview-Commit-ID: K75KTg6pDEV

--HG--
extra : transplant_source : %93%E6%25%C9%C2%EF%96%11%E2%90%04%E9g%0A%CA%15%B9zo%AA
2016-04-07 19:08:42 -04:00
Grigory Kruglov
a8a4a8f16c Bug 1046709 - Part 5: Delete history db extensions related stuff r=nalexander,rnewman
- class
- tests

MozReview-Commit-ID: LwHo5Ej2FGS

--HG--
extra : transplant_source : %DFt%9B%C6gy%F3q%90%7Fc%FE%22%B5%BD%F85%FE%E4%1A
2016-04-12 15:52:53 -07:00
Grigory Kruglov
774870136d Bug 1046709 - Part 4: Sync changes r=nalexander,rnewman
- insert/merge visits on "sync down"
- ensure to attach visits on "sync up"
- tests

MozReview-Commit-ID: 4OmyQS5JSm7

--HG--
extra : transplant_source : %F0%A8fs%AB%90%EC%2C-%8B%7D1%E1h%FF%97%DAVT%28
2016-04-13 16:33:36 -07:00