Title: [173144] trunk/Source/WebKit2
- Revision
- 173144
- Author
- [email protected]
- Date
- 2014-08-31 01:04:25 -0700 (Sun, 31 Aug 2014)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (173143 => 173144)
--- trunk/Source/WebKit2/ChangeLog 2014-08-31 07:41:50 UTC (rev 173143)
+++ trunk/Source/WebKit2/ChangeLog 2014-08-31 08:04:25 UTC (rev 173144)
@@ -1,3 +1,15 @@
+2014-08-31 Tim Horton <[email protected]>
+
+ 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 <[email protected]>
Use RetainPtr::autorelease in some places where it seems appropriate
Modified: trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm (173143 => 173144)
--- trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm 2014-08-31 07:41:50 UTC (rev 173143)
+++ trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm 2014-08-31 08:04:25 UTC (rev 173144)
@@ -208,8 +208,10 @@
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;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
