Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-11 01:57:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1278480 - prevent null pointer dereference. r=kats

Browse Source 
MozReview-Commit-ID: LhntDa5Fqqi

--HG--
extra : rebase_source : b22e53908a68a099efe0afbd6cba5d0012f9b5c9
This commit is contained in:
Andi-Bogdan Postelnicu 2016-06-08 16:12:37 +03:00
parent 13bae14424
commit 2092648418
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gfx/layers/apz/util/TouchActionHelper.cpp
View File

@ -47,6 +47,13 @@ mozilla::layers::TouchBehaviorFlags
TouchActionHelper::GetAllowedTouchBehavior(nsIWidget* aWidget, const LayoutDeviceIntPoint& aPoint)
{
nsView *view = nsView::GetViewFor(aWidget);
TouchBehaviorFlags behavior = AllowedTouchBehavior::VERTICAL_PAN | AllowedTouchBehavior::HORIZONTAL_PAN |
AllowedTouchBehavior::PINCH_ZOOM | AllowedTouchBehavior::DOUBLE_TAP_ZOOM;
if (!view) {
return behavior;
}
nsIFrame *viewFrame = view->GetFrame();
nsPoint relativePoint =
@ -73,8 +80,6 @@ TouchActionHelper::GetAllowedTouchBehavior(nsIWidget* aWidget, const LayoutDevic
// root frame but not the subframes.
bool considerPanning = true;
TouchBehaviorFlags behavior = AllowedTouchBehavior::VERTICAL_PAN | AllowedTouchBehavior::HORIZONTAL_PAN |
AllowedTouchBehavior::PINCH_ZOOM | AllowedTouchBehavior::DOUBLE_TAP_ZOOM;
for (nsIFrame *frame = target; frame && frame->GetContent() && behavior; frame = frame->GetParent()) {
UpdateAllowedBehavior(nsLayoutUtils::GetTouchActionFromFrame(frame), considerPanning, behavior);