Title: [177754] trunk/Source/WebKit2
- Revision
- 177754
- Author
- [email protected]
- Date
- 2014-12-26 21:46:33 -0800 (Fri, 26 Dec 2014)
Log Message
Safari build crashes when "zooming into"/choosing a tab from tab view
https://bugs.webkit.org/show_bug.cgi?id=139934
Reviewed by Dan Bernstein.
* UIProcess/API/mac/WKView.mm:
(-[WKView _setIgnoresNonWheelEvents:]):
Trying to add a nil gesture recognizer raises an exception. Stop assuming that a
gesture recognizer is non-nil.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (177753 => 177754)
--- trunk/Source/WebKit2/ChangeLog 2014-12-27 01:17:01 UTC (rev 177753)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-27 05:46:33 UTC (rev 177754)
@@ -1,3 +1,15 @@
+2014-12-26 Conrad Shultz <[email protected]>
+
+ Safari build crashes when "zooming into"/choosing a tab from tab view
+ https://bugs.webkit.org/show_bug.cgi?id=139934
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _setIgnoresNonWheelEvents:]):
+ Trying to add a nil gesture recognizer raises an exception. Stop assuming that a
+ gesture recognizer is non-nil.
+
2014-12-26 Anders Carlsson <[email protected]>
Handle more types in the UserData encode/decode functions
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (177753 => 177754)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-12-27 01:17:01 UTC (rev 177753)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-12-27 05:46:33 UTC (rev 177754)
@@ -4104,8 +4104,8 @@
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
if (ignoresNonWheelEvents)
[self removeGestureRecognizer:_data->_immediateActionGestureRecognizer.get()];
- else
- [self addGestureRecognizer:_data->_immediateActionGestureRecognizer.get()];
+ else if (NSGestureRecognizer *immediateActionRecognizer = _data->_immediateActionGestureRecognizer.get())
+ [self addGestureRecognizer:immediateActionRecognizer];
#endif
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
