From 989ba636e03d366179e058a6386164fcd5022c99 Mon Sep 17 00:00:00 2001 From: John Reck Date: Mon, 5 Mar 2012 16:18:23 -0800 Subject: Fix platformLayerIdFromNode lookup Bug: 6119014 If the RenderLayer of the node isn't composited, traverse up the tree until we find a composited parent. Change-Id: I9448273fb5cc86ae56a47e229e9556a15569ed69 --- Source/WebKit/android/jni/WebViewCore.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Source/WebKit') diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp index 0113e2f..41a8339 100644 --- a/Source/WebKit/android/jni/WebViewCore.cpp +++ b/Source/WebKit/android/jni/WebViewCore.cpp @@ -1501,6 +1501,8 @@ int WebViewCore::platformLayerIdFromNode(Node* node, LayerAndroid** outLayer) if (!node || !node->renderer()) return -1; RenderLayer* renderLayer = node->renderer()->enclosingLayer(); + while (renderLayer && !renderLayer->isComposited()) + renderLayer = renderLayer->parent(); if (!renderLayer || !renderLayer->isComposited()) return -1; GraphicsLayer* graphicsLayer = renderLayer->backing()->graphicsLayer(); -- cgit v1.1