Changeset 202861 in webkit

Timestamp:

Jul 6, 2016 10:04:28 AM (8 years ago)

Author:

pvollan@apple.com

Message:

[Win] Add null pointer check in gesture handling.
​https://bugs.webkit.org/show_bug.cgi?id=159454

Reviewed by Brent Fulgham.

• WebView.cpp:

(WebView::gesture):

Location:

trunk/Source/WebKit/win

Files:

• ChangeLog (modified) (1 diff)
• WebView.cpp (modified) (1 diff)

trunk/Source/WebKit/win/ChangeLog

@@ +1 @@
+2016-07-06  Per Arne Vollan  <pvollan@apple.com>
+
+        [Win] Add null pointer check in gesture handling.
+        https://bugs.webkit.org/show_bug.cgi?id=159454
+
+        Reviewed by Brent Fulgham.
+
+        * WebView.cpp:
+        (WebView::gesture):
+
 2016-07-01  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Source/WebKit/win/WebView.cpp

@@ -1870 +1870 @@
         IntSize logicalScrollDelta(-deltaX * scaleFactor, -deltaY * scaleFactor);
 
-        if (!m_gestureTargetNode || !m_gestureTargetNode->renderer()) {
+        RenderLayer* scrollableLayer = nullptr;
+        if (m_gestureTargetNode && m_gestureTargetNode->renderer() && m_gestureTargetNode->renderer()->enclosingLayer())
+            scrollableLayer = m_gestureTargetNode->renderer()->enclosingLayer()->enclosingScrollableLayer();
+
+        if (!scrollableLayer) {
             // We might directly hit the document without hitting any nodes
             coreFrame->view()->scrollBy(logicalScrollDelta);
             scrolledArea = coreFrame->view();
         } else
-            m_gestureTargetNode->renderer()->enclosingLayer()->enclosingScrollableLayer()->scrollByRecursively(logicalScrollDelta, WebCore::RenderLayer::ScrollOffsetClamped, &scrolledArea);
+            scrollableLayer->scrollByRecursively(logicalScrollDelta, WebCore::RenderLayer::ScrollOffsetClamped, &scrolledArea);
 
         if (!(UpdatePanningFeedbackPtr() && BeginPanningFeedbackPtr() && EndPanningFeedbackPtr())) {