Commit Graph

500898 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
ccf45973d0 Bug 1258127 - Update the bookmarks engine to pull changes from Places. r=markh
MozReview-Commit-ID: 4YESuxP2rRf

--HG--
extra : rebase_source : 9c2f5830d10ba280e45c30076f19f498e6913fd0
2016-11-17 15:39:15 -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
Cykesiopka
96938ea780 Bug 1311379 - Stop using Scoped.h NSS types in WebCryptoTask.(cpp|h). r=rbarnes,ttaubert
Scoped.h is deprecated.

MozReview-Commit-ID: CAcnrB9v3dH

--HG--
extra : rebase_source : eaa0dc4348f8577f42c0577d5f9f9031d2d2bb95
2016-11-18 00:49:25 +08:00
Haik Aftandilian
9caed1b4c8 Bug 1315121 - OS X Remote printing (print_via_parent) scaled prints don't fill page; r=mconley
Send the size from PMGetAdjustedPaperRect to the child to use as the page size.
Add an Mac implementation of GetEffectivePageSize that returns the adjusted dimensions.
Add an Mac implementation of SetPaperWidth and SetPaperHeight so that adjusted dimensions can be manually set for reftest-print.

MozReview-Commit-ID: GgTFgBzkxTy

--HG--
extra : rebase_source : 66d5b2f8216ebd28401aec9bbb78c5ad32dd666c
2016-11-17 15:29:08 -08:00
cku
03916132bb Bug 1314536 - Part 3. Correct comment and add a test case for it. r=mstange
At the caller side of nsSVGMaskFrame::GetMaskForMaskedFrame(nsSVGIntegrationUtils
& nsSVGUtils), we do skip masked frame painting when this function return value
other then DrawResult::SUCCESS. So there is no need to return an empty surface
anymore.

And add a test case to verify it.

MozReview-Commit-ID: DHl6krJ1ABF

--HG--
extra : rebase_source : 46d653d4e35833e3e816d252ce3f08d2d8190602
2016-11-18 22:06:51 +08:00
cku
31495768f7 Bug 1314536 - Part 2. Implement MixModeBlender to simplify nsSVGUtils::PaintFrameWithEffects. r=mstange
MozReview-Commit-ID: JBlj7nApsbT

--HG--
extra : rebase_source : 470a6759cbd1725111c66f69fb32eab1653ec52e
2016-11-16 12:16:20 +08:00
cku
f1ae46cbdd Bug 1314536 - Part 1. Implement/use nsSVGMaskFrame::MaskParams and add a test case for nested mask-mode usage in SVG mask. r=mstange
MozReview-Commit-ID: SkU6F5fJ9b

--HG--
extra : rebase_source : d25e8ab2bc0bc3efad78a04705c9aef40119f91f
2016-11-16 12:59:52 +08:00
Andreas Tolfsen
0be98ed1ef Bug 1150527 - Remove unusued InstallGeckoError type; r=automatedtester
It does not appear to be used in m-c.

MozReview-Commit-ID: EAr0g3VJNi4

--HG--
extra : rebase_source : 0881d56dad82ce39710934cf4fdd71c21b7d5ed6
2016-11-16 16:27:19 +00:00
Andreas Tolfsen
3cd5fa1d51 Bug 1150527 - Remove error numbers from Marionette Python client; r=automatedtester
MozReview-Commit-ID: IGAdxItviaz

--HG--
extra : rebase_source : 88016c33782f19bee602a69a24ee487e522895f3
2016-11-16 16:21:06 +00:00
Andreas Tolfsen
f716b437df Bug 1317733 - Simplify Marionette component file names; r=automatedtester
MozReview-Commit-ID: 3byVSqpkr9

--HG--
rename : testing/marionette/components/marionettecomponent.js => testing/marionette/components/marionette.js
extra : rebase_source : 5db9377612c52bc636d55215f5dd7852ce0650bb
2016-11-15 17:16:23 +00:00
Andreas Tolfsen
3fd41bd102 Bug 1317733 - Stop packaging specialpowers with Marionette; r=automatedtester
Marionette does not use specialpowers any more and it is pointless to
include it in the Marionette jar.

MozReview-Commit-ID: 8tzSO4VsMA7

--HG--
extra : rebase_source : a2a78e5a37a444b1d04dcae25551c8cbcc3aca61
2016-11-15 15:59:33 +00:00
Andreas Tolfsen
25e7517b5a Bug 1317462 - Add test for processId capability; r=automatedtester
MozReview-Commit-ID: 34SUFLf3F6

--HG--
extra : rebase_source : ea2addcc50889a22eaefa2381084c24b016d6ead
2016-11-15 10:51:53 +00:00
Andreas Tolfsen
bf24b8862b Bug 1317462 - Remove screenshot capabilities from Marionette; r=automatedtester
MozReview-Commit-ID: EVdiixG6dsD

--HG--
extra : rebase_source : 7cf09ebd0f0129387dcfd04eb4246a38e5a8c293
2016-11-15 00:32:22 +00:00
Andreas Tolfsen
e7ed8dffd5 Bug 1317462 - Remove platform capability from Marionette; r=automatedtester
MozReview-Commit-ID: FKdRazfHHJG

--HG--
extra : rebase_source : 83dd1b62febac91e131026fc50fc2d8a09bcf3f7
2016-11-15 00:31:05 +00:00
Andreas Tolfsen
0ea3820108 Bug 1317462 - Remove appBuildId capability from Marionette; r=automatedtester
MozReview-Commit-ID: DoHaLMtGLEL

--HG--
extra : rebase_source : 93e99390e23db23eba90a6eb01acbd87e359ddaa
2016-11-15 00:28:31 +00:00
Andreas Tolfsen
47131541d9 Bug 1317462 - Remove XULappId capability from Marionette; r=automatedtester
MozReview-Commit-ID: 5kgY3SAYFrr

--HG--
extra : rebase_source : 8184b020c6e4b7a43e776d421fad84129ffac1ac
2016-11-15 00:23:31 +00:00
Andreas Tolfsen
588a3d5f36 Bug 1317462 - Remove version capability from Marionette; r=automatedtester
MozReview-Commit-ID: 2XtugK0mJrj

--HG--
extra : rebase_source : 8776fbde8dbf1e5b7ccb60176ae24f027979e5b2
2016-11-15 00:22:15 +00:00
Masatoshi Kimura
23e3e57a08 Bug 1143644 - Allow IDEOGRAPHIC SPACE in UnEscapeURIForUI r=m_kato
MozReview-Commit-ID: E1WVccrtKRg

--HG--
extra : rebase_source : e7b04b8303689e70fcd02fa997a0e3286c334ff4
2016-11-19 21:41:04 +09: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
Masayuki Nakano
c28dd06954 Bug 1318635 Set "dblclick" event's time and timeStamp to mouseup event's time and timeStamp r=smaug
MozReview-Commit-ID: 4c3GsNf9CKi

--HG--
extra : rebase_source : 37537b6d297636a6d68db354600b5edbf904fb87
2016-11-18 20:35:20 +09:00
Masayuki Nakano
dbf69d5b2c Bug 1316302 part.4 Refine HTMLEditRules::TryToJoinBlocks() and HTMLEditRules::MoveNodeSmart() with early return style for making scope of EditActionResult variable smaller r=smaug
For now, let's make the scope of EditActionResult variable in them smaller without big change.

MozReview-Commit-ID: 9vDoU9bUdVO

--HG--
extra : rebase_source : 6cdd50954d6cfe1fa80aeee5b06b3fec6b1ada3d
2016-11-18 18:59:39 +09:00
Masayuki Nakano
e8b4d6d5fe Bug 1316302 part.3 Create EditActionResult class for making the methods which return nsresult, handled and canceled with out params r=smaug
In a lot of places, edit action handlers and their helper methods return nsresult and aHandled and aCanceled with out params.  However, the out params cause the code complicated since:

* it's not unclear if the method will overwrite aHandled and aCanceled value.
* callers need to create temporary variable event if some of them are not necessary.

This patch rewrites the helper methods of HTMLEditRules::WillDeleteSelection() with it.

MozReview-Commit-ID: CJv75KdOdXf

--HG--
extra : rebase_source : 708d378bdd0ddc4ae984de9294525b01a829b0b7
2016-11-18 17:59:23 +09:00
Masayuki Nakano
8b2ac2889e Bug 1316302 part.2 WillDeleteSelection() should retry to handle it when selection is collapsed and JoinBlocks() doesn't handle nor cancel the action r=smaug
When selection is collapsed and JoinBlocks() doesn't handle nor cancel the action, WillDeleteSelection() should move selection to the start/end of leftmost/rightmost editable leaf node and retry to handle the action again.

For avoiding infinite loop, it checks if selected node is changed actually before calling itself again.

MozReview-Commit-ID: GtEC4dim3r9

--HG--
extra : rebase_source : f84afd754e71f441c3fad15456d20a11c42dd6de
2016-11-16 20:20:41 +09:00
Masayuki Nakano
a8116bc72f Bug 1316302 part.1 Helper methods for HTMLEditRules::WillDeleteSelection() should have an out argument to indicates if it actually handles the action r=smaug
When HTMLEditRules::WillDeleteSelection() tries to remove something from the end/start of a block to its last/first text node but it's contained by block elements, it tries to join the container and the block.  However, JoinBlocks() always fails to join them since it's impossible operation.  In this case, HTMLEditRules::WillDeleteSelection() should retry to remove something in the leaf, however, it's impossible for now because JoinBlocks() and its helper methods don't return if it handles the action actually.

This patch renames |JoinBlocks()| to |TryToJoinBlocks()| for representing what it is.  And this patch adds |bool* aHandled| to the helper methods.  Then, *aHandled and *aCancel are now always returns the result of each method.  Therefore, for merging the result of multiple helper methods, callers need to receive the result with temporary variables and merge them by themselves.

Note that when they modify DOM node actually or the action should do nothing (for example, selection is across tables), aHandled is set to true.

MozReview-Commit-ID: 7ApUOgtLUog

--HG--
extra : rebase_source : 4abc1ec208107b782a719df058623fd7f92d180c
2016-11-18 17:54:31 +09:00
Phil Ringnalda
7ab6adac90 Backed out 3 changesets (bug 1314536) for Android "'Pair' does not name a type" build bustage
Backed out changeset 16632b726b19 (bug 1314536)
Backed out changeset 2effc920decf (bug 1314536)
Backed out changeset b0aa89236bb2 (bug 1314536)
2016-11-18 18:48:49 -08:00
cku
5eb153c021 Bug 1314536 - Part 3. Correct comment and add a test case for it. r=mstange
At the caller side of nsSVGMaskFrame::GetMaskForMaskedFrame(nsSVGIntegrationUtils
& nsSVGUtils), we do skip masked frame painting when this function return value
other then DrawResult::SUCCESS. So there is no need to return an empty surface
anymore.

And add a test case to verify it.

MozReview-Commit-ID: DHl6krJ1ABF

--HG--
extra : rebase_source : a4e23896a84c5dd1b5df9c6e8505a2b32ee17b84
2016-11-18 22:06:51 +08:00
cku
da105994e1 Bug 1314536 - Part 2. Implement MixModeBlender to simplify nsSVGUtils::PaintFrameWithEffects. r=mstange
MozReview-Commit-ID: JBlj7nApsbT

--HG--
extra : rebase_source : 4fec950a0469b92ac4bef0391a6d100497d3d24b
2016-11-16 12:16:20 +08:00
cku
eee760be28 Bug 1314536 - Part 1. Implement/use nsSVGMaskFrame::MaskParams and add a test case for nested mask-mode usage in SVG mask. r=mstange
MozReview-Commit-ID: SkU6F5fJ9b

--HG--
extra : rebase_source : 129dc2d6abf5911ba42b459db20cfb54b83dfc0c
2016-11-16 12:59:52 +08: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
Andrew McCreight
bf271af4ea Bug 1318743 - Remove errout from IPDL parser. r=billm
MozReview-Commit-ID: 922dDCgd6s6

--HG--
extra : rebase_source : c562c551e63a93570fbe8390bf746c3df5ef0a63
2016-11-18 11:07:06 -08:00
Gerald Squelart
2af5ebc606 Bug 1318228 - Replace nsAutoPtr with UniquePtr in MediaDrmCDMProxy - r=cpearce
MozReview-Commit-ID: 71BGVx1G7JH

--HG--
extra : rebase_source : cac6f50eaeaf1afa2f2b03f3514f5e598039618e
2016-11-17 21:11:04 +11:00
Gerald Squelart
c22dcadd40 Bug 1318228 - Replace nsAutoPtr with UniquePtr in GMPCDMProxy - r=cpearce
MozReview-Commit-ID: Hy4rag5UbsZ

--HG--
extra : rebase_source : d3802b3e0e22cb1ef982eecc4c1a5b016f0ff6aa
2016-11-17 18:40:28 +11:00
Gerald Squelart
b3fb2f5bf4 Bug 1318228 - NewRunnable defaults to StoreCopyPassByConstLRef - r=froydnj
MozReview-Commit-ID: LmQHthMLUd3

--HG--
extra : rebase_source : 84ab099977d6ab32c6f0afb354569bdcec5ce0a5
2016-11-17 17:07:02 +11:00
Brad Werth
c973750b3d Bug 1304636 Part 4: Rename test_flexbox_min_size_auto.html to a more inclusive name. r=dholbert
MozReview-Commit-ID: B72Q8z5zvxc

--HG--
rename : layout/style/test/test_flexbox_min_size_auto.html => layout/style/test/test_computed_style_min_size_auto.html
extra : rebase_source : a30e6b5801425664ab359c862c3e4c0c615c9d63
2016-11-17 16:17:34 -08:00
Brad Werth
bd30e23c19 Bug 1304636 Part 3: Update the existing test_flexbox_min_size_auto.html test to match new behavior. r=dholbert
MozReview-Commit-ID: 8jyaDttWF6e

--HG--
extra : rebase_source : 221e7d302cf30942b5b618f6c45503f0679b0845
2016-11-17 16:12:19 -08:00
Brad Werth
7e8c2c8166 Bug 1304636 Part 2: Make GetComputedStyle report 'auto' for min-height:auto flex/grid items. r=dholbert
MozReview-Commit-ID: BmMvny3HePe

--HG--
extra : rebase_source : c9f155bc550091d491fd25d71bb2ca8d2c42320d
2016-11-17 15:41:49 -08:00
Brad Werth
8796e8969d Bug 1304636 Part 1: Make GetComputedStyle report 'auto' for min-width:auto flex/grid items. r=dholbert
MozReview-Commit-ID: 3snktoHTohq

--HG--
extra : rebase_source : 2f8c4e62cf25bcb82ea52a8e984dc1dab0c00737
2016-11-18 13:47:30 -08:00
Mike Shal
5133dad8c3 Bug 1315810 - Support some FinalTargetFiles in the tup backend; r=chmanchester
MozReview-Commit-ID: 68b596wAp8g

--HG--
extra : rebase_source : cd99d1a0ee9822871eedaca63455578dc79efad1
2016-10-08 11:49:20 -04:00
Mike Shal
458dc35b77 Bug 1315810 - Use tup's internal symlinking instead of build manifests; r=chmanchester
MozReview-Commit-ID: LNsbghIGJvH

--HG--
extra : rebase_source : 475bfbb846910095ae3d8f4b9d3412bd22b0eab5
2016-09-30 11:16:41 -04:00
Haik Aftandilian
86a6edf21c Bug 1314056 - Enable Mac content sandbox level 1 in 52; r=gcp,glandium
MozReview-Commit-ID: GlitFcFb3P0

--HG--
extra : rebase_source : a278c85665e6424facba4f3fbcfe73e693ed8184
2016-11-15 22:39:00 -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