Changeset 172199 in webkit

Timestamp:

Aug 6, 2014, 7:43:35 PM (11 years ago)

Author:

Simon Fraser

Message:

[iOS WK2] www.france24.com doesn't always load the page, sections stay white
​https://bugs.webkit.org/show_bug.cgi?id=135684
<rdar://problem/17931712>

Reviewed by Tim Horton.

It's possible for a UIScrollView for overflow to move between one scrolling tree node
and another. When this happens, we need to avoid unconditionally clearing the delegate
on the node that's being destroyed, because the new node will already have set the
UIScrollView delegate to its own delegate.

• UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm:

(WebKit::ScrollingTreeOverflowScrollingNodeIOS::~ScrollingTreeOverflowScrollingNodeIOS):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-08-06  Simon Fraser  <simon.fraser@apple.com>
+
+        [iOS WK2] www.france24.com doesn't always load the page, sections stay white
+        https://bugs.webkit.org/show_bug.cgi?id=135684
+        <rdar://problem/17931712>
+
+        Reviewed by Tim Horton.
+        
+        It's possible for a UIScrollView for overflow to move between one scrolling tree node
+        and another. When this happens, we need to avoid unconditionally clearing the delegate
+        on the node that's being destroyed, because the new node will already have set the
+        UIScrollView delegate to its own delegate.
+
+        * UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm:
+        (WebKit::ScrollingTreeOverflowScrollingNodeIOS::~ScrollingTreeOverflowScrollingNodeIOS):
+
 2014-08-06  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm

@@ -112 +112 @@
     if (UIScrollView *scrollView = (UIScrollView *)[scrollLayer() delegate]) {
         ASSERT([scrollView isKindOfClass:[UIScrollView self]]);
-        scrollView.delegate = nil;
+        // The scrollView may have been adopted by another node, so only clear the delegate if it's ours.
+        if (scrollView.delegate == m_scrollViewDelegate.get())
+            scrollView.delegate = nil;
     }
     END_BLOCK_OBJC_EXCEPTIONS