wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge m-c to fx-team.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2013-05-30 11:47:17 -04:00
commit bd1234814b
676 changed files with 6718 additions and 4156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
accessible/src/atk/AccessibleWrap.cpp
View File

@ -954,6 +954,11 @@ AccessibleWrap::HandleAccEvent(AccEvent* aEvent)
Accessible* accessible = aEvent->GetAccessible();
NS_ENSURE_TRUE(accessible, NS_ERROR_FAILURE);
// The accessible can become defunct if we have an xpcom event listener
// which decides it would be fun to change the DOM and flush layout.
if (accessible->IsDefunct())
return NS_OK;
uint32_t type = aEvent->GetEventType();
AtkObject* atkObj = AccessibleWrap::GetAtkObject(accessible);

16
accessible/src/base/NotificationController.cpp
View File

@ -151,6 +151,10 @@ NotificationController::WillRefresh(mozilla::TimeStamp aTime)
if (!mDocument)
return;
if (mObservingState == eRefreshProcessing ||
mObservingState == eRefreshProcessingForUpdate)
return;
// Any generic notifications should be queued if we're processing content
// insertions or generic notifications.
mObservingState = eRefreshProcessingForUpdate;
@ -265,18 +269,20 @@ NotificationController::WillRefresh(mozilla::TimeStamp aTime)
mDocument->ProcessInvalidationList();
// If a generic notification occurs after this point then we may be allowed to
// process it synchronously.
mObservingState = eRefreshObserving;
// process it synchronously. However we do not want to reenter if fireing
// events causes script to run.
mObservingState = eRefreshProcessing;
ProcessEventQueue();
mObservingState = eRefreshObserving;
if (!mDocument)
return;
// Stop further processing if there are no new notifications of any kind or
// events and document load is processed.
if (mContentInsertions.Length() == 0 && mNotifications.Length() == 0 &&
mEvents.Length() == 0 && mTextHash.Count() == 0 &&
mHangingChildDocuments.Length() == 0 &&
if (mContentInsertions.IsEmpty() && mNotifications.IsEmpty() &&
mEvents.IsEmpty() && mTextHash.Count() == 0 &&
mHangingChildDocuments.IsEmpty() &&
mDocument->HasLoadState(DocAccessible::eCompletelyLoaded) &&
mPresShell->RemoveRefreshObserver(this, Flush_Display)) {
mObservingState = eNotObservingRefresh;

1
accessible/src/base/NotificationController.h
View File

@ -212,6 +212,7 @@ private:
enum eObservingState {
eNotObservingRefresh,
eRefreshObserving,
eRefreshProcessing,
eRefreshProcessingForUpdate
};
eObservingState mObservingState;

4
accessible/tests/mochitest/actions/test_link.html
View File

@ -17,10 +17,6 @@
src="../actions.js"></script>
<script type="application/javascript">
if (navigator.platform.startsWith("Linux")) {
SimpleTest.expectAssertions(2);
}
function getAnchorTargetDocumentAcc()
{
var thisTabDocAcc = getTabDocAccessible();

3
browser/app/profile/firefox.js
View File

@ -227,6 +227,7 @@ pref("general.useragent.complexOverride.moodle", false); // bug 797703
// At startup, check if we're the default browser and prompt user if not.
pref("browser.shell.checkDefaultBrowser", true);
pref("browser.shell.shortcutFavicons",true);
// 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session
// The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore
@ -895,7 +896,7 @@ pref("toolkit.crashreporter.infoURL",
"https://www.mozilla.org/legal/privacy/firefox.html#crash-reporter");
// base URL for web-based support pages
pref("app.support.baseURL", "http://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/");
pref("app.support.baseURL", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/");
// Name of alternate about: page for certificate errors (when undefined, defaults to about:neterror)
pref("security.alternate_certificate_error_page", "certerror");

4
browser/branding/aurora/pref/firefox-branding.js
View File

@ -16,10 +16,10 @@ pref("app.update.download.backgroundInterval", 60);
pref("app.update.promptWaitTime", 86400);
// URL user can browse to manually if for some reason all update installation
// attempts fail.
pref("app.update.url.manual", "http://www.mozilla.com/firefox/channel/");
pref("app.update.url.manual", "https://www.mozilla.org/firefox/aurora/");
// A default value for the "More information about this update" link
// supplied in the "An update is available" page of the update wizard.
pref("app.update.url.details", "http://www.mozilla.org/projects/firefox/");
pref("app.update.url.details", "https://www.mozilla.org/firefox/aurora/");
// Release notes and vendor URLs
pref("app.releaseNotesURL", "http://www.mozilla.org/projects/firefox/%VERSION%/releasenotes/");

8
browser/branding/nightly/pref/firefox-branding.js
View File

@ -2,8 +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/. */
pref("startup.homepage_override_url","http://www.mozilla.org/projects/firefox/%VERSION%/whatsnew/?oldversion=%OLD_VERSION%");
pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/firefox/%VERSION%/firstrun/");
pref("startup.homepage_override_url","");
pref("startup.homepage_welcome_url","");
// The time interval between checks for a new version (in seconds)
pref("app.update.interval", 7200); // 2 hours
// The time interval between the downloading of mar file chunks in the
@ -13,10 +13,10 @@ pref("app.update.download.backgroundInterval", 60);
pref("app.update.promptWaitTime", 43200);
// URL user can browse to manually if for some reason all update installation
// attempts fail.
pref("app.update.url.manual", "http://nightly.mozilla.org/");
pref("app.update.url.manual", "https://nightly.mozilla.org");
// A default value for the "More information about this update" link
// supplied in the "An update is available" page of the update wizard.
pref("app.update.url.details", "http://www.mozilla.org/projects/firefox/");
pref("app.update.url.details", "https://nightly.mozilla.org");
// Release notes and vendor URLs
pref("app.releaseNotesURL", "http://www.mozilla.org/projects/firefox/%VERSION%/releasenotes/");

8
browser/branding/official/pref/firefox-branding.js
View File

@ -2,8 +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/. */
pref("startup.homepage_override_url","http://www.mozilla.com/%LOCALE%/firefox/%VERSION%/whatsnew/?oldversion=%OLD_VERSION%");
pref("startup.homepage_welcome_url","http://www.mozilla.com/%LOCALE%/firefox/%VERSION%/firstrun/");
pref("startup.homepage_override_url","https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/whatsnew/?oldversion=%OLD_VERSION%");
pref("startup.homepage_welcome_url","https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/firstrun/");
// Interval: Time between checks for a new version (in seconds)
pref("app.update.interval", 43200); // 12 hours
// The time interval between the downloading of mar file chunks in the
@ -13,10 +13,10 @@ pref("app.update.download.backgroundInterval", 60);
pref("app.update.promptWaitTime", 86400);
// URL user can browse to manually if for some reason all update installation
// attempts fail.
pref("app.update.url.manual", "http://www.firefox.com");
pref("app.update.url.manual", "https://www.mozilla.org/firefox/");
// A default value for the "More information about this update" link
// supplied in the "An update is available" page of the update wizard.
pref("app.update.url.details", "http://www.mozilla.com/%LOCALE%/firefox/releases/");
pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/firefox/notes");
// Release notes and vendor URLs
pref("app.releaseNotesURL", "http://www.mozilla.com/%LOCALE%/firefox/%VERSION%/releasenotes/");

8
browser/branding/unofficial/pref/firefox-branding.js
View File

@ -2,8 +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/. */
pref("startup.homepage_override_url","http://www.mozilla.org/projects/firefox/%VERSION%/whatsnew/");
pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/firefox/%VERSION%/firstrun/");
pref("startup.homepage_override_url","");
pref("startup.homepage_welcome_url","");
// The time interval between checks for a new version (in seconds)
pref("app.update.interval", 86400); // 24 hours
// The time interval between the downloading of mar file chunks in the
@ -13,10 +13,10 @@ pref("app.update.download.backgroundInterval", 60);
pref("app.update.promptWaitTime", 86400);
// URL user can browse to manually if for some reason all update installation
// attempts fail.
pref("app.update.url.manual", "http://www.mozilla.org/products/firefox/");
pref("app.update.url.manual", "https://nightly.mozilla.org");
// A default value for the "More information about this update" link
// supplied in the "An update is available" page of the update wizard.
pref("app.update.url.details", "http://www.mozilla.org/projects/firefox/");
pref("app.update.url.details", "https://nightly.mozilla.org");
// Release notes and vendor URLs
pref("app.releaseNotesURL", "http://www.mozilla.org/projects/firefox/%VERSION%/releasenotes/");

2
browser/components/nsBrowserGlue.js
View File

@ -505,7 +505,7 @@ BrowserGlue.prototype = {
if (WINTASKBAR_CONTRACTID in Cc &&
Cc[WINTASKBAR_CONTRACTID].getService(Ci.nsIWinTaskbar).available) {
let temp = {};
Cu.import("resource://gre/modules/WindowsJumpLists.jsm", temp);
Cu.import("resource:///modules/WindowsJumpLists.jsm", temp);
temp.WinTaskbarJumpList.startup();
}
#endif

11
browser/components/places/tests/unit/test_browserGlue_shutdown.js
View File

@ -79,8 +79,15 @@ tests.push({
// Check a new bookmarks.html has been created.
let profileBookmarksHTMLFile = check_bookmarks_html();
//XXX not working on Linux unit boxes. Could be filestats caching issue.
//do_check_true(profileBookmarksHTMLFile.lastModifiedTime > lastMod);
do_check_neq(profileBookmarksHTMLFile.fileSize, fileSize);
let isLinux = ("@mozilla.org/gnome-gconf-service;1" in Cc);
if (!isLinux) {
//XXX this test does not working on Mac boxes as well.
let isOSX = ("nsILocalFileMac" in Ci);
if (!isOSX) {
do_check_true(profileBookmarksHTMLFile.lastModifiedTime > lastMod);
}
do_check_neq(profileBookmarksHTMLFile.fileSize, fileSize);
}
// Check preferences have not been reverted.
do_check_true(ps.getBoolPref(PREF_AUTO_EXPORT_HTML));

152
browser/devtools/webconsole/test/browser_bug_638949_copy_link_location.js
View File

@ -13,8 +13,11 @@ let output = null;
let menu = null;
function test() {
addTab(TEST_URI);
registerCleanupFunction(() => {
HUD = output = menu = null;
});
addTab(TEST_URI);
browser.addEventListener("load", function onLoad() {
browser.removeEventListener("load", onLoad, true);
@ -30,124 +33,75 @@ function test() {
// Return whether "Copy Link Location" command is enabled or not.
function isEnabled() {
let controller = top.document.commandDispatcher.
getControllerForCommand(COMMAND_NAME);
let controller = top.document.commandDispatcher
.getControllerForCommand(COMMAND_NAME);
return controller && controller.isCommandEnabled(COMMAND_NAME);
}
function select(query) {
let target = output.querySelector(query);
output.focus();
output.selectedItem = target;
return target;
}
function testWithoutNetActivity() {
HUD.jsterm.clearOutput();
output = HUD.outputNode;
content.wrappedJSObject.console.log("bug 638949");
content.console.log("bug 638949");
// Test that "Copy Link Location" command is disabled if there
// were no network-related messages.
waitForSuccess({
name: "no net activity in console",
validatorFn: function () {
return output.textContent.indexOf("bug 638949") > -1;
},
successFn: function () {
select(".webconsole-msg-log");
goUpdateCommand(COMMAND_NAME);
ok(!isEnabled(), COMMAND_NAME + "is disabled");
executeSoon(testMenuWithoutNetActivity);
}
});
// Test that the "Copy Link Location" command is disabled for non-network
// messages.
waitForMessages({
webconsole: HUD,
messages: [{
text: "bug 638949",
category: CATEGORY_WEBDEV,
severity: SEVERITY_LOG,
}],
}).then(onConsoleMessage);
}
function testMenuWithoutNetActivity() {
// Test that "Copy Link Location" menu item is hidden if there
// were no network-related messages.
let target = select(".webconsole-msg-log");
function onConsoleMessage(aResults) {
output.focus();
output.selectedItem = [...aResults[0].matched][0];
function next() {
menu.hidePopup();
executeSoon(testWithNetActivity);
}
goUpdateCommand(COMMAND_NAME);
ok(!isEnabled(), COMMAND_NAME + "is disabled");
waitForOpenContextMenu(menu, {
target: target,
successFn: function () {
let isHidden = menu.querySelector(CONTEXT_MENU_ID).hidden;
ok(isHidden, CONTEXT_MENU_ID + " is hidden");
next();
},
failureFn: next
});
// Test that the "Copy Link Location" menu item is hidden for non-network
// messages.
waitForContextMenu(menu, output.selectedItem, () => {
let isHidden = menu.querySelector(CONTEXT_MENU_ID).hidden;
ok(isHidden, CONTEXT_MENU_ID + " is hidden");
}, testWithNetActivity);
}
function testWithNetActivity() {
HUD.jsterm.clearOutput();
content.location.reload(); // Reloading will produce network logging
// Test that "Copy Link Location" command is enabled and works
// as expected if there were any network-related messages.
//
// This command should copy only the URL without timestamp and other
// stuff.
waitForSuccess({
name: "net activity in console",
// Test that the "Copy Link Location" command is enabled and works
// as expected for any network-related message.
// This command should copy only the URL.
waitForMessages({
webconsole: HUD,
messages: [{
text: "test-console.html",
category: CATEGORY_NETWORK,
severity: SEVERITY_LOG,
}],
}).then(onNetworkMessage);
}
validatorFn: function () {
let item = select(".webconsole-msg-network");
return item && item.url;
},
function onNetworkMessage(aResults) {
output.focus();
output.selectedItem = [...aResults[0].matched][0];
successFn: function () {
output.focus();
goUpdateCommand(COMMAND_NAME);
ok(isEnabled(), COMMAND_NAME + " is enabled");
goUpdateCommand(COMMAND_NAME);
ok(isEnabled(), COMMAND_NAME + " is enabled");
waitForClipboard(output.selectedItem.url, function clipboardSetup() {
goDoCommand(COMMAND_NAME);
}, testMenuWithNetActivity, testMenuWithNetActivity);
},
failureFn: testMenuWithNetActivity
});
waitForClipboard(output.selectedItem.url, () => goDoCommand(COMMAND_NAME),
testMenuWithNetActivity, testMenuWithNetActivity);
}
function testMenuWithNetActivity() {
// Test that "Copy Link Location" menu item is visible if there
// were any network-related messages.
let target = select(".webconsole-msg-network");
function next() {
menu.hidePopup();
executeSoon(finalize);
}
waitForOpenContextMenu(menu, {
target: target,
successFn: function () {
let isVisible = !menu.querySelector(CONTEXT_MENU_ID).hidden;
ok(isVisible, CONTEXT_MENU_ID + " is visible");
next();
},
failureFn: next
});
}
function finalize() {
HUD = null;
output = null;
menu = null;
finishTest();
// Test that the "Copy Link Location" menu item is visible for network-related
// messages.
waitForContextMenu(menu, output.selectedItem, () => {
let isVisible = !menu.querySelector(CONTEXT_MENU_ID).hidden;
ok(isVisible, CONTEXT_MENU_ID + " is visible");
}, finishTest);
}

185
browser/devtools/webconsole/test/browser_webconsole_bug_764572_output_open_url.js
View File

@ -23,127 +23,87 @@ function consoleOpened(aHud) {
outputNode = aHud.outputNode;
contextMenu = HUD.iframeWindow.document.getElementById("output-contextmenu");
executeSoon(testOnNotNetActivity);
}
registerCleanupFunction(() => {
HUD = outputNode = contextMenu = null;
});
function testOnNotNetActivity() {
HUD.jsterm.clearOutput();
outputNode = HUD.outputNode;
let console = content.wrappedJSObject.console;
console.log("bug 764572");
content.console.log("bug 764572");
testOnNotNetActivity_command();
waitForMessages({
webconsole: HUD,
messages: [{
text: "bug 764572",
category: CATEGORY_WEBDEV,
severity: SEVERITY_LOG,
}],
}).then(onConsoleMessage);
}
function testOnNotNetActivity_command () {
waitForSuccess({
name: "show no net activity in console",
validatorFn: function () {
return outputNode.textContent.indexOf("bug 764572") > -1;
},
successFn: function () {
outputNode.focus();
outputNode.selectedItem = outputNode.querySelector(".webconsole-msg-log");
// check whether the command is disable
goUpdateCommand(COMMAND_NAME);
let controller = top.document.commandDispatcher.
getControllerForCommand(COMMAND_NAME);
let isDisabled = !controller || !controller.isCommandEnabled("consoleCmd_openURL");
ok(isDisabled, COMMAND_NAME + " should be disabled.");
executeSoon(testOnNotNetActivity_contextmenu);
},
failureFn: testOnNotNetActivity_contextmenu,
});
}
function testOnNotNetActivity_contextmenu() {
let target = outputNode.querySelector(".webconsole-msg-log");
function onConsoleMessage(aResults) {
outputNode.focus();
outputNode.selectedItem = target;
outputNode.selectedItem = [...aResults[0].matched][0];
waitForOpenContextMenu(contextMenu, {
target: target,
successFn: function () {
let isHidden = contextMenu.querySelector(CONTEXT_MENU_ID).hidden;
ok(isHidden, CONTEXT_MENU_ID + "should be hidden.");
// Check if the command is disabled non-network messages.
goUpdateCommand(COMMAND_NAME);
let controller = top.document.commandDispatcher
.getControllerForCommand(COMMAND_NAME);
closeContextMenu(contextMenu);
executeSoon(testOnNetActivity);
},
failureFn: function(){
closeContextMenu(contextMenu);
executeSoon(testOnNetActivity);
},
});
let isDisabled = !controller || !controller.isCommandEnabled(COMMAND_NAME);
ok(isDisabled, COMMAND_NAME + " should be disabled.");
waitForContextMenu(contextMenu, outputNode.selectedItem, () => {
let isHidden = contextMenu.querySelector(CONTEXT_MENU_ID).hidden;
ok(isHidden, CONTEXT_MENU_ID + " should be hidden.");
}, testOnNetActivity);
}
function testOnNetActivity() {
HUD.jsterm.clearOutput();
// reload the url to show net activity in console.
// Reload the url to show net activity in console.
content.location.reload();
testOnNetActivity_command();
waitForMessages({
webconsole: HUD,
messages: [{
text: "test-console.html",
category: CATEGORY_NETWORK,
severity: SEVERITY_LOG,
}],
}).then(onNetworkMessage);
}
function testOnNetActivity_command() {
waitForSuccess({
name: "show TEST_URI's net activity in console",
validatorFn: function () {
outputNode.focus();
outputNode.selectedItem = outputNode.querySelector(".webconsole-msg-network");
function onNetworkMessage(aResults) {
outputNode.focus();
outputNode.selectedItem = [...aResults[0].matched][0];
let item = outputNode.selectedItem;
return item && item.url;
},
successFn: function () {
outputNode.focus();
let currentTab = gBrowser.selectedTab;
let newTab = null;
// set up the event handler for TabOpen
gBrowser.tabContainer.addEventListener("TabOpen", function onOpen(aEvent) {
gBrowser.tabContainer.removeEventListener("TabOpen", onOpen, true);
gBrowser.tabContainer.addEventListener("TabOpen", function onOpen(aEvent) {
gBrowser.tabContainer.removeEventListener("TabOpen", onOpen, true);
newTab = aEvent.target;
newTab.linkedBrowser.addEventListener("load", onTabLoaded, true);
}, true);
let tab = aEvent.target;
onTabOpen(tab);
}, true);
function onTabLoaded() {
newTab.linkedBrowser.removeEventListener("load", onTabLoaded, true);
gBrowser.removeTab(newTab);
gBrowser.selectedTab = currentTab;
executeSoon(testOnNetActivity_contextmenu);
}
// check whether the command is enable
goUpdateCommand(COMMAND_NAME);
let controller = top.document.commandDispatcher.
getControllerForCommand(COMMAND_NAME);
ok(controller.isCommandEnabled("consoleCmd_openURL"), COMMAND_NAME + " should be enabled.");
// Check if the command is enabled for a network message.
goUpdateCommand(COMMAND_NAME);
let controller = top.document.commandDispatcher
.getControllerForCommand(COMMAND_NAME);
ok(controller.isCommandEnabled(COMMAND_NAME),
COMMAND_NAME + " should be enabled.");
// try to open url.
goDoCommand(COMMAND_NAME);
},
failureFn: testOnNetActivity_contextmenu,
});
}
// check TabOpen event
function onTabOpen(aTab) {
waitForSuccess({
timeout: 10000,
name: "complete to initialize the opening tab",
validatorFn: function()
{
// wait to complete initialization for the new tab.
let url = aTab.linkedBrowser.currentURI.spec;
return url === TEST_URI;
},
successFn: function()
{
gBrowser.removeTab(aTab);
executeSoon(testOnNetActivity_contextmenu);
},
failureFn: function()
{
info("new tab currentURI " + aTab.linkedBrowser.currentURI.spec);
testOnNetActivity_contextmenu();
},
});
// Try to open the URL.
goDoCommand(COMMAND_NAME);
}
function testOnNetActivity_contextmenu() {
@ -152,29 +112,8 @@ function testOnNetActivity_contextmenu() {
outputNode.focus();
outputNode.selectedItem = target;
waitForOpenContextMenu(contextMenu, {
target: target,
successFn: function () {
let isShown = !contextMenu.querySelector(CONTEXT_MENU_ID).hidden;
ok(isShown, CONTEXT_MENU_ID + "should be shown.");
closeContextMenu(contextMenu);
executeSoon(finalizeTest);
},
failureFn: function(){
closeContextMenu(contextMenu);
executeSoon(finalizeTest);
},
});
}
function finalizeTest() {
HUD = null;
outputNode = null;
contextMenu = null
finishTest();
}
function closeContextMenu (aContextMenu) {
aContextMenu.hidePopup();
waitForContextMenu(contextMenu, target, () => {
let isShown = !contextMenu.querySelector(CONTEXT_MENU_ID).hidden;
ok(isShown, CONTEXT_MENU_ID + " should be shown.");
}, finishTest);
}

72
browser/devtools/webconsole/test/head.js
View File

@ -197,54 +197,42 @@ function closeConsole(aTab, aCallback = function() { })
}
/**
* Polls a given function waiting for opening context menu.
* Wait for a context menu popup to open.
*
* @Param {nsIDOMElement} aContextMenu
* @param object aOptions
* Options object with the following properties:
* - successFn
* A function called if opening the given context menu - success to return.
* - failureFn
* A function called if not opening the given context menu - fails to return.
* - target
* The target element for showing a context menu.
* - timeout
* Timeout for popup shown, in milliseconds. Default is 5000.
* @param nsIDOMElement aPopup
* The XUL popup you expect to open.
* @param nsIDOMElement aButton
* The button/element that receives the contextmenu event. This is
* expected to open the popup.
* @param function aOnShown
* Function to invoke on popupshown event.
* @param function aOnHidden
* Function to invoke on popuphidden event.
*/
function waitForOpenContextMenu(aContextMenu, aOptions) {
let start = Date.now();
let timeout = aOptions.timeout || 5000;
let targetElement = aOptions.target;
if (!aContextMenu) {
ok(false, "Can't get a context menu.");
aOptions.failureFn();
return;
}
if (!targetElement) {
ok(false, "Can't get a target element.");
aOptions.failureFn();
return;
}
function waitForContextMenu(aPopup, aButton, aOnShown, aOnHidden)
{
function onPopupShown() {
aContextMenu.removeEventListener("popupshown", onPopupShown);
clearTimeout(onTimeout);
aOptions.successFn();
info("onPopupShown");
aPopup.removeEventListener("popupshown", onPopupShown);
aOnShown();
// Use executeSoon() to get out of the popupshown event.
aPopup.addEventListener("popuphidden", onPopupHidden);
executeSoon(() => aPopup.hidePopup());
}
function onPopupHidden() {
info("onPopupHidden");
aPopup.removeEventListener("popuphidden", onPopupHidden);
aOnHidden();
}
aPopup.addEventListener("popupshown", onPopupShown);
aContextMenu.addEventListener("popupshown", onPopupShown);
let onTimeout = setTimeout(function(){
aContextMenu.removeEventListener("popupshown", onPopupShown);
aOptions.failureFn();
}, timeout);
// open a context menu.
let eventDetails = { type : "contextmenu", button : 2};
EventUtils.synthesizeMouse(targetElement, 2, 2,
eventDetails, targetElement.ownerDocument.defaultView);
info("wait for the context menu to open");
let eventDetails = { type: "contextmenu", button: 2};
EventUtils.synthesizeMouse(aButton, 2, 2, eventDetails,
aButton.ownerDocument.defaultView);
}
/**

1
browser/extensions/pdfjs/test/Makefile.in
View File

@ -13,6 +13,7 @@ include $(DEPTH)/config/autoconf.mk
MOCHITEST_BROWSER_FILES = \
browser_pdfjs_main.js \
browser_pdfjs_savedialog.js \
browser_pdfjs_views.js \
file_pdfjs_test.pdf \
$(NULL)

74
browser/extensions/pdfjs/test/browser_pdfjs_views.js Normal file
View File

@ -0,0 +1,74 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
const RELATIVE_DIR = "browser/extensions/pdfjs/test/";
const TESTROOT = "http://example.com/browser/" + RELATIVE_DIR;
function test() {
var tab;
let handlerService = Cc["@mozilla.org/uriloader/handler-service;1"].getService(Ci.nsIHandlerService);
let mimeService = Cc["@mozilla.org/mime;1"].getService(Ci.nsIMIMEService);
let handlerInfo = mimeService.getFromTypeAndExtension('application/pdf', 'pdf');
// Make sure pdf.js is the default handler.
is(handlerInfo.alwaysAskBeforeHandling, false, 'pdf handler defaults to always-ask is false');
is(handlerInfo.preferredAction, Ci.nsIHandlerInfo.handleInternally, 'pdf handler defaults to internal');
info('Pref action: ' + handlerInfo.preferredAction);
waitForExplicitFinish();
registerCleanupFunction(function() {
gBrowser.removeTab(tab);
});
tab = gBrowser.addTab(TESTROOT + "file_pdfjs_test.pdf");
var newTabBrowser = gBrowser.getBrowserForTab(tab);
newTabBrowser.addEventListener("load", function eventHandler() {
newTabBrowser.removeEventListener("load", eventHandler, true);
var document = newTabBrowser.contentDocument,
window = newTabBrowser.contentWindow;
// Runs tests after all 'load' event handlers have fired off
window.addEventListener("documentload", function() {runTests(document, window, finish);}, false, true);
}, true);
}
function runTests(document, window, callback) {
// check that PDF is opened with internal viewer
ok(document.querySelector('div#viewer'), "document content has viewer UI");
ok('PDFJS' in window.wrappedJSObject, "window content has PDFJS object");
//open sidebar
var sidebar = document.querySelector('button#sidebarToggle');
var outerContainer = document.querySelector('div#outerContainer');
sidebar.click();
ok(outerContainer.classList.contains('sidebarOpen'), 'sidebar opens on click');
// check that thumbnail view is open
var thumbnailView = document.querySelector('div#thumbnailView');
var outlineView = document.querySelector('div#outlineView');
is(thumbnailView.getAttribute('class'), null, 'Initial view is thumbnail view');
is(outlineView.getAttribute('class'), 'hidden', 'Outline view is hidden initially');
//switch to outline view
var viewOutlineButton = document.querySelector('button#viewOutline');
viewOutlineButton.click();
is(outlineView.getAttribute('class'), '', 'Outline view is visible when selected');
is(thumbnailView.getAttribute('class'), 'hidden', 'Thumbnail view is hidden when outline is selected');
//switch back to thumbnail view
var viewThumbnailButton = document.querySelector('button#viewThumbnail');
viewThumbnailButton.click();
is(thumbnailView.getAttribute('class'), '', 'Thumbnail view is visible when selected');
is(outlineView.getAttribute('class'), 'hidden', 'Outline view is hidden when thumbnail is selected');
sidebar.click();
callback();
}

BIN
browser/extensions/pdfjs/test/file_pdfjs_test.pdf
View File

Binary file not shown.

2
browser/locales/en-US/chrome/browser-region/region.properties
View File

@ -28,7 +28,7 @@ gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/wi
# The default set of protocol handlers for mailto:
gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s
gecko.handlerService.schemes.mailto.0.uriTemplate=https://compose.mail.yahoo.com/?To=%s
gecko.handlerService.schemes.mailto.1.name=Gmail
gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s

13
browser/metro/base/content/bindings/autocomplete.xml
View File

@ -54,7 +54,7 @@
box.showContextMenu(this, event, true);
]]>
</handler>
<handler event="keypress" phase="capturing" keycode="VK_RETURN">
<![CDATA[
event.preventDefault();
@ -268,7 +268,7 @@
for (let i = 0; i < iterCount; i++) {
if (i > lastMatch) {
let lastItem = this._results.itemCount - 1;
this._results.removeItemAt(lastItem);
this._results.removeItemAt(lastItem, true);
continue;
}
@ -278,7 +278,7 @@
let item = this._results.getItemAtIndex(i);
if (item == null) {
item = this._results.appendItem(label, value);
item = this._results.appendItem(label, value, true);
item.setAttribute("autocomplete", "true");
} else {
item.setAttribute("label", label);
@ -308,10 +308,10 @@
this._engines = Services.search.getVisibleEngines();
while (this._searches.itemCount > 0)
this._searches.removeItemAt(0);
this._searches.removeItemAt(0, true);
this._engines.forEach(function (anEngine) {
let item = this._searches.appendItem(anEngine.name, anEngine.name);
let item = this._searches.appendItem(anEngine.name, anEngine.name, true);
item.setAttribute("autocomplete", "true");
item.setAttribute("search", "true");
@ -336,9 +336,8 @@
for (let i = 0, len = this._searches.itemCount; i < len; i++) {
let item = this._searches.getItemAtIndex(i);
item.setAttribute("label", label);
item.refresh && item.refresh();
}
this._searches.arrangeItems();
]]>
</body>
</method>

23
browser/metro/base/content/bookmarks.js
View File

@ -30,7 +30,7 @@ var Bookmarks = {
aURI,
bookmarkService.DEFAULT_INDEX,
bookmarkTitle);
// XXX Used for browser-chrome tests
let event = document.createEvent("Events");
event.initEvent("BookmarkCreated", true, false);
@ -69,7 +69,7 @@ var Bookmarks = {
/**
* Wraps a list/grid control implementing nsIDOMXULSelectControlElement and
* fills it with the user's bookmarks.
*
*
* @param aSet Control implementing nsIDOMXULSelectControlElement.
* @param {Number} aLimit Maximum number of items to show in the view.
* @param aRoot Bookmark root to show in the view.
@ -77,6 +77,7 @@ var Bookmarks = {
function BookmarksView(aSet, aLimit, aRoot, aFilterUnpinned) {
this._set = aSet;
this._set.controller = this;
this._inBatch = false; // batch up grid updates to avoid redundant arrangeItems calls
this._limit = aLimit;
this._filterUnpinned = aFilterUnpinned;
@ -152,6 +153,8 @@ BookmarksView.prototype = {
rootNode.containerOpen = true;
let childCount = rootNode.childCount;
this._inBatch = true; // batch up grid updates to avoid redundant arrangeItems calls
for (let i = 0, addedCount = 0; i < childCount && addedCount < limit; i++) {
let node = rootNode.getChild(i);
@ -188,9 +191,10 @@ BookmarksView.prototype = {
// This can happen when undoing a delete.
if (aRefresh) {
while (this._set.itemCount > limit)
this._set.removeItemAt(this._set.itemCount - 1);
this._set.removeItemAt(this._set.itemCount - 1, true);
}
this._set.arrangeItems();
this._inBatch = false;
rootNode.containerOpen = false;
},
@ -203,14 +207,15 @@ BookmarksView.prototype = {
clearBookmarks: function bv_clearBookmarks() {
while (this._set.itemCount > 0)
this._set.removeItemAt(0);
this._set.removeItemAt(0, true);
this._set.arrangeItems();
},
addBookmark: function bv_addBookmark(aBookmarkId, aPos) {
let index = this._bookmarkService.getItemIndex(aBookmarkId);
let uri = this._bookmarkService.getBookmarkURI(aBookmarkId);
let title = this._bookmarkService.getItemTitle(aBookmarkId) || uri.spec;
let item = this._set.insertItemAt(aPos || index, title, uri.spec);
let item = this._set.insertItemAt(aPos || index, title, uri.spec, this._inBatch);
item.setAttribute("bookmarkId", aBookmarkId);
this._setContextActions(item);
this._updateFavicon(aBookmarkId, item, uri);
@ -252,7 +257,7 @@ BookmarksView.prototype = {
if (!item)
return;
let oldIndex = this._set.getIndexOfItem(item);
let index = this._bookmarkService.getItemIndex(aBookmarkId);
@ -274,7 +279,7 @@ BookmarksView.prototype = {
removeBookmark: function bv_removeBookmark(aBookmarkId) {
let item = this._getItemForBookmarkId(aBookmarkId);
let index = this._set.getIndexOfItem(item);
this._set.removeItemAt(index);
this._set.removeItemAt(index, this._inBatch);
},
destruct: function bv_destruct() {
@ -426,7 +431,7 @@ BookmarkChangeListener.prototype = {
let itemIndex = PlacesUtils.bookmarks.getItemIndex(aItemId);
if (!this._view.inCurrentView(aParentId, aItemId))
return;
this._view.updateBookmark(aItemId);
},

9
browser/metro/base/content/browser-ui.js
View File

@ -1096,6 +1096,10 @@ var BrowserUI = {
this.savePage();
break;
}
},
crashReportingPrefChanged: function crashReportingPrefChanged(aState) {
CrashReporter.submitReports = aState;
}
};
@ -1520,6 +1524,11 @@ var FlyoutPanelsUI = {
AboutPanelUI.init();
PreferencesPanelView.init();
SyncPanelUI.init();
// make sure to hide all flyouts when window is deactivated
window.addEventListener("deactivate", function(window) {
FlyoutPanelsUI.hide();
});
},
hide: function() {

3
browser/metro/base/content/browser.xul
View File

@ -511,6 +511,9 @@
</hbox>
</settings>
<setting pref="signon.rememberSignons" title="&optionsHeader.privacy.passwords.label;" type="bool"/>
<settings id="prefs-reporting" label="&optionsHeader.reporting.title;">
<setting pref="app.reportCrashes" type="bool" title="&optionsHeader.reporting.crashes.label;" oncommand="BrowserUI.crashReportingPrefChanged(this.value);"/>
</settings>
<settings id="prefs-dnt" label="&doNotTrack.title;">
<description>&doNotTrack.desc;</description>
<setting id="prefs-dnt-value" pref="privacy.donottrackheader.value" onpreferencechanged="PreferencesPanelView.onDNTPreferenceChanged()" type="radio" >

17
browser/metro/base/content/history.js
View File

@ -7,7 +7,7 @@
function HistoryView(aSet, aLimit, aFilterUnpinned) {
this._set = aSet;
this._set.controller = this;
this._inBatch = false;
this._inBatch = 0;
this._limit = aLimit;
this._filterUnpinned = aFilterUnpinned;
@ -30,6 +30,7 @@ HistoryView.prototype = {
},
populateGrid: function populateGrid(aRefresh) {
this._inBatch++; // always batch up grid updates to avoid redundant arrangeItems calls
let query = this._navHistoryService.getNewQuery();
let options = this._navHistoryService.getNewQueryOptions();
options.excludeQueries = true;
@ -83,6 +84,9 @@ HistoryView.prototype = {
}
rootNode.containerOpen = false;
this._set.arrangeItems();
if (this._inBatch > 0)
this._inBatch--;
},
destruct: function destruct() {
@ -113,7 +117,9 @@ HistoryView.prototype = {
removeHistory: function (aUri) {
let items = this._set.getItemsByUrl(aUri);
for (let item of items)
this._set.removeItem(item, this._inBatch);
this._set.removeItem(item, true);
if (!this._inBatch)
this._set.arrangeItems();
},
doActionOnSelectedTiles: function bv_doActionOnSelectedTiles(aActionName, aEvent) {
@ -207,12 +213,15 @@ HistoryView.prototype = {
onBeginUpdateBatch: function() {
// Avoid heavy grid redraws while a batch is in process
this._inBatch = true;
this._inBatch++;
},
onEndUpdateBatch: function() {
this._inBatch = false;
this.populateGrid(true);
if (this._inBatch > 0) {
this._inBatch--;
this._set.arrangeItems();
}
},
onVisit: function(aURI, aVisitID, aTime, aSessionID,

2
browser/metro/locales/en-US/chrome/preferences.dtd
View File

@ -36,3 +36,5 @@
<!ENTITY doNotTrack.options.trackingNotOkay "I do not want to be tracked">
<!ENTITY doNotTrack.options.noPreference "Nothing about my tracking preferences">
<!ENTITY doNotTrack.options.trackingOkay "I want to be tracked">
<!ENTITY optionsHeader.reporting.title "Crash Reporter">
<!ENTITY optionsHeader.reporting.crashes.label "&brandShortName; submits crash reports to help Mozilla make your browser more stable and secure">

2
browser/metro/profile/metro.js
View File

@ -382,7 +382,7 @@ pref("dom.ipc.content.nice", 1);
pref("breakpad.reportURL", "https://crash-stats.mozilla.com/report/index/");
// TODO: This is not the correct article for metro!!!
pref("app.sync.tutorialURL", "https://support.mozilla.org/kb/sync-firefox-between-desktop-and-mobile");
pref("app.support.baseURL", "http://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/");
pref("app.support.baseURL", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/");
pref("app.privacyURL", "http://www.mozilla.com/legal/privacy/");
pref("app.creditsURL", "http://www.mozilla.org/credits/");
pref("app.channelURL", "http://www.mozilla.org/%LOCALE%/firefox/channel/");

6
browser/metro/theme/browser.css
View File

@ -561,6 +561,12 @@ flyoutpanel > settings:first-child {
margin-top: 24pt;
}
#currentChannel {
margin: 0;
padding: 0;
font-weight: bold;
}
/* Preferences flyout */
#prefs-flyoutpanel {

2
browser/themes/osx/jar.mn
View File

@ -201,7 +201,7 @@ browser.jar:
skin/classic/browser/tabbrowser/tab-top-selected-active@2x.png (tabbrowser/tab-top-selected-active@2x.png)
skin/classic/browser/tabbrowser/tab-overflow-border.png (tabbrowser/tab-overflow-border.png)
skin/classic/browser/tabbrowser/tabDragIndicator.png (tabbrowser/tabDragIndicator.png)
skin/classic/browser/tabbrowser/tabDragIndicator@2x.png (tabbrowser/tabDragIndicator.png)
skin/classic/browser/tabbrowser/tabDragIndicator@2x.png (tabbrowser/tabDragIndicator@2x.png)
skin/classic/browser/tabview/close.png (tabview/close.png)
skin/classic/browser/tabview/edit-light.png (tabview/edit-light.png)
skin/classic/browser/tabview/search.png (tabview/search.png)

BIN
browser/themes/osx/tabbrowser/tabDragIndicator@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

4
build/autoconf/frameptr.m4
View File

@ -15,6 +15,10 @@ AC_DEFUN([MOZ_SET_FRAMEPTR_FLAGS], [
if test "$GNU_CC"; then
MOZ_ENABLE_FRAME_PTR="-fno-omit-frame-pointer $unwind_tables"
MOZ_DISABLE_FRAME_PTR="-fomit-frame-pointer"
if test "$CPU_ARCH" = arm; then
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54398
MOZ_ENABLE_FRAME_PTR="$unwind_tables"
fi
else
case "$target" in
*-mingw*)

1
configure.in
View File

@ -2092,6 +2092,7 @@ ia64*-hpux*)
RC='$(WINDRES)'
# Use static libgcc and libstdc++
LDFLAGS="$LDFLAGS -static-libgcc -static-libstdc++"
NSPR_LDFLAGS="$NSPR_LDFLAGS -static-libgcc"
# Use temp file for windres (bug 213281)
RCFLAGS='-O coff --use-temp-file'
# mingw doesn't require kernel32, user32, and advapi32 explicitly

24
content/base/public/Element.h
View File

@ -396,14 +396,14 @@ private:
NotifyStateChange(aStates);
}
public:
virtual void UpdateEditableState(bool aNotify);
virtual void UpdateEditableState(bool aNotify) MOZ_OVERRIDE;
virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
nsIContent* aBindingParent,
bool aCompileEventHandlers);
bool aCompileEventHandlers) MOZ_OVERRIDE;
virtual void UnbindFromTree(bool aDeep = true,
bool aNullParent = true);
virtual already_AddRefed<nsINodeInfo> GetExistingAttrNameFromQName(const nsAString& aStr) const;
bool aNullParent = true) MOZ_OVERRIDE;
virtual already_AddRefed<nsINodeInfo> GetExistingAttrNameFromQName(const nsAString& aStr) const MOZ_OVERRIDE;
nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
const nsAString& aValue, bool aNotify)
{
@ -439,7 +439,7 @@ public:
uint8_t* aModType, bool* aHasListeners);
virtual nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName, nsIAtom* aPrefix,
const nsAString& aValue, bool aNotify);
const nsAString& aValue, bool aNotify) MOZ_OVERRIDE;
nsresult SetParsedAttr(int32_t aNameSpaceID, nsIAtom* aName, nsIAtom* aPrefix,
nsAttrValue& aParsedValue, bool aNotify);
// GetAttr is not inlined on purpose, to keep down codesize from all
@ -457,19 +457,19 @@ public:
virtual int32_t FindAttrValueIn(int32_t aNameSpaceID,
nsIAtom* aName,
AttrValuesArray* aValues,
nsCaseTreatment aCaseSensitive) const;
nsCaseTreatment aCaseSensitive) const MOZ_OVERRIDE;
virtual nsresult UnsetAttr(int32_t aNameSpaceID, nsIAtom* aAttribute,
bool aNotify);
virtual const nsAttrName* GetAttrNameAt(uint32_t aIndex) const;
virtual uint32_t GetAttrCount() const;
virtual bool IsNodeOfType(uint32_t aFlags) const;
bool aNotify) MOZ_OVERRIDE;
virtual const nsAttrName* GetAttrNameAt(uint32_t aIndex) const MOZ_OVERRIDE;
virtual uint32_t GetAttrCount() const MOZ_OVERRIDE;
virtual bool IsNodeOfType(uint32_t aFlags) const MOZ_OVERRIDE;
#ifdef DEBUG
virtual void List(FILE* out = stdout, int32_t aIndent = 0) const
virtual void List(FILE* out = stdout, int32_t aIndent = 0) const MOZ_OVERRIDE
{
List(out, aIndent, EmptyCString());
}
virtual void DumpContent(FILE* out, int32_t aIndent, bool aDumpAll) const;
virtual void DumpContent(FILE* out, int32_t aIndent, bool aDumpAll) const MOZ_OVERRIDE;
void List(FILE* out, int32_t aIndent, const nsCString& aPrefix) const;
void ListAttributes(FILE* out) const;
#endif

55
content/base/public/FragmentOrElement.h
View File

@ -12,6 +12,7 @@
#ifndef FragmentOrElement_h___
#define FragmentOrElement_h___
#include "mozilla/Attributes.h"
#include "nsAttrAndChildArray.h" // member
#include "nsCycleCollectionParticipant.h" // NS_DECL_CYCLE_*
#include "nsIContent.h" // base class
@ -60,15 +61,15 @@ public:
NS_DECL_NSIDOMNODELIST
// nsINodeList interface
virtual int32_t IndexOf(nsIContent* aContent);
virtual nsIContent* Item(uint32_t aIndex);
virtual int32_t IndexOf(nsIContent* aContent) MOZ_OVERRIDE;
virtual nsIContent* Item(uint32_t aIndex) MOZ_OVERRIDE;
void DropReference()
{
mNode = nullptr;
}
virtual nsINode* GetParentObject()
virtual nsINode* GetParentObject() MOZ_OVERRIDE
{
return mNode;
}
@ -186,40 +187,40 @@ public:
nsresult PostQueryInterface(REFNSIID aIID, void** aInstancePtr);
// nsINode interface methods
virtual uint32_t GetChildCount() const;
virtual nsIContent *GetChildAt(uint32_t aIndex) const;
virtual nsIContent * const * GetChildArray(uint32_t* aChildCount) const;
virtual uint32_t GetChildCount() const MOZ_OVERRIDE;
virtual nsIContent *GetChildAt(uint32_t aIndex) const MOZ_OVERRIDE;
virtual nsIContent * const * GetChildArray(uint32_t* aChildCount) const MOZ_OVERRIDE;
virtual int32_t IndexOf(const nsINode* aPossibleChild) const MOZ_OVERRIDE;
virtual nsresult InsertChildAt(nsIContent* aKid, uint32_t aIndex,
bool aNotify);
virtual void RemoveChildAt(uint32_t aIndex, bool aNotify);
virtual void GetTextContentInternal(nsAString& aTextContent);
bool aNotify) MOZ_OVERRIDE;
virtual void RemoveChildAt(uint32_t aIndex, bool aNotify) MOZ_OVERRIDE;
virtual void GetTextContentInternal(nsAString& aTextContent) MOZ_OVERRIDE;
virtual void SetTextContentInternal(const nsAString& aTextContent,
mozilla::ErrorResult& aError);
mozilla::ErrorResult& aError) MOZ_OVERRIDE;
// nsIContent interface methods
virtual already_AddRefed<nsINodeList> GetChildren(uint32_t aFilter);
virtual const nsTextFragment *GetText();
virtual uint32_t TextLength() const;
virtual already_AddRefed<nsINodeList> GetChildren(uint32_t aFilter) MOZ_OVERRIDE;
virtual const nsTextFragment *GetText() MOZ_OVERRIDE;
virtual uint32_t TextLength() const MOZ_OVERRIDE;
virtual nsresult SetText(const PRUnichar* aBuffer, uint32_t aLength,
bool aNotify);
bool aNotify) MOZ_OVERRIDE;
// Need to implement this here too to avoid hiding.
nsresult SetText(const nsAString& aStr, bool aNotify)
{
return SetText(aStr.BeginReading(), aStr.Length(), aNotify);
}
virtual nsresult AppendText(const PRUnichar* aBuffer, uint32_t aLength,
bool aNotify);
virtual bool TextIsOnlyWhitespace();
virtual void AppendTextTo(nsAString& aResult);
virtual nsIContent *GetBindingParent() const;
virtual bool IsLink(nsIURI** aURI) const;
bool aNotify) MOZ_OVERRIDE;
virtual bool TextIsOnlyWhitespace() MOZ_OVERRIDE;
virtual void AppendTextTo(nsAString& aResult) MOZ_OVERRIDE;
virtual nsIContent *GetBindingParent() const MOZ_OVERRIDE;
virtual bool IsLink(nsIURI** aURI) const MOZ_OVERRIDE;
virtual void DestroyContent();
virtual void SaveSubtreeState();
virtual void DestroyContent() MOZ_OVERRIDE;
virtual void SaveSubtreeState() MOZ_OVERRIDE;
virtual const nsAttrValue* DoGetClasses() const;
NS_IMETHOD WalkContentStyleRules(nsRuleWalker* aRuleWalker);
virtual const nsAttrValue* DoGetClasses() const MOZ_OVERRIDE;
NS_IMETHOD WalkContentStyleRules(nsRuleWalker* aRuleWalker) MOZ_OVERRIDE;
nsIHTMLCollection* Children();
@ -239,7 +240,7 @@ public:
*/
void FireNodeRemovedForChildren();
virtual bool OwnedOnlyByTheDOMTree()
virtual bool OwnedOnlyByTheDOMTree() MOZ_OVERRIDE
{
uint32_t rc = mRefCnt.get();
if (GetParent()) {
@ -249,12 +250,12 @@ public:
return rc == 0;
}
virtual bool IsPurple()
virtual bool IsPurple() MOZ_OVERRIDE
{
return mRefCnt.IsPurple();
}
virtual void RemovePurple()
virtual void RemovePurple() MOZ_OVERRIDE
{
mRefCnt.RemovePurple();
}
@ -361,7 +362,7 @@ public:
protected:
// Override from nsINode
virtual nsINode::nsSlots* CreateSlots();
virtual nsINode::nsSlots* CreateSlots() MOZ_OVERRIDE;
nsDOMSlots *DOMSlots()
{

23
content/base/public/nsDOMFile.h
View File

@ -6,6 +6,7 @@
#ifndef nsDOMFile_h__
#define nsDOMFile_h__
#include "mozilla/Attributes.h"
#include "nsICharsetDetectionObserver.h"
#include "nsIFile.h"
#include "nsIDOMFile.h"
@ -290,12 +291,12 @@ public:
}
// Overrides
NS_IMETHOD GetSize(uint64_t* aSize);
NS_IMETHOD GetType(nsAString& aType);
NS_IMETHOD GetLastModifiedDate(JSContext* cx, JS::Value* aLastModifiedDate);
NS_IMETHOD GetMozLastModifiedDate(uint64_t* aLastModifiedDate);
NS_IMETHOD GetMozFullPathInternal(nsAString& aFullPath);
NS_IMETHOD GetInternalStream(nsIInputStream**);
NS_IMETHOD GetSize(uint64_t* aSize) MOZ_OVERRIDE;
NS_IMETHOD GetType(nsAString& aType) MOZ_OVERRIDE;
NS_IMETHOD GetLastModifiedDate(JSContext* cx, JS::Value* aLastModifiedDate) MOZ_OVERRIDE;
NS_IMETHOD GetMozLastModifiedDate(uint64_t* aLastModifiedDate) MOZ_OVERRIDE;
NS_IMETHOD GetMozFullPathInternal(nsAString& aFullPath) MOZ_OVERRIDE;
NS_IMETHOD GetInternalStream(nsIInputStream**) MOZ_OVERRIDE;
protected:
// Create slice
@ -327,14 +328,14 @@ protected:
virtual already_AddRefed<nsIDOMBlob>
CreateSlice(uint64_t aStart, uint64_t aLength,
const nsAString& aContentType);
const nsAString& aContentType) MOZ_OVERRIDE;
virtual bool IsStoredFile() const
virtual bool IsStoredFile() const MOZ_OVERRIDE
{
return mStoredFile;
}
virtual bool IsWholeFile() const
virtual bool IsWholeFile() const MOZ_OVERRIDE
{
return mWholeFile;
}
@ -372,7 +373,7 @@ public:
NS_ASSERTION(mDataOwner && mDataOwner->mData, "must have data");
}
NS_IMETHOD GetInternalStream(nsIInputStream**);
NS_IMETHOD GetInternalStream(nsIInputStream**) MOZ_OVERRIDE;
protected:
// Create slice
@ -386,7 +387,7 @@ protected:
}
virtual already_AddRefed<nsIDOMBlob>
CreateSlice(uint64_t aStart, uint64_t aLength,
const nsAString& aContentType);
const nsAString& aContentType) MOZ_OVERRIDE;
// These classes need to see DataOwner.
friend class DataOwnerAdapter;

3
content/base/public/nsDocElementCreatedNotificationRunner.h
View File

@ -6,6 +6,7 @@
#ifndef nsDocElementCreatedNotificationRunner_h
#define nsDocElementCreatedNotificationRunner_h
#include "mozilla/Attributes.h"
#include "nsThreadUtils.h" /* nsRunnable */
#include "nsContentSink.h"
@ -20,7 +21,7 @@ public:
{
}
NS_IMETHOD Run()
NS_IMETHOD Run() MOZ_OVERRIDE
{
nsContentSink::NotifyDocElementCreated(mDoc);
return NS_OK;

15
content/base/public/nsHostObjectProtocolHandler.h
View File

@ -5,6 +5,7 @@
#ifndef nsHostObjectProtocolHandler_h
#define nsHostObjectProtocolHandler_h
#include "mozilla/Attributes.h"
#include "nsIProtocolHandler.h"
#include "nsIURI.h"
#include "nsCOMPtr.h"
@ -25,11 +26,11 @@ public:
// nsIProtocolHandler methods, except for GetScheme which is only defined
// in subclasses.
NS_IMETHOD GetDefaultPort(int32_t *aDefaultPort);
NS_IMETHOD GetProtocolFlags(uint32_t *aProtocolFlags);
NS_IMETHOD NewURI(const nsACString & aSpec, const char * aOriginCharset, nsIURI *aBaseURI, nsIURI * *_retval);
NS_IMETHOD NewChannel(nsIURI *aURI, nsIChannel * *_retval);
NS_IMETHOD AllowPort(int32_t port, const char * scheme, bool *_retval);
NS_IMETHOD GetDefaultPort(int32_t *aDefaultPort) MOZ_OVERRIDE;
NS_IMETHOD GetProtocolFlags(uint32_t *aProtocolFlags) MOZ_OVERRIDE;
NS_IMETHOD NewURI(const nsACString & aSpec, const char * aOriginCharset, nsIURI *aBaseURI, nsIURI * *_retval) MOZ_OVERRIDE;
NS_IMETHOD NewChannel(nsIURI *aURI, nsIChannel * *_retval) MOZ_OVERRIDE;
NS_IMETHOD AllowPort(int32_t port, const char * scheme, bool *_retval) MOZ_OVERRIDE;
// Methods for managing uri->object mapping
// AddDataEntry creates the URI with the given scheme and returns it in aUri
@ -45,13 +46,13 @@ public:
class nsBlobProtocolHandler : public nsHostObjectProtocolHandler
{
public:
NS_IMETHOD GetScheme(nsACString &result);
NS_IMETHOD GetScheme(nsACString &result) MOZ_OVERRIDE;
};
class nsMediaStreamProtocolHandler : public nsHostObjectProtocolHandler
{
public:
NS_IMETHOD GetScheme(nsACString &result);
NS_IMETHOD GetScheme(nsACString &result) MOZ_OVERRIDE;
};
inline bool IsBlobURI(nsIURI* aUri)

5
content/base/public/nsIContent.h
View File

@ -5,6 +5,7 @@
#ifndef nsIContent_h___
#define nsIContent_h___
#include "mozilla/Attributes.h"
#include "nsCaseTreatment.h" // for enum, cannot be forward-declared
#include "nsIDocument.h"
@ -846,9 +847,9 @@ public:
}
// Overloaded from nsINode
virtual already_AddRefed<nsIURI> GetBaseURI() const;
virtual already_AddRefed<nsIURI> GetBaseURI() const MOZ_OVERRIDE;
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor);
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor) MOZ_OVERRIDE;
virtual bool IsPurple() = 0;
virtual void RemovePurple() = 0;

3
content/base/public/nsIDocument.h
View File

@ -5,6 +5,7 @@
#ifndef nsIDocument_h___
#define nsIDocument_h___
#include "mozilla/Attributes.h"
#include "mozFlushType.h" // for enum
#include "nsAutoPtr.h" // for member
#include "nsCOMArray.h" // for member
@ -260,7 +261,7 @@ public:
{
return mDocumentBaseURI ? mDocumentBaseURI : mDocumentURI;
}
virtual already_AddRefed<nsIURI> GetBaseURI() const
virtual already_AddRefed<nsIURI> GetBaseURI() const MOZ_OVERRIDE
{
nsCOMPtr<nsIURI> uri = GetDocBaseURI();

3
content/base/public/nsReferencedElement.h
View File

@ -7,6 +7,7 @@
#ifndef NSREFERENCEDELEMENT_H_
#define NSREFERENCEDELEMENT_H_
#include "mozilla/Attributes.h"
#include "mozilla/dom/Element.h"
#include "nsIAtom.h"
#include "nsIDocument.h"
@ -134,7 +135,7 @@ private:
virtual ~ChangeNotification() {}
NS_DECL_ISUPPORTS_INHERITED
NS_IMETHOD Run() {
NS_IMETHOD Run() MOZ_OVERRIDE {
if (mTarget) {
mTarget->mPendingNotification = nullptr;
mTarget->ElementChanged(mFrom, mTo);

33
content/base/src/Attr.h
View File

@ -10,6 +10,7 @@
#ifndef mozilla_dom_Attr_h
#define mozilla_dom_Attr_h
#include "mozilla/Attributes.h"
#include "nsIAttribute.h"
#include "nsIDOMAttr.h"
#include "nsIDOMText.h"
@ -39,34 +40,34 @@ public:
// nsIDOMNode interface
NS_FORWARD_NSIDOMNODE_TO_NSINODE
virtual void GetTextContentInternal(nsAString& aTextContent);
virtual void GetTextContentInternal(nsAString& aTextContent) MOZ_OVERRIDE;
virtual void SetTextContentInternal(const nsAString& aTextContent,
ErrorResult& aError);
virtual void GetNodeValueInternal(nsAString& aNodeValue);
ErrorResult& aError) MOZ_OVERRIDE;
virtual void GetNodeValueInternal(nsAString& aNodeValue) MOZ_OVERRIDE;
virtual void SetNodeValueInternal(const nsAString& aNodeValue,
ErrorResult& aError);
ErrorResult& aError) MOZ_OVERRIDE;
// nsIDOMAttr interface
NS_DECL_NSIDOMATTR
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor);
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor) MOZ_OVERRIDE;
// nsIAttribute interface
void SetMap(nsDOMAttributeMap *aMap);
nsIContent *GetContent() const;
nsresult SetOwnerDocument(nsIDocument* aDocument);
void SetMap(nsDOMAttributeMap *aMap) MOZ_OVERRIDE;
nsIContent *GetContent() const MOZ_OVERRIDE;
nsresult SetOwnerDocument(nsIDocument* aDocument) MOZ_OVERRIDE;
// nsINode interface
virtual bool IsNodeOfType(uint32_t aFlags) const;
virtual uint32_t GetChildCount() const;
virtual nsIContent *GetChildAt(uint32_t aIndex) const;
virtual nsIContent * const * GetChildArray(uint32_t* aChildCount) const;
virtual bool IsNodeOfType(uint32_t aFlags) const MOZ_OVERRIDE;
virtual uint32_t GetChildCount() const MOZ_OVERRIDE;
virtual nsIContent *GetChildAt(uint32_t aIndex) const MOZ_OVERRIDE;
virtual nsIContent * const * GetChildArray(uint32_t* aChildCount) const MOZ_OVERRIDE;
virtual int32_t IndexOf(const nsINode* aPossibleChild) const MOZ_OVERRIDE;
virtual nsresult InsertChildAt(nsIContent* aKid, uint32_t aIndex,
bool aNotify);
virtual void RemoveChildAt(uint32_t aIndex, bool aNotify);
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual already_AddRefed<nsIURI> GetBaseURI() const;
bool aNotify) MOZ_OVERRIDE;
virtual void RemoveChildAt(uint32_t aIndex, bool aNotify) MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual already_AddRefed<nsIURI> GetBaseURI() const MOZ_OVERRIDE;
static void Initialize();
static void Shutdown();

9
content/base/src/Comment.h
View File

@ -6,6 +6,7 @@
#ifndef mozilla_dom_Comment_h
#define mozilla_dom_Comment_h
#include "mozilla/Attributes.h"
#include "nsIDOMComment.h"
#include "nsGenericDOMDataNode.h"
@ -54,13 +55,13 @@ public:
virtual bool IsNodeOfType(uint32_t aFlags) const;
virtual nsGenericDOMDataNode* CloneDataNode(nsINodeInfo *aNodeInfo,
bool aCloneText) const;
bool aCloneText) const MOZ_OVERRIDE;
virtual nsIDOMNode* AsDOMNode() { return this; }
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
#ifdef DEBUG
virtual void List(FILE* out, int32_t aIndent) const;
virtual void List(FILE* out, int32_t aIndent) const MOZ_OVERRIDE;
virtual void DumpContent(FILE* out = stdout, int32_t aIndent = 0,
bool aDumpAll = true) const
bool aDumpAll = true) const MOZ_OVERRIDE
{
return;
}

29
content/base/src/DocumentFragment.h
View File

@ -7,6 +7,7 @@
#ifndef mozilla_dom_DocumentFragment_h__
#define mozilla_dom_DocumentFragment_h__
#include "mozilla/Attributes.h"
#include "mozilla/dom/FragmentOrElement.h"
#include "nsIDOMDocumentFragment.h"
@ -75,7 +76,7 @@ public:
// nsIContent
virtual already_AddRefed<nsINodeInfo>
GetExistingAttrNameFromQName(const nsAString& aStr) const
GetExistingAttrNameFromQName(const nsAString& aStr) const MOZ_OVERRIDE
{
return nullptr;
}
@ -87,40 +88,40 @@ public:
}
virtual nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
nsIAtom* aPrefix, const nsAString& aValue,
bool aNotify)
bool aNotify) MOZ_OVERRIDE
{
return NS_OK;
}
virtual nsresult UnsetAttr(int32_t aNameSpaceID, nsIAtom* aAttribute,
bool aNotify)
bool aNotify) MOZ_OVERRIDE
{
return NS_OK;
}
virtual const nsAttrName* GetAttrNameAt(uint32_t aIndex) const
virtual const nsAttrName* GetAttrNameAt(uint32_t aIndex) const MOZ_OVERRIDE
{
return nullptr;
}
virtual uint32_t GetAttrCount() const
virtual uint32_t GetAttrCount() const MOZ_OVERRIDE
{
return 0;
}
virtual bool IsNodeOfType(uint32_t aFlags) const;
virtual bool IsNodeOfType(uint32_t aFlags) const MOZ_OVERRIDE;
virtual nsIDOMNode* AsDOMNode() { return this; }
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual nsIAtom* DoGetID() const;
virtual nsIAtom *GetIDAttributeName() const;
virtual nsIAtom* DoGetID() const MOZ_OVERRIDE;
virtual nsIAtom *GetIDAttributeName() const MOZ_OVERRIDE;
virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
nsIContent* aBindingParent,
bool aCompileEventHandlers)
bool aCompileEventHandlers) MOZ_OVERRIDE
{
NS_ASSERTION(false, "Trying to bind a fragment to a tree");
return NS_ERROR_NOT_IMPLEMENTED;
}
virtual void UnbindFromTree(bool aDeep, bool aNullParent)
virtual void UnbindFromTree(bool aDeep, bool aNullParent) MOZ_OVERRIDE
{
NS_ASSERTION(false, "Trying to unbind a fragment from a tree");
return;
@ -145,12 +146,12 @@ public:
Constructor(const GlobalObject& aGlobal, ErrorResult& aRv);
#ifdef DEBUG
virtual void List(FILE* out, int32_t aIndent) const;
virtual void DumpContent(FILE* out, int32_t aIndent, bool aDumpAll) const;
virtual void List(FILE* out, int32_t aIndent) const MOZ_OVERRIDE;
virtual void DumpContent(FILE* out, int32_t aIndent, bool aDumpAll) const MOZ_OVERRIDE;
#endif
protected:
nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
mozilla::dom::HTMLTemplateElement* mHost; // Weak
};

13
content/base/src/DocumentType.h
View File

@ -10,6 +10,7 @@
#ifndef DocumentType_h
#define DocumentType_h
#include "mozilla/Attributes.h"
#include "nsCOMPtr.h"
#include "nsIDOMDocumentType.h"
#include "nsIContent.h"
@ -57,23 +58,23 @@ public:
NS_DECL_NSIDOMDOCUMENTTYPE
// nsINode
virtual bool IsNodeOfType(uint32_t aFlags) const;
virtual void GetNodeValueInternal(nsAString& aNodeValue)
virtual bool IsNodeOfType(uint32_t aFlags) const MOZ_OVERRIDE;
virtual void GetNodeValueInternal(nsAString& aNodeValue) MOZ_OVERRIDE
{
SetDOMStringToNull(aNodeValue);
}
virtual void SetNodeValueInternal(const nsAString& aNodeValue,
mozilla::ErrorResult& aError)
mozilla::ErrorResult& aError) MOZ_OVERRIDE
{
}
// nsIContent overrides
virtual const nsTextFragment* GetText();
virtual const nsTextFragment* GetText() MOZ_OVERRIDE;
virtual nsGenericDOMDataNode* CloneDataNode(nsINodeInfo *aNodeInfo,
bool aCloneText) const;
bool aCloneText) const MOZ_OVERRIDE;
virtual nsIDOMNode* AsDOMNode() { return this; }
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
protected:
virtual JSObject* WrapNode(JSContext *cx,

3
content/base/src/EventSource.h
View File

@ -13,6 +13,7 @@
#ifndef mozilla_dom_EventSource_h
#define mozilla_dom_EventSource_h
#include "mozilla/Attributes.h"
#include "nsDOMEventTargetHelper.h"
#include "nsIObserver.h"
#include "nsIStreamListener.h"
@ -106,7 +107,7 @@ public:
// Determine if preferences allow EventSource
static bool PrefEnabled();
virtual void DisconnectFromOwner();
virtual void DisconnectFromOwner() MOZ_OVERRIDE;
protected:
nsresult Init(nsISupports* aOwner,

3
content/base/src/WebSocket.h
View File

@ -7,6 +7,7 @@
#ifndef WebSocket_h__
#define WebSocket_h__
#include "mozilla/Attributes.h"
#include "mozilla/Util.h"
#include "nsWrapperCache.h"
@ -75,7 +76,7 @@ public:
virtual void EventListenerAdded(nsIAtom* aType) MOZ_OVERRIDE;
virtual void EventListenerRemoved(nsIAtom* aType) MOZ_OVERRIDE;
virtual void DisconnectFromOwner();
virtual void DisconnectFromOwner() MOZ_OVERRIDE;
// nsWrapperCache
nsPIDOMWindow* GetParentObject() { return GetOwner(); }

23
content/base/src/nsContentList.h
View File

@ -12,6 +12,7 @@
#ifndef nsContentList_h___
#define nsContentList_h___
#include "mozilla/Attributes.h"
#include "nsContentListDeclarations.h"
#include "nsISupports.h"
#include "nsTArray.h"
@ -49,8 +50,8 @@ public:
NS_DECL_NSIDOMNODELIST
// nsINodeList
virtual int32_t IndexOf(nsIContent* aContent);
virtual nsIContent* Item(uint32_t aIndex);
virtual int32_t IndexOf(nsIContent* aContent) MOZ_OVERRIDE;
virtual nsIContent* Item(uint32_t aIndex) MOZ_OVERRIDE;
uint32_t Length() const {
return mElements.Length();
@ -111,7 +112,7 @@ public:
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(nsSimpleContentList,
nsBaseContentList)
virtual nsINode* GetParentObject()
virtual nsINode* GetParentObject() MOZ_OVERRIDE
{
return mRoot;
}
@ -254,18 +255,18 @@ public:
NS_DECL_NSIDOMHTMLCOLLECTION
// nsBaseContentList overrides
virtual int32_t IndexOf(nsIContent *aContent, bool aDoFlush);
virtual int32_t IndexOf(nsIContent* aContent);
virtual nsINode* GetParentObject()
virtual int32_t IndexOf(nsIContent *aContent, bool aDoFlush) MOZ_OVERRIDE;
virtual int32_t IndexOf(nsIContent* aContent) MOZ_OVERRIDE;
virtual nsINode* GetParentObject() MOZ_OVERRIDE
{
return mRootNode;
}
virtual nsIContent* Item(uint32_t aIndex);
virtual mozilla::dom::Element* GetElementAt(uint32_t index);
virtual nsIContent* Item(uint32_t aIndex) MOZ_OVERRIDE;
virtual mozilla::dom::Element* GetElementAt(uint32_t index) MOZ_OVERRIDE;
virtual JSObject* NamedItem(JSContext* cx, const nsAString& name,
mozilla::ErrorResult& error);
virtual void GetSupportedNames(nsTArray<nsString>& aNames);
mozilla::ErrorResult& error) MOZ_OVERRIDE;
virtual void GetSupportedNames(nsTArray<nsString>& aNames) MOZ_OVERRIDE;
// nsContentList public methods
NS_HIDDEN_(uint32_t) Length(bool aDoFlush);
@ -492,7 +493,7 @@ protected:
MOZ_ASSERT(mData);
}
virtual void RemoveFromCaches() {
virtual void RemoveFromCaches() MOZ_OVERRIDE {
RemoveFromFuncStringHashtable();
}
void RemoveFromFuncStringHashtable();

3
content/base/src/nsContentSink.h
View File

@ -13,6 +13,7 @@
// Base class for contentsink implementations.
#include "mozilla/Attributes.h"
#include "nsICSSLoaderObserver.h"
#include "nsWeakReference.h"
#include "nsCOMPtr.h"
@ -86,7 +87,7 @@ class nsContentSink : public nsICSSLoaderObserver,
// nsICSSLoaderObserver
NS_IMETHOD StyleSheetLoaded(nsCSSStyleSheet* aSheet, bool aWasAlternate,
nsresult aStatus);
nsresult aStatus) MOZ_OVERRIDE;
virtual nsresult ProcessMETATag(nsIContent* aContent);

10
content/base/src/nsDOMBlobBuilder.h
View File

@ -51,7 +51,7 @@ public:
NS_IMETHOD Initialize(nsISupports* aOwner,
JSContext* aCx,
JSObject* aObj,
const JS::CallArgs& aArgs);
const JS::CallArgs& aArgs) MOZ_OVERRIDE;
typedef nsIDOMBlob* (*UnwrapFuncPtr)(JSContext*, JSObject*);
nsresult InitBlob(JSContext* aCx,
@ -63,10 +63,10 @@ public:
JS::Value* aArgv);
already_AddRefed<nsIDOMBlob>
CreateSlice(uint64_t aStart, uint64_t aLength, const nsAString& aContentType);
CreateSlice(uint64_t aStart, uint64_t aLength, const nsAString& aContentType) MOZ_OVERRIDE;
NS_IMETHOD GetSize(uint64_t*);
NS_IMETHOD GetInternalStream(nsIInputStream**);
NS_IMETHOD GetSize(uint64_t*) MOZ_OVERRIDE;
NS_IMETHOD GetInternalStream(nsIInputStream**) MOZ_OVERRIDE;
static nsresult
NewFile(const nsAString& aName, nsISupports* *aNewObject);
@ -86,7 +86,7 @@ public:
}
virtual const nsTArray<nsCOMPtr<nsIDOMBlob> >*
GetSubBlobs() const { return &mBlobs; }
GetSubBlobs() const MOZ_OVERRIDE { return &mBlobs; }
protected:
nsTArray<nsCOMPtr<nsIDOMBlob> > mBlobs;

9
content/base/src/nsDOMDataChannel.h
View File

@ -7,6 +7,7 @@
#ifndef nsDOMDataChannel_h
#define nsDOMDataChannel_h
#include "mozilla/Attributes.h"
#include "mozilla/dom/DataChannelBinding.h"
#include "mozilla/dom/TypedArray.h"
#include "mozilla/net/DataChannel.h"
@ -77,18 +78,18 @@ public:
DoOnMessageAvailable(const nsACString& aMessage, bool aBinary);
virtual nsresult
OnMessageAvailable(nsISupports* aContext, const nsACString& aMessage);
OnMessageAvailable(nsISupports* aContext, const nsACString& aMessage) MOZ_OVERRIDE;
virtual nsresult
OnBinaryMessageAvailable(nsISupports* aContext, const nsACString& aMessage);
OnBinaryMessageAvailable(nsISupports* aContext, const nsACString& aMessage) MOZ_OVERRIDE;
virtual nsresult OnSimpleEvent(nsISupports* aContext, const nsAString& aName);
virtual nsresult
OnChannelConnected(nsISupports* aContext);
OnChannelConnected(nsISupports* aContext) MOZ_OVERRIDE;
virtual nsresult
OnChannelClosed(nsISupports* aContext);
OnChannelClosed(nsISupports* aContext) MOZ_OVERRIDE;
virtual void
AppReady();

5
content/base/src/nsDOMFileReader.h
View File

@ -6,6 +6,7 @@
#ifndef nsDOMFileReader_h__
#define nsDOMFileReader_h__
#include "mozilla/Attributes.h"
#include "nsISupportsUtils.h"
#include "nsString.h"
#include "nsWeakReference.h"
@ -50,10 +51,10 @@ public:
virtual void DoAbort(nsAString& aEvent) MOZ_OVERRIDE;
NS_IMETHOD DoOnStopRequest(nsIRequest* aRequest, nsISupports* aContext,
nsresult aStatus, nsAString& aSuccessEvent,
nsAString& aTerminationEvent);
nsAString& aTerminationEvent) MOZ_OVERRIDE;
NS_IMETHOD DoOnDataAvailable(nsIRequest* aRequest, nsISupports* aContext,
nsIInputStream* aInputStream, uint64_t aOffset,
uint32_t aCount);
uint32_t aCount) MOZ_OVERRIDE;
nsPIDOMWindow* GetParentObject() const
{

3
content/base/src/nsDOMMutationObserver.h
View File

@ -7,6 +7,7 @@
#ifndef nsDOMMutationObserver_h
#define nsDOMMutationObserver_h
#include "mozilla/Attributes.h"
#include "nsCycleCollectionParticipant.h"
#include "nsPIDOMWindow.h"
#include "nsIScriptContext.h"
@ -328,7 +329,7 @@ public:
virtual void AttributeSetToCurrentValue(nsIDocument* aDocument,
mozilla::dom::Element* aElement,
int32_t aNameSpaceID,
nsIAtom* aAttribute)
nsIAtom* aAttribute) MOZ_OVERRIDE
{
// We can reuse AttributeWillChange implementation.
AttributeWillChange(aDocument, aElement, aNameSpaceID, aAttribute,

4
content/base/src/nsDOMTokenList.h
View File

@ -12,13 +12,11 @@
#include "nsCOMPtr.h"
#include "nsDOMString.h"
#include "nsWrapperCache.h"
#include "mozilla/dom/Element.h"
namespace mozilla {
class ErrorResult;
namespace dom {
class Element;
} // namespace dom
} // namespace mozilla
class nsAttrValue;

304
content/base/src/nsDocument.h
View File

@ -516,9 +516,9 @@ public:
NS_DECL_SIZEOF_EXCLUDING_THIS
virtual void Reset(nsIChannel *aChannel, nsILoadGroup *aLoadGroup);
virtual void Reset(nsIChannel *aChannel, nsILoadGroup *aLoadGroup) MOZ_OVERRIDE;
virtual void ResetToURI(nsIURI *aURI, nsILoadGroup *aLoadGroup,
nsIPrincipal* aPrincipal);
nsIPrincipal* aPrincipal) MOZ_OVERRIDE;
// StartDocumentLoad is pure virtual so that subclasses must override it.
// The nsDocument StartDocumentLoad does some setup, but does NOT set
@ -529,18 +529,18 @@ public:
nsISupports* aContainer,
nsIStreamListener **aDocListener,
bool aReset = true,
nsIContentSink* aContentSink = nullptr) = 0;
nsIContentSink* aContentSink = nullptr) MOZ_OVERRIDE = 0;
virtual void StopDocumentLoad();
virtual void StopDocumentLoad() MOZ_OVERRIDE;
virtual void NotifyPossibleTitleChange(bool aBoundTitleElement);
virtual void NotifyPossibleTitleChange(bool aBoundTitleElement) MOZ_OVERRIDE;
virtual void SetDocumentURI(nsIURI* aURI);
virtual void SetDocumentURI(nsIURI* aURI) MOZ_OVERRIDE;
/**
* Set the principal responsible for this document.
*/
virtual void SetPrincipal(nsIPrincipal *aPrincipal);
virtual void SetPrincipal(nsIPrincipal *aPrincipal) MOZ_OVERRIDE;
/**
* Get the Content-Type of this document.
@ -551,43 +551,43 @@ public:
/**
* Set the Content-Type of this document.
*/
virtual void SetContentType(const nsAString& aContentType);
virtual void SetContentType(const nsAString& aContentType) MOZ_OVERRIDE;
virtual nsresult SetBaseURI(nsIURI* aURI);
virtual nsresult SetBaseURI(nsIURI* aURI) MOZ_OVERRIDE;
/**
* Get/Set the base target of a link in a document.
*/
virtual void GetBaseTarget(nsAString &aBaseTarget);
virtual void GetBaseTarget(nsAString &aBaseTarget) MOZ_OVERRIDE;
/**
* Return a standard name for the document's character set. This will
* trigger a startDocumentLoad if necessary to answer the question.
*/
virtual void SetDocumentCharacterSet(const nsACString& aCharSetID);
virtual void SetDocumentCharacterSet(const nsACString& aCharSetID) MOZ_OVERRIDE;
/**
* Add an observer that gets notified whenever the charset changes.
*/
virtual nsresult AddCharSetObserver(nsIObserver* aObserver);
virtual nsresult AddCharSetObserver(nsIObserver* aObserver) MOZ_OVERRIDE;
/**
* Remove a charset observer.
*/
virtual void RemoveCharSetObserver(nsIObserver* aObserver);
virtual void RemoveCharSetObserver(nsIObserver* aObserver) MOZ_OVERRIDE;
virtual Element* AddIDTargetObserver(nsIAtom* aID, IDTargetObserver aObserver,
void* aData, bool aForImage);
void* aData, bool aForImage) MOZ_OVERRIDE;
virtual void RemoveIDTargetObserver(nsIAtom* aID, IDTargetObserver aObserver,
void* aData, bool aForImage);
void* aData, bool aForImage) MOZ_OVERRIDE;
/**
* Access HTTP header data (this may also get set from other sources, like
* HTML META tags).
*/
virtual void GetHeaderData(nsIAtom* aHeaderField, nsAString& aData) const;
virtual void GetHeaderData(nsIAtom* aHeaderField, nsAString& aData) const MOZ_OVERRIDE;
virtual void SetHeaderData(nsIAtom* aheaderField,
const nsAString& aData);
const nsAString& aData) MOZ_OVERRIDE;
/**
* Create a new presentation shell that will use aContext for
@ -597,47 +597,47 @@ public:
virtual already_AddRefed<nsIPresShell> CreateShell(nsPresContext* aContext,
nsViewManager* aViewManager,
nsStyleSet* aStyleSet) MOZ_OVERRIDE;
virtual void DeleteShell();
virtual void DeleteShell() MOZ_OVERRIDE;
virtual nsresult GetAllowPlugins(bool* aAllowPlugins);
virtual nsresult GetAllowPlugins(bool* aAllowPlugins) MOZ_OVERRIDE;
virtual already_AddRefed<mozilla::dom::UndoManager> GetUndoManager();
virtual already_AddRefed<mozilla::dom::UndoManager> GetUndoManager() MOZ_OVERRIDE;
virtual nsresult SetSubDocumentFor(Element* aContent,
nsIDocument* aSubDoc);
virtual nsIDocument* GetSubDocumentFor(nsIContent* aContent) const;
virtual Element* FindContentForSubDocument(nsIDocument *aDocument) const;
virtual Element* GetRootElementInternal() const;
nsIDocument* aSubDoc) MOZ_OVERRIDE;
virtual nsIDocument* GetSubDocumentFor(nsIContent* aContent) const MOZ_OVERRIDE;
virtual Element* FindContentForSubDocument(nsIDocument *aDocument) const MOZ_OVERRIDE;
virtual Element* GetRootElementInternal() const MOZ_OVERRIDE;
/**
* Get the style sheets owned by this document.
* These are ordered, highest priority last
*/
virtual int32_t GetNumberOfStyleSheets() const;
virtual nsIStyleSheet* GetStyleSheetAt(int32_t aIndex) const;
virtual int32_t GetIndexOfStyleSheet(nsIStyleSheet* aSheet) const;
virtual void AddStyleSheet(nsIStyleSheet* aSheet);
virtual void RemoveStyleSheet(nsIStyleSheet* aSheet);
virtual int32_t GetNumberOfStyleSheets() const MOZ_OVERRIDE;
virtual nsIStyleSheet* GetStyleSheetAt(int32_t aIndex) const MOZ_OVERRIDE;
virtual int32_t GetIndexOfStyleSheet(nsIStyleSheet* aSheet) const MOZ_OVERRIDE;
virtual void AddStyleSheet(nsIStyleSheet* aSheet) MOZ_OVERRIDE;
virtual void RemoveStyleSheet(nsIStyleSheet* aSheet) MOZ_OVERRIDE;
virtual void UpdateStyleSheets(nsCOMArray<nsIStyleSheet>& aOldSheets,
nsCOMArray<nsIStyleSheet>& aNewSheets);
nsCOMArray<nsIStyleSheet>& aNewSheets) MOZ_OVERRIDE;
virtual void AddStyleSheetToStyleSets(nsIStyleSheet* aSheet);
virtual void RemoveStyleSheetFromStyleSets(nsIStyleSheet* aSheet);
virtual void InsertStyleSheetAt(nsIStyleSheet* aSheet, int32_t aIndex);
virtual void InsertStyleSheetAt(nsIStyleSheet* aSheet, int32_t aIndex) MOZ_OVERRIDE;
virtual void SetStyleSheetApplicableState(nsIStyleSheet* aSheet,
bool aApplicable);
bool aApplicable) MOZ_OVERRIDE;
virtual int32_t GetNumberOfCatalogStyleSheets() const;
virtual nsIStyleSheet* GetCatalogStyleSheetAt(int32_t aIndex) const;
virtual void AddCatalogStyleSheet(nsCSSStyleSheet* aSheet);
virtual void EnsureCatalogStyleSheet(const char *aStyleSheetURI);
virtual int32_t GetNumberOfCatalogStyleSheets() const MOZ_OVERRIDE;
virtual nsIStyleSheet* GetCatalogStyleSheetAt(int32_t aIndex) const MOZ_OVERRIDE;
virtual void AddCatalogStyleSheet(nsCSSStyleSheet* aSheet) MOZ_OVERRIDE;
virtual void EnsureCatalogStyleSheet(const char *aStyleSheetURI) MOZ_OVERRIDE;
virtual nsresult LoadAdditionalStyleSheet(additionalSheetType aType, nsIURI* aSheetURI);
virtual void RemoveAdditionalStyleSheet(additionalSheetType aType, nsIURI* sheetURI);
virtual nsIStyleSheet* FirstAdditionalAuthorSheet();
virtual nsresult LoadAdditionalStyleSheet(additionalSheetType aType, nsIURI* aSheetURI) MOZ_OVERRIDE;
virtual void RemoveAdditionalStyleSheet(additionalSheetType aType, nsIURI* sheetURI) MOZ_OVERRIDE;
virtual nsIStyleSheet* FirstAdditionalAuthorSheet() MOZ_OVERRIDE;
virtual nsIChannel* GetChannel() const {
virtual nsIChannel* GetChannel() const MOZ_OVERRIDE {
return mChannel;
}
@ -645,7 +645,7 @@ public:
* Get this document's inline style sheet. May return null if there
* isn't one
*/
virtual nsHTMLCSSStyleSheet* GetInlineStyleSheet() const {
virtual nsHTMLCSSStyleSheet* GetInlineStyleSheet() const MOZ_OVERRIDE {
return mStyleAttrStyleSheet;
}
@ -654,87 +654,87 @@ public:
* This is the context within which all scripts (during document
* creation and during event handling) will run.
*/
virtual nsIScriptGlobalObject* GetScriptGlobalObject() const;
virtual void SetScriptGlobalObject(nsIScriptGlobalObject* aGlobalObject);
virtual nsIScriptGlobalObject* GetScriptGlobalObject() const MOZ_OVERRIDE;
virtual void SetScriptGlobalObject(nsIScriptGlobalObject* aGlobalObject) MOZ_OVERRIDE;
virtual void SetScriptHandlingObject(nsIScriptGlobalObject* aScriptObject);
virtual void SetScriptHandlingObject(nsIScriptGlobalObject* aScriptObject) MOZ_OVERRIDE;
virtual nsIGlobalObject* GetScopeObject() const;
void SetScopeObject(nsIGlobalObject* aGlobal);
virtual nsIGlobalObject* GetScopeObject() const MOZ_OVERRIDE;
void SetScopeObject(nsIGlobalObject* aGlobal) MOZ_OVERRIDE;
/**
* Get the script loader for this document
*/
virtual nsScriptLoader* ScriptLoader();
virtual nsScriptLoader* ScriptLoader() MOZ_OVERRIDE;
/**
* Add/Remove an element to the document's id and name hashes
*/
virtual void AddToIdTable(Element* aElement, nsIAtom* aId);
virtual void RemoveFromIdTable(Element* aElement, nsIAtom* aId);
virtual void AddToNameTable(Element* aElement, nsIAtom* aName);
virtual void RemoveFromNameTable(Element* aElement, nsIAtom* aName);
virtual void AddToIdTable(Element* aElement, nsIAtom* aId) MOZ_OVERRIDE;
virtual void RemoveFromIdTable(Element* aElement, nsIAtom* aId) MOZ_OVERRIDE;
virtual void AddToNameTable(Element* aElement, nsIAtom* aName) MOZ_OVERRIDE;
virtual void RemoveFromNameTable(Element* aElement, nsIAtom* aName) MOZ_OVERRIDE;
/**
* Add a new observer of document change notifications. Whenever
* content is changed, appended, inserted or removed the observers are
* informed.
*/
virtual void AddObserver(nsIDocumentObserver* aObserver);
virtual void AddObserver(nsIDocumentObserver* aObserver) MOZ_OVERRIDE;
/**
* Remove an observer of document change notifications. This will
* return false if the observer cannot be found.
*/
virtual bool RemoveObserver(nsIDocumentObserver* aObserver);
virtual bool RemoveObserver(nsIDocumentObserver* aObserver) MOZ_OVERRIDE;
// Observation hooks used to propagate notifications to document
// observers.
virtual void BeginUpdate(nsUpdateType aUpdateType);
virtual void EndUpdate(nsUpdateType aUpdateType);
virtual void BeginLoad();
virtual void EndLoad();
virtual void BeginUpdate(nsUpdateType aUpdateType) MOZ_OVERRIDE;
virtual void EndUpdate(nsUpdateType aUpdateType) MOZ_OVERRIDE;
virtual void BeginLoad() MOZ_OVERRIDE;
virtual void EndLoad() MOZ_OVERRIDE;
virtual void SetReadyStateInternal(ReadyState rs);
virtual void SetReadyStateInternal(ReadyState rs) MOZ_OVERRIDE;
virtual void ContentStateChanged(nsIContent* aContent,
nsEventStates aStateMask);
virtual void DocumentStatesChanged(nsEventStates aStateMask);
nsEventStates aStateMask) MOZ_OVERRIDE;
virtual void DocumentStatesChanged(nsEventStates aStateMask) MOZ_OVERRIDE;
virtual void StyleRuleChanged(nsIStyleSheet* aStyleSheet,
nsIStyleRule* aOldStyleRule,
nsIStyleRule* aNewStyleRule);
nsIStyleRule* aNewStyleRule) MOZ_OVERRIDE;
virtual void StyleRuleAdded(nsIStyleSheet* aStyleSheet,
nsIStyleRule* aStyleRule);
nsIStyleRule* aStyleRule) MOZ_OVERRIDE;
virtual void StyleRuleRemoved(nsIStyleSheet* aStyleSheet,
nsIStyleRule* aStyleRule);
nsIStyleRule* aStyleRule) MOZ_OVERRIDE;
virtual void FlushPendingNotifications(mozFlushType aType);
virtual void FlushExternalResources(mozFlushType aType);
virtual void FlushPendingNotifications(mozFlushType aType) MOZ_OVERRIDE;
virtual void FlushExternalResources(mozFlushType aType) MOZ_OVERRIDE;
virtual void SetXMLDeclaration(const PRUnichar *aVersion,
const PRUnichar *aEncoding,
const int32_t aStandalone);
const int32_t aStandalone) MOZ_OVERRIDE;
virtual void GetXMLDeclaration(nsAString& aVersion,
nsAString& aEncoding,
nsAString& Standalone);
virtual bool IsScriptEnabled();
nsAString& Standalone) MOZ_OVERRIDE;
virtual bool IsScriptEnabled() MOZ_OVERRIDE;
virtual void OnPageShow(bool aPersisted, mozilla::dom::EventTarget* aDispatchStartTarget);
virtual void OnPageHide(bool aPersisted, mozilla::dom::EventTarget* aDispatchStartTarget);
virtual void OnPageShow(bool aPersisted, mozilla::dom::EventTarget* aDispatchStartTarget) MOZ_OVERRIDE;
virtual void OnPageHide(bool aPersisted, mozilla::dom::EventTarget* aDispatchStartTarget) MOZ_OVERRIDE;
virtual void WillDispatchMutationEvent(nsINode* aTarget);
virtual void MutationEventDispatched(nsINode* aTarget);
virtual void WillDispatchMutationEvent(nsINode* aTarget) MOZ_OVERRIDE;
virtual void MutationEventDispatched(nsINode* aTarget) MOZ_OVERRIDE;
// nsINode
virtual bool IsNodeOfType(uint32_t aFlags) const;
virtual nsIContent *GetChildAt(uint32_t aIndex) const;
virtual nsIContent * const * GetChildArray(uint32_t* aChildCount) const;
virtual bool IsNodeOfType(uint32_t aFlags) const MOZ_OVERRIDE;
virtual nsIContent *GetChildAt(uint32_t aIndex) const MOZ_OVERRIDE;
virtual nsIContent * const * GetChildArray(uint32_t* aChildCount) const MOZ_OVERRIDE;
virtual int32_t IndexOf(const nsINode* aPossibleChild) const MOZ_OVERRIDE;
virtual uint32_t GetChildCount() const;
virtual uint32_t GetChildCount() const MOZ_OVERRIDE;
virtual nsresult InsertChildAt(nsIContent* aKid, uint32_t aIndex,
bool aNotify);
bool aNotify) MOZ_OVERRIDE;
virtual nsresult AppendChildTo(nsIContent* aKid, bool aNotify);
virtual void RemoveChildAt(uint32_t aIndex, bool aNotify);
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const
virtual void RemoveChildAt(uint32_t aIndex, bool aNotify) MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE
{
return NS_ERROR_NOT_IMPLEMENTED;
}
@ -742,30 +742,30 @@ public:
// nsIRadioGroupContainer
NS_IMETHOD WalkRadioGroup(const nsAString& aName,
nsIRadioVisitor* aVisitor,
bool aFlushContent);
bool aFlushContent) MOZ_OVERRIDE;
virtual void SetCurrentRadioButton(const nsAString& aName,
nsIDOMHTMLInputElement* aRadio);
virtual nsIDOMHTMLInputElement* GetCurrentRadioButton(const nsAString& aName);
nsIDOMHTMLInputElement* aRadio) MOZ_OVERRIDE;
virtual nsIDOMHTMLInputElement* GetCurrentRadioButton(const nsAString& aName) MOZ_OVERRIDE;
NS_IMETHOD GetNextRadioButton(const nsAString& aName,
const bool aPrevious,
nsIDOMHTMLInputElement* aFocusedRadio,
nsIDOMHTMLInputElement** aRadioOut);
nsIDOMHTMLInputElement** aRadioOut) MOZ_OVERRIDE;
virtual void AddToRadioGroup(const nsAString& aName,
nsIFormControl* aRadio);
nsIFormControl* aRadio) MOZ_OVERRIDE;
virtual void RemoveFromRadioGroup(const nsAString& aName,
nsIFormControl* aRadio);
virtual uint32_t GetRequiredRadioCount(const nsAString& aName) const;
nsIFormControl* aRadio) MOZ_OVERRIDE;
virtual uint32_t GetRequiredRadioCount(const nsAString& aName) const MOZ_OVERRIDE;
virtual void RadioRequiredChanged(const nsAString& aName,
nsIFormControl* aRadio);
virtual bool GetValueMissingState(const nsAString& aName) const;
virtual void SetValueMissingState(const nsAString& aName, bool aValue);
nsIFormControl* aRadio) MOZ_OVERRIDE;
virtual bool GetValueMissingState(const nsAString& aName) const MOZ_OVERRIDE;
virtual void SetValueMissingState(const nsAString& aName, bool aValue) MOZ_OVERRIDE;
// for radio group
nsRadioGroupStruct* GetRadioGroup(const nsAString& aName) const;
nsRadioGroupStruct* GetOrCreateRadioGroup(const nsAString& aName);
virtual nsViewportInfo GetViewportInfo(uint32_t aDisplayWidth,
uint32_t aDisplayHeight);
uint32_t aDisplayHeight) MOZ_OVERRIDE;
private:
@ -785,12 +785,12 @@ public:
NS_DECL_NSIDOMDOCUMENTXBL
// nsIDOMEventTarget
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor);
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor) MOZ_OVERRIDE;
virtual nsEventListenerManager*
GetListenerManager(bool aCreateIfNotFound);
GetListenerManager(bool aCreateIfNotFound) MOZ_OVERRIDE;
// nsIScriptObjectPrincipal
virtual nsIPrincipal* GetPrincipal();
virtual nsIPrincipal* GetPrincipal() MOZ_OVERRIDE;
// nsIApplicationCacheContainer
NS_DECL_NSIAPPLICATIONCACHECONTAINER
@ -814,7 +814,7 @@ public:
virtual nsresult CreateElem(const nsAString& aName, nsIAtom *aPrefix,
int32_t aNamespaceID,
nsIContent **aResult);
nsIContent **aResult) MOZ_OVERRIDE;
virtual NS_HIDDEN_(void) Sanitize();
@ -834,7 +834,7 @@ public:
NS_HIDDEN_(void) ClearBoxObjectFor(nsIContent* aContent);
already_AddRefed<nsIBoxObject> GetBoxObjectFor(mozilla::dom::Element* aElement,
mozilla::ErrorResult& aRv);
mozilla::ErrorResult& aRv) MOZ_OVERRIDE;
virtual NS_HIDDEN_(nsresult) GetXBLChildNodesFor(nsIContent* aContent,
nsIDOMNodeList** aResult);
@ -873,20 +873,20 @@ public:
// Returns our (lazily-initialized) animation controller.
// If HasAnimationController is true, this is guaranteed to return non-null.
nsSMILAnimationController* GetAnimationController();
nsSMILAnimationController* GetAnimationController() MOZ_OVERRIDE;
void SetImagesNeedAnimating(bool aAnimating);
void SetImagesNeedAnimating(bool aAnimating) MOZ_OVERRIDE;
virtual void SuppressEventHandling(uint32_t aIncrease);
virtual void SuppressEventHandling(uint32_t aIncrease) MOZ_OVERRIDE;
virtual void UnsuppressEventHandlingAndFireEvents(bool aFireEvents);
virtual void UnsuppressEventHandlingAndFireEvents(bool aFireEvents) MOZ_OVERRIDE;
void DecreaseEventSuppression() {
--mEventsSuppressed;
MaybeRescheduleAnimationFrameNotifications();
}
virtual nsIDocument* GetTemplateContentsOwner();
virtual nsIDocument* GetTemplateContentsOwner() MOZ_OVERRIDE;
NS_DECL_CYCLE_COLLECTION_SKIPPABLE_SCRIPT_HOLDER_CLASS_AMBIGUOUS(nsDocument,
nsIDocument)
@ -911,35 +911,35 @@ public:
void MaybeEndOutermostXBLUpdate();
virtual void MaybePreLoadImage(nsIURI* uri,
const nsAString &aCrossOriginAttr);
const nsAString &aCrossOriginAttr) MOZ_OVERRIDE;
virtual void PreloadStyle(nsIURI* uri, const nsAString& charset,
const nsAString& aCrossOriginAttr);
const nsAString& aCrossOriginAttr) MOZ_OVERRIDE;
virtual nsresult LoadChromeSheetSync(nsIURI* uri, bool isAgentSheet,
nsCSSStyleSheet** sheet);
nsCSSStyleSheet** sheet) MOZ_OVERRIDE;
virtual nsISupports* GetCurrentContentSink();
virtual nsISupports* GetCurrentContentSink() MOZ_OVERRIDE;
virtual nsEventStates GetDocumentState();
virtual nsEventStates GetDocumentState() MOZ_OVERRIDE;
virtual void RegisterHostObjectUri(const nsACString& aUri);
virtual void UnregisterHostObjectUri(const nsACString& aUri);
virtual void RegisterHostObjectUri(const nsACString& aUri) MOZ_OVERRIDE;
virtual void UnregisterHostObjectUri(const nsACString& aUri) MOZ_OVERRIDE;
// Only BlockOnload should call this!
void AsyncBlockOnload();
virtual void SetScrollToRef(nsIURI *aDocumentURI);
virtual void ScrollToRef();
virtual void ResetScrolledToRefAlready();
virtual void SetChangeScrollPosWhenScrollingToRef(bool aValue);
virtual void SetScrollToRef(nsIURI *aDocumentURI) MOZ_OVERRIDE;
virtual void ScrollToRef() MOZ_OVERRIDE;
virtual void ResetScrolledToRefAlready() MOZ_OVERRIDE;
virtual void SetChangeScrollPosWhenScrollingToRef(bool aValue) MOZ_OVERRIDE;
virtual Element *GetElementById(const nsAString& aElementId);
virtual const nsSmallVoidArray* GetAllElementsForId(const nsAString& aElementId) const;
virtual Element *GetElementById(const nsAString& aElementId) MOZ_OVERRIDE;
virtual const nsSmallVoidArray* GetAllElementsForId(const nsAString& aElementId) const MOZ_OVERRIDE;
virtual Element *LookupImageElement(const nsAString& aElementId);
virtual Element *LookupImageElement(const nsAString& aElementId) MOZ_OVERRIDE;
virtual void MozSetImageElement(const nsAString& aImageElementId,
Element* aElement);
Element* aElement) MOZ_OVERRIDE;
virtual NS_HIDDEN_(nsresult) AddImage(imgIRequest* aImage);
virtual NS_HIDDEN_(nsresult) RemoveImage(imgIRequest* aImage, uint32_t aFlags);
@ -947,40 +947,40 @@ public:
// AddPlugin adds a plugin-related element to mPlugins when the element is
// added to the tree.
virtual nsresult AddPlugin(nsIObjectLoadingContent* aPlugin);
virtual nsresult AddPlugin(nsIObjectLoadingContent* aPlugin) MOZ_OVERRIDE;
// RemovePlugin removes a plugin-related element to mPlugins when the
// element is removed from the tree.
virtual void RemovePlugin(nsIObjectLoadingContent* aPlugin);
virtual void RemovePlugin(nsIObjectLoadingContent* aPlugin) MOZ_OVERRIDE;
// GetPlugins returns the plugin-related elements from
// the frame and any subframes.
virtual void GetPlugins(nsTArray<nsIObjectLoadingContent*>& aPlugins);
virtual void GetPlugins(nsTArray<nsIObjectLoadingContent*>& aPlugins) MOZ_OVERRIDE;
virtual nsresult GetStateObject(nsIVariant** aResult);
virtual nsresult GetStateObject(nsIVariant** aResult) MOZ_OVERRIDE;
virtual nsDOMNavigationTiming* GetNavigationTiming() const;
virtual nsresult SetNavigationTiming(nsDOMNavigationTiming* aTiming);
virtual nsDOMNavigationTiming* GetNavigationTiming() const MOZ_OVERRIDE;
virtual nsresult SetNavigationTiming(nsDOMNavigationTiming* aTiming) MOZ_OVERRIDE;
virtual Element* FindImageMap(const nsAString& aNormalizedMapName);
virtual Element* FindImageMap(const nsAString& aNormalizedMapName) MOZ_OVERRIDE;
virtual void NotifyAudioAvailableListener();
virtual void NotifyAudioAvailableListener() MOZ_OVERRIDE;
bool HasAudioAvailableListeners()
bool HasAudioAvailableListeners() MOZ_OVERRIDE
{
return mHasAudioAvailableListener;
}
virtual Element* GetFullScreenElement();
virtual void AsyncRequestFullScreen(Element* aElement);
virtual void RestorePreviousFullScreenState();
virtual bool IsFullscreenLeaf();
virtual bool IsFullScreenDoc();
virtual void SetApprovedForFullscreen(bool aIsApproved);
virtual Element* GetFullScreenElement() MOZ_OVERRIDE;
virtual void AsyncRequestFullScreen(Element* aElement) MOZ_OVERRIDE;
virtual void RestorePreviousFullScreenState() MOZ_OVERRIDE;
virtual bool IsFullscreenLeaf() MOZ_OVERRIDE;
virtual bool IsFullScreenDoc() MOZ_OVERRIDE;
virtual void SetApprovedForFullscreen(bool aIsApproved) MOZ_OVERRIDE;
virtual nsresult RemoteFrameFullscreenChanged(nsIDOMElement* aFrameElement,
const nsAString& aNewOrigin);
const nsAString& aNewOrigin) MOZ_OVERRIDE;
virtual nsresult RemoteFrameFullscreenReverted();
virtual nsIDocument* GetFullscreenRoot();
virtual void SetFullscreenRoot(nsIDocument* aRoot);
virtual nsresult RemoteFrameFullscreenReverted() MOZ_OVERRIDE;
virtual nsIDocument* GetFullscreenRoot() MOZ_OVERRIDE;
virtual void SetFullscreenRoot(nsIDocument* aRoot) MOZ_OVERRIDE;
static void ExitFullscreen(nsIDocument* aDoc);
@ -1023,10 +1023,10 @@ public:
Element* FullScreenStackTop();
// DOM-exposed fullscreen API
virtual bool MozFullScreenEnabled();
virtual Element* GetMozFullScreenElement(mozilla::ErrorResult& rv);
virtual bool MozFullScreenEnabled() MOZ_OVERRIDE;
virtual Element* GetMozFullScreenElement(mozilla::ErrorResult& rv) MOZ_OVERRIDE;
void RequestPointerLock(Element* aElement);
void RequestPointerLock(Element* aElement) MOZ_OVERRIDE;
bool ShouldLockPointer(Element* aElement, Element* aCurrentLock,
bool aNoFocusCheck = false);
bool SetPointerLock(Element* aElement, int aCursorStyle);
@ -1036,12 +1036,12 @@ public:
// synchronously.
void UpdateVisibilityState();
// Posts an event to call UpdateVisibilityState
virtual void PostVisibilityUpdateEvent();
virtual void PostVisibilityUpdateEvent() MOZ_OVERRIDE;
virtual void DocSizeOfExcludingThis(nsWindowSizes* aWindowSizes) const;
virtual void DocSizeOfExcludingThis(nsWindowSizes* aWindowSizes) const MOZ_OVERRIDE;
// DocSizeOfIncludingThis is inherited from nsIDocument.
virtual nsIDOMNode* AsDOMNode() { return this; }
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
void GetCustomPrototype(const nsAString& aElementName, JS::MutableHandle<JSObject*> prototype)
{
@ -1052,16 +1052,16 @@ public:
// WebIDL bits
virtual mozilla::dom::DOMImplementation*
GetImplementation(mozilla::ErrorResult& rv);
GetImplementation(mozilla::ErrorResult& rv) MOZ_OVERRIDE;
virtual JSObject*
Register(JSContext* aCx, const nsAString& aName,
const mozilla::dom::ElementRegistrationOptions& aOptions,
mozilla::ErrorResult& rv);
virtual nsIDOMStyleSheetList* StyleSheets();
virtual void SetSelectedStyleSheetSet(const nsAString& aSheetSet);
virtual void GetLastStyleSheetSet(nsString& aSheetSet);
virtual nsIDOMDOMStringList* StyleSheetSets();
virtual void EnableStyleSheetsForSet(const nsAString& aSheetSet);
mozilla::ErrorResult& rv) MOZ_OVERRIDE;
virtual nsIDOMStyleSheetList* StyleSheets() MOZ_OVERRIDE;
virtual void SetSelectedStyleSheetSet(const nsAString& aSheetSet) MOZ_OVERRIDE;
virtual void GetLastStyleSheetSet(nsString& aSheetSet) MOZ_OVERRIDE;
virtual nsIDOMDOMStringList* StyleSheetSets() MOZ_OVERRIDE;
virtual void EnableStyleSheetsForSet(const nsAString& aSheetSet) MOZ_OVERRIDE;
protected:
friend class nsNodeUtils;
@ -1133,9 +1133,9 @@ protected:
void GetTitleFromElement(uint32_t aNodeType, nsAString& aTitle);
public:
// Get our title
virtual void GetTitle(nsString& aTitle);
virtual void GetTitle(nsString& aTitle) MOZ_OVERRIDE;
// Set our title
virtual void SetTitle(const nsAString& aTitle, mozilla::ErrorResult& rv);
virtual void SetTitle(const nsAString& aTitle, mozilla::ErrorResult& rv) MOZ_OVERRIDE;
static void XPCOMShutdown();
@ -1160,9 +1160,9 @@ protected:
const nsAString& aType,
bool aPersisted);
virtual nsPIDOMWindow *GetWindowInternal() const;
virtual nsIScriptGlobalObject* GetScriptHandlingObjectInternal() const;
virtual bool InternalAllowXULXBL();
virtual nsPIDOMWindow *GetWindowInternal() const MOZ_OVERRIDE;
virtual nsIScriptGlobalObject* GetScriptHandlingObjectInternal() const MOZ_OVERRIDE;
virtual bool InternalAllowXULXBL() MOZ_OVERRIDE;
#define NS_DOCUMENT_NOTIFY_OBSERVERS(func_, params_) \
NS_OBSERVER_ARRAY_NOTIFY_XPCOM_OBSERVERS(mObservers, nsIDocumentObserver, \

7
content/base/src/nsFormData.h
View File

@ -5,6 +5,7 @@
#ifndef nsFormData_h__
#define nsFormData_h__
#include "mozilla/Attributes.h"
#include "nsIDOMFormData.h"
#include "nsIXMLHttpRequest.h"
#include "nsFormSubmission.h"
@ -59,9 +60,9 @@ public:
// nsFormSubmission
virtual nsresult GetEncodedSubmission(nsIURI* aURI,
nsIInputStream** aPostDataStream);
nsIInputStream** aPostDataStream) MOZ_OVERRIDE;
virtual nsresult AddNameValuePair(const nsAString& aName,
const nsAString& aValue)
const nsAString& aValue) MOZ_OVERRIDE
{
FormDataTuple* data = mFormData.AppendElement();
data->name = aName;
@ -71,7 +72,7 @@ public:
}
virtual nsresult AddNameFilePair(const nsAString& aName,
nsIDOMBlob* aBlob,
const nsString& aFilename)
const nsString& aFilename) MOZ_OVERRIDE
{
FormDataTuple* data = mFormData.AppendElement();
data->name = aName;

10
content/base/src/nsFrameLoader.h
View File

@ -185,12 +185,12 @@ public:
/**
* MessageManagerCallback methods that we override.
*/
virtual bool DoLoadFrameScript(const nsAString& aURL);
virtual bool DoLoadFrameScript(const nsAString& aURL) MOZ_OVERRIDE;
virtual bool DoSendAsyncMessage(const nsAString& aMessage,
const mozilla::dom::StructuredCloneData& aData);
virtual bool CheckPermission(const nsAString& aPermission);
virtual bool CheckManifestURL(const nsAString& aManifestURL);
virtual bool CheckAppHasPermission(const nsAString& aPermission);
const mozilla::dom::StructuredCloneData& aData) MOZ_OVERRIDE;
virtual bool CheckPermission(const nsAString& aPermission) MOZ_OVERRIDE;
virtual bool CheckManifestURL(const nsAString& aManifestURL) MOZ_OVERRIDE;
virtual bool CheckAppHasPermission(const nsAString& aPermission) MOZ_OVERRIDE;
/**
* Called from the layout frame associated with this frame loader;

4
content/base/src/nsFrameMessageManager.cpp
View File

@ -344,7 +344,7 @@ GetParamsForMessage(JSContext* aCx,
JS::Rooted<JS::Value> val(aCx, JS::NullValue());
NS_ENSURE_TRUE(JS_ParseJSON(aCx, static_cast<const jschar*>(json.get()),
json.Length(), val.address()), false);
json.Length(), &val), false);
return WriteStructuredClone(aCx, val, aBuffer, aClosure);
}
@ -388,7 +388,7 @@ nsFrameMessageManager::SendSyncMessage(const nsAString& aMessageName,
JS::Rooted<JS::Value> ret(aCx);
if (!JS_ParseJSON(aCx, static_cast<const jschar*>(retval[i].get()),
retval[i].Length(), ret.address())) {
retval[i].Length(), &ret)) {
return NS_ERROR_UNEXPECTED;
}
NS_ENSURE_TRUE(JS_SetElement(aCx, dataArray, i, ret.address()),

81
content/base/src/nsGenericDOMDataNode.h
View File

@ -11,6 +11,7 @@
#ifndef nsGenericDOMDataNode_h___
#define nsGenericDOMDataNode_h___
#include "mozilla/Attributes.h"
#include "nsIContent.h"
#include "nsTextFragment.h"
@ -58,9 +59,9 @@ public:
nsGenericDOMDataNode(already_AddRefed<nsINodeInfo> aNodeInfo);
virtual ~nsGenericDOMDataNode();
virtual void GetNodeValueInternal(nsAString& aNodeValue);
virtual void GetNodeValueInternal(nsAString& aNodeValue) MOZ_OVERRIDE;
virtual void SetNodeValueInternal(const nsAString& aNodeValue,
mozilla::ErrorResult& aError);
mozilla::ErrorResult& aError) MOZ_OVERRIDE;
// Implementation for nsIDOMCharacterData
nsresult GetData(nsAString& aData) const;
@ -76,19 +77,19 @@ public:
NS_IMETHOD MozRemove();
// nsINode methods
virtual uint32_t GetChildCount() const;
virtual nsIContent *GetChildAt(uint32_t aIndex) const;
virtual nsIContent * const * GetChildArray(uint32_t* aChildCount) const;
virtual int32_t IndexOf(const nsINode* aPossibleChild) const;
virtual uint32_t GetChildCount() const MOZ_OVERRIDE;
virtual nsIContent *GetChildAt(uint32_t aIndex) const MOZ_OVERRIDE;
virtual nsIContent * const * GetChildArray(uint32_t* aChildCount) const MOZ_OVERRIDE;
virtual int32_t IndexOf(const nsINode* aPossibleChild) const MOZ_OVERRIDE;
virtual nsresult InsertChildAt(nsIContent* aKid, uint32_t aIndex,
bool aNotify);
virtual void RemoveChildAt(uint32_t aIndex, bool aNotify);
virtual void GetTextContentInternal(nsAString& aTextContent)
bool aNotify) MOZ_OVERRIDE;
virtual void RemoveChildAt(uint32_t aIndex, bool aNotify) MOZ_OVERRIDE;
virtual void GetTextContentInternal(nsAString& aTextContent) MOZ_OVERRIDE
{
GetNodeValue(aTextContent);
}
virtual void SetTextContentInternal(const nsAString& aTextContent,
mozilla::ErrorResult& aError)
mozilla::ErrorResult& aError) MOZ_OVERRIDE
{
// Batch possible DOMSubtreeModified events.
mozAutoSubtreeModified subtree(OwnerDoc(), nullptr);
@ -98,14 +99,14 @@ public:
// Implementation for nsIContent
virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
nsIContent* aBindingParent,
bool aCompileEventHandlers);
bool aCompileEventHandlers) MOZ_OVERRIDE;
virtual void UnbindFromTree(bool aDeep = true,
bool aNullParent = true);
bool aNullParent = true) MOZ_OVERRIDE;
virtual already_AddRefed<nsINodeList> GetChildren(uint32_t aFilter);
virtual already_AddRefed<nsINodeList> GetChildren(uint32_t aFilter) MOZ_OVERRIDE;
virtual nsIAtom *GetIDAttributeName() const;
virtual already_AddRefed<nsINodeInfo> GetExistingAttrNameFromQName(const nsAString& aStr) const;
virtual nsIAtom *GetIDAttributeName() const MOZ_OVERRIDE;
virtual already_AddRefed<nsINodeInfo> GetExistingAttrNameFromQName(const nsAString& aStr) const MOZ_OVERRIDE;
nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
const nsAString& aValue, bool aNotify)
{
@ -113,45 +114,45 @@ public:
}
virtual nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aAttribute,
nsIAtom* aPrefix, const nsAString& aValue,
bool aNotify);
bool aNotify) MOZ_OVERRIDE;
virtual nsresult UnsetAttr(int32_t aNameSpaceID, nsIAtom* aAttribute,
bool aNotify);
virtual const nsAttrName* GetAttrNameAt(uint32_t aIndex) const;
virtual uint32_t GetAttrCount() const;
virtual const nsTextFragment *GetText();
virtual uint32_t TextLength() const;
bool aNotify) MOZ_OVERRIDE;
virtual const nsAttrName* GetAttrNameAt(uint32_t aIndex) const MOZ_OVERRIDE;
virtual uint32_t GetAttrCount() const MOZ_OVERRIDE;
virtual const nsTextFragment *GetText() MOZ_OVERRIDE;
virtual uint32_t TextLength() const MOZ_OVERRIDE;
virtual nsresult SetText(const PRUnichar* aBuffer, uint32_t aLength,
bool aNotify);
bool aNotify) MOZ_OVERRIDE;
// Need to implement this here too to avoid hiding.
nsresult SetText(const nsAString& aStr, bool aNotify)
{
return SetText(aStr.BeginReading(), aStr.Length(), aNotify);
}
virtual nsresult AppendText(const PRUnichar* aBuffer, uint32_t aLength,
bool aNotify);
virtual bool TextIsOnlyWhitespace();
virtual void AppendTextTo(nsAString& aResult);
virtual void DestroyContent();
virtual void SaveSubtreeState();
bool aNotify) MOZ_OVERRIDE;
virtual bool TextIsOnlyWhitespace() MOZ_OVERRIDE;
virtual void AppendTextTo(nsAString& aResult) MOZ_OVERRIDE;
virtual void DestroyContent() MOZ_OVERRIDE;
virtual void SaveSubtreeState() MOZ_OVERRIDE;
#ifdef DEBUG
virtual void List(FILE* out, int32_t aIndent) const;
virtual void DumpContent(FILE* out, int32_t aIndent, bool aDumpAll) const;
virtual void List(FILE* out, int32_t aIndent) const MOZ_OVERRIDE;
virtual void DumpContent(FILE* out, int32_t aIndent, bool aDumpAll) const MOZ_OVERRIDE;
#endif
virtual nsIContent *GetBindingParent() const;
virtual bool IsNodeOfType(uint32_t aFlags) const;
virtual bool IsLink(nsIURI** aURI) const;
virtual nsIContent *GetBindingParent() const MOZ_OVERRIDE;
virtual bool IsNodeOfType(uint32_t aFlags) const MOZ_OVERRIDE;
virtual bool IsLink(nsIURI** aURI) const MOZ_OVERRIDE;
virtual nsIAtom* DoGetID() const;
virtual const nsAttrValue* DoGetClasses() const;
NS_IMETHOD WalkContentStyleRules(nsRuleWalker* aRuleWalker);
virtual nsIAtom* DoGetID() const MOZ_OVERRIDE;
virtual const nsAttrValue* DoGetClasses() const MOZ_OVERRIDE;
NS_IMETHOD WalkContentStyleRules(nsRuleWalker* aRuleWalker) MOZ_OVERRIDE;
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
virtual nsChangeHint GetAttributeChangeHint(const nsIAtom* aAttribute,
int32_t aModType) const;
virtual nsIAtom *GetClassAttributeName() const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE
{
*aResult = CloneDataNode(aNodeInfo, true);
if (!*aResult) {
@ -235,7 +236,7 @@ protected:
};
// Override from nsINode
virtual nsINode::nsSlots* CreateSlots();
virtual nsINode::nsSlots* CreateSlots() MOZ_OVERRIDE;
nsDataSlots* DataSlots()
{
@ -277,16 +278,16 @@ protected:
nsTextFragment mText;
public:
virtual bool OwnedOnlyByTheDOMTree()
virtual bool OwnedOnlyByTheDOMTree() MOZ_OVERRIDE
{
return GetParent() && mRefCnt.get() == 1;
}
virtual bool IsPurple()
virtual bool IsPurple() MOZ_OVERRIDE
{
return mRefCnt.IsPurple();
}
virtual void RemovePurple()
virtual void RemovePurple() MOZ_OVERRIDE
{
mRefCnt.RemovePurple();
}

9
content/base/src/nsHTMLContentSerializer.h
View File

@ -12,6 +12,7 @@
#ifndef nsHTMLContentSerializer_h__
#define nsHTMLContentSerializer_h__
#include "mozilla/Attributes.h"
#include "nsXHTMLContentSerializer.h"
#include "nsIEntityConverter.h"
#include "nsString.h"
@ -26,13 +27,13 @@ class nsHTMLContentSerializer : public nsXHTMLContentSerializer {
NS_IMETHOD AppendElementStart(mozilla::dom::Element* aElement,
mozilla::dom::Element* aOriginalElement,
nsAString& aStr);
nsAString& aStr) MOZ_OVERRIDE;
NS_IMETHOD AppendElementEnd(mozilla::dom::Element* aElement,
nsAString& aStr);
nsAString& aStr) MOZ_OVERRIDE;
NS_IMETHOD AppendDocumentStart(nsIDocument *aDocument,
nsAString& aStr);
nsAString& aStr) MOZ_OVERRIDE;
protected:
virtual void SerializeHTMLAttributes(nsIContent* aContent,
@ -44,7 +45,7 @@ class nsHTMLContentSerializer : public nsXHTMLContentSerializer {
nsAString& aStr);
virtual void AppendAndTranslateEntities(const nsAString& aStr,
nsAString& aOutputStr);
nsAString& aOutputStr) MOZ_OVERRIDE;
};

7
content/base/src/nsHostObjectURI.h
View File

@ -5,6 +5,7 @@
#ifndef nsHostObjectURI_h
#define nsHostObjectURI_h
#include "mozilla/Attributes.h"
#include "nsCOMPtr.h"
#include "nsIClassInfo.h"
#include "nsIPrincipal.h"
@ -35,13 +36,13 @@ public:
// Override CloneInternal() and EqualsInternal()
virtual nsresult CloneInternal(RefHandlingEnum aRefHandlingMode,
nsIURI** aClone);
nsIURI** aClone) MOZ_OVERRIDE;
virtual nsresult EqualsInternal(nsIURI* aOther,
RefHandlingEnum aRefHandlingMode,
bool* aResult);
bool* aResult) MOZ_OVERRIDE;
// Override StartClone to hand back a nsHostObjectURI
virtual nsSimpleURI* StartClone(RefHandlingEnum /* unused */)
virtual nsSimpleURI* StartClone(RefHandlingEnum /* unused */) MOZ_OVERRIDE
{ return new nsHostObjectURI(); }
nsCOMPtr<nsIPrincipal> mPrincipal;

27
content/base/src/nsInProcessTabChildGlobal.h
View File

@ -7,6 +7,7 @@
#ifndef nsInProcessTabChildGlobal_h
#define nsInProcessTabChildGlobal_h
#include "mozilla/Attributes.h"
#include "nsCOMPtr.h"
#include "nsFrameMessageManager.h"
#include "nsIScriptContext.h"
@ -48,17 +49,17 @@ public:
? mMessageManager->SendSyncMessage(aMessageName, aObject, aCx, aArgc, aRetval)
: NS_ERROR_NULL_POINTER;
}
NS_IMETHOD GetContent(nsIDOMWindow** aContent);
NS_IMETHOD GetDocShell(nsIDocShell** aDocShell);
NS_IMETHOD Dump(const nsAString& aStr)
NS_IMETHOD GetContent(nsIDOMWindow** aContent) MOZ_OVERRIDE;
NS_IMETHOD GetDocShell(nsIDocShell** aDocShell) MOZ_OVERRIDE;
NS_IMETHOD Dump(const nsAString& aStr) MOZ_OVERRIDE
{
return mMessageManager ? mMessageManager->Dump(aStr) : NS_OK;
}
NS_IMETHOD PrivateNoteIntentionalCrash();
NS_IMETHOD PrivateNoteIntentionalCrash() MOZ_OVERRIDE;
NS_IMETHOD Btoa(const nsAString& aBinaryData,
nsAString& aAsciiBase64String);
nsAString& aAsciiBase64String) MOZ_OVERRIDE;
NS_IMETHOD Atob(const nsAString& aAsciiString,
nsAString& aBinaryData);
nsAString& aBinaryData) MOZ_OVERRIDE;
NS_DECL_NSIINPROCESSCONTENTFRAMEMESSAGEMANAGER
@ -67,11 +68,11 @@ public:
*/
virtual bool DoSendSyncMessage(const nsAString& aMessage,
const mozilla::dom::StructuredCloneData& aData,
InfallibleTArray<nsString>* aJSONRetVal);
InfallibleTArray<nsString>* aJSONRetVal) MOZ_OVERRIDE;
virtual bool DoSendAsyncMessage(const nsAString& aMessage,
const mozilla::dom::StructuredCloneData& aData);
const mozilla::dom::StructuredCloneData& aData) MOZ_OVERRIDE;
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor);
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor) MOZ_OVERRIDE;
NS_IMETHOD AddEventListener(const nsAString& aType,
nsIDOMEventListener* aListener,
bool aUseCapture)
@ -83,7 +84,7 @@ public:
NS_IMETHOD AddEventListener(const nsAString& aType,
nsIDOMEventListener* aListener,
bool aUseCapture, bool aWantsUntrusted,
uint8_t optional_argc)
uint8_t optional_argc) MOZ_OVERRIDE
{
return nsDOMEventTargetHelper::AddEventListener(aType, aListener,
aUseCapture,
@ -92,8 +93,8 @@ public:
}
using nsDOMEventTargetHelper::AddEventListener;
virtual JSContext* GetJSContextForEventHandlers() { return mCx; }
virtual nsIPrincipal* GetPrincipal() { return mPrincipal; }
virtual JSContext* GetJSContextForEventHandlers() MOZ_OVERRIDE { return mCx; }
virtual nsIPrincipal* GetPrincipal() MOZ_OVERRIDE { return mPrincipal; }
void LoadFrameScript(const nsAString& aURL);
void Disconnect();
void SendMessageToParent(const nsString& aMessage, bool aSync,
@ -116,7 +117,7 @@ public:
void DelayedDisconnect();
virtual JSObject* GetGlobalJSObject() {
virtual JSObject* GetGlobalJSObject() MOZ_OVERRIDE {
if (!mGlobal) {
return nullptr;
}

5
content/base/src/nsMappedAttributeElement.h
View File

@ -12,6 +12,7 @@
#ifndef NS_MAPPEDATTRIBUTEELEMENT_H_
#define NS_MAPPEDATTRIBUTEELEMENT_H_
#include "mozilla/Attributes.h"
#include "nsStyledElement.h"
class nsMappedAttributes;
@ -37,11 +38,11 @@ public:
static void MapNoAttributesInto(const nsMappedAttributes* aAttributes,
nsRuleData* aRuleData);
NS_IMETHOD WalkContentStyleRules(nsRuleWalker* aRuleWalker);
NS_IMETHOD WalkContentStyleRules(nsRuleWalker* aRuleWalker) MOZ_OVERRIDE;
virtual bool SetMappedAttribute(nsIDocument* aDocument,
nsIAtom* aName,
nsAttrValue& aValue,
nsresult* aRetval);
nsresult* aRetval) MOZ_OVERRIDE;
};
#endif // NS_MAPPEDATTRIBUTEELEMENT_H_

4
content/base/src/nsMappedAttributes.h
View File

@ -72,9 +72,9 @@ public:
// nsIStyleRule
virtual void MapRuleInfoInto(nsRuleData* aRuleData);
virtual void MapRuleInfoInto(nsRuleData* aRuleData) MOZ_OVERRIDE;
#ifdef DEBUG
virtual void List(FILE* out = stdout, int32_t aIndent = 0) const;
virtual void List(FILE* out = stdout, int32_t aIndent = 0) const MOZ_OVERRIDE;
#endif
size_t SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const;

3
content/base/src/nsNodeInfo.h
View File

@ -13,6 +13,7 @@
#ifndef nsNodeInfo_h___
#define nsNodeInfo_h___
#include "mozilla/Attributes.h"
#include "nsINodeInfo.h"
#include "nsNodeInfoManager.h"
#include "plhash.h"
@ -29,7 +30,7 @@ public:
// nsINodeInfo
virtual void GetNamespaceURI(nsAString& aNameSpaceURI) const;
virtual bool NamespaceEquals(const nsAString& aNamespaceURI) const;
virtual bool NamespaceEquals(const nsAString& aNamespaceURI) const MOZ_OVERRIDE;
// nsNodeInfo
public:

3
content/base/src/nsObjectLoadingContent.h
View File

@ -13,6 +13,7 @@
#ifndef NSOBJECTLOADINGCONTENT_H_
#define NSOBJECTLOADINGCONTENT_H_
#include "mozilla/Attributes.h"
#include "nsImageLoadingContent.h"
#include "nsIStreamListener.h"
#include "nsIInterfaceRequestor.h"
@ -448,7 +449,7 @@ class nsObjectLoadingContent : public nsImageLoadingContent
SetupProtoChainRunner(nsIScriptContext* scriptContext,
nsObjectLoadingContent* aContent);
NS_IMETHOD Run();
NS_IMETHOD Run() MOZ_OVERRIDE;
private:
nsCOMPtr<nsIScriptContext> mContext;

21
content/base/src/nsPlainTextSerializer.h
View File

@ -12,6 +12,7 @@
#ifndef nsPlainTextSerializer_h__
#define nsPlainTextSerializer_h__
#include "mozilla/Attributes.h"
#include "nsAutoPtr.h"
#include "nsCOMPtr.h"
#include "nsIAtom.h"
@ -40,30 +41,30 @@ public:
// nsIContentSerializer
NS_IMETHOD Init(uint32_t flags, uint32_t aWrapColumn,
const char* aCharSet, bool aIsCopying,
bool aIsWholeDocument);
bool aIsWholeDocument) MOZ_OVERRIDE;
NS_IMETHOD AppendText(nsIContent* aText, int32_t aStartOffset,
int32_t aEndOffset, nsAString& aStr);
int32_t aEndOffset, nsAString& aStr) MOZ_OVERRIDE;
NS_IMETHOD AppendCDATASection(nsIContent* aCDATASection,
int32_t aStartOffset, int32_t aEndOffset,
nsAString& aStr);
nsAString& aStr) MOZ_OVERRIDE;
NS_IMETHOD AppendProcessingInstruction(nsIContent* aPI,
int32_t aStartOffset,
int32_t aEndOffset,
nsAString& aStr) { return NS_OK; }
nsAString& aStr) MOZ_OVERRIDE { return NS_OK; }
NS_IMETHOD AppendComment(nsIContent* aComment, int32_t aStartOffset,
int32_t aEndOffset, nsAString& aStr) { return NS_OK; }
int32_t aEndOffset, nsAString& aStr) MOZ_OVERRIDE { return NS_OK; }
NS_IMETHOD AppendDoctype(nsIContent *aDoctype,
nsAString& aStr) { return NS_OK; }
nsAString& aStr) MOZ_OVERRIDE { return NS_OK; }
NS_IMETHOD AppendElementStart(mozilla::dom::Element* aElement,
mozilla::dom::Element* aOriginalElement,
nsAString& aStr);
nsAString& aStr) MOZ_OVERRIDE;
NS_IMETHOD AppendElementEnd(mozilla::dom::Element* aElement,
nsAString& aStr);
NS_IMETHOD Flush(nsAString& aStr);
nsAString& aStr) MOZ_OVERRIDE;
NS_IMETHOD Flush(nsAString& aStr) MOZ_OVERRIDE;
NS_IMETHOD AppendDocumentStart(nsIDocument *aDocument,
nsAString& aStr);
nsAString& aStr) MOZ_OVERRIDE;
protected:
nsresult GetAttributeValue(nsIAtom* aName, nsString& aValueRet);

5
content/base/src/nsScriptElement.h
View File

@ -2,6 +2,7 @@
* 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/. */
#include "mozilla/Attributes.h"
#include "nsIScriptLoaderObserver.h"
#include "nsIScriptElement.h"
#include "nsStubMutationObserver.h"
@ -30,7 +31,7 @@ public:
{
}
virtual nsresult FireErrorEvent();
virtual nsresult FireErrorEvent() MOZ_OVERRIDE;
protected:
// Internal methods
@ -40,5 +41,5 @@ protected:
*/
virtual bool HasScriptContent() = 0;
virtual bool MaybeProcessScript();
virtual bool MaybeProcessScript() MOZ_OVERRIDE;
};

19
content/base/src/nsStyleLinkElement.h
View File

@ -13,6 +13,7 @@
#ifndef nsStyleLinkElement_h___
#define nsStyleLinkElement_h___
#include "mozilla/Attributes.h"
#include "nsCOMPtr.h"
#include "nsIDOMLinkStyle.h"
#include "nsIStyleSheetLinkingElement.h"
@ -36,7 +37,7 @@ public:
nsStyleLinkElement();
virtual ~nsStyleLinkElement();
NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr) = 0;
NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr) MOZ_OVERRIDE = 0;
// nsIDOMLinkStyle
NS_DECL_NSIDOMLINKSTYLE
@ -44,17 +45,17 @@ public:
nsCSSStyleSheet* GetSheet() const { return mStyleSheet; }
// nsIStyleSheetLinkingElement
NS_IMETHOD SetStyleSheet(nsCSSStyleSheet* aStyleSheet);
NS_IMETHOD GetStyleSheet(nsIStyleSheet*& aStyleSheet);
NS_IMETHOD InitStyleLinkElement(bool aDontLoadStyle);
NS_IMETHOD SetStyleSheet(nsCSSStyleSheet* aStyleSheet) MOZ_OVERRIDE;
NS_IMETHOD GetStyleSheet(nsIStyleSheet*& aStyleSheet) MOZ_OVERRIDE;
NS_IMETHOD InitStyleLinkElement(bool aDontLoadStyle) MOZ_OVERRIDE;
NS_IMETHOD UpdateStyleSheet(nsICSSLoaderObserver* aObserver,
bool* aWillNotify,
bool* aIsAlternate);
NS_IMETHOD SetEnableUpdates(bool aEnableUpdates);
NS_IMETHOD GetCharset(nsAString& aCharset);
bool* aIsAlternate) MOZ_OVERRIDE;
NS_IMETHOD SetEnableUpdates(bool aEnableUpdates) MOZ_OVERRIDE;
NS_IMETHOD GetCharset(nsAString& aCharset) MOZ_OVERRIDE;
virtual void OverrideBaseURI(nsIURI* aNewBaseURI);
virtual void SetLineNumber(uint32_t aLineNumber);
virtual void OverrideBaseURI(nsIURI* aNewBaseURI) MOZ_OVERRIDE;
virtual void SetLineNumber(uint32_t aLineNumber) MOZ_OVERRIDE;
static uint32_t ParseLinkTypes(const nsAString& aTypes);

17
content/base/src/nsStyledElement.h
View File

@ -13,6 +13,7 @@
#ifndef __NS_STYLEDELEMENT_H_
#define __NS_STYLEDELEMENT_H_
#include "mozilla/Attributes.h"
#include "nsString.h"
#include "mozilla/dom/Element.h"
@ -35,20 +36,20 @@ protected:
public:
// nsIContent interface methods
virtual nsIAtom* GetClassAttributeName() const;
virtual nsIAtom* GetIDAttributeName() const;
virtual nsIAtom* DoGetID() const;
virtual const nsAttrValue* DoGetClasses() const;
virtual nsIAtom* GetClassAttributeName() const MOZ_OVERRIDE;
virtual nsIAtom* GetIDAttributeName() const MOZ_OVERRIDE;
virtual nsIAtom* DoGetID() const MOZ_OVERRIDE;
virtual const nsAttrValue* DoGetClasses() const MOZ_OVERRIDE;
virtual mozilla::css::StyleRule* GetInlineStyleRule();
virtual nsresult SetInlineStyleRule(mozilla::css::StyleRule* aStyleRule,
const nsAString* aSerialized,
bool aNotify);
bool aNotify) MOZ_OVERRIDE;
virtual nsresult UnsetAttr(int32_t aNameSpaceID, nsIAtom* aAttribute,
bool aNotify);
bool aNotify) MOZ_OVERRIDE;
virtual nsresult AfterSetAttr(int32_t aNameSpaceID, nsIAtom* aAttribute,
const nsAttrValue* aValue, bool aNotify);
const nsAttrValue* aValue, bool aNotify) MOZ_OVERRIDE;
nsICSSDeclaration* Style();
@ -66,7 +67,7 @@ protected:
bool aForceInDataDoc);
virtual bool ParseAttribute(int32_t aNamespaceID, nsIAtom* aAttribute,
const nsAString& aValue, nsAttrValue& aResult);
const nsAString& aValue, nsAttrValue& aResult) MOZ_OVERRIDE;
friend class mozilla::dom::Element;

13
content/base/src/nsTextNode.h
View File

@ -10,6 +10,7 @@
* Implementation of DOM Core's nsIDOMText node.
*/
#include "mozilla/Attributes.h"
#include "mozilla/dom/Text.h"
#include "nsIDOMText.h"
#include "nsDebug.h"
@ -61,22 +62,22 @@ public:
virtual bool IsNodeOfType(uint32_t aFlags) const;
virtual nsGenericDOMDataNode* CloneDataNode(nsINodeInfo *aNodeInfo,
bool aCloneText) const;
bool aCloneText) const MOZ_OVERRIDE;
virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
nsIContent* aBindingParent,
bool aCompileEventHandlers);
bool aCompileEventHandlers) MOZ_OVERRIDE;
virtual void UnbindFromTree(bool aDeep = true,
bool aNullParent = true);
bool aNullParent = true) MOZ_OVERRIDE;
nsresult AppendTextForNormalize(const PRUnichar* aBuffer, uint32_t aLength,
bool aNotify, nsIContent* aNextSibling);
virtual nsIDOMNode* AsDOMNode() { return this; }
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
#ifdef DEBUG
virtual void List(FILE* out, int32_t aIndent) const;
virtual void DumpContent(FILE* out, int32_t aIndent, bool aDumpAll) const;
virtual void List(FILE* out, int32_t aIndent) const MOZ_OVERRIDE;
virtual void DumpContent(FILE* out, int32_t aIndent, bool aDumpAll) const MOZ_OVERRIDE;
#endif
protected:

33
content/base/src/nsXHTMLContentSerializer.h
View File

@ -12,6 +12,7 @@
#ifndef nsXHTMLContentSerializer_h__
#define nsXHTMLContentSerializer_h__
#include "mozilla/Attributes.h"
#include "nsXMLContentSerializer.h"
#include "nsIEntityConverter.h"
#include "nsString.h"
@ -27,49 +28,49 @@ class nsXHTMLContentSerializer : public nsXMLContentSerializer {
NS_IMETHOD Init(uint32_t flags, uint32_t aWrapColumn,
const char* aCharSet, bool aIsCopying,
bool aRewriteEncodingDeclaration);
bool aRewriteEncodingDeclaration) MOZ_OVERRIDE;
NS_IMETHOD AppendText(nsIContent* aText,
int32_t aStartOffset,
int32_t aEndOffset,
nsAString& aStr);
nsAString& aStr) MOZ_OVERRIDE;
NS_IMETHOD AppendDocumentStart(nsIDocument *aDocument,
nsAString& aStr);
nsAString& aStr) MOZ_OVERRIDE;
protected:
virtual bool CheckElementStart(nsIContent * aContent,
bool & aForceFormat,
nsAString& aStr);
nsAString& aStr) MOZ_OVERRIDE;
virtual void AppendEndOfElementStart(nsIContent *aOriginalElement,
nsIAtom * aName,
int32_t aNamespaceID,
nsAString& aStr);
nsAString& aStr) MOZ_OVERRIDE;
virtual void AfterElementStart(nsIContent * aContent,
nsIContent *aOriginalElement,
nsAString& aStr);
nsAString& aStr) MOZ_OVERRIDE;
virtual bool CheckElementEnd(nsIContent * aContent,
bool & aForceFormat,
nsAString& aStr);
nsAString& aStr) MOZ_OVERRIDE;
virtual void AfterElementEnd(nsIContent * aContent,
nsAString& aStr);
nsAString& aStr) MOZ_OVERRIDE;
virtual bool LineBreakBeforeOpen(int32_t aNamespaceID, nsIAtom* aName);
virtual bool LineBreakAfterOpen(int32_t aNamespaceID, nsIAtom* aName);
virtual bool LineBreakBeforeClose(int32_t aNamespaceID, nsIAtom* aName);
virtual bool LineBreakAfterClose(int32_t aNamespaceID, nsIAtom* aName);
virtual bool LineBreakBeforeOpen(int32_t aNamespaceID, nsIAtom* aName) MOZ_OVERRIDE;
virtual bool LineBreakAfterOpen(int32_t aNamespaceID, nsIAtom* aName) MOZ_OVERRIDE;
virtual bool LineBreakBeforeClose(int32_t aNamespaceID, nsIAtom* aName) MOZ_OVERRIDE;
virtual bool LineBreakAfterClose(int32_t aNamespaceID, nsIAtom* aName) MOZ_OVERRIDE;
bool HasLongLines(const nsString& text, int32_t& aLastNewlineOffset);
// functions to check if we enter in or leave from a preformated content
virtual void MaybeEnterInPreContent(nsIContent* aNode);
virtual void MaybeLeaveFromPreContent(nsIContent* aNode);
virtual void MaybeEnterInPreContent(nsIContent* aNode) MOZ_OVERRIDE;
virtual void MaybeLeaveFromPreContent(nsIContent* aNode) MOZ_OVERRIDE;
virtual void SerializeAttributes(nsIContent* aContent,
nsIContent *aOriginalElement,
@ -78,7 +79,7 @@ class nsXHTMLContentSerializer : public nsXMLContentSerializer {
nsIAtom* aTagName,
nsAString& aStr,
uint32_t aSkipAttr,
bool aAddNSAttr);
bool aAddNSAttr) MOZ_OVERRIDE;
bool IsFirstChildOfOL(nsIContent* aElement);
@ -87,7 +88,7 @@ class nsXHTMLContentSerializer : public nsXMLContentSerializer {
bool IsShorthandAttr(const nsIAtom* aAttrName,
const nsIAtom* aElementName);
virtual void AppendAndTranslateEntities(const nsAString& aStr,
nsAString& aOutputStr);
nsAString& aOutputStr) MOZ_OVERRIDE;
nsresult EscapeURI(nsIContent* aContent,
const nsAString& aURI,
nsAString& aEscapedURI);

21
content/base/src/nsXMLContentSerializer.h
View File

@ -12,6 +12,7 @@
#ifndef nsXMLContentSerializer_h__
#define nsXMLContentSerializer_h__
#include "mozilla/Attributes.h"
#include "nsIContentSerializer.h"
#include "nsISupportsUtils.h"
#include "nsCOMPtr.h"
@ -34,37 +35,37 @@ class nsXMLContentSerializer : public nsIContentSerializer {
NS_IMETHOD Init(uint32_t flags, uint32_t aWrapColumn,
const char* aCharSet, bool aIsCopying,
bool aRewriteEncodingDeclaration);
bool aRewriteEncodingDeclaration) MOZ_OVERRIDE;
NS_IMETHOD AppendText(nsIContent* aText, int32_t aStartOffset,
int32_t aEndOffset, nsAString& aStr);
int32_t aEndOffset, nsAString& aStr) MOZ_OVERRIDE;
NS_IMETHOD AppendCDATASection(nsIContent* aCDATASection,
int32_t aStartOffset, int32_t aEndOffset,
nsAString& aStr);
nsAString& aStr) MOZ_OVERRIDE;
NS_IMETHOD AppendProcessingInstruction(nsIContent* aPI,
int32_t aStartOffset,
int32_t aEndOffset,
nsAString& aStr);
nsAString& aStr) MOZ_OVERRIDE;
NS_IMETHOD AppendComment(nsIContent* aComment, int32_t aStartOffset,
int32_t aEndOffset, nsAString& aStr);
int32_t aEndOffset, nsAString& aStr) MOZ_OVERRIDE;
NS_IMETHOD AppendDoctype(nsIContent *aDoctype,
nsAString& aStr);
nsAString& aStr) MOZ_OVERRIDE;
NS_IMETHOD AppendElementStart(mozilla::dom::Element* aElement,
mozilla::dom::Element* aOriginalElement,
nsAString& aStr);
nsAString& aStr) MOZ_OVERRIDE;
NS_IMETHOD AppendElementEnd(mozilla::dom::Element* aElement,
nsAString& aStr);
nsAString& aStr) MOZ_OVERRIDE;
NS_IMETHOD Flush(nsAString& aStr) { return NS_OK; }
NS_IMETHOD Flush(nsAString& aStr) MOZ_OVERRIDE { return NS_OK; }
NS_IMETHOD AppendDocumentStart(nsIDocument *aDocument,
nsAString& aStr);
nsAString& aStr) MOZ_OVERRIDE;
protected:

4
content/base/src/nsXMLHttpRequest.cpp
View File

@ -783,8 +783,8 @@ nsXMLHttpRequest::CreateResponseParsedJSON(JSContext* aCx)
// The Unicode converter has already zapped the BOM if there was one
if (!JS_ParseJSON(aCx,
static_cast<const jschar*>(mResponseText.get()),
mResponseText.Length(), &mResultJSON)) {
static_cast<const jschar*>(mResponseText.get()), mResponseText.Length(),
JS::MutableHandle<JS::Value>::fromMarkedLocation(&mResultJSON))) {
return NS_ERROR_FAILURE;
}

5
content/base/src/nsXMLHttpRequest.h
View File

@ -7,6 +7,7 @@
#ifndef nsXMLHttpRequest_h__
#define nsXMLHttpRequest_h__
#include "mozilla/Attributes.h"
#include "nsIXMLHttpRequest.h"
#include "nsISupportsUtils.h"
#include "nsString.h"
@ -473,7 +474,7 @@ public:
bool AllowUploadProgress();
void RootJSResultObjects();
virtual void DisconnectFromOwner();
virtual void DisconnectFromOwner() MOZ_OVERRIDE;
protected:
nsresult DetectCharset();
@ -721,7 +722,7 @@ class nsXHRParseEndListener : public nsIDOMEventListener
{
public:
NS_DECL_ISUPPORTS
NS_IMETHOD HandleEvent(nsIDOMEvent *event)
NS_IMETHOD HandleEvent(nsIDOMEvent *event) MOZ_OVERRIDE
{
nsCOMPtr<nsIXMLHttpRequest> xhr = do_QueryReferent(mXHR);
if (xhr) {

3
content/canvas/src/CanvasGradient.h
View File

@ -5,6 +5,7 @@
#ifndef mozilla_dom_CanvasGradient_h
#define mozilla_dom_CanvasGradient_h
#include "mozilla/Attributes.h"
#include "nsTArray.h"
#include "mozilla/RefPtr.h"
#include "mozilla/dom/CanvasRenderingContext2DBinding.h"
@ -53,7 +54,7 @@ public:
// WebIDL
void AddColorStop(float offset, const nsAString& colorstr, ErrorResult& rv);
JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope) MOZ_OVERRIDE
{
return CanvasGradientBinding::Wrap(aCx, aScope, this);
}

3
content/canvas/src/CanvasPattern.h
View File

@ -5,6 +5,7 @@
#ifndef mozilla_dom_CanvasPattern_h
#define mozilla_dom_CanvasPattern_h
#include "mozilla/Attributes.h"
#include "mozilla/dom/CanvasRenderingContext2DBinding.h"
#include "mozilla/dom/CanvasRenderingContext2D.h"
#include "mozilla/RefPtr.h"
@ -54,7 +55,7 @@ public:
SetIsDOMBinding();
}
JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope) MOZ_OVERRIDE
{
return CanvasPatternBinding::Wrap(aCx, aScope, this);
}

29
content/canvas/src/CanvasRenderingContext2D.h
View File

@ -5,6 +5,7 @@
#ifndef CanvasRenderingContext2D_h
#define CanvasRenderingContext2D_h
#include "mozilla/Attributes.h"
#include <vector>
#include "nsIDOMCanvasRenderingContext2D.h"
#include "nsICanvasRenderingContextInternal.h"
@ -20,12 +21,12 @@
#include "mozilla/dom/CanvasGradient.h"
#include "mozilla/dom/CanvasRenderingContext2DBinding.h"
#include "mozilla/dom/CanvasPattern.h"
#include "mozilla/gfx/Rect.h"
class nsXULElement;
namespace mozilla {
namespace gfx {
struct Rect;
class SourceSurface;
}
@ -360,31 +361,31 @@ public:
nsresult Redraw();
// nsICanvasRenderingContextInternal
NS_IMETHOD SetDimensions(int32_t width, int32_t height);
NS_IMETHOD InitializeWithSurface(nsIDocShell *shell, gfxASurface *surface, int32_t width, int32_t height);
NS_IMETHOD SetDimensions(int32_t width, int32_t height) MOZ_OVERRIDE;
NS_IMETHOD InitializeWithSurface(nsIDocShell *shell, gfxASurface *surface, int32_t width, int32_t height) MOZ_OVERRIDE;
NS_IMETHOD Render(gfxContext *ctx,
gfxPattern::GraphicsFilter aFilter,
uint32_t aFlags = RenderFlagPremultAlpha);
uint32_t aFlags = RenderFlagPremultAlpha) MOZ_OVERRIDE;
NS_IMETHOD GetInputStream(const char* aMimeType,
const PRUnichar* aEncoderOptions,
nsIInputStream **aStream);
NS_IMETHOD GetThebesSurface(gfxASurface **surface);
nsIInputStream **aStream) MOZ_OVERRIDE;
NS_IMETHOD GetThebesSurface(gfxASurface **surface) MOZ_OVERRIDE;
mozilla::TemporaryRef<mozilla::gfx::SourceSurface> GetSurfaceSnapshot()
mozilla::TemporaryRef<mozilla::gfx::SourceSurface> GetSurfaceSnapshot() MOZ_OVERRIDE
{ EnsureTarget(); return mTarget->Snapshot(); }
NS_IMETHOD SetIsOpaque(bool isOpaque);
NS_IMETHOD Reset();
NS_IMETHOD SetIsOpaque(bool isOpaque) MOZ_OVERRIDE;
NS_IMETHOD Reset() MOZ_OVERRIDE;
already_AddRefed<CanvasLayer> GetCanvasLayer(nsDisplayListBuilder* aBuilder,
CanvasLayer *aOldLayer,
LayerManager *aManager);
virtual bool ShouldForceInactiveLayer(LayerManager *aManager);
void MarkContextClean();
NS_IMETHOD SetIsIPC(bool isIPC);
LayerManager *aManager) MOZ_OVERRIDE;
virtual bool ShouldForceInactiveLayer(LayerManager *aManager) MOZ_OVERRIDE;
void MarkContextClean() MOZ_OVERRIDE;
NS_IMETHOD SetIsIPC(bool isIPC) MOZ_OVERRIDE;
// this rect is in canvas device space
void Redraw(const mozilla::gfx::Rect &r);
NS_IMETHOD Redraw(const gfxRect &r) { Redraw(ToRect(r)); return NS_OK; }
NS_IMETHOD Redraw(const gfxRect &r) MOZ_OVERRIDE { Redraw(ToRect(r)); return NS_OK; }
// this rect is in mTarget's current user space
void RedrawUser(const gfxRect &r);

28
content/canvas/src/WebGLContext.cpp
View File

@ -949,10 +949,15 @@ bool WebGLContext::IsExtensionSupported(JSContext *cx, WebGLExtensionID ext) con
switch (ext) {
case OES_element_index_uint:
return !gl->IsGLES2() || gl->IsExtensionSupported(GLContext::OES_element_index_uint);
if (!gl->IsGLES2())
return true;
return gl->IsExtensionSupported(GLContext::OES_element_index_uint);
case OES_standard_derivatives:
if (!gl->IsGLES2())
return true;
return gl->IsExtensionSupported(GLContext::OES_standard_derivatives);
case WEBGL_lose_context:
// We always support these extensions.
// We always support this extension.
return true;
case OES_texture_float:
return gl->IsExtensionSupported(gl->IsGLES2() ? GLContext::OES_texture_float
@ -964,15 +969,12 @@ bool WebGLContext::IsExtensionSupported(JSContext *cx, WebGLExtensionID ext) con
return true;
}
else if (gl->IsExtensionSupported(GLContext::EXT_texture_compression_dxt1) &&
gl->IsExtensionSupported(GLContext::ANGLE_texture_compression_dxt3) &&
gl->IsExtensionSupported(GLContext::ANGLE_texture_compression_dxt5))
gl->IsExtensionSupported(GLContext::ANGLE_texture_compression_dxt3) &&
gl->IsExtensionSupported(GLContext::ANGLE_texture_compression_dxt5))
{
return true;
}
else
{
return false;
}
return false;
case WEBGL_compressed_texture_atc:
return gl->IsExtensionSupported(GLContext::AMD_compressed_ATC_texture);
case WEBGL_compressed_texture_pvrtc:
@ -989,17 +991,15 @@ bool WebGLContext::IsExtensionSupported(JSContext *cx, WebGLExtensionID ext) con
{
return true;
}
else
{
return false;
}
return false;
case WEBGL_debug_renderer_info:
return xpc::AccessCheck::isChrome(js::GetContextCompartment(cx));
default:
MOZ_ASSERT(false, "should not get there.");
// For warnings-as-errors.
break;
}
MOZ_ASSERT(false, "should not get there.");
MOZ_NOT_REACHED("Query for unknown extension.");
return false;
}

25
content/canvas/src/WebGLContext.h
View File

@ -6,6 +6,7 @@
#ifndef WEBGLCONTEXT_H_
#define WEBGLCONTEXT_H_
#include "mozilla/Attributes.h"
#include "WebGLElementArrayCache.h"
#include "WebGLObjectModel.h"
#include "WebGLShader.h"
@ -202,25 +203,25 @@ public:
NS_DECL_NSIDOMWEBGLRENDERINGCONTEXT
// nsICanvasRenderingContextInternal
NS_IMETHOD SetDimensions(int32_t width, int32_t height);
NS_IMETHOD InitializeWithSurface(nsIDocShell *docShell, gfxASurface *surface, int32_t width, int32_t height)
NS_IMETHOD SetDimensions(int32_t width, int32_t height) MOZ_OVERRIDE;
NS_IMETHOD InitializeWithSurface(nsIDocShell *docShell, gfxASurface *surface, int32_t width, int32_t height) MOZ_OVERRIDE
{ return NS_ERROR_NOT_IMPLEMENTED; }
NS_IMETHOD Reset()
NS_IMETHOD Reset() MOZ_OVERRIDE
{ /* (InitializeWithSurface) */ return NS_ERROR_NOT_IMPLEMENTED; }
NS_IMETHOD Render(gfxContext *ctx,
gfxPattern::GraphicsFilter f,
uint32_t aFlags = RenderFlagPremultAlpha);
uint32_t aFlags = RenderFlagPremultAlpha) MOZ_OVERRIDE;
NS_IMETHOD GetInputStream(const char* aMimeType,
const PRUnichar* aEncoderOptions,
nsIInputStream **aStream);
NS_IMETHOD GetThebesSurface(gfxASurface **surface);
mozilla::TemporaryRef<mozilla::gfx::SourceSurface> GetSurfaceSnapshot()
nsIInputStream **aStream) MOZ_OVERRIDE;
NS_IMETHOD GetThebesSurface(gfxASurface **surface) MOZ_OVERRIDE;
mozilla::TemporaryRef<mozilla::gfx::SourceSurface> GetSurfaceSnapshot() MOZ_OVERRIDE
{ return nullptr; }
NS_IMETHOD SetIsOpaque(bool b) { return NS_OK; };
NS_IMETHOD SetContextOptions(nsIPropertyBag *aOptions);
NS_IMETHOD SetIsOpaque(bool b) MOZ_OVERRIDE { return NS_OK; };
NS_IMETHOD SetContextOptions(nsIPropertyBag *aOptions) MOZ_OVERRIDE;
NS_IMETHOD SetIsIPC(bool b) { return NS_ERROR_NOT_IMPLEMENTED; }
NS_IMETHOD SetIsIPC(bool b) MOZ_OVERRIDE { return NS_ERROR_NOT_IMPLEMENTED; }
NS_IMETHOD Redraw(const gfxRect&) { return NS_ERROR_NOT_IMPLEMENTED; }
NS_IMETHOD Swap(mozilla::ipc::Shmem& aBack,
int32_t x, int32_t y, int32_t w, int32_t h)
@ -256,11 +257,11 @@ public:
already_AddRefed<CanvasLayer> GetCanvasLayer(nsDisplayListBuilder* aBuilder,
CanvasLayer *aOldLayer,
LayerManager *aManager);
LayerManager *aManager) MOZ_OVERRIDE;
// Note that 'clean' here refers to its invalidation state, not the
// contents of the buffer.
void MarkContextClean() { mInvalidated = false; }
void MarkContextClean() MOZ_OVERRIDE { mInvalidated = false; }
gl::GLContext* GL() const {
return gl;

1
content/canvas/test/webgl/Makefile.in
View File

@ -23,6 +23,7 @@ MOCHITEST_FILES = \
failing_tests_mac.txt \
failing_tests_mac_mtnlion.txt \
failing_tests_android.txt \
failing_tests_android_nvidia.txt \
skipped_tests_android.txt \
$(NULL)

8
content/canvas/test/webgl/failing_tests_android_nvidia.txt Normal file
View File

@ -0,0 +1,8 @@
# Failures for our Tegra 2 slaves.
conformance/extensions/oes-standard-derivatives.html
conformance/glsl/misc/shared.html
conformance/misc/null-object-behaviour.html
conformance/textures/texture-mips.html
conformance/textures/texture-npot.html
conformance/textures/texture-npot-video.html

276
content/canvas/test/webgl/test_webgl_conformance_test_suite.html
View File

@ -39,12 +39,16 @@ var OPTIONS = {
if (request.readyState != 4) {
throw error;
}
if (request.status >= 400) {
// Error response, probably a 404.
throw 'Error: request.status: ' + request.status;
}
return request.responseText;
};
SimpleTest.waitForExplicitFinish();
function detectDriverType() {
function detectDriverInfo() {
const Cc = SpecialPowers.Cc;
const Ci = SpecialPowers.Ci;
var doc = Cc["@mozilla.org/xmlextras/domparser;1"].createInstance(Ci.nsIDOMParser).parseFromString("<html/>", "text/html");
@ -57,59 +61,82 @@ function detectDriverType() {
var gl;
try {
gl = canvas.getContext("experimental-webgl");
} catch(e) {}
if (gl) {
var ext = gl.getExtension("WEBGL_debug_renderer_info");
// this extension is unconditionally available to chrome. No need to check.
var webglRenderer = gl.getParameter(ext.UNMASKED_RENDERER_WEBGL);
var webglVendor = gl.getParameter(ext.UNMASKED_VENDOR_WEBGL);
if (webglRenderer.contains('llvmpipe')) {
type = "mesa";
} else if (webglVendor.contains('NVIDIA')) {
type = "nvidia";
}
} catch(e) {
ok(false, "Failed to create a WebGL context for getting driver info.");
return ["", ""]
}
return type;
var ext = gl.getExtension("WEBGL_debug_renderer_info");
// this extension is unconditionally available to chrome. No need to check.
var webglRenderer = gl.getParameter(ext.UNMASKED_RENDERER_WEBGL);
var webglVendor = gl.getParameter(ext.UNMASKED_VENDOR_WEBGL);
return [webglVendor, webglRenderer];
}
function start() {
var OS_WINDOWS = 'windows';
var OS_MAC = 'mac';
var OS_LINUX = 'linux';
var OS_ANDROID = 'android';
var GLDRIVER_MESA = 'mesa';
var GLDRIVER_NVIDIA = 'nvidia';
var kIsWindows = false;
var kIsAndroid = false;
var kIsLinux = false;
var kIsLinuxNVidia = false;
var kIsLinuxMesa = false;
var kOS = null;
var kOSVersion = null;
var kGLDriver = null;
if (navigator.platform.indexOf("Win") == 0)
kIsWindows = true;
else if (navigator.appVersion.indexOf("Android") != -1)
kIsAndroid = true;
else if (navigator.platform.indexOf("Linux") == 0) {
// must be checked after android, as android also has a 'Linux' platform string
var type = detectDriverType();
if (type == "mesa") {
kIsLinuxMesa = true;
} else if (type == "nvidia") {
kIsLinuxNVidia = true;
} else {
kIsLinux = true;
}
}
// Set kMacVersion to the OS X version for Mac, and 0 otherwise.
var osxmatch = /Mac OS X (\d+.\d+)/.exec(navigator.userAgent);
var kMacVersion = osxmatch ? parseFloat(osxmatch[1]) : 0;
var kIsWindowsVistaOrHigher = false;
if (kIsWindows) {
if (navigator.platform.indexOf('Win') == 0) {
kOS = OS_WINDOWS;
// code borrowed from browser/modules/test/browser_taskbar_preview.js
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
var version = SpecialPowers.Cc["@mozilla.org/system-info;1"]
.getService(SpecialPowers.Ci.nsIPropertyBag2)
.getProperty("version");
kIsWindowsVistaOrHigher = (parseFloat(version) >= 6.0);
netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
var version = SpecialPowers.Cc['@mozilla.org/system-info;1']
.getService(SpecialPowers.Ci.nsIPropertyBag2)
.getProperty('version');
kOSVersion = parseFloat(version);
// Version 6.0 is Vista, 6.1 is 7.
} else if (navigator.platform.indexOf('Mac') == 0) {
kOS = OS_MAC;
var versionMatch = /Mac OS X (\d+.\d+)/.exec(navigator.userAgent);
kOSVersion = versionMatch ? parseFloat(versionMatch[1]) : null;
} else if (navigator.appVersion.indexOf('Android') != -1) {
kOS = OS_ANDROID;
} else if (navigator.platform.indexOf('Linux') == 0) {
// Must be checked after android, as android also has a 'Linux' platform string.
kOS = OS_LINUX;
}
var glVendor, glRenderer;
[glVendor, glRenderer] = detectDriverInfo();
info('GL vendor: ' + glVendor);
info('GL renderer: ' + glRenderer);
if (glRenderer.contains('llvmpipe')) {
kGLDriver = GLDRIVER_MESA;
} else if (glVendor.contains('NVIDIA')) {
kGLDriver = GLDRIVER_NVIDIA;
}
if (kOS) {
info('OS detected as: ' + kOS);
info(' Version: ' + kOSVersion);
} else {
info('OS not detected.');
info(' `platform`: ' + navigator.platform);
info(' `appVersion`: ' + navigator.appVersion);
info(' `userAgent`: ' + navigator.userAgent);
}
if (kGLDriver) {
info('GL driver detected as: ' + kGLDriver);
} else {
info('GL driver not detected.');
}
var requestLongerTimeoutLen = 3;
if (kOS == OS_ANDROID)
requestLongerTimeoutLen = 6;
function getEnv(env) {
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
@ -440,7 +467,7 @@ function start() {
window.webglTestHarness = testHarness;
}
SimpleTest.requestLongerTimeout(kIsAndroid ? 6 : 3);
SimpleTest.requestLongerTimeout(requestLongerTimeoutLen);
var statusElem = document.getElementById("status");
var statusTextNode = document.createTextNode('');
@ -458,59 +485,110 @@ function start() {
// failing tests. It's easier to do a platform check for Windows than for ANGLE itself.
// Moreover, we currently also have different tests failing on Mac and on Linux,
// presumably due to differences in the drivers.
var failingTestsFilename;
if (kIsWindows)
failingTestsFilename = 'failing_tests_windows.txt';
else if (kIsLinux)
failingTestsFilename = 'failing_tests_linux.txt';
else if (kIsLinuxMesa)
failingTestsFilename = 'failing_tests_linux_mesa.txt';
else if (kIsLinuxNVidia)
failingTestsFilename = 'failing_tests_linux_nvidia.txt';
else if (kMacVersion == 10.8)
failingTestsFilename = 'failing_tests_mac_mtnlion.txt';
else if (kMacVersion)
failingTestsFilename = 'failing_tests_mac.txt';
else if (kIsAndroid)
failingTestsFilename = 'failing_tests_android.txt';
var testsExpectedToFail = loadTextFileSynchronous(failingTestsFilename)
.replace(/\r/g, '') // convert to unix line breaks
.split('\n');
// remove empty filenames
var indexOfEmptyFilename = testsExpectedToFail.indexOf("");
while(indexOfEmptyFilename != -1) {
testsExpectedToFail.splice(indexOfEmptyFilename, 1);
indexOfEmptyFilename = testsExpectedToFail.indexOf("");
}
var testsToIgnore = [];
var testsToSkip = [];
if (kIsAndroid) {
testsToSkip = loadTextFileSynchronous('skipped_tests_android.txt')
.replace(/\r/g, '') // convert to unix line breaks
.split('\n');
}
if (kIsLinuxMesa) {
testsToSkip = loadTextFileSynchronous('skipped_tests_linux_mesa.txt')
.replace(/\r/g, '') // convert to unix line breaks
.split('\n');
}
if (kIsWindows) {
if (!kIsWindowsVistaOrHigher) {
testsToSkip = loadTextFileSynchronous('skipped_tests_winxp.txt')
.replace(/\r/g, '') // convert to unix line breaks
.split('\n');
} else {
testsToSkip = loadTextFileSynchronous('skipped_tests_win_vista.txt')
.replace(/\r/g, '') // convert to unix line breaks
.split('\n');
var failingTestsFilename = null;
var skippedTestsFilename = null;
switch (kOS) {
case OS_WINDOWS: {
failingTestsFilename = 'failing_tests_windows.txt';
if (kOSVersion >= 6.0) // 6.0 is Vista
skippedTestsFilename = 'skipped_tests_win_vista.txt'
else // XP
skippedTestsFilename = 'skipped_tests_winxp.txt';
break;
}
case OS_MAC: {
if (kOSVersion == 10.8)
failingTestsFilename = 'failing_tests_mac_mtnlion.txt';
else
failingTestsFilename = 'failing_tests_mac.txt';
break;
}
case OS_LINUX: {
switch (kGLDriver) {
case GLDRIVER_MESA:
failingTestsFilename = 'failing_tests_linux_mesa.txt';
skippedTestsFilename = 'skipped_tests_linux_mesa.txt';
break;
case GLDRIVER_NVIDIA:
failingTestsFilename = 'failing_tests_linux_nvidia.txt';
break;
default:
failingTestsFilename = 'failing_tests_linux.txt';
break;
}
break;
}
case OS_ANDROID: {
skippedTestsFilename = 'skipped_tests_android.txt';
switch (kGLDriver) {
case GLDRIVER_NVIDIA:
failingTestsFilename = 'failing_tests_android_nvidia.txt';
break;
default:
failingTestsFilename = 'failing_tests_android.txt';
break;
}
break;
}
}
info('Failing tests file: ' + failingTestsFilename);
info('Skipped tests file: ' + skippedTestsFilename);
function LoadNewlineSepFile(filename) {
var lines;
try {
lines = loadTextFileSynchronous(filename)
.replace(/\r/g, '') // convert to unix line breaks
.split('\n');
}
catch(e) {
// Request failed for some reason.
ok(false, 'Loading \'' + filename + '\' failed: ' + e);
return [];
}
// Remove comments and trim whitespace.
var retLines = [];
for (var i = 0; i < lines.length; i++) {
var line = lines[i];
line = line.split('#', 1)[0].trim();
if (!line.length)
continue;
retLines.push(line);
}
return retLines;
};
var testsExpectedToFail = [];
if (failingTestsFilename)
testsExpectedToFail = LoadNewlineSepFile(failingTestsFilename);
var testsToSkip = [];
if (skippedTestsFilename)
testsToSkip = LoadNewlineSepFile(skippedTestsFilename);
var testsToIgnore = [];
info('Tests to fail: ' + testsExpectedToFail.length + (testsExpectedToFail.length ? ':' : ''));
for (var i = 0; i < testsExpectedToFail.length; i++) {
var test = testsExpectedToFail[i];
info(' ' + test);
}
info('Tests to skip: ' + testsToSkip.length + (testsToSkip.length ? ':' : ''));
for (var i = 0; i < testsToSkip.length; i++) {
var test = testsToSkip[i];
info(' ' + test);
}
info('Tests to ignore: ' + testsToIgnore.length + (testsToIgnore.length ? ':' : ''));
for (var i = 0; i < testsToIgnore.length; i++) {
var test = testsToIgnore[i];
info(' ' + test);
}
runTestSuite();

3
content/events/public/nsAsyncDOMEvent.h
View File

@ -6,6 +6,7 @@
#ifndef nsAsyncDOMEvent_h___
#define nsAsyncDOMEvent_h___
#include "mozilla/Attributes.h"
#include "nsCOMPtr.h"
#include "nsThreadUtils.h"
#include "nsINode.h"
@ -35,7 +36,7 @@ public:
nsAsyncDOMEvent(nsINode *aEventNode, nsEvent &aEvent);
NS_IMETHOD Run();
NS_IMETHOD Run() MOZ_OVERRIDE;
nsresult PostDOMEvent();
void RunDOMEventWhenSafe();

2
content/events/src/TextComposition.h
View File

@ -111,7 +111,7 @@ private:
nsINode* aEventTarget,
uint32_t aEventMessage,
const nsAString& aData);
NS_IMETHOD Run();
NS_IMETHOD Run() MOZ_OVERRIDE;
private:
nsRefPtr<nsPresContext> mPresContext;

3
content/events/src/nsDOMEvent.h
View File

@ -6,6 +6,7 @@
#ifndef nsDOMEvent_h__
#define nsDOMEvent_h__
#include "mozilla/Attributes.h"
#include "nsIDOMEvent.h"
#include "nsISupports.h"
#include "nsCOMPtr.h"
@ -99,7 +100,7 @@ public:
// nsIJSNativeInitializer
NS_IMETHOD Initialize(nsISupports* aOwner, JSContext* aCx, JSObject* aObj,
const JS::CallArgs& aArgs);
const JS::CallArgs& aArgs) MOZ_OVERRIDE;
virtual nsresult InitFromCtor(const nsAString& aType,
JSContext* aCx, JS::Value* aVal);

7
content/events/src/nsDOMNotifyPaintEvent.h
View File

@ -6,6 +6,7 @@
#ifndef nsDOMNotifyPaintEvent_h_
#define nsDOMNotifyPaintEvent_h_
#include "mozilla/Attributes.h"
#include "nsIDOMNotifyPaintEvent.h"
#include "nsDOMEvent.h"
#include "nsPresContext.h"
@ -31,12 +32,12 @@ public:
// Forward to base class
NS_FORWARD_TO_NSDOMEVENT_NO_SERIALIZATION_NO_DUPLICATION
NS_IMETHOD DuplicatePrivateData()
NS_IMETHOD DuplicatePrivateData() MOZ_OVERRIDE
{
return nsDOMEvent::DuplicatePrivateData();
}
NS_IMETHOD_(void) Serialize(IPC::Message* aMsg, bool aSerializeInterfaceType);
NS_IMETHOD_(bool) Deserialize(const IPC::Message* aMsg, void** aIter);
NS_IMETHOD_(void) Serialize(IPC::Message* aMsg, bool aSerializeInterfaceType) MOZ_OVERRIDE;
NS_IMETHOD_(bool) Deserialize(const IPC::Message* aMsg, void** aIter) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx,
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE

5
content/events/src/nsDOMScrollAreaEvent.h
View File

@ -6,6 +6,7 @@
#ifndef nsDOMScrollAreaEvent_h__
#define nsDOMScrollAreaEvent_h__
#include "mozilla/Attributes.h"
#include "nsIDOMScrollAreaEvent.h"
#include "nsDOMUIEvent.h"
@ -33,8 +34,8 @@ public:
{
return nsDOMEvent::DuplicatePrivateData();
}
NS_IMETHOD_(void) Serialize(IPC::Message* aMsg, bool aSerializeInterfaceType);
NS_IMETHOD_(bool) Deserialize(const IPC::Message* aMsg, void** aIter);
NS_IMETHOD_(void) Serialize(IPC::Message* aMsg, bool aSerializeInterfaceType) MOZ_OVERRIDE;
NS_IMETHOD_(bool) Deserialize(const IPC::Message* aMsg, void** aIter) MOZ_OVERRIDE;
virtual JSObject* WrapObject(JSContext* aCx,
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE

5
content/events/src/nsDOMTextEvent.h
View File

@ -6,6 +6,7 @@
#ifndef nsDOMTextEvent_h__
#define nsDOMTextEvent_h__
#include "mozilla/Attributes.h"
#include "nsDOMUIEvent.h"
#include "nsIPrivateTextEvent.h"
#include "nsPrivateTextRange.h"
@ -23,8 +24,8 @@ public:
NS_FORWARD_TO_NSDOMUIEVENT
// nsIPrivateTextEvent interface
NS_IMETHOD GetText(nsString& aText);
NS_IMETHOD_(already_AddRefed<nsIPrivateTextRangeList>) GetInputRange();
NS_IMETHOD GetText(nsString& aText) MOZ_OVERRIDE;
NS_IMETHOD_(already_AddRefed<nsIPrivateTextRangeList>) GetInputRange() MOZ_OVERRIDE;
protected:
nsString mText;

7
content/events/src/nsDOMUIEvent.h
View File

@ -6,6 +6,7 @@
#ifndef nsDOMUIEvent_h
#define nsDOMUIEvent_h
#include "mozilla/Attributes.h"
#include "nsIDOMUIEvent.h"
#include "nsDOMEvent.h"
#include "nsLayoutUtils.h"
@ -27,9 +28,9 @@ public:
// Forward to nsDOMEvent
NS_FORWARD_TO_NSDOMEVENT_NO_SERIALIZATION_NO_DUPLICATION
NS_IMETHOD DuplicatePrivateData();
NS_IMETHOD_(void) Serialize(IPC::Message* aMsg, bool aSerializeInterfaceType);
NS_IMETHOD_(bool) Deserialize(const IPC::Message* aMsg, void** aIter);
NS_IMETHOD DuplicatePrivateData() MOZ_OVERRIDE;
NS_IMETHOD_(void) Serialize(IPC::Message* aMsg, bool aSerializeInterfaceType) MOZ_OVERRIDE;
NS_IMETHOD_(bool) Deserialize(const IPC::Message* aMsg, void** aIter) MOZ_OVERRIDE;
static nsIntPoint CalculateScreenPoint(nsPresContext* aPresContext,
nsEvent* aEvent)

12
content/events/src/nsPrivateTextRange.h
View File

@ -19,10 +19,10 @@ public:
nsPrivateTextRange(const nsTextRange &aTextRange);
virtual ~nsPrivateTextRange(void);
NS_IMETHOD GetRangeStart(uint16_t* aRangeStart);
NS_IMETHOD GetRangeEnd(uint16_t* aRangeEnd);
NS_IMETHOD GetRangeType(uint16_t* aRangeType);
NS_IMETHOD GetRangeStyle(nsTextRangeStyle* aRangeStyle);
NS_IMETHOD GetRangeStart(uint16_t* aRangeStart) MOZ_OVERRIDE;
NS_IMETHOD GetRangeEnd(uint16_t* aRangeEnd) MOZ_OVERRIDE;
NS_IMETHOD GetRangeType(uint16_t* aRangeType) MOZ_OVERRIDE;
NS_IMETHOD GetRangeStyle(nsTextRangeStyle* aRangeStyle) MOZ_OVERRIDE;
protected:
@ -40,9 +40,9 @@ public:
void AppendTextRange(nsRefPtr<nsPrivateTextRange>& aRange);
NS_IMETHOD_(uint16_t) GetLength();
NS_IMETHOD_(uint16_t) GetLength() MOZ_OVERRIDE;
NS_IMETHOD_(already_AddRefed<nsIPrivateTextRange>) Item(uint16_t aIndex);
NS_IMETHOD_(already_AddRefed<nsIPrivateTextRange>) Item(uint16_t aIndex) MOZ_OVERRIDE;
protected:
nsTArray<nsRefPtr<nsPrivateTextRange> > mList;
};

3
content/html/content/public/HTMLAudioElement.h
View File

@ -6,6 +6,7 @@
#ifndef mozilla_dom_HTMLAudioElement_h
#define mozilla_dom_HTMLAudioElement_h
#include "mozilla/Attributes.h"
#include "nsITimer.h"
#include "nsIDOMHTMLAudioElement.h"
#include "mozilla/dom/HTMLMediaElement.h"
@ -50,7 +51,7 @@ public:
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsresult SetAcceptHeader(nsIHttpChannel* aChannel);
virtual nsIDOMNode* AsDOMNode() { return this; }
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
// WebIDL

20
content/html/content/public/HTMLCanvasElement.h
View File

@ -6,6 +6,7 @@
#if !defined(mozilla_dom_HTMLCanvasElement_h)
#define mozilla_dom_HTMLCanvasElement_h
#include "mozilla/Attributes.h"
#include "nsIDOMHTMLCanvasElement.h"
#include "nsGenericHTMLElement.h"
#include "nsGkAtoms.h"
@ -15,6 +16,7 @@
#include "nsICanvasElementExternal.h"
#include "nsLayoutUtils.h"
#include "mozilla/gfx/Rect.h"
class nsICanvasRenderingContextInternal;
class nsIDOMFile;
@ -28,10 +30,6 @@ class CanvasLayer;
class LayerManager;
}
namespace gfx {
struct Rect;
}
namespace dom {
class HTMLCanvasPrintState;
@ -185,16 +183,16 @@ public:
/*
* nsICanvasElementExternal -- for use outside of content/layout
*/
NS_IMETHOD_(nsIntSize) GetSizeExternal();
NS_IMETHOD_(nsIntSize) GetSizeExternal() MOZ_OVERRIDE;
NS_IMETHOD RenderContextsExternal(gfxContext *aContext,
gfxPattern::GraphicsFilter aFilter,
uint32_t aFlags = RenderFlagPremultAlpha);
uint32_t aFlags = RenderFlagPremultAlpha) MOZ_OVERRIDE;
virtual bool ParseAttribute(int32_t aNamespaceID,
nsIAtom* aAttribute,
const nsAString& aValue,
nsAttrValue& aResult);
nsChangeHint GetAttributeChangeHint(const nsIAtom* aAttribute, int32_t aModType) const;
nsAttrValue& aResult) MOZ_OVERRIDE;
nsChangeHint GetAttributeChangeHint(const nsIAtom* aAttribute, int32_t aModType) const MOZ_OVERRIDE;
// SetAttr override. C++ is stupid, so have to override both
// overloaded methods.
@ -205,8 +203,8 @@ public:
}
virtual nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
nsIAtom* aPrefix, const nsAString& aValue,
bool aNotify);
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
bool aNotify) MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
nsresult CopyInnerTo(mozilla::dom::Element* aDest);
/*
@ -229,7 +227,7 @@ public:
nsresult GetContext(const nsAString& aContextId, nsISupports** aContext);
virtual nsIDOMNode* AsDOMNode() { return this; }
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
protected:
virtual JSObject* WrapNode(JSContext* aCx,

22
content/html/content/public/HTMLMediaElement.h
View File

@ -96,7 +96,7 @@ public:
virtual bool ParseAttribute(int32_t aNamespaceID,
nsIAtom* aAttribute,
const nsAString& aValue,
nsAttrValue& aResult);
nsAttrValue& aResult) MOZ_OVERRIDE;
// SetAttr override. C++ is stupid, so have to override both
// overloaded methods.
nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
@ -106,20 +106,20 @@ public:
}
virtual nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
nsIAtom* aPrefix, const nsAString& aValue,
bool aNotify);
bool aNotify) MOZ_OVERRIDE;
virtual nsresult UnsetAttr(int32_t aNameSpaceID, nsIAtom* aAttr,
bool aNotify);
bool aNotify) MOZ_OVERRIDE;
virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
nsIContent* aBindingParent,
bool aCompileEventHandlers);
bool aCompileEventHandlers) MOZ_OVERRIDE;
virtual void UnbindFromTree(bool aDeep = true,
bool aNullParent = true);
virtual void DoneCreatingElement();
bool aNullParent = true) MOZ_OVERRIDE;
virtual void DoneCreatingElement() MOZ_OVERRIDE;
virtual bool IsHTMLFocusable(bool aWithMouse, bool *aIsFocusable,
int32_t *aTabIndex);
virtual int32_t TabIndexDefault();
int32_t *aTabIndex) MOZ_OVERRIDE;
virtual int32_t TabIndexDefault() MOZ_OVERRIDE;
/**
* Call this to reevaluate whether we should start/stop due to our owner
@ -284,7 +284,7 @@ public:
virtual void NotifyAudioAvailable(float* aFrameBuffer, uint32_t aFrameBufferLength,
float aTime) MOZ_FINAL MOZ_OVERRIDE;
virtual bool IsNodeOfType(uint32_t aFlags) const;
virtual bool IsNodeOfType(uint32_t aFlags) const MOZ_OVERRIDE;
/**
* Returns the current load ID. Asynchronous events store the ID that was
@ -527,8 +527,8 @@ protected:
class MediaLoadListener;
class StreamListener;
virtual void GetItemValueText(nsAString& text);
virtual void SetItemValueText(const nsAString& text);
virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
virtual void SetItemValueText(const nsAString& text) MOZ_OVERRIDE;
class WakeLockBoolWrapper {
public:

9
content/html/content/public/HTMLVideoElement.h
View File

@ -7,6 +7,7 @@
#ifndef mozilla_dom_HTMLVideoElement_h
#define mozilla_dom_HTMLVideoElement_h
#include "mozilla/Attributes.h"
#include "nsIDOMHTMLVideoElement.h"
#include "mozilla/dom/HTMLMediaElement.h"
@ -45,10 +46,10 @@ public:
nsIAtom* aAttribute,
const nsAString& aValue,
nsAttrValue& aResult);
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const;
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const MOZ_OVERRIDE;
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
// Set size with the current video frame's height and width.
// If there is no video frame, returns NS_ERROR_FAILURE.
@ -56,7 +57,7 @@ public:
virtual nsresult SetAcceptHeader(nsIHttpChannel* aChannel);
virtual nsIDOMNode* AsDOMNode() { return this; }
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
// WebIDL

7
content/html/content/public/nsFormSubmission.h
View File

@ -5,6 +5,7 @@
#ifndef nsIFormSubmission_h___
#define nsIFormSubmission_h___
#include "mozilla/Attributes.h"
#include "nsISupports.h"
#include "nsString.h"
#include "nsCOMPtr.h"
@ -159,12 +160,12 @@ public:
~nsFSMultipartFormData();
virtual nsresult AddNameValuePair(const nsAString& aName,
const nsAString& aValue);
const nsAString& aValue) MOZ_OVERRIDE;
virtual nsresult AddNameFilePair(const nsAString& aName,
nsIDOMBlob* aBlob,
const nsString& aFilename);
const nsString& aFilename) MOZ_OVERRIDE;
virtual nsresult GetEncodedSubmission(nsIURI* aURI,
nsIInputStream** aPostDataStream);
nsIInputStream** aPostDataStream) MOZ_OVERRIDE;
void GetContentType(nsACString& aContentType)
{

39
content/html/content/src/HTMLAnchorElement.h
View File

@ -7,6 +7,7 @@
#ifndef mozilla_dom_HTMLAnchorElement_h
#define mozilla_dom_HTMLAnchorElement_h
#include "mozilla/Attributes.h"
#include "nsGenericHTMLElement.h"
#include "nsIDOMHTMLAnchorElement.h"
#include "nsILink.h"
@ -55,22 +56,22 @@ public:
NS_DECL_SIZEOF_EXCLUDING_THIS
// nsILink
NS_IMETHOD LinkAdded() { return NS_OK; }
NS_IMETHOD LinkRemoved() { return NS_OK; }
NS_IMETHOD LinkAdded() MOZ_OVERRIDE { return NS_OK; }
NS_IMETHOD LinkRemoved() MOZ_OVERRIDE { return NS_OK; }
virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
nsIContent* aBindingParent,
bool aCompileEventHandlers);
bool aCompileEventHandlers) MOZ_OVERRIDE;
virtual void UnbindFromTree(bool aDeep = true,
bool aNullParent = true);
virtual bool IsHTMLFocusable(bool aWithMouse, bool *aIsFocusable, int32_t *aTabIndex);
bool aNullParent = true) MOZ_OVERRIDE;
virtual bool IsHTMLFocusable(bool aWithMouse, bool *aIsFocusable, int32_t *aTabIndex) MOZ_OVERRIDE;
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor);
virtual nsresult PostHandleEvent(nsEventChainPostVisitor& aVisitor);
virtual bool IsLink(nsIURI** aURI) const;
virtual void GetLinkTarget(nsAString& aTarget);
virtual nsLinkState GetLinkState() const;
virtual already_AddRefed<nsIURI> GetHrefURI() const;
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor) MOZ_OVERRIDE;
virtual nsresult PostHandleEvent(nsEventChainPostVisitor& aVisitor) MOZ_OVERRIDE;
virtual bool IsLink(nsIURI** aURI) const MOZ_OVERRIDE;
virtual void GetLinkTarget(nsAString& aTarget) MOZ_OVERRIDE;
virtual nsLinkState GetLinkState() const MOZ_OVERRIDE;
virtual already_AddRefed<nsIURI> GetHrefURI() const MOZ_OVERRIDE;
nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
const nsAString& aValue, bool aNotify)
@ -79,19 +80,19 @@ public:
}
virtual nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
nsIAtom* aPrefix, const nsAString& aValue,
bool aNotify);
bool aNotify) MOZ_OVERRIDE;
virtual nsresult UnsetAttr(int32_t aNameSpaceID, nsIAtom* aAttribute,
bool aNotify);
bool aNotify) MOZ_OVERRIDE;
virtual bool ParseAttribute(int32_t aNamespaceID,
nsIAtom* aAttribute,
const nsAString& aValue,
nsAttrValue& aResult);
nsAttrValue& aResult) MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsEventStates IntrinsicState() const;
virtual nsEventStates IntrinsicState() const MOZ_OVERRIDE;
virtual nsIDOMNode* AsDOMNode() { return this; }
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual void OnDNSPrefetchDeferred();
virtual void OnDNSPrefetchRequested();
@ -200,8 +201,8 @@ public:
}
protected:
virtual void GetItemValueText(nsAString& text);
virtual void SetItemValueText(const nsAString& text);
virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
virtual void SetItemValueText(const nsAString& text) MOZ_OVERRIDE;
virtual JSObject* WrapNode(JSContext *aCx,
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
};

35
content/html/content/src/HTMLAreaElement.h
View File

@ -7,6 +7,7 @@
#ifndef mozilla_dom_HTMLAreaElement_h
#define mozilla_dom_HTMLAreaElement_h
#include "mozilla/Attributes.h"
#include "nsIDOMHTMLAreaElement.h"
#include "nsGenericHTMLElement.h"
#include "nsILink.h"
@ -49,21 +50,21 @@ public:
NS_DECL_NSIDOMHTMLAREAELEMENT
// nsILink
NS_IMETHOD LinkAdded() { return NS_OK; }
NS_IMETHOD LinkRemoved() { return NS_OK; }
NS_IMETHOD LinkAdded() MOZ_OVERRIDE { return NS_OK; }
NS_IMETHOD LinkRemoved() MOZ_OVERRIDE { return NS_OK; }
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor);
virtual nsresult PostHandleEvent(nsEventChainPostVisitor& aVisitor);
virtual bool IsLink(nsIURI** aURI) const;
virtual void GetLinkTarget(nsAString& aTarget);
virtual nsLinkState GetLinkState() const;
virtual already_AddRefed<nsIURI> GetHrefURI() const;
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor) MOZ_OVERRIDE;
virtual nsresult PostHandleEvent(nsEventChainPostVisitor& aVisitor) MOZ_OVERRIDE;
virtual bool IsLink(nsIURI** aURI) const MOZ_OVERRIDE;
virtual void GetLinkTarget(nsAString& aTarget) MOZ_OVERRIDE;
virtual nsLinkState GetLinkState() const MOZ_OVERRIDE;
virtual already_AddRefed<nsIURI> GetHrefURI() const MOZ_OVERRIDE;
virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
nsIContent* aBindingParent,
bool aCompileEventHandlers);
bool aCompileEventHandlers) MOZ_OVERRIDE;
virtual void UnbindFromTree(bool aDeep = true,
bool aNullParent = true);
bool aNullParent = true) MOZ_OVERRIDE;
nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
const nsAString& aValue, bool aNotify)
{
@ -71,15 +72,15 @@ public:
}
virtual nsresult SetAttr(int32_t aNameSpaceID, nsIAtom* aName,
nsIAtom* aPrefix, const nsAString& aValue,
bool aNotify);
bool aNotify) MOZ_OVERRIDE;
virtual nsresult UnsetAttr(int32_t aNameSpaceID, nsIAtom* aAttribute,
bool aNotify);
bool aNotify) MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const;
virtual nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const MOZ_OVERRIDE;
virtual nsEventStates IntrinsicState() const;
virtual nsEventStates IntrinsicState() const MOZ_OVERRIDE;
virtual nsIDOMNode* AsDOMNode() { return this; }
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
// WebIDL
@ -165,8 +166,8 @@ protected:
virtual JSObject* WrapNode(JSContext* aCx,
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
virtual void GetItemValueText(nsAString& text);
virtual void SetItemValueText(const nsAString& text);
virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
virtual void SetItemValueText(const nsAString& text) MOZ_OVERRIDE;
};
} // namespace dom

11
content/html/content/src/HTMLBRElement.h
View File

@ -6,6 +6,7 @@
#ifndef mozilla_dom_HTMLBRElement_h
#define mozilla_dom_HTMLBRElement_h
#include "mozilla/Attributes.h"
#include "nsIDOMHTMLBRElement.h"
#include "nsGenericHTMLElement.h"
#include "nsGkAtoms.h"
@ -38,11 +39,11 @@ public:
virtual bool ParseAttribute(int32_t aNamespaceID,
nsIAtom* aAttribute,
const nsAString& aValue,
nsAttrValue& aResult);
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
nsAttrValue& aResult) MOZ_OVERRIDE;
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const MOZ_OVERRIDE;
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
bool Clear()
{

21
content/html/content/src/HTMLBodyElement.h
View File

@ -5,6 +5,7 @@
#ifndef HTMLBodyElement_h___
#define HTMLBodyElement_h___
#include "mozilla/Attributes.h"
#include "nsGenericHTMLElement.h"
#include "nsIDOMHTMLBodyElement.h"
#include "nsIStyleRule.h"
@ -24,9 +25,9 @@ public:
NS_DECL_ISUPPORTS
// nsIStyleRule interface
virtual void MapRuleInfoInto(nsRuleData* aRuleData);
virtual void MapRuleInfoInto(nsRuleData* aRuleData) MOZ_OVERRIDE;
#ifdef DEBUG
virtual void List(FILE* out = stdout, int32_t aIndent = 0) const;
virtual void List(FILE* out = stdout, int32_t aIndent = 0) const MOZ_OVERRIDE;
#endif
HTMLBodyElement* mPart; // not ref-counted, cleared by content
@ -133,15 +134,15 @@ public:
virtual bool ParseAttribute(int32_t aNamespaceID,
nsIAtom* aAttribute,
const nsAString& aValue,
nsAttrValue& aResult);
nsAttrValue& aResult) MOZ_OVERRIDE;
virtual void UnbindFromTree(bool aDeep = true,
bool aNullParent = true);
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const;
NS_IMETHOD WalkContentStyleRules(nsRuleWalker* aRuleWalker);
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
virtual already_AddRefed<nsIEditor> GetAssociatedEditor();
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
bool aNullParent = true) MOZ_OVERRIDE;
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const MOZ_OVERRIDE;
NS_IMETHOD WalkContentStyleRules(nsRuleWalker* aRuleWalker) MOZ_OVERRIDE;
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const MOZ_OVERRIDE;
virtual already_AddRefed<nsIEditor> GetAssociatedEditor() MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual bool IsEventAttributeName(nsIAtom* aName) MOZ_OVERRIDE;

35
content/html/content/src/HTMLButtonElement.h
View File

@ -6,6 +6,7 @@
#ifndef mozilla_dom_HTMLButtonElement_h
#define mozilla_dom_HTMLButtonElement_h
#include "mozilla/Attributes.h"
#include "nsGenericHTMLElement.h"
#include "nsIDOMHTMLButtonElement.h"
#include "nsIConstraintValidation.h"
@ -46,52 +47,52 @@ public:
// overriden nsIFormControl methods
NS_IMETHOD_(uint32_t) GetType() const { return mType; }
NS_IMETHOD Reset();
NS_IMETHOD SubmitNamesValues(nsFormSubmission* aFormSubmission);
NS_IMETHOD SaveState();
bool RestoreState(nsPresState* aState);
virtual bool IsDisabledForEvents(uint32_t aMessage);
NS_IMETHOD Reset() MOZ_OVERRIDE;
NS_IMETHOD SubmitNamesValues(nsFormSubmission* aFormSubmission) MOZ_OVERRIDE;
NS_IMETHOD SaveState() MOZ_OVERRIDE;
bool RestoreState(nsPresState* aState) MOZ_OVERRIDE;
virtual bool IsDisabledForEvents(uint32_t aMessage) MOZ_OVERRIDE;
// nsIDOMEventTarget
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor);
virtual nsresult PostHandleEvent(nsEventChainPostVisitor& aVisitor);
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor) MOZ_OVERRIDE;
virtual nsresult PostHandleEvent(nsEventChainPostVisitor& aVisitor) MOZ_OVERRIDE;
// nsINode
virtual nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
virtual nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const MOZ_OVERRIDE;
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
virtual JSObject* WrapNode(JSContext* aCx,
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
// nsIContent
virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
nsIContent* aBindingParent,
bool aCompileEventHandlers);
bool aCompileEventHandlers) MOZ_OVERRIDE;
virtual void UnbindFromTree(bool aDeep = true,
bool aNullParent = true);
virtual void DoneCreatingElement();
bool aNullParent = true) MOZ_OVERRIDE;
virtual void DoneCreatingElement() MOZ_OVERRIDE;
// Element
nsEventStates IntrinsicState() const;
nsEventStates IntrinsicState() const MOZ_OVERRIDE;
/**
* Called when an attribute is about to be changed
*/
virtual nsresult BeforeSetAttr(int32_t aNameSpaceID, nsIAtom* aName,
const nsAttrValueOrString* aValue,
bool aNotify);
bool aNotify) MOZ_OVERRIDE;
/**
* Called when an attribute has just been changed
*/
nsresult AfterSetAttr(int32_t aNamespaceID, nsIAtom* aName,
const nsAttrValue* aValue, bool aNotify);
const nsAttrValue* aValue, bool aNotify) MOZ_OVERRIDE;
virtual bool ParseAttribute(int32_t aNamespaceID,
nsIAtom* aAttribute,
const nsAString& aValue,
nsAttrValue& aResult);
nsAttrValue& aResult) MOZ_OVERRIDE;
// nsGenericHTMLElement
virtual bool IsHTMLFocusable(bool aWithMouse,
bool* aIsFocusable,
int32_t* aTabIndex);
int32_t* aTabIndex) MOZ_OVERRIDE;
// WebIDL
bool Autofocus() const

9
content/html/content/src/HTMLDataElement.h
View File

@ -6,6 +6,7 @@
#ifndef mozilla_dom_HTMLDataElement_h
#define mozilla_dom_HTMLDataElement_h
#include "mozilla/Attributes.h"
#include "nsIDOMHTMLElement.h"
#include "nsGenericHTMLElement.h"
#include "nsGkAtoms.h"
@ -43,10 +44,10 @@ public:
SetHTMLAttr(nsGkAtoms::value, aValue, aError);
}
virtual void GetItemValueText(nsAString& text);
virtual void SetItemValueText(const nsAString& text);
virtual nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
virtual void SetItemValueText(const nsAString& text) MOZ_OVERRIDE;
virtual nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const MOZ_OVERRIDE;
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
protected:
virtual JSObject* WrapNode(JSContext* aCx,

5
content/html/content/src/HTMLDataListElement.h
View File

@ -5,6 +5,7 @@
#ifndef HTMLDataListElement_h___
#define HTMLDataListElement_h___
#include "mozilla/Attributes.h"
#include "nsGenericHTMLElement.h"
#include "nsIDOMHTMLDataListElement.h"
#include "nsContentList.h"
@ -48,7 +49,7 @@ public:
}
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
// This function is used to generate the nsContentList (option elements).
static bool MatchOptions(nsIContent* aContent, int32_t aNamespaceID,
@ -57,7 +58,7 @@ public:
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(HTMLDataListElement,
nsGenericHTMLElement)
virtual nsIDOMNode* AsDOMNode() { return this; }
virtual nsIDOMNode* AsDOMNode() MOZ_OVERRIDE { return this; }
protected:
virtual JSObject* WrapNode(JSContext *aCx,
JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;

Some files were not shown because too many files have changed in this diff Show More