Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3397)

Unified Diff: chrome/browser/ui/cocoa/certificate_viewer_mac.mm

Issue 2363823003: [merge-m54] Mac: Hack around Sierra autolayout bug in the certificate viewer. (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/certificate_viewer_mac.mm
diff --git a/chrome/browser/ui/cocoa/certificate_viewer_mac.mm b/chrome/browser/ui/cocoa/certificate_viewer_mac.mm
index 42ff57d1e5efe9e2a6224d5b428e5774ccf69755..ab7ff45584b112ed455b1ad9d530e6a8a6fe23fb 100644
--- a/chrome/browser/ui/cocoa/certificate_viewer_mac.mm
+++ b/chrome/browser/ui/cocoa/certificate_viewer_mac.mm
@@ -6,9 +6,11 @@
#include <Security/Security.h>
#include <SecurityInterface/SFCertificatePanel.h>
+#import <objc/runtime.h>
#include <vector>
#include "base/mac/foundation_util.h"
+#include "base/mac/mac_util.h"
#include "base/mac/scoped_cftyperef.h"
#include "base/macros.h"
#include "chrome/browser/certificate_viewer.h"
@@ -21,6 +23,68 @@
class SSLCertificateViewerCocoaBridge;
+namespace {
+
+// The maximum height of the certificate panel. Imposed whenever Sierra's buggy
+// autolayout algorithm tries to change it. Doesn't affect user resizes.
+const CGFloat kMaxPanelSetFrameHeight = 400;
+
+// Pointer to the real implementation of -[SFCertificatePanel setFrame:..]. This
+// is cached so a correct lookup is performed before we add the override.
+IMP g_real_certificate_panel_setframe = nullptr;
+
+// Provide a workaround for a buggy autolayout algorithm in macOS Sierra when
+// running Chrome linked against the 10.10 SDK on macOS 10.12.
+// See http://crbug.com/643123 for more details.
+// Note it's not possible to inherit from SFCertificatePanel without triggering
+// *** Assertion failure in -[BrowserCrApplication
+// _commonBeginModalSessionForWindow:relativeToWindow:modalDelegate:
+// didEndSelector:contextInfo:], .../AppKit.subproj/NSApplication.m:4077
+// After that assertion, the sheet simply refuses to continue loading.
+// It's also not possible to swizzle the -setFrame: method because
+// SFCertificatePanel doesn't define it. Attempting to swizzle that would
+// replace the implementation on NSWindow and constrain all dialogs.
+// So, provide a regular C method and append it to the SFCertificatePanel
+// implementation using the objc runtime.
+// TODO(tapted): Remove all of this when Chrome's SDK target gets bumped.
+id SFCertificatePanelSetFrameOverride(id self,
+ SEL _cmd,
+ NSRect frame,
+ BOOL display,
+ BOOL animate) {
+ if (frame.size.height > kMaxPanelSetFrameHeight)
+ frame.size.height = kMaxPanelSetFrameHeight;
+
+ DCHECK(g_real_certificate_panel_setframe);
+ return g_real_certificate_panel_setframe(self, _cmd, frame, display, animate);
+}
+
+void MaybeConstrainPanelSizeForSierraBug() {
+#if defined(MAC_OS_X_VERSION_10_11) && \
+ MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_11
+ // This is known not to be required when linking against the 10.11 SDK. Early
+ // exit in that case but assume anything earlier is broken.
+ return;
+#endif
+
+ // It's also not required when running on El Capitan or earlier.
+ if (base::mac::IsAtMostOS10_11() || g_real_certificate_panel_setframe)
+ return;
+
+ const SEL kSetFrame = @selector(setFrame:display:animate:);
+ Method real_method =
+ class_getInstanceMethod([SFCertificatePanel class], kSetFrame);
+ const char* type_encoding = method_getTypeEncoding(real_method);
+ g_real_certificate_panel_setframe = method_getImplementation(real_method);
+ DCHECK(g_real_certificate_panel_setframe);
+ IMP method = reinterpret_cast<IMP>(&SFCertificatePanelSetFrameOverride);
+ BOOL method_added = class_addMethod([SFCertificatePanel class], kSetFrame,
+ method, type_encoding);
+ DCHECK(method_added);
+}
+
+} // namespace
+
@interface SFCertificatePanel (SystemPrivate)
// A system-private interface that dismisses a panel whose sheet was started by
// -beginSheetForWindow:
@@ -144,6 +208,9 @@ void ShowCertificateViewer(content::WebContents* web_contents,
- (void)showSheetForWindow:(NSWindow*)window {
overlayWindow_.reset([window retain]);
+
+ MaybeConstrainPanelSizeForSierraBug();
+
[panel_ beginSheetForWindow:window
modalDelegate:self
didEndSelector:@selector(sheetDidEnd:
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698