diff options
| author | John Reck <jreck@google.com> | 2012-01-18 12:49:29 -0800 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2012-01-18 12:54:16 -0800 |
| commit | 7023010bb63a565357556a480114a0db229c7b33 (patch) | |
| tree | 4ada028e9186d6d4292c8db8fbf866007c587e94 /Source/WebCore/platform | |
| parent | 8df0eba6a3a17a722e4501827666ab5d7ae00f92 (diff) | |
| download | external_webkit-7023010bb63a565357556a480114a0db229c7b33.zip external_webkit-7023010bb63a565357556a480114a0db229c7b33.tar.gz external_webkit-7023010bb63a565357556a480114a0db229c7b33.tar.bz2 | |
Fix software extras on base layer
Need to revist software drawing in general, but this gets it working for now
Change-Id: I1745de7a67c75400c31a070f1e17a0602b0df190
Diffstat (limited to 'Source/WebCore/platform')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/android_graphics.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/android_graphics.cpp b/Source/WebCore/platform/graphics/android/android_graphics.cpp index 57f1b41..c8b7f59 100644 --- a/Source/WebCore/platform/graphics/android/android_graphics.cpp +++ b/Source/WebCore/platform/graphics/android/android_graphics.cpp @@ -54,7 +54,8 @@ void CursorRing::draw(SkCanvas* canvas, LayerAndroid* layer, IntRect* inval) } #if USE(ACCELERATED_COMPOSITING) int layerId = m_node->isInLayer() ? m_frame->layer(m_node)->uniqueId() : -1; - if (layer->uniqueId() != layerId) + int drawingLayerId = layer ? layer->uniqueId() : -1; + if (drawingLayerId != layerId) return; #endif if (canvas->quickReject(m_bounds, SkCanvas::kAA_EdgeType)) { |