Changeset 202861 in webkit
- Timestamp:
- Jul 6, 2016 10:04:28 AM (8 years ago)
- Location:
- trunk/Source/WebKit/win
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/win/ChangeLog
r202744 r202861 1 2016-07-06 Per Arne Vollan <pvollan@apple.com> 2 3 [Win] Add null pointer check in gesture handling. 4 https://bugs.webkit.org/show_bug.cgi?id=159454 5 6 Reviewed by Brent Fulgham. 7 8 * WebView.cpp: 9 (WebView::gesture): 10 1 11 2016-07-01 Per Arne Vollan <pvollan@apple.com> 2 12 -
trunk/Source/WebKit/win/WebView.cpp
r202744 r202861 1870 1870 IntSize logicalScrollDelta(-deltaX * scaleFactor, -deltaY * scaleFactor); 1871 1871 1872 if (!m_gestureTargetNode || !m_gestureTargetNode->renderer()) { 1872 RenderLayer* scrollableLayer = nullptr; 1873 if (m_gestureTargetNode && m_gestureTargetNode->renderer() && m_gestureTargetNode->renderer()->enclosingLayer()) 1874 scrollableLayer = m_gestureTargetNode->renderer()->enclosingLayer()->enclosingScrollableLayer(); 1875 1876 if (!scrollableLayer) { 1873 1877 // We might directly hit the document without hitting any nodes 1874 1878 coreFrame->view()->scrollBy(logicalScrollDelta); 1875 1879 scrolledArea = coreFrame->view(); 1876 1880 } else 1877 m_gestureTargetNode->renderer()->enclosingLayer()->enclosingScrollableLayer()->scrollByRecursively(logicalScrollDelta, WebCore::RenderLayer::ScrollOffsetClamped, &scrolledArea);1881 scrollableLayer->scrollByRecursively(logicalScrollDelta, WebCore::RenderLayer::ScrollOffsetClamped, &scrolledArea); 1878 1882 1879 1883 if (!(UpdatePanningFeedbackPtr() && BeginPanningFeedbackPtr() && EndPanningFeedbackPtr())) {
Note: See TracChangeset
for help on using the changeset viewer.