Title: [242552] trunk/Source/WebKit
- Revision
- 242552
- Author
- [email protected]
- Date
- 2019-03-06 10:14:13 -0800 (Wed, 06 Mar 2019)
Log Message
Fix WKPasswordView compilation on iOS
https://bugs.webkit.org/show_bug.cgi?id=195344
<rdar://problem/48620066>
Reviewed by Dan Bates.
Use WebKitAdditions.
* UIProcess/ios/WKPasswordView.mm:
(-[WKPasswordView showInScrollView:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (242551 => 242552)
--- trunk/Source/WebKit/ChangeLog 2019-03-06 17:38:37 UTC (rev 242551)
+++ trunk/Source/WebKit/ChangeLog 2019-03-06 18:14:13 UTC (rev 242552)
@@ -1,3 +1,16 @@
+2019-03-05 Dean Jackson <[email protected]>
+
+ Fix WKPasswordView compilation on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=195344
+ <rdar://problem/48620066>
+
+ Reviewed by Dan Bates.
+
+ Use WebKitAdditions.
+
+ * UIProcess/ios/WKPasswordView.mm:
+ (-[WKPasswordView showInScrollView:]):
+
2019-03-06 Wenson Hsieh <[email protected]>
[iOS] Frequent 1 second IPC deadlocks when showing a paste callout
Modified: trunk/Source/WebKit/UIProcess/ios/WKPasswordView.mm (242551 => 242552)
--- trunk/Source/WebKit/UIProcess/ios/WKPasswordView.mm 2019-03-06 17:38:37 UTC (rev 242551)
+++ trunk/Source/WebKit/UIProcess/ios/WKPasswordView.mm 2019-03-06 18:14:13 UTC (rev 242552)
@@ -35,6 +35,16 @@
#import <wtf/RetainPtr.h>
#import <wtf/text/WTFString.h>
+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WKPasswordViewAdditions.mm>)
+#include <WebKitAdditions/WKPasswordViewAdditions.mm>
+#else
+static void configureScrollView(UIScrollView *scrollView)
+{
+ [scrollView setBackgroundColor:[UIColor groupTableViewBackgroundColor]];
+}
+#endif
+
+
const CGFloat passwordEntryFieldPadding = 10;
@interface WKPasswordView () <UIDocumentPasswordViewDelegate>
@@ -100,8 +110,9 @@
[_scrollView setMaximumZoomScale:1];
[_scrollView setZoomScale:1];
[_scrollView setContentSize:self.frame.size];
- [_scrollView setBackgroundColor:[UIColor groupTableViewBackgroundColor]];
+ configureScrollView(_scrollView.get());
+
[scrollView addSubview:self];
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
