Changeset 175973 in webkit

Timestamp:

Nov 11, 2014, 1:39:46 PM (12 years ago)

Author:

timothy_horton@apple.com

Message:

Occasional assertion failure under recommendedScrollbarStyleDidChange()
​https://bugs.webkit.org/show_bug.cgi?id=138604
<rdar://problem/18855914>

Reviewed by Beth Dakin.

It is possible for AppKit to install tracking areas into our view
behind our back, but we have code that depends on knowing exactly
the set of tracking areas installed on WKView.

Make this more robust by keeping a reference to the tracking area we
use for many things and manipulating that instead of making assumptions
about the total set of tracking areas on WKView.

• UIProcess/API/mac/WKView.mm:

(-[WKView _primaryTrackingArea]):
(-[WKView _replacePrimaryTrackingArea:]):
Provide a 'primary' tracking area setter/getter.

(-[WKView initWithFrame:context:configuration:webView:]):
Keep a reference to the original tracking area installed at initialization time.

• UIProcess/API/mac/WKViewInternal.h:
• UIProcess/mac/PageClientImpl.mm:

(WebKit::PageClientImpl::recommendedScrollbarStyleDidChange):
Instead of walking the set of tracking areas, make use of the fact that
we know exactly which tracking area we installed, and uninstall just that
one, and replace it with our newly-built one.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/mac/WKView.mm (modified) (3 diffs)
• UIProcess/API/mac/WKViewInternal.h (modified) (1 diff)
• UIProcess/mac/PageClientImpl.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-11-11  Tim Horton  <timothy_horton@apple.com>
+
+        Occasional assertion failure under recommendedScrollbarStyleDidChange()
+        https://bugs.webkit.org/show_bug.cgi?id=138604
+        <rdar://problem/18855914>
+
+        Reviewed by Beth Dakin.
+
+        It is possible for AppKit to install tracking areas into our view
+        behind our back, but we have code that depends on knowing exactly
+        the set of tracking areas installed on WKView.
+
+        Make this more robust by keeping a reference to the tracking area we
+        use for many things and manipulating that instead of making assumptions
+        about the total set of tracking areas on WKView.
+
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView _primaryTrackingArea]):
+        (-[WKView _replacePrimaryTrackingArea:]):
+        Provide a 'primary' tracking area setter/getter.
+
+        (-[WKView initWithFrame:context:configuration:webView:]):
+        Keep a reference to the original tracking area installed at initialization time.
+
+        * UIProcess/API/mac/WKViewInternal.h:
+        * UIProcess/mac/PageClientImpl.mm:
+        (WebKit::PageClientImpl::recommendedScrollbarStyleDidChange):
+        Instead of walking the set of tracking areas, make use of the fact that
+        we know exactly which tracking area we installed, and uninstall just that
+        one, and replace it with our newly-built one.
+
 2014-11-11  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm

@@ -170 +170 @@
     RetainPtr<WKBrowsingContextController> _browsingContextController;
 #endif
+
+    RetainPtr<NSTrackingArea> _primaryTrackingArea;
 
     // For ToolTips.
@@ -3494 +3496 @@
 }
 
+- (NSTrackingArea *)_primaryTrackingArea
+{
+    return _data->_primaryTrackingArea.get();
+}
+
+- (void)_setPrimaryTrackingArea:(NSTrackingArea *)trackingArea
+{
+    [self removeTrackingArea:_data->_primaryTrackingArea.get()];
+    _data->_primaryTrackingArea = trackingArea;
+    [self addTrackingArea:trackingArea];
+}
+
 - (instancetype)initWithFrame:(NSRect)frame context:(WebContext&)context configuration:(WebPageConfiguration)webPageConfiguration webView:(WKWebView *)webView
 {
@@ -3511 +3525 @@
         options |= NSTrackingActiveInKeyWindow;
 
-    NSTrackingArea *trackingArea = [[NSTrackingArea alloc] initWithRect:frame
-                                                                options:options
-                                                                  owner:self
-                                                               userInfo:nil];
-    [self addTrackingArea:trackingArea];
-    [trackingArea release];
-
     _data = [[WKViewData alloc] init];
+    _data->_primaryTrackingArea = adoptNS([[NSTrackingArea alloc] initWithRect:frame options:options owner:self userInfo:nil]);
+    [self addTrackingArea:_data->_primaryTrackingArea.get()];
+
     _data->_pageClient = std::make_unique<PageClientImpl>(self, webView);
     _data->_page = context.createWebPage(*_data->_pageClient, WTF::move(webPageConfiguration));

trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h

@@ -134 +134 @@
 - (void)_dismissActionMenuPopovers;
 
+@property (nonatomic, retain, setter=_setPrimaryTrackingArea:) NSTrackingArea *_primaryTrackingArea;
+
 @end

trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm

@@ -586 +586 @@
 void PageClientImpl::recommendedScrollbarStyleDidChange(int32_t newStyle)
 {
-    NSArray *trackingAreas = [m_wkView trackingAreas];
-    NSUInteger count = [trackingAreas count];
-    ASSERT(count == 1);
-    
-    for (NSUInteger i = 0; i < count; ++i)
-        [m_wkView removeTrackingArea:[trackingAreas objectAtIndex:i]];
-
     // Now re-create a tracking area with the appropriate options given the new scrollbar style
     NSTrackingAreaOptions options = NSTrackingMouseMoved | NSTrackingMouseEnteredAndExited | NSTrackingInVisibleRect;
@@ -600 +593 @@
         options |= NSTrackingActiveInKeyWindow;
 
-    NSTrackingArea *trackingArea = [[NSTrackingArea alloc] initWithRect:[m_wkView frame]
-                                                                options:options
-                                                                  owner:m_wkView
-                                                               userInfo:nil];
-    [m_wkView addTrackingArea:trackingArea];
-    [trackingArea release];
+    RetainPtr<NSTrackingArea> trackingArea = adoptNS([[NSTrackingArea alloc] initWithRect:[m_wkView frame] options:options owner:m_wkView userInfo:nil]);
+    [m_wkView _setPrimaryTrackingArea:trackingArea.get()];
 }