Commit Graph

40877 Commits

Author SHA1 Message Date
Nihanth Subramanya
6c18bc9e4b Bug 1267514 - Fix about:neterror generic fallback text when there is no available title/description for the error. r=Gijs
MozReview-Commit-ID: 4no91xMhDYQ

--HG--
extra : rebase_source : 6305595154f7642906798de82dc490243157b51e
2016-05-03 16:12:32 -07:00
Nihanth Subramanya
0c6a13eb51 Bug 1246162 - Position advanced panels absolutely below the main content in about:neterror. r=Gijs
MozReview-Commit-ID: Vzk0HnPifM

--HG--
extra : rebase_source : baa24c207632d93237340acff0f3630c24196f49
2016-04-26 14:42:15 -07:00
Gijs Kruitbosch
7c22dba684 Bug 1270886 - only use lwtheme styling for search bar borders in the main toolbox, r=dao
This is still not completely perfect in that in principle it is possible for add-ons to add toolbars that they force to be non-transparent, but there is no way to select for that. Keeping a list of toolbars we know are transparent would break the more common case of third-party toolbars that do behave 'normally' when used with lightweight themes. So for now, just assume navigator-toolbox is all transparent when a lwtheme is in use.

MozReview-Commit-ID: 4I8l3Bn7DQf

--HG--
extra : rebase_source : 58aa9e76fee1df7530bef592cb360f45fe936f2d
2016-05-09 17:03:48 +01:00
Carsten "Tomcat" Book
40c39189ef Merge mozilla-central to fx-team 2016-05-09 11:20:26 +02:00
Carsten "Tomcat" Book
56fe0e8f2c merge mozilla-inbound to mozilla-central a=merge 2016-05-09 11:17:59 +02:00
Carsten "Tomcat" Book
53d7c78e72 merge fx-team to mozilla-central a=merge 2016-05-09 11:15:51 +02:00
ffxbld
a751ffc1c7 No bug, Automated blocklist update from host bld-linux64-spot-1062 - a=blocklist-update 2016-05-07 05:00:38 -07:00
Wes Kocher
b17d7be7c1 Merge fx-team to central, a=merge 2016-05-06 15:57:08 -07:00
Gijs Kruitbosch
916b0a33fe Bug 1269238 - allow text-links to use origin principals for link opening checks, r=mikedeboer
MozReview-Commit-ID: HPWxEyNEsps

--HG--
extra : rebase_source : 4fb5f3f3baca236f5507235929d50c249abe3ebd
extra : histedit_source : 69fab5bf3f2859c5c7d208432585db7354f15d53
2016-05-06 10:05:47 +01:00
Ryan VanderMeulen
8d16e6ebd5 Bug 1270846 - Update pdf.js to version 1.5.232. r=bdahl 2016-05-06 09:50:42 -04:00
Carsten "Tomcat" Book
22dd4df68d Merge mozilla-central to fx-team 2016-05-06 14:24:56 +02:00
Carsten "Tomcat" Book
9b6572bf54 merge mozilla-inbound to mozilla-central a=merge 2016-05-06 14:18:17 +02:00
Jared Wein
a542edda98 Bug 1270495 - Only apply the margin-top to direct children of the widget-overflow-list, instead of also to children of combined toolbar items. r=gijs
MozReview-Commit-ID: 3QZuWOrGOQp
2016-05-05 12:19:00 -04:00
Wes Kocher
8d8be41d6d Merge m-c to fx-team, a=merge 2016-05-05 14:20:16 -07:00
Gijs Kruitbosch
3dc1902afe Backed out changesets b386e97721cf, 386b9c750bd2, 3c86861912bb (bug 1241085) because the about:newtab URI is now kept across sessions, a=backout-with-approval-from-ryanvm
MozReview-Commit-ID: EVv6M6x9F44

--HG--
extra : source : de5ab3fd7c7e5772cc323a6d998a3a94143c23b1
extra : amend_source : cf7abadb9a7dbb97aaa9665a3df5981ae3459bff
2016-05-05 17:45:58 +01:00
Ryan VanderMeulen
70ba843b03 Merge m-c to inbound. a=merge
CLOSED TREE
2016-05-05 10:06:54 -04:00
Gijs Kruitbosch
98bdcaacfa Bug 1270148 - move urlbar-border-color definition to the window so the search bar doesn't lose its border styling when moved, r=jaws
MozReview-Commit-ID: 24dEVc5rdCh

--HG--
extra : rebase_source : a39bb2a118407df60bbca2bb936cd7a350849bfa
2016-05-04 16:10:16 +01:00
Ehsan Akhgari
eaba90d427 Bug 1261011 - Remove Inter-App Communication API; r=fabrice 2016-05-05 07:39:10 -04:00
Astley Chen
d626fe0c49 bug 859301 : Part 2 - unprefix internal css files. r=dbaron
MozReview-Commit-ID: CRyp3zQxayh

--HG--
extra : rebase_source : 6b4a5d3e5292a1bdeceab37c5067c78fac69834a
2016-05-04 13:31:24 +08:00
Mark Banner
d85de4e9c7 Bug 1270622 - Land version 1.3.2 of the Loop system add-on in mozilla-central, rs=standard8 for already reviewed code. 2016-05-05 21:29:16 +01:00
Ryan VanderMeulen
27ec66e090 Merge m-c to fx-team. a=merge
--HG--
extra : rebase_source : 5fa479be50a4739ccd9f42a799594afa8fcc4f28
2016-05-05 14:58:24 -04:00
Gijs Kruitbosch
d9348654ed Bug 1241085 - part 3: actually fix about:privatebrowsing clearing the URL bar, r=mconley
MozReview-Commit-ID: JB3GPKsfmTs

--HG--
extra : rebase_source : adf877b86e0a3bc035e3c8bd460b5472997fb7cd
2016-04-28 20:03:38 +01:00
Gijs Kruitbosch
2f63110f3f Bug 1241085 - part 2: rip out userTypedClear and replace it with more self-documenting stuff, r=mconley
userTypedClear was used for two cases:
1) to keep track of whether we were in the middle of a loadURI call. This use is replaced by inLoadURI, which is
more sane when using e10s (though it's hard to be precise there because we're sending all web navigation calls to
the content process and this introduces a degree of asynchronousness that we just have to live with...).
2) to keep track of whether we were between a network start and a corresponding network stop, and whether the user
typed since the load properly started. This is now tracked on a small object on the browser binding, which has
appropriately named method so we're not just incrementing some magic number but actually understand what
we're saying, and so the information we get out (did the user type since this load started or not?) makes sense.

Note that we're keeping userTypedClear in session store information in order to remain backwards compatible.
It becomes a simple boolean-stored-as-int (1 or 0) that indicates whether we quit/crashed/stopped while a load
was pending, or not.

MozReview-Commit-ID: 5NbmVueocC7

--HG--
extra : rebase_source : f87199c77094c24c132e6c88f751a5b5d5aa62f9
2016-04-28 19:51:36 +01:00
Yoshi Huang
de5b190579 Bug 1266022 - skip checking of LoadInfo for chrome resources. r=sicking
When tab with a userContextId!=0 contains a chrome page (such as
about:newtab) the userContextId in the LoadInfo won't match the
userContextId in the LoadContext. The LoadInfo will contain the
systemPrincipal and so use userContextId=0, the LoadContext has the
userContextId of the tab (!=0).

This is fine as long as we page only loads chrome-URLs and other
non-http URLs since those don't use cookies anyway.

So avoid asserting in this situation.

Long term we want the chrome page to use the default userContextId for
cookies, since that's what it chrome code normally use. This will work
properly once we get the cookie jar information from the LoadInfo rather
than from the LoadContext.
2016-05-06 11:04:50 +08:00
gasolin
51fda07150 Bug 1228258 - Search aliases should be trimmed. r=mak
MozReview-Commit-ID: CzTU7aBnIRd

MozReview-Commit-ID: 2OzxRTtr39b

--HG--
extra : transplant_source : y%3DQ%03%D7%BA%F7%8B%92/%FB%26%E1jP%E9%ECI%DD%EB
2016-04-25 15:19:36 +08:00
Edouard Oger
bf53149b02 Bug 1269352 - Synced Tabs sidebar does not register duplicate listeners. r=markh 2016-05-04 11:52:00 -04:00
Edouard Oger
bba8a9635c Bug 1094580 - Sync browser.urlbar.suggest.* preferences. r=markh 2016-05-03 12:52:00 -04:00
Marco Bonardo
06932c74d1 Bug 1223728 - Remove the unifiedcomplete pref, the urlinline component and stop bundling the old autocomplete component in Firefox. r=adw
MozReview-Commit-ID: Ee08mDGxBjJ

--HG--
extra : rebase_source : 4473da657f85e443e5095b43b3e774e85292ecd1
extra : amend_source : c9c322ebae255a24c28e6367b9fe93474db21d6d
2016-05-05 00:14:51 +02:00
Wes Kocher
e07d6df737 Merge m-c to fx-team, a=merge 2016-05-06 15:59:00 -07:00
Panos Astithas
6290ac73e4 Don't show a badge on the hamburger button for successful downloads (bug 1268483). r=jaws
MozReview-Commit-ID: JazPOmctdpy
2016-05-06 22:42:20 +03:00
Gijs Kruitbosch
939515d3cc Bug 1265368 - enable resetting non-default profiles, r=MattN
MozReview-Commit-ID: KpW9JgghFkn

--HG--
extra : rebase_source : e1a6ce0a05ccd6ef94026c6fdeaf6421d5cffe03
extra : histedit_source : ca0ed957aa68ed495cc2d8897aae3e553dd2ebff%2C8ce1e45de095401a6cc85f912cfebacd384eb989
2016-05-05 21:38:49 +01:00
Jeremiah Orem
0a99a7cc46 Bug 1174254 - Disable FTP protocol guessing. r=mcmanus 2016-04-28 18:00:00 -04:00
Wes Kocher
419e80ad06 Merge m-c to inbound, a=merge 2016-05-06 15:58:32 -07:00
"Helen V. Holmes"
5fededb359 Bug 1205330 - Changes to the devtools/devedition dark theme colors;r=bgrins
MozReview-Commit-ID: 7gOuqTPBFcf
2016-05-02 09:38:44 -04:00
Shane Caraveo
c75f47993f Bug 1261375 fix load handling in pocket panel, r=gijs 2016-05-04 09:19:10 -07:00
Dão Gottwald
ab3bd282d9 Bug 1250203 - Re-populate recent bookmarks when a bookmark gets deleted while the menu is open. r=mak 2016-05-04 16:52:40 +02:00
Carsten "Tomcat" Book
3db7c01bb7 Merge mozilla-central to fx-team 2016-05-04 12:01:17 +02:00
Carsten "Tomcat" Book
ad9214381b merge mozilla-inbound to mozilla-central a=merge 2016-05-04 11:54:42 +02:00
Bob Silverberg
1b139444cb Bug 1265842 - Implement browser.history.deleteAll and deleteRange. r=aswan
MozReview-Commit-ID: 6rcQfPajmfw

--HG--
extra : transplant_source : %7C%9B%E9%AD%F0K%8Ds%960%D0J%B8%3B%B5%B1r%C2%2A%03
2016-04-27 16:51:11 -04:00
Carsten "Tomcat" Book
f9e0bb9939 Merge mozilla-central to fx-team 2016-05-03 16:19:57 +02:00
Andrea Marchesini
3df261e948 Bug 1269303 - Remove RequestSync API, r=fabrice 2016-05-03 11:13:03 +02:00
Bob Silverberg
c3f7086b51 Bug 1265837 - Implement browser.history.deleteUrl, r=aswan
MozReview-Commit-ID: AzVWzviLkGQ

--HG--
extra : rebase_source : 877140bd0d0616f05a62ee94ddae806e51518e55
2016-04-28 08:37:04 -04:00
Edouard Oger
d1666b06c2 Bug 1269344 - Use normal cursor in Synced Tabs sidebar. r=markh
MozReview-Commit-ID: 7T4ZMQ3f07r
2016-05-02 12:39:00 -07:00
Carsten "Tomcat" Book
548d98c27e merge mozilla-inbound to mozilla-central a=merge 2016-05-02 11:25:32 +02:00
Carsten "Tomcat" Book
87bdb8ed2d merge fx-team to mozilla-central a=merge 2016-05-02 11:19:50 +02:00
ffxbld
64a1e03ff3 No bug, Automated blocklist update from host bld-linux64-spot-576 - a=blocklist-update 2016-04-30 04:56:05 -07:00
Wes Kocher
fcb496e3e5 Merge inbound to m-c a=merge
MozReview-Commit-ID: BKbqwBtHrBR
2016-04-29 14:54:44 -07:00
Ryan VanderMeulen
0ebf94b516 Backed out changeset 47fdbb8493d0 (bug 1268706) for browser_pdfjs_navigation.js failures. 2016-04-28 21:48:13 -04:00
Ryan VanderMeulen
ff8f4c4700 Bug 1268706 - Update pdf.js to version 1.5.216. r=bdahl 2016-04-28 19:02:46 -04:00
Carsten "Tomcat" Book
efeedc62cb Merge mozilla-central to fx-team 2016-04-28 16:34:59 +02:00