diff options
| author | John Reck <jreck@google.com> | 2012-03-05 17:20:03 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-05 17:20:03 -0800 |
| commit | 090354d00cb78dbde302cb96fc7a10d2c194ea86 (patch) | |
| tree | 424f0ece268444cd7283b051d215df2841c8d18a | |
| parent | e08cc3f512d262d8b82b4fb5f661b95ea4d74d9b (diff) | |
| parent | 989ba636e03d366179e058a6386164fcd5022c99 (diff) | |
| download | external_webkit-090354d00cb78dbde302cb96fc7a10d2c194ea86.zip external_webkit-090354d00cb78dbde302cb96fc7a10d2c194ea86.tar.gz external_webkit-090354d00cb78dbde302cb96fc7a10d2c194ea86.tar.bz2 | |
Merge "Fix platformLayerIdFromNode lookup"
| -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(); |