https://bugs.webkit.org/show_bug.cgi?id=136409
<rdar://problem/
18104748>
Reviewed by Dan Bernstein.
* UIProcess/mac/ViewGestureControllerMac.mm:
(WebKit::ViewGestureController::endMagnificationGesture):
Null-check DrawingArea.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@173144
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2014-08-31 Tim Horton <timothy_horton@apple.com>
+
+ Occasional crashes (null deref) under ViewGestureController::endMagnificationGesture
+ https://bugs.webkit.org/show_bug.cgi?id=136409
+ <rdar://problem/18104748>
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/mac/ViewGestureControllerMac.mm:
+ (WebKit::ViewGestureController::endMagnificationGesture):
+ Null-check DrawingArea.
+
2014-08-26 Maciej Stachowiak <mjs@apple.com>
Use RetainPtr::autorelease in some places where it seems appropriate
if (m_frameHandlesMagnificationGesture)
m_webPageProxy.scalePage(newMagnification, roundedIntPoint(m_magnificationOrigin));
- else
- m_webPageProxy.drawingArea()->commitTransientZoom(newMagnification, scaledMagnificationOrigin(m_magnificationOrigin, newMagnification));
+ else {
+ if (auto drawingArea = m_webPageProxy.drawingArea())
+ drawingArea->commitTransientZoom(newMagnification, scaledMagnificationOrigin(m_magnificationOrigin, newMagnification));
+ }
m_activeGestureType = ViewGestureType::None;
}