Changeset 239367 in webkit

Timestamp:

Dec 18, 2018, 9:01:04 PM (8 years ago)

Author:

achristensen@apple.com

Message:

REGRESSION(r239134) iOS safe browsing warning unable to show details
​https://bugs.webkit.org/show_bug.cgi?id=192837

Reviewed by Tim Horton.

• UIProcess/Cocoa/WKSafeBrowsingWarning.mm:

(-[WKSafeBrowsingWarning addContent]):
I had a fragile design that relied on the internal view heirarchy structure of UIScrollView,
which I changed in r239134 by introducing a layout which changed where its scrollbars were in the view heirarchy.
I now have a more robust design that saves a WeakObjCPtr to the view I need to traverse to.
Testing is problematic because this had to do with scrollbars and UIScrollView internals which seem to behave
differently in TestWebKitAPI, but I verified manually that this fixes the issue.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Cocoa/WKSafeBrowsingWarning.h (modified) (2 diffs)
• UIProcess/Cocoa/WKSafeBrowsingWarning.mm (modified) (4 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-12-18  Alex Christensen  <achristensen@webkit.org>
+
+        REGRESSION(r239134) iOS safe browsing warning unable to show details
+        https://bugs.webkit.org/show_bug.cgi?id=192837
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/Cocoa/WKSafeBrowsingWarning.mm:
+        (-[WKSafeBrowsingWarning addContent]):
+        I had a fragile design that relied on the internal view heirarchy structure of UIScrollView,
+        which I changed in r239134 by introducing a layout which changed where its scrollbars were in the view heirarchy.
+        I now have a more robust design that saves a WeakObjCPtr to the view I need to traverse to.
+        Testing is problematic because this had to do with scrollbars and UIScrollView internals which seem to behave
+        differently in TestWebKitAPI, but I verified manually that this fixes the issue.
+
 2018-12-18  Fujii Hironori  <Hironori.Fujii@sony.com>
 

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

@@ -44 +44 @@
 
 #if PLATFORM(MAC)
+using ViewType = NSView;
 using RectType = NSRect;
 @interface WKSafeBrowsingWarning : NSView<NSTextViewDelegate>
 #else
+using ViewType = UIView;
 using RectType = CGRect;
 @interface WKSafeBrowsingWarning : UIScrollView<UITextViewDelegate>
@@ -55 +57 @@
     RefPtr<const WebKit::SafeBrowsingWarning> _warning;
     WeakObjCPtr<WKSafeBrowsingTextView> _details;
+    WeakObjCPtr<ViewType> _box;
 }
 

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

@@ -51 +51 @@
 using ButtonType = NSButton;
 using AlignmentType = NSLayoutAttribute;
-using ViewType = NSView;
 using SizeType = NSSize;
 #else
@@ -59 +58 @@
 using ButtonType = UIButton;
 using AlignmentType = UIStackViewAlignment;
-using ViewType = UIView;
 using SizeType = CGSize;
 #endif
@@ -300 +298 @@
     auto goBack = makeButton(WarningItem::GoBackButton, self, @selector(goBackClicked));
     auto box = [[ViewType new] autorelease];
+    _box = box;
     setBackground(box, colorForItem(WarningItem::BoxBackground, self));
     box.layer.cornerRadius = boxCornerRadius;
@@ -368 +367 @@
 - (void)showDetailsClicked
 {
-    ViewType *box = self.subviews.lastObject;
+    ViewType *box = _box.get().get();
     ButtonType *showDetails = box.subviews.lastObject;
     [showDetails removeFromSuperview];