From 983c6000d6b6feb7ab77f3ee6e188a2a169f4cfe Mon Sep 17 00:00:00 2001 From: Kartikaya Gupta Date: Mon, 8 Jun 2015 14:46:47 -0400 Subject: [PATCH] Bug 1172224 - Ensure that docshells return an appropriate value for APZ-enabled even if they don't have a presShell. r=dvander --- docshell/base/nsDocShell.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index 0e2742ff2a24..2a839b0b906b 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -13867,7 +13867,9 @@ nsDocShell::GetAsyncPanZoomEnabled(bool* aOut) return NS_OK; } - *aOut = false; + // If we don't have a presShell, fall back to the default platform value of + // whether or not APZ is enabled. + *aOut = gfxPlatform::AsyncPanZoomEnabled(); return NS_OK; }