Changeset 238133 in webkit

Timestamp:

Nov 13, 2018 9:16:02 AM (5 years ago)

Author:

achristensen@apple.com

Message:

Fix internal builds after r238115
​https://bugs.webkit.org/show_bug.cgi?id=191441

• UIProcess/Cocoa/WKSafeBrowsingWarning.mm:

(-[WKSafeBrowsingTextView intrinsicContentSize]):
Some iOS-like operating systems don't have safe browsing. Don't use symbols that don't exist on those systems.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Cocoa/WKSafeBrowsingWarning.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-11-13  Alex Christensen  <achristensen@webkit.org>
+
+        Fix internal builds after r238115
+        https://bugs.webkit.org/show_bug.cgi?id=191441
+
+        * UIProcess/Cocoa/WKSafeBrowsingWarning.mm:
+        (-[WKSafeBrowsingTextView intrinsicContentSize]):
+        Some iOS-like operating systems don't have safe browsing.  Don't use symbols that don't exist on those systems.
+
 2018-11-13  Ali Juma  <ajuma@chromium.org>
 

trunk/Source/WebKit/UIProcess/Cocoa/WKSafeBrowsingWarning.mm

@@ -560 +560 @@
     [self.layoutManager ensureLayoutForTextContainer:self.textContainer];
     return { NSViewNoIntrinsicMetric, [self.layoutManager usedRectForTextContainer:self.textContainer].size.height };
-#else
+#elif HAVE(SAFE_BROWSING)
     auto width = std::min<CGFloat>(maxWidth, [_warning frame].size.width) - 2 * marginSize;
     constexpr auto noHeightConstraint = CGFLOAT_MAX;
     return { width, [self sizeThatFits: { width, noHeightConstraint }].height };
+#else
+    return { 0, 0 };
 #endif
 }