From a069c0e2287c018552f58cd901306703986e3467 Mon Sep 17 00:00:00 2001
From: Cary Clark <cary@android.com>
Date: Wed, 2 Mar 2011 09:34:43 -0500
Subject: check for stacking context before scrolling layer

It doesn't make sense to scroll without a stacking
context.

bug:3494970
Change-Id: I59e951b3688aa21f5c99b16a953b6620b501442c
---
 WebKit/android/jni/WebViewCore.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'WebKit/android/jni')

diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp
index a72864f..5744609 100644
--- a/WebKit/android/jni/WebViewCore.cpp
+++ b/WebKit/android/jni/WebViewCore.cpp
@@ -3680,7 +3680,10 @@ void WebViewCore::scrollRenderLayer(int layer, const SkRect& rect)
         return;
 
     RenderLayer* owner = target->owningLayer();
-    if (owner)
+    if (!owner)
+        return;
+
+    if (owner->stackingContext())
         owner->scrollToOffset(rect.fLeft, rect.fTop, true, false);
 #endif
 }
-- 
cgit v1.1