Commit Graph

37301 Commits

Author SHA1 Message Date
Kit Cambridge
4c26a7b758 Bug 1258127 - Move bookmark deletion logic into PlacesSyncUtils.bookmarks.remove. r=tcsc
This patch moves most of `BookmarksStore::deletePending` and
`BookmarksStore::_shouldReviveRemotelyDeletedRecord` into
`PlacesSyncUtils.bookmarks.remove` and `touch`, respectively. Both
methods use the same approach as `PlacesSyncUtils.bookmarks.dedupe` to
amend the `_modified` changeset with new change records.

We use the new `SYNC_REPARENT_REMOVED_FOLDER_CHILDREN` change source to
bump the change counters for the reparented items and their new
parents, without bumping the score and triggering extra syncs.

MozReview-Commit-ID: 1SZvygWNkgL

--HG--
extra : rebase_source : 97fdac6ccb0d0326a3da7e42259dc6a961994ac3
2016-11-17 15:07:14 -08:00
Kit Cambridge
69350f8b7b Bug 1258127 - Move bookmark de-duping logic into PlacesSyncUtils.bookmarks.dedupe. r=markh
This patch moves the logic from `BookmarksEngine::_switchItemToDupe`
into `PlacesSyncUtils.bookmarks.dedupe`, and updates it to work with
the new tracker. `dedupe` returns an object containing new change
records, which the bookmarks engine merges into the initial changeset
from `PlacesSyncUtils.bookmarks.pullChanges`.

This patch also removes `changeItemID` and
`PlacesSyncUtils.bookmarks.changeGuid`, since `dedupe` subsumes them.

MozReview-Commit-ID: Iw3YRxWuZnK

--HG--
extra : rebase_source : 6fd80c64b160103e1090b87a300ed74b8ef85eed
2016-11-17 15:04:19 -08:00
Kit Cambridge
308045ed35 Bug 1258127 - Add PlacesSyncUtils methods for pulling bookmark changes from Places. r=mak,markh,rnewman
MozReview-Commit-ID: JsCRwnmgw09

--HG--
extra : rebase_source : a5dbb11b65c0488c2f80e6fe17b203c2e8034f9c
2016-11-18 14:15:59 -08:00
Kit Cambridge
9679aeaf76 Bug 1258127 - Update nsNavBookmarksService (C++) to track sync changes. r=mak,rnewman
MozReview-Commit-ID: AV6Uyr2eMtA

--HG--
extra : rebase_source : aaff92ff702eb15a11e004ec2ae7b9fd8a7a0234
2016-11-17 14:50:24 -08:00
Kit Cambridge
9c2720e1f0 Bug 1258127 - Update Bookmarks.jsm (JS) to track sync changes. r=mak,rnewman
MozReview-Commit-ID: ItXlDKIUyYs

--HG--
extra : rebase_source : 6061b357eefa74885d22ec8b7962da228292a959
2016-11-20 09:57:14 -08:00
Kit Cambridge
564cc476e6 Bug 1258127 - Update the Places schema to track bookmark sync changes. r=mak,rnewman
MozReview-Commit-ID: K27JzgU4KnB

--HG--
extra : rebase_source : d5444da8f6d77d66eb174bf09ed3252d5fd55327
2016-11-20 08:22:02 -08:00
Brad Werth
b96e085956 Bug 1302470 Part 3: Augment the IsRangeVisible function to test for opaque overdraw. r=mstange
MozReview-Commit-ID: F2qbu0WLl9O

--HG--
extra : rebase_source : 0191d2efdd2e03ccbb087bc90e5dc031552b9c39
2016-11-09 16:08:56 -08:00
Mike de Boer
87e7094923 Bug 1302470 Part 2: Use a hit-test method to determine if the rect of a range is visible on the page or not to the eye, for use in find-in-page. r=mstange,smaug
MozReview-Commit-ID: 9P7gf0GcREv

--HG--
extra : rebase_source : 498fbc14d6b2e09b8dc7cfb6962b7698a6b38c52
2016-11-09 15:09:36 -08:00
Brad Werth
8aab2da9f4 Bug 1302470 Part 1: Remove trailing whitespace. r=mstange
MozReview-Commit-ID: 1vlEVEn07Qb

--HG--
extra : rebase_source : 9280ba88c7ee0b778813ef778635ad6caa98ce70
2016-11-09 13:46:17 -08:00
Sebastian Hengst
0849ed2bea Backed out changeset c644b01be649 (bug 1318414) for failing xpcshell test test_bookmark_store.js. r=backout 2016-11-19 09:35:02 +01:00
Kit Cambridge
96702bd1f2 Bug 1318414 - Default to empty strings for titles and parent titles if not set. r=rnewman,tcsc
MozReview-Commit-ID: DppxJuVrbAM

--HG--
extra : rebase_source : 649bc0b945c8a2dd69dade682bf80c874053bc92
2016-11-17 10:42:32 -08:00
Ryan VanderMeulen
ee574db67b Merge m-c to autoland. a=merge 2016-11-18 15:47:52 -05:00
Ryan VanderMeulen
2c0ace7f19 Merge inbound to m-c. a=merge 2016-11-18 15:47:05 -05:00
Carsten "Tomcat" Book
a69c372ef1 Merge mozilla-central to autoland 2016-11-18 16:57:20 +01:00
Carsten "Tomcat" Book
866da9f9c6 merge mozilla-inbound to mozilla-central a=merge 2016-11-18 16:51:17 +01:00
Ehsan Akhgari
a0a6c1cd33 Bug 1318562 - Remove Navigator.updateManager; r=baku 2016-11-18 09:01:49 -05:00
Carsten "Tomcat" Book
e599757126 Backed out changeset 5c047b770037 (bug 1302663) for eslint failures
--HG--
extra : rebase_source : 2cd803ba85c6e0a17f0f9b7135e0b01f652557bc
2016-11-18 14:29:03 +01:00
Carsten "Tomcat" Book
fa25c7a85c Backed out changeset 64b95c8f9f12 (bug 1302663)
--HG--
extra : rebase_source : 042b24c918ce8bc04974b838cf1c4612739ef49b
2016-11-18 14:27:50 +01:00
Carsten "Tomcat" Book
c855df4890 Backed out changeset ae8ae9a484d3 (bug 1302663)
--HG--
extra : rebase_source : 19cf217801ce5a69479d5e5153bc689e689a8913
2016-11-18 14:27:49 +01:00
Carsten "Tomcat" Book
4b1ce477ad Backed out changeset 0bd621a27696 (bug 1302663)
--HG--
extra : rebase_source : bc5a64ec3f7b80cc573cae1897927d8c27639941
2016-11-18 14:27:47 +01:00
Phil Ringnalda
f55ce4a38c Merge m-c to autoland 2016-11-17 22:57:50 -08:00
Phil Ringnalda
2a47afda66 Bug 1273871 - disable browser_capture_doorhanger.js for constant failures, a=nnoyance 2016-11-17 21:39:45 -08:00
Phil Ringnalda
533b788fd9 Bug 1317284 - disable test_password_field_autocomplete.html on Linux for constant failures, a=nnoyance 2016-11-17 21:31:58 -08:00
Phil Ringnalda
61baa2aa9a Merge m-i to m-c, a=merge
MozReview-Commit-ID: A3wgReQAalj
2016-11-17 19:21:20 -08:00
Kris Maglione
5e31259a64 Bug 1318604: Don't add task for OOP preference initialization. r=mixedpuppy
Adding mochitest tasks from head scripts turns out to cause unpredictable
timing issues, where the initial add_task() call sometimes causes tests to
begin running before the main test script has loaded, and had a chance to add
its tasks. While I'd still prefer to do this initialization in a task, it's
not worth the intermittent failures it causes.

MozReview-Commit-ID: 3CDL82NyrzC

--HG--
extra : rebase_source : 9cb9dd96c06d054b7350248ccec2a4087c90f11e
2016-11-18 09:27:06 -08:00
Jessica Jong
5509eabfe1 Bug 1314544 - Allow keyboard shortcut when focus is on date/time input box. r=mconley 2016-11-16 23:16:00 +01:00
Andrea Marchesini
42cdd9436b Bug 1318273 - Improve the use of SpecialPowers.pushPrefEnv() - part 2, r=qdot 2016-11-18 09:33:50 +01:00
Andrea Marchesini
2f974ccbce Bug 1318273 - Improve the use of SpecialPowers.pushPrefEnv() - part 1, r=qdot 2016-11-18 09:33:33 +01:00
Phil Ringnalda
cba055b5fe Merge m-c to m-i
MozReview-Commit-ID: ICJOT8GTPT3
2016-11-17 22:57:10 -08:00
Phil Ringnalda
e3b53628aa Merge m-c to m-i
MozReview-Commit-ID: GwBaSZdoAZK
2016-11-17 20:33:59 -08:00
Sebastian Hengst
5fca81c6e4 Backed out changeset 5cffb4645bc0 (bug 1147911) 2016-11-18 00:58:52 +01:00
Sebastian Hengst
bc8435d60a Backed out changeset 514e9bc44723 (bug 1147911) 2016-11-18 00:58:51 +01:00
Sebastian Hengst
ea96126bb8 Backed out changeset 1a72c4919371 (bug 1147911) 2016-11-18 00:58:51 +01:00
Kris Maglione
08deb18ad0 Bug 1317101: Follow-up: Don't use remote-browser bindings for reftests.
MozReview-Commit-ID: AHGpFSOTaVz

--HG--
extra : rebase_source : e990ad11f3dccb287c006d46fad3caf0e6d1fd20
2016-11-16 17:47:19 -08:00
Neil Deakin
e8520ef209 Bug 1311279, scroll the select popup when click+drag is used, r=mconley 2016-11-17 09:56:43 -05:00
Neil Deakin
18dc1a098a Bug 1314251, close menulist on alt+up/down, r=ksteuber 2016-11-17 09:56:43 -05:00
Neil Deakin
74aa0c0079 Bug 1313131, don't wrap when using cursor navigation in menus onr dropdowns on Mac, or dropdowns on Windows, r=ksteuber 2016-11-17 09:56:43 -05:00
Neil Deakin
140766f711 Bug 1314647, clear active state of select on mouseup, r=mconley 2016-11-17 09:56:43 -05:00
Carsten "Tomcat" Book
c274b1bb68 Backed out changeset deec8c2ba931 (bug 1314647) for eslint failures 2016-11-17 15:42:59 +01:00
Carsten "Tomcat" Book
8a5fc639cc Backed out changeset 4ed7a34ea7ab (bug 1313131) 2016-11-17 15:42:45 +01:00
Carsten "Tomcat" Book
52809c6506 Backed out changeset 9af8f4f33471 (bug 1314251) 2016-11-17 15:42:43 +01:00
Carsten "Tomcat" Book
27c7333444 Backed out changeset 09093d38540e (bug 1311279) 2016-11-17 15:42:38 +01:00
Phil Ringnalda
ae361307c7 Merge m-c to autoland 2016-11-17 20:11:25 -08:00
Kris Maglione
32159cc38d Bug 1317101 - Part 8c: Run plain mochitests in both parent-process and remote configurations. r=billm
MozReview-Commit-ID: 3gs4vAlFBeU

--HG--
rename : toolkit/components/extensions/test/mochitest/mochitest.ini => toolkit/components/extensions/test/mochitest/mochitest-common.ini
extra : rebase_source : 3ce2c385ea73fa91609ab9c655c4f590cc1ce84a
extra : source : 61f8a4084bbd9bdfda1d2d460f659c880a7deb13
2016-11-15 18:20:52 -08:00
Kris Maglione
97d62aa407 Bug 1317101 - Part 8b: Run browser mochitests in both parent-process and remote configurations. r=billm
MozReview-Commit-ID: 6IGGnpgZLce

--HG--
rename : browser/components/extensions/test/browser/browser.ini => browser/components/extensions/test/browser/browser-common.ini
rename : browser/components/extensions/test/browser/browser.ini => browser/components/extensions/test/browser/browser-remote.ini
extra : rebase_source : 3a4cf9d7d77f3d906f8d34b537b4d05cb28718c4
extra : source : a8cdc81cdcce558592d01d3cc6d0ee66269f1077
2016-11-17 14:00:32 -08:00
Neil Deakin
5a0853cab6 Bug 1311279, scroll the select popup when click+drag is used, r=mconley 2016-11-17 09:28:27 -05:00
Neil Deakin
28bb8afb89 Bug 1314251, close menulist on alt+up/down, r=ksteuber 2016-11-17 09:28:27 -05:00
Neil Deakin
3982f6a6c1 Bug 1313131, don't wrap when using cursor navigation in menus onr dropdowns on Mac, or dropdowns on Windows, r=ksteuber 2016-11-17 09:28:27 -05:00
Neil Deakin
842f358037 Bug 1314647, clear active state of select on mouseup, r=mconley 2016-11-17 09:28:26 -05:00
Kris Maglione
73067d82f6 Bug 1317101 - Part 7e: Load extension options pages in a remote browser. r=aswan
MozReview-Commit-ID: 963sD0DcwhT

--HG--
extra : rebase_source : 2d914c53476133d4e635998e6fbefd9d450758ea
extra : source : 1e1bfb578dcd24433d43fb67cc1f75e87ba48d21
2016-11-16 13:24:08 -08:00