Title: [178935] branches/safari-600.5-branch/Source/WebKit/mac
- Revision
- 178935
- Author
- matthew_han...@apple.com
- Date
- 2015-01-22 12:34:57 -0800 (Thu, 22 Jan 2015)
Log Message
Merge r177011. rdar://problem/19451253
Modified Paths
Diff
Modified: branches/safari-600.5-branch/Source/WebKit/mac/ChangeLog (178934 => 178935)
--- branches/safari-600.5-branch/Source/WebKit/mac/ChangeLog 2015-01-22 20:34:54 UTC (rev 178934)
+++ branches/safari-600.5-branch/Source/WebKit/mac/ChangeLog 2015-01-22 20:34:57 UTC (rev 178935)
@@ -1,3 +1,22 @@
+2015-01-22 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r177011. rdar://problem/19451253
+
+ 2014-12-08 Alexey Proskuryakov <a...@apple.com>
+
+ REGRESSION (r158036): WebView cannot handle HTTP Basic Authentication challenge
+ https://bugs.webkit.org/show_bug.cgi?id=138843
+ rdar://problem/18793695
+
+ Reviewed by Dan Bernstein.
+
+ * Panels/WebAuthenticationPanel.m:
+ (-[WebAuthenticationPanel cancel:]):
+ (-[WebAuthenticationPanel logIn:]):
+ Don't close the panel before using panel.sheetParent, because the parent becomes nil.
+ In fact, we don't need to close it at all, it's enough to call orderOut:, and even
+ that only when using an old NSWindow API.
+
2015-01-15 Matthew Hanson <matthew_han...@apple.com>
Merge r175719. rdar://problem/19424169
Modified: branches/safari-600.5-branch/Source/WebKit/mac/Panels/WebAuthenticationPanel.m (178934 => 178935)
--- branches/safari-600.5-branch/Source/WebKit/mac/Panels/WebAuthenticationPanel.m 2015-01-22 20:34:54 UTC (rev 178934)
+++ branches/safari-600.5-branch/Source/WebKit/mac/Panels/WebAuthenticationPanel.m 2015-01-22 20:34:57 UTC (rev 178935)
@@ -77,14 +77,15 @@
// This is required as a workaround for AppKit issue 4118422
[[self retain] autorelease];
- [panel close];
if (usingSheet) {
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
[panel.sheetParent endSheet:panel returnCode:NSModalResponseCancel];
#else
+ [panel orderOut:sender];
[[NSApplication sharedApplication] endSheet:panel returnCode:1];
#endif
} else {
+ [panel orderOut:sender];
[[NSApplication sharedApplication] stopModalWithCode:1];
}
}
@@ -97,14 +98,15 @@
// sure it lives on a bit longer.
[[panel retain] autorelease];
- [panel close];
if (usingSheet) {
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
[panel.sheetParent endSheet:panel returnCode:NSModalResponseOK];
#else
+ [panel orderOut:sender];
[[NSApplication sharedApplication] endSheet:panel returnCode:0];
#endif
} else {
+ [panel orderOut:sender];
[[NSApplication sharedApplication] stopModalWithCode:0];
}
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
