Skip to content

Commit

Permalink
merge mozilla-inbound to mozilla-central a=merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@BavarianTomcat
BavarianTomcat committed Sep 7, 2016
2 parents 074c8b4 + b61a85e commit a11f7d2
Show file tree
Hide file tree
Showing 321 changed files with 5,008 additions and 2,156 deletions.
20 changes: 6 additions & 14 deletions accessible/tests/mochitest/text/test_atcaretoffset.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -414,26 +414,18 @@
[ "words", "", 10, 15, { words: [ 10, 15 ] } ]
] );

var line2 = [ // " my "
[ "TextBeforeOffset", BOUNDARY_WORD_END, kTodo, kTodo, kTodo ],
[ "TextAfterOffset", BOUNDARY_WORD_END, kTodo, kTodo, kTodo ]
];
var line4 = [ // "riend"
[ "TextBeforeOffset", BOUNDARY_WORD_END, kTodo, kTodo, kTodo ],
[ "TextAfterOffset", BOUNDARY_WORD_END, kTodo, kTodo, kTodo ]
];
var line5 = [ // " t "
var line4 = [ // "riend "
[ "TextBeforeOffset", BOUNDARY_WORD_END, kTodo, kTodo, kTodo ],
[ "TextAfterOffset", BOUNDARY_WORD_END, kTodo, kTodo, kTodo ]
];
traverseTextByLines(gQueue, "ta_wrapped",
[ [ "hi ", "", 0, 3, { words: [ 0, 2 ] } ],
[ "hello", "", 3, 8, { words: [ 3, 8 ] } ],
[ " my ", "", 8, 12, { words: [ 9, 11 ], lsf: line2 } ],
[ "hello ", "", 3, 9, { words: [ 3, 8 ] } ],
[ "my ", "", 9, 12, { words: [ 9, 11 ] } ],
[ "longf", "", 12, 17, { words: [ 12, 17 ] } ],
[ "riend", "", 17, 22, { words: [ 17, 22 ], lsf: line4 } ],
[ " t ", "", 22, 25, { words: [ 23, 24 ], lsf: line5 } ],
[ "sq t", "", 25, 29, { words: [ 25, 27, 28, 29 ] } ]
[ "riend ", "", 17, 23, { words: [ 17, 22 ], lsf: line4 } ],
[ "t sq ", "", 23, 28, { words: [ 23, 24, 25, 27 ] } ],
[ "t", "", 28, 29, { words: [ 28, 29 ] } ]
] );

gQueue.invoke(); // will call SimpleTest.finish();
Expand Down
3 changes: 3 additions & 0 deletions browser/app/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ USE_LIBS += [
'mozglue',
]

if CONFIG['LIBFUZZER']:
USE_LIBS += [ 'fuzzer' ]

if CONFIG['_MSC_VER']:
# Always enter a Windows program through wmain, whether or not we're
# a console application.
Expand Down
24 changes: 24 additions & 0 deletions browser/app/nsBrowserApp.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,10 @@ XRE_GetProcessTypeType XRE_GetProcessType;
XRE_SetProcessTypeType XRE_SetProcessType;
XRE_InitChildProcessType XRE_InitChildProcess;
XRE_EnableSameExecutableForContentProcType XRE_EnableSameExecutableForContentProc;
#ifdef LIBFUZZER
XRE_LibFuzzerSetMainType XRE_LibFuzzerSetMain;
XRE_LibFuzzerGetFuncsType XRE_LibFuzzerGetFuncs;
#endif

static const nsDynamicFunctionLoad kXULFuncs[] = {
{ "XRE_GetFileFromPath", (NSFuncPtr*) &XRE_GetFileFromPath },
Expand All @@ -143,9 +147,24 @@ static const nsDynamicFunctionLoad kXULFuncs[] = {
{ "XRE_SetProcessType", (NSFuncPtr*) &XRE_SetProcessType },
{ "XRE_InitChildProcess", (NSFuncPtr*) &XRE_InitChildProcess },
{ "XRE_EnableSameExecutableForContentProc", (NSFuncPtr*) &XRE_EnableSameExecutableForContentProc },
#ifdef LIBFUZZER
{ "XRE_LibFuzzerSetMain", (NSFuncPtr*) &XRE_LibFuzzerSetMain },
{ "XRE_LibFuzzerGetFuncs", (NSFuncPtr*) &XRE_LibFuzzerGetFuncs },
#endif
{ nullptr, nullptr }
};

#ifdef LIBFUZZER
int libfuzzer_main(int argc, char **argv);

/* This wrapper is used by the libFuzzer main to call into libxul */

void libFuzzerGetFuncs(const char* moduleName, LibFuzzerInitFunc* initFunc,
LibFuzzerTestingFunc* testingFunc) {
return XRE_LibFuzzerGetFuncs(moduleName, initFunc, testingFunc);
}
#endif

static int do_main(int argc, char* argv[], char* envp[], nsIFile *xreDirectory)
{
nsCOMPtr<nsIFile> appini;
Expand Down Expand Up @@ -256,6 +275,11 @@ static int do_main(int argc, char* argv[], char* envp[], nsIFile *xreDirectory)
appData.sandboxBrokerServices = brokerServices;
#endif

#ifdef LIBFUZZER
if (getenv("LIBFUZZER"))
XRE_LibFuzzerSetMain(argc, argv, libfuzzer_main);
#endif

return XRE_main(argc, argv, &appData, mainFlags);
}

Expand Down
19 changes: 16 additions & 3 deletions browser/base/content/aboutDialog.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

"use strict";

// Services = object with smart getters for common XPCOM services
Components.utils.import("resource://gre/modules/Services.jsm");
Components.utils.import("resource://gre/modules/AppConstants.jsm");
Expand Down Expand Up @@ -39,19 +41,30 @@ function init(aEvent)
}

// Include the build ID and display warning if this is an "a#" (nightly or aurora) build
let versionField = document.getElementById("version");
let version = Services.appinfo.version;
if (/a\d+$/.test(version)) {
let buildID = Services.appinfo.appBuildID;
let buildDate = buildID.slice(0, 4) + "-" + buildID.slice(4, 6) + "-" + buildID.slice(6, 8);
document.getElementById("version").textContent += " (" + buildDate + ")";
let year = buildID.slice(0, 4);
let month = buildID.slice(4, 6);
let day = buildID.slice(6, 8);
versionField.textContent += ` (${year}-${month}-${day})`;

document.getElementById("experimental").hidden = false;
document.getElementById("communityDesc").hidden = true;
}

// Append "(32-bit)" or "(64-bit)" build architecture to the version number:
let bundle = Services.strings.createBundle("chrome://browser/locale/browser.properties");
let archResource = Services.appinfo.is64Bit
? "aboutDialog.architecture.sixtyFourBit"
: "aboutDialog.architecture.thirtyTwoBit";
let arch = bundle.GetStringFromName(archResource);
versionField.textContent += ` (${arch})`;

if (AppConstants.MOZ_UPDATER) {
gAppUpdater = new appUpdater();

let defaults = Services.prefs.getDefaultBranch("");
let channelLabel = document.getElementById("currentChannel");
let currentChannelText = document.getElementById("currentChannelText");
channelLabel.value = UpdateUtils.UpdateChannel;
Expand Down
47 changes: 23 additions & 24 deletions browser/base/content/browser.xul
View file
Original file line number Diff line number Diff line change
Expand Up @@ -691,56 +691,55 @@
consumeanchor="identity-box"
onclick="PageProxyClickHandler(event);"/>
<image id="sharing-icon" mousethrough="always"/>
<box id="blocked-permissions-container" align="center" tooltiptext="">
<box id="blocked-permissions-container" align="center">
<image data-permission-id="geo" class="blocked-permission-icon geo-icon" role="button"
aria-label="&urlbar.geolocationNotificationAnchor.label;"/>
tooltiptext="&urlbar.geolocationBlocked.tooltip;"/>
<image data-permission-id="desktop-notification" class="blocked-permission-icon desktop-notification-icon" role="button"
aria-label="&urlbar.webNotsNotificationAnchor3.label;"/>
tooltiptext="&urlbar.webNotificationsBlocked.tooltip;"/>
<image data-permission-id="camera" class="blocked-permission-icon camera-icon" role="button"
aria-label="&urlbar.webRTCShareDevicesNotificationAnchor.label;"/>
tooltiptext="&urlbar.cameraBlocked.tooltip;"/>
<image data-permission-id="indexedDB" class="blocked-permission-icon indexedDB-icon" role="button"
aria-label="&urlbar.indexedDBNotificationAnchor.label;"/>
tooltiptext="&urlbar.indexedDBBlocked.tooltip;"/>
<image data-permission-id="microphone" class="blocked-permission-icon microphone-icon" role="button"
aria-label="&urlbar.webRTCShareMicrophoneNotificationAnchor.label;"/>
tooltiptext="&urlbar.microphoneBlocked.tooltip;"/>
<image data-permission-id="screen" class="blocked-permission-icon screen-icon" role="button"
aria-label="&urlbar.webRTCShareScreenNotificationAnchor.label;"/>
tooltiptext="&urlbar.screenBlocked.tooltip;"/>
</box>
<box id="notification-popup-box"
hidden="true"
tooltiptext=""
onmouseover="document.getElementById('identity-icon').classList.add('no-hover');"
onmouseout="document.getElementById('identity-icon').classList.remove('no-hover');"
align="center">
<image id="default-notification-icon" class="notification-anchor-icon" role="button"
aria-label="&urlbar.defaultNotificationAnchor.label;"/>
tooltiptext="&urlbar.defaultNotificationAnchor.tooltip;"/>
<image id="geo-notification-icon" class="notification-anchor-icon geo-icon" role="button"
aria-label="&urlbar.geolocationNotificationAnchor.label;"/>
tooltiptext="&urlbar.geolocationNotificationAnchor.tooltip;"/>
<image id="addons-notification-icon" class="notification-anchor-icon install-icon" role="button"
aria-label="&urlbar.addonsNotificationAnchor.label;"/>
tooltiptext="&urlbar.addonsNotificationAnchor.tooltip;"/>
<image id="indexedDB-notification-icon" class="notification-anchor-icon indexedDB-icon" role="button"
aria-label="&urlbar.indexedDBNotificationAnchor.label;"/>
tooltiptext="&urlbar.indexedDBNotificationAnchor.tooltip;"/>
<image id="login-fill-notification-icon" class="notification-anchor-icon login-icon" role="button"
aria-label="&urlbar.loginFillNotificationAnchor.label;"/>
tooltiptext="&urlbar.loginFillNotificationAnchor.tooltip;"/>
<image id="password-notification-icon" class="notification-anchor-icon login-icon" role="button"
aria-label="&urlbar.passwordNotificationAnchor.label;"/>
tooltiptext="&urlbar.passwordNotificationAnchor.tooltip;"/>
<image id="plugins-notification-icon" class="notification-anchor-icon plugin-icon" role="button"
aria-label="&urlbar.pluginsNotificationAnchor.label;"/>
tooltiptext="&urlbar.pluginsNotificationAnchor.tooltip;"/>
<image id="web-notifications-notification-icon" class="notification-anchor-icon desktop-notification-icon" role="button"
aria-label="&urlbar.webNotsNotificationAnchor3.label;"/>
tooltiptext="&urlbar.webNotificationAnchor.tooltip;"/>
<image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon camera-icon" role="button"
aria-label="&urlbar.webRTCShareDevicesNotificationAnchor.label;"/>
tooltiptext="&urlbar.webRTCShareDevicesNotificationAnchor.tooltip;"/>
<image id="webRTC-shareMicrophone-notification-icon" class="notification-anchor-icon microphone-icon" role="button"
aria-label="&urlbar.webRTCShareMicrophoneNotificationAnchor.label;"/>
tooltiptext="&urlbar.webRTCShareMicrophoneNotificationAnchor.tooltip;"/>
<image id="webRTC-shareScreen-notification-icon" class="notification-anchor-icon screen-icon" role="button"
aria-label="&urlbar.webRTCShareScreenNotificationAnchor.label;"/>
tooltiptext="&urlbar.webRTCShareScreenNotificationAnchor.tooltip;"/>
<image id="servicesInstall-notification-icon" class="notification-anchor-icon service-icon" role="button"
aria-label="&urlbar.servicesNotificationAnchor.label;"/>
tooltiptext="&urlbar.servicesNotificationAnchor.tooltip;"/>
<image id="translate-notification-icon" class="notification-anchor-icon translation-icon" role="button"
aria-label="&urlbar.translateNotificationAnchor.label;"/>
tooltiptext="&urlbar.translateNotificationAnchor.tooltip;"/>
<image id="translated-notification-icon" class="notification-anchor-icon translation-icon in-use" role="button"
aria-label="&urlbar.translatedNotificationAnchor.label;"/>
tooltiptext="&urlbar.translatedNotificationAnchor.tooltip;"/>
<image id="eme-notification-icon" class="notification-anchor-icon drm-icon" role="button"
aria-label="&urlbar.emeNotificationAnchor.label;"/>
tooltiptext="&urlbar.emeNotificationAnchor.tooltip;"/>
</box>
<image id="tracking-protection-icon"/>
<image id="connection-icon"/>
Expand Down Expand Up @@ -1047,7 +1046,7 @@
<image id="sidebar-throbber"/>
<toolbarbutton class="close-icon tabbable" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="SidebarUI.hide();"/>
</sidebarheader>
<browser id="sidebar" flex="1" autoscroll="false" disablehistory="true"
<browser id="sidebar" flex="1" autoscroll="false" disablehistory="true" disablefullscreen="true"
style="min-width: 14em; width: 18em; max-width: 36em;" tooltip="aHTMLTooltip"/>
</vbox>

Expand Down
2 changes: 2 additions & 0 deletions browser/base/content/test/popupNotifications/browser.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ skip-if = (os == "linux" && (debug || asan))
skip-if = (os == "linux" && (debug || asan))
[browser_popupNotification_4.js]
skip-if = (os == "linux" && (debug || asan))
[browser_popupNotification_checkbox.js]
skip-if = (os == "linux" && (debug || asan))
Loading

0 comments on commit a11f7d2

Please sign in to comment.