summaryrefslogtreecommitdiffstats
path: root/WebKit
diff options
context:
space:
mode:
authorCary Clark <cary@android.com>2010-08-20 09:30:30 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-08-20 09:30:30 -0700
commite4f33b798e088fbc8f00d6300716be1d24dda0de (patch)
treea66e915a9aa073c810401ffbef3d0e1f8c915793 /WebKit
parent6a61f7f6e24e0a2a9df46a9a23d18eda067a9401 (diff)
parentaeac322191ce47f38c45db86e34469fb6fe7bb76 (diff)
downloadexternal_webkit-e4f33b798e088fbc8f00d6300716be1d24dda0de.zip
external_webkit-e4f33b798e088fbc8f00d6300716be1d24dda0de.tar.gz
external_webkit-e4f33b798e088fbc8f00d6300716be1d24dda0de.tar.bz2
Merge "order text selection by line centers"
Diffstat (limited to 'WebKit')
-rw-r--r--WebKit/android/nav/SelectText.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/WebKit/android/nav/SelectText.cpp b/WebKit/android/nav/SelectText.cpp
index 9792cd3..3716b03 100644
--- a/WebKit/android/nav/SelectText.cpp
+++ b/WebKit/android/nav/SelectText.cpp
@@ -1542,9 +1542,9 @@ bool SelectText::wordSelection(const SkPicture* picture)
void SelectText::swapAsNeeded()
{
- if (m_selStart.fTop >= m_selEnd.fBottom
- || (m_selStart.fBottom > m_selEnd.fTop
- && m_selStart.fRight > m_selEnd.fLeft))
+ if (m_selStart.fTop >= (m_selEnd.fTop + m_selEnd.fBottom) >> 1
+ || (m_selEnd.fTop < (m_selStart.fTop + m_selStart.fBottom) >> 1
+ && m_selStart.fRight > m_selEnd.fLeft))
{
SkTSwap(m_startBase, m_endBase);
SkTSwap(m_selStart, m_selEnd);