diff options
| author | John Reck <jreck@google.com> | 2012-03-05 16:18:23 -0800 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2012-03-05 16:34:41 -0800 |
| commit | 989ba636e03d366179e058a6386164fcd5022c99 (patch) | |
| tree | ed8d0e5e6010155f01101bd0d15dbc7336980808 /Source/WebKit/android/jni/WebViewCore.cpp | |
| parent | 69c551b23300a3c735fb2b1f84d7682afd3d893a (diff) | |
| download | external_webkit-989ba636e03d366179e058a6386164fcd5022c99.zip external_webkit-989ba636e03d366179e058a6386164fcd5022c99.tar.gz external_webkit-989ba636e03d366179e058a6386164fcd5022c99.tar.bz2 | |
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
Diffstat (limited to 'Source/WebKit/android/jni/WebViewCore.cpp')
| -rw-r--r-- | Source/WebKit/android/jni/WebViewCore.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
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(); |