зеркало из https://github.com/mozilla/gecko-dev.git
Space patrol. Partially extra whitespace from my last patch.
This commit is contained in:
Родитель
632e7cf374
Коммит
a8c339859b
|
@ -1921,14 +1921,14 @@ enum BWCOpenDest {
|
|||
nsAutoString windowName, features;
|
||||
|
||||
// get the popup window's features
|
||||
aPopupBlockedEvent->GetPopupWindowFeatures(features);
|
||||
aPopupBlockedEvent->GetPopupWindowFeatures(features);
|
||||
|
||||
#ifndef MOZILLA_1_8_BRANCH
|
||||
// XXXhakan: nsIDOMPopupBlockedEvent didn't get the popupWindowName property added on branch, so
|
||||
// we can't set the popup window's original name for now.
|
||||
// see bug 343734
|
||||
aPopupBlockedEvent->GetPopupWindowName(windowName);
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// find the docshell for the blocked popup window, in order to show it
|
||||
if (!requestingWindow)
|
||||
|
@ -1946,20 +1946,20 @@ enum BWCOpenDest {
|
|||
|
||||
// whitelist the URL
|
||||
nsCOMPtr<nsIURI> requestingWindowURI;
|
||||
nsCOMPtr<nsIWebNavigation> webNav = do_GetInterface(requestingWindow);
|
||||
if (webNav)
|
||||
nsCOMPtr<nsIWebNavigation> webNav = do_GetInterface(requestingWindow);
|
||||
if (webNav)
|
||||
webNav->GetCurrentURI(getter_AddRefs(requestingWindowURI));
|
||||
|
||||
if (requestingWindowURI)
|
||||
[self whitelistURL:requestingWindowURI];
|
||||
else
|
||||
NSLog(@"Couldn't whitelist the URI");
|
||||
NSLog(@"Couldn't whitelist the URI");
|
||||
|
||||
// show the blocked popup
|
||||
nsCOMPtr<nsIDOMWindow> openedWindow;
|
||||
nsresult rv = piDomWin->Open(NS_ConvertUTF8toUTF16(uriStr), windowName, features, getter_AddRefs(openedWindow));
|
||||
if (NS_FAILED(rv))
|
||||
NSLog(@"Couldn't show the blocked popup window for %@", [NSString stringWith_nsACString:uriStr]);
|
||||
NSLog(@"Couldn't show the blocked popup window for %@", [NSString stringWith_nsACString:uriStr]);
|
||||
}
|
||||
|
||||
- (void)whitelistURL:(nsIURI*)URL
|
||||
|
|
Загрузка…
Ссылка в новой задаче