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

Bug 1234735 - Remove redundant spaces in nsGlobalWindow. r=baku

Browse Source
This commit is contained in:
Alastor Wu 2015-12-23 10:34:54 +08:00
parent 6afe68b7c7
commit de087f9e93
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
dom/base/nsGlobalWindow.cpp
View File

@ -1228,7 +1228,7 @@ nsGlobalWindow::nsGlobalWindow(nsGlobalWindow *aOuterWindow)
Preferences::AddIntVarCache(&gMinBackgroundTimeoutValue,
"dom.min_background_timeout_value",
DEFAULT_MIN_BACKGROUND_TIMEOUT_VALUE);
Preferences::AddBoolVarCache(&sIdleObserversAPIFuzzTimeDisabled,
Preferences::AddBoolVarCache(&sIdleObserversAPIFuzzTimeDisabled,
"dom.idle-observers-api.fuzz_time.disabled",
false);
}
@ -2071,7 +2071,7 @@ nsGlobalWindow::WouldReuseInnerWindow(nsIDocument* aNewDocument)
if (!mDoc->IsInitialDocument()) {
return false;
}
NS_ASSERTION(NS_IsAboutBlank(mDoc->GetDocumentURI()),
"How'd this happen?");
@ -4361,7 +4361,7 @@ nsGlobalWindow::GetControllersOuter(ErrorResult& aError)
aError.Throw(rv);
return nullptr;
}
mControllers->InsertControllerAt(0, controller);
nsCOMPtr<nsIControllerContext> controllerContext = do_QueryInterface(controller);
if (!controllerContext) {
@ -4972,7 +4972,7 @@ nsGlobalWindow::SetOuterSize(int32_t aLengthCSSPixels, bool aIsWidth,
} else {
height = lengthDevPixels;
}
aError = treeOwnerAsWin->SetSize(width, height, true);
aError = treeOwnerAsWin->SetSize(width, height, true);
}
void
@ -6417,8 +6417,8 @@ nsGlobalWindow::AlertOrConfirm(bool aAlert,
nsAutoString title;
MakeScriptDialogTitle(title);
// Remove non-terminating null characters from the
// string. See bug #310037.
// Remove non-terminating null characters from the
// string. See bug #310037.
nsAutoString final;
nsContentUtils::StripNullChars(aMessage, final);
@ -6534,9 +6534,9 @@ nsGlobalWindow::PromptOuter(const nsAString& aMessage, const nsAString& aInitial
nsAutoString title;
MakeScriptDialogTitle(title);
// Remove non-terminating null characters from the
// string. See bug #310037.
// Remove non-terminating null characters from the
// string. See bug #310037.
nsAutoString fixedMessage, fixedInitial;
nsContentUtils::StripNullChars(aMessage, fixedMessage);
nsContentUtils::StripNullChars(aInitial, fixedInitial);
@ -6903,11 +6903,11 @@ nsGlobalWindow::PrintOuter(ErrorResult& aError)
nsCOMPtr<nsIWebBrowserPrint> webBrowserPrint;
if (NS_SUCCEEDED(GetInterface(NS_GET_IID(nsIWebBrowserPrint),
getter_AddRefs(webBrowserPrint)))) {
nsAutoSyncOperation sync(GetCurrentInnerWindowInternal() ?
nsAutoSyncOperation sync(GetCurrentInnerWindowInternal() ?
GetCurrentInnerWindowInternal()->mDoc :
nullptr);
nsCOMPtr<nsIPrintSettingsService> printSettingsService =
nsCOMPtr<nsIPrintSettingsService> printSettingsService =
do_GetService("@mozilla.org/gfx/printsettings-service;1");
nsCOMPtr<nsIPrintSettings> printSettings;
@ -6925,8 +6925,8 @@ nsGlobalWindow::PrintOuter(ErrorResult& aError)
printSettings->SetPrinterName(printerName);
}
printSettingsService->InitPrintSettingsFromPrinter(printerName, printSettings);
printSettingsService->InitPrintSettingsFromPrefs(printSettings,
true,
printSettingsService->InitPrintSettingsFromPrefs(printSettings,
true,
nsIPrintSettings::kInitSaveAll);
} else {
printSettingsService->GetNewPrintSettings(getter_AddRefs(printSettings));
@ -7031,7 +7031,7 @@ nsGlobalWindow::MoveByOuter(int32_t aXDif, int32_t aYDif, ErrorResult& aError, b
cssPos.width += aXDif;
cssPos.height += aYDif;
CheckSecurityLeftAndTop(&cssPos.width, &cssPos.height, aCallerIsChrome);
nsIntSize newDevPos(CSSToDevIntPixels(cssPos));
@ -7088,7 +7088,7 @@ nsGlobalWindow::ResizeToOuter(int32_t aWidth, int32_t aHeight, ErrorResult& aErr
aError.Throw(NS_ERROR_FAILURE);
return;
}
nsIntSize cssSize(aWidth, aHeight);
CheckSecurityWidthAndHeight(&cssSize.width, &cssSize.height, aCallerIsChrome);
@ -7561,7 +7561,7 @@ nsGlobalWindow::RevisePopupAbuseLevel(PopupControlState aControl)
MOZ_ASSERT(IsOuterWindow());
NS_ASSERTION(mDocShell, "Must have docshell");
if (mDocShell->ItemType() != nsIDocShellTreeItem::typeContent) {
return openAllowed;
}
@ -9040,7 +9040,7 @@ nsGlobalWindow::FindOuter(const nsAString& aString, bool aCaseSensitive,
framesFinder->SetRootSearchFrame(this); // paranoia
framesFinder->SetCurrentSearchFrame(this);
}
// The Find API does not accept empty strings. Launch the Find Dialog.
if (aString.IsEmpty() || aShowDialog) {
// See if the find dialog is already up using nsIWindowMediator
@ -9627,7 +9627,7 @@ nsGlobalWindow::TakeFocus(bool aFocus, uint32_t aFocusMethod)
if (mCleanedUp) {
return false;
}
if (aFocus)
mFocusMethod = aFocusMethod & FOCUSMETHOD_MASK;
@ -12171,7 +12171,7 @@ nsresult nsGlobalWindow::ResetTimersForNonBackgroundWindow()
// Since we reset mWhen we need to move |timeout| to the right
// place in the list so that it remains sorted by mWhen.
// Get the pointer to the next timeout now, before we move the
// current timeout in the list.
nsTimeout* nextTimeout = timeout->getNext();
@ -12531,12 +12531,12 @@ nsGlobalWindow::SuspendTimeouts(uint32_t aIncrease,
t->mTimeRemaining = t->mWhen - now;
else
t->mTimeRemaining = TimeDuration(0);
// Drop the XPCOM timer; we'll reschedule when restoring the state.
if (t->mTimer) {
t->mTimer->Cancel();
t->mTimer = nullptr;
// Drop the reference that the timer's closure had on this timeout, we'll
// add it back in ResumeTimeouts. Note that it shouldn't matter that we're
// passing null for the context, since this shouldn't actually release this