Title: [180512] trunk/Source/WebKit2
- Revision
- 180512
- Author
- [email protected]
- Date
- 2015-02-23 13:05:28 -0800 (Mon, 23 Feb 2015)
Log Message
Reproducible crash in ViewGestureController::removeSwipeSnapshot()
https://bugs.webkit.org/show_bug.cgi?id=141917
<rdar://problem/19918590>
Reviewed by Brian Weinstein.
* UIProcess/mac/ViewGestureControllerMac.mm:
(WebKit::ViewGestureController::removeSwipeSnapshot):
If the snapshot was purged and we're showing a white snapshot, we won't
be able to mark the (null) snapshot surface as volatile. Add a null check.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (180511 => 180512)
--- trunk/Source/WebKit2/ChangeLog 2015-02-23 20:31:04 UTC (rev 180511)
+++ trunk/Source/WebKit2/ChangeLog 2015-02-23 21:05:28 UTC (rev 180512)
@@ -1,3 +1,16 @@
+2015-02-23 Timothy Horton <[email protected]>
+
+ Reproducible crash in ViewGestureController::removeSwipeSnapshot()
+ https://bugs.webkit.org/show_bug.cgi?id=141917
+ <rdar://problem/19918590>
+
+ Reviewed by Brian Weinstein.
+
+ * UIProcess/mac/ViewGestureControllerMac.mm:
+ (WebKit::ViewGestureController::removeSwipeSnapshot):
+ If the snapshot was purged and we're showing a white snapshot, we won't
+ be able to mark the (null) snapshot surface as volatile. Add a null check.
+
2015-02-23 Anders Carlsson <[email protected]>
Replace another straight-up cast with a toImpl call
Modified: trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm (180511 => 180512)
--- trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm 2015-02-23 20:31:04 UTC (rev 180511)
+++ trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm 2015-02-23 21:05:28 UTC (rev 180512)
@@ -772,7 +772,7 @@
return;
#if USE_IOSURFACE_VIEW_SNAPSHOTS
- if (m_currentSwipeSnapshot)
+ if (m_currentSwipeSnapshot && m_currentSwipeSnapshot->surface())
m_currentSwipeSnapshot->surface()->setIsVolatile(true);
m_currentSwipeSnapshot = nullptr;
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
