Attachment 361869 Details for Bug 194569 – Patch

[patch] Patch

bug-194569-20190212170246.patch (text/plain), 2.01 KB, created by Tim Horton on 2019-02-12 17:02:47 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Horton

Created: 2019-02-12 17:02:47 PST

Size: 2.01 KB

patch

obsolete

>Subversion Revision: 241323
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 618c3a58b18cc8a99f273189b80a7aab95bd6555..914c2f88afe0fdf0f807fb54b0454c1391521097 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,20 @@
>+2019-02-12  Tim Horton  <timothy_horton@apple.com>
>+
>+        Null deref in userInterfaceLayoutDirection under ViewGestureController::handleSwipeGesture
>+        https://bugs.webkit.org/show_bug.cgi?id=194569
>+        <rdar://problem/46711049>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UIProcess/mac/ViewGestureControllerMac.mm:
>+        (WebKit::ViewGestureController::handleSwipeGesture):
>+        It is conceivable that we could get here if the client closes the page
>+        e.g. in the callback from willEndSwipeGesture. We already guarded against
>+        this ... one line too late! Rearrange the lines so we don't call into
>+        WebPageProxy at all if we don't have a drawing area (which is a strict subset
>+        of the time that isValid would return true). This is a speculative fix,
>+        since I can no longer reproduce the crash on demand.
>+
> 2019-02-12  Tim Horton  <timothy_horton@apple.com>
> 
>         Find on Page shouldn't zoom in on matches
>diff --git a/Source/WebKit/UIProcess/mac/ViewGestureControllerMac.mm b/Source/WebKit/UIProcess/mac/ViewGestureControllerMac.mm
>index 872e298f20af12803576da5499aae5b8c75c7996..298b5e37b3a6b703c9d331ea7d6aca12b09f87dc 100644
>--- a/Source/WebKit/UIProcess/mac/ViewGestureControllerMac.mm
>+++ b/Source/WebKit/UIProcess/mac/ViewGestureControllerMac.mm
>@@ -544,11 +544,11 @@ void ViewGestureController::handleSwipeGesture(WebBackForwardListItem* targetIte
> {
>     ASSERT(m_activeGestureType == ViewGestureType::Swipe);
> 
>-    bool swipingLeft = isPhysicallySwipingLeft(direction);
>-
>     if (!m_webPageProxy.drawingArea())
>         return;
> 
>+    bool swipingLeft = isPhysicallySwipingLeft(direction);
>+
>     double width;
>     if (!m_customSwipeViews.isEmpty())
>         width = m_currentSwipeCustomViewBounds.width();

Actions: View | Formatted Diff | Diff

Attachments on bug 194569: 361869