Merge mozilla-central to mozilla-inbound. a=merge on a CLOSED TREE (c39d5daf) · Commits · The Tor Project / Applications / Tor Browser

browser/base/content/browser-pageActions.js

+6 −4

Original line number	Diff line number	Diff line
		@@ -1288,14 +1288,16 @@ BrowserPageActions.shareURL = {
		shareProviders.forEach(function(share) {
		let item = document.createElement("toolbarbutton");
		item.setAttribute("label", share.menuItemTitle);
		item.setAttribute("share-title", share.title);
		item.setAttribute("share-name", share.name);
		item.setAttribute("image", share.image);
		item.classList.add("subviewbutton", "subviewbutton-iconic");

		item.addEventListener("command", event => {
		let shareTitle = event.target.getAttribute("share-title");
		if (shareTitle) {
		sharingService.shareUrl(shareTitle, currentURI);
		let shareName = event.target.getAttribute("share-name");
		if (shareName) {
		sharingService.shareUrl(shareName,
		currentURI,
		gBrowser.selectedBrowser.contentTitle);
		}
		PanelMultiView.hidePopup(BrowserPageActions.panelNode);
		});

browser/base/content/test/urlbar/browser_page_action_menu_share_mac.js

+9 −5

Original line number	Diff line number	Diff line
		@@ -10,11 +10,12 @@ Services.scriptloader.loadSubScript("resource://testing-common/sinon-2.3.2.js");
		const URL = "http://example.org/";

		// Keep track of title of service we chose to share with
		let sharedTitle;
		let serviceName;
		let sharedUrl;
		let sharedTitle;

		let mockShareData = [{
		title: "NSA",
		name: "NSA",
		menuItemTitle: "National Security Agency",
		image: "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEA" +
		"LAAAAAABAAEAAAICTAEAOw=="
		@@ -25,7 +26,8 @@ let stub = sinon.stub(BrowserPageActions.shareURL, "_sharingService").get(() =>
		getSharingProviders(url) {
		return mockShareData;
		},
		shareUrl(title, url) {
		shareUrl(name, url, title) {
		serviceName = name;
		sharedUrl = url;
		sharedTitle = title;
		}
		@@ -61,10 +63,12 @@ add_task(async function shareURL() {
		EventUtils.synthesizeMouseAtCenter(shareButton, {});
		await hiddenPromise;

		Assert.equal(sharedTitle, mockShareData[0].title,
		"Shared with the correct title");
		Assert.equal(serviceName, mockShareData[0].name,
		"Shared the correct service name");
		Assert.equal(sharedUrl, "http://example.org/",
		"Shared correct URL");
		Assert.equal(sharedTitle, "mochitest index /",
		"Shared with the correct title");
		});
		});

dom/tests/mochitest/general/test_interfaces.js

+9 −9

Original line number	Diff line number	Diff line
		@@ -1169,21 +1169,21 @@ var interfaceNamesInGlobalScope =
		// IMPORTANT: Do not change this list without review from a DOM peer!
		{name: "VideoStreamTrack", insecureContext: true},
		// IMPORTANT: Do not change this list without review from a DOM peer!
		{name: "VRDisplay", insecureContext: true, releaseNonWindowsAndMac: false},
		{name: "VRDisplay", insecureContext: true, releaseNonWindows: false},
		// IMPORTANT: Do not change this list without review from a DOM peer!
		{name: "VRDisplayCapabilities", insecureContext: true, releaseNonWindowsAndMac: false},
		{name: "VRDisplayCapabilities", insecureContext: true, releaseNonWindows: false},
		// IMPORTANT: Do not change this list without review from a DOM peer!
		{name: "VRDisplayEvent", insecureContext: true, releaseNonWindowsAndMac: false},
		{name: "VRDisplayEvent", insecureContext: true, releaseNonWindows: false},
		// IMPORTANT: Do not change this list without review from a DOM peer!
		{name: "VREyeParameters", insecureContext: true, releaseNonWindowsAndMac: false},
		{name: "VREyeParameters", insecureContext: true, releaseNonWindows: false},
		// IMPORTANT: Do not change this list without review from a DOM peer!
		{name: "VRFieldOfView", insecureContext: true, releaseNonWindowsAndMac: false},
		{name: "VRFieldOfView", insecureContext: true, releaseNonWindows: false},
		// IMPORTANT: Do not change this list without review from a DOM peer!
		{name: "VRFrameData", insecureContext: true, releaseNonWindowsAndMac: false},
		{name: "VRFrameData", insecureContext: true, releaseNonWindows: false},
		// IMPORTANT: Do not change this list without review from a DOM peer!
		{name: "VRPose", insecureContext: true, releaseNonWindowsAndMac: false},
		{name: "VRPose", insecureContext: true, releaseNonWindows: false},
		// IMPORTANT: Do not change this list without review from a DOM peer!
		{name: "VRStageParameters", insecureContext: true, releaseNonWindowsAndMac: false},
		{name: "VRStageParameters", insecureContext: true, releaseNonWindows: false},
		// IMPORTANT: Do not change this list without review from a DOM peer!
		{name: "VTTCue", insecureContext: true},
		// IMPORTANT: Do not change this list without review from a DOM peer!
		@@ -1291,7 +1291,7 @@ function createInterfaceMap(isXBLScope) {
		(entry.linux === !isLinux) \|\|
		(entry.android === !isAndroid && !entry.nightlyAndroid) \|\|
		(entry.release === !isRelease) \|\|
		(entry.releaseNonWindowsAndMac === !(isRelease && !isWindows && !isMac)) \|\|
		(entry.releaseNonWindows === !(isRelease && !isWindows)) \|\|
		// The insecureContext test is very purposefully converting
		// entry.insecureContext to boolean, so undefined will convert to
		// false. That way entries without an insecureContext annotation

gfx/thebes/gfxFT2FontBase.cpp

+4 −8

Original line number	Diff line number	Diff line
		@@ -317,18 +317,14 @@ gfxFT2FontBase::InitMetrics()
		// If the OS/2 fsSelection USE_TYPO_METRICS bit is set,
		// set maxAscent/Descent from the sTypo* fields instead of hhea.
		const uint16_t kUseTypoMetricsMask = 1 << 7;
		if (os2->fsSelection & kUseTypoMetricsMask) {
		mMetrics.maxAscent = NS_round(mMetrics.emAscent);
		mMetrics.maxDescent = NS_round(mMetrics.emDescent);
		} else {
		if ((os2->fsSelection & kUseTypoMetricsMask) \|\|
		// maxAscent/maxDescent get used for frame heights, and some fonts
		// don't have the HHEA table ascent/descent set (bug 279032).
		(mMetrics.maxAscent == 0.0 && mMetrics.maxDescent == 0.0)) {
		// We use NS_round here to parallel the pixel-rounded values that
		// freetype gives us for ftMetrics.ascender/descender.
		mMetrics.maxAscent =
		std::max(mMetrics.maxAscent, NS_round(mMetrics.emAscent));
		mMetrics.maxDescent =
		std::max(mMetrics.maxDescent, NS_round(mMetrics.emDescent));
		mMetrics.maxAscent = NS_round(mMetrics.emAscent);
		mMetrics.maxDescent = NS_round(mMetrics.emDescent);
		}
		} else {
		mMetrics.emAscent = mMetrics.maxAscent;

layout/reftests/font-face/reftest.list

+1 −1

Original line number	Diff line number	Diff line
		@@ -129,7 +129,7 @@ load 486974-1.html
		# Tests for bug 523717
		== underline-offset-change-1.html underline-offset-change-1-ref.html
		== underline-offset-change-2.html underline-offset-change-2-ref.html
		fails-if(cocoaWidget\|\|winWidget) != underline-offset-change-1-ref.html underline-offset-change-2-ref.html # Bug 534132
		fails != underline-offset-change-1-ref.html underline-offset-change-2-ref.html # Bug 534132

		!= 534352-1-extra-cmap-sentinel.html 534352-1-extra-cmap-sentinel-ref.html
		== bug533251.html bug533251-ref.html