Do not merge -- restrict text selection to the main layer

Gmail causes layers to appear as a message is scrolled. This confuses
the text selection logic. To workaround this in Gingerbread,
text selection is only allowed to be drawn in the main layer.

Change-Id: Idd814bcb5dfeef2fc12d6b0d586a63f711351d96
http://b/2998882

1 files changed, 6 insertions, 0 deletions

diff --git a/WebKit/android/nav/SelectText.cpp b/WebKit/android/nav/SelectText.cpp
index e303d2b..5ffb1e3 100644
--- a/WebKit/android/nav/SelectText.cpp
+++ b/WebKit/android/nav/SelectText.cpp
@@ -1244,6 +1244,12 @@ SelectText::SelectText()
 
 void SelectText::draw(SkCanvas* canvas, LayerAndroid* layer)
 {
+    // Gmail makes layers appear dynamically the page scrolls. The picture
+    // recorded when the selection begins is confused by the pictures seen
+    // in subsequent layers. To work around this, only allow text selection
+    // in the main picture.
+    if (layer->uniqueId() != -1)
+        return;
     // FIXME: layer may not own the original selected picture
     m_picture = layer->picture();
     if (!m_picture)