diff options
| author | Cary Clark <cary@android.com> | 2010-09-15 10:36:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-15 10:36:46 -0700 |
| commit | 71d8d800bdd87cd1aa95f64cd8586b8e3d1f1479 (patch) | |
| tree | 1884bf0e27771852944321b4555ee2733d26563c /WebKit | |
| parent | d7ab5ccadf9c3e6b43e39d9e80c7f155da1ac8d9 (diff) | |
| parent | 1441f89dceb65cbe25d23b1b90005e51d3ed28bd (diff) | |
| download | external_webkit-71d8d800bdd87cd1aa95f64cd8586b8e3d1f1479.zip external_webkit-71d8d800bdd87cd1aa95f64cd8586b8e3d1f1479.tar.gz external_webkit-71d8d800bdd87cd1aa95f64cd8586b8e3d1f1479.tar.bz2 | |
am 1441f89d: Do not merge -- restrict text selection to the main layer
Merge commit '1441f89dceb65cbe25d23b1b90005e51d3ed28bd' into gingerbread-plus-aosp
* commit '1441f89dceb65cbe25d23b1b90005e51d3ed28bd':
Do not merge -- restrict text selection to the main layer
Diffstat (limited to 'WebKit')
| -rw-r--r-- | WebKit/android/nav/SelectText.cpp | 6 |
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) |