mozilla-inbound: changeset 226717:8d3180c7e7cd43a608868c9c9a88ebc41867b4d5

author	Peter Chang <pchang@mozilla.com>
	Wed, 28 Jan 2015 01:32:00 +0100
changeset 226717	8d3180c7e7cd43a608868c9c9a88ebc41867b4d5
parent 226716	672cdff6ba49c293d4fbedc915af21b45d359cb4
child 226718	e51f02d321f98580e1d708854fc722069afc4e6b
push id	54905
push user	cbook@mozilla.com
push date	Fri, 30 Jan 2015 12:38:59 +0000
treeherder	mozilla-inbound@8d3180c7e7cd [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	roc
bugs	1123179
milestone	38.0a1
first release with	nightly linux32 d7e156a7a0a6 / 38.0a1 / 20150131030230 / files nightly linux64 d7e156a7a0a6 / 38.0a1 / 20150131030230 / files nightly mac d7e156a7a0a6 / 38.0a1 / 20150131030230 / files nightly win32 d7e156a7a0a6 / 38.0a1 / 20150131030230 / files nightly win64 d7e156a7a0a6 / 38.0a1 / 20150131030230 / files
last release without	nightly linux32 29b05d283b00 / 38.0a1 / 20150130030232 / files nightly linux64 29b05d283b00 / 38.0a1 / 20150130030232 / files nightly mac 29b05d283b00 / 38.0a1 / 20150130030232 / files nightly win32 29b05d283b00 / 38.0a1 / 20150130030232 / files nightly win64 29b05d283b00 / 38.0a1 / 20150130030232 / files

--- a/layout/base/TouchCaret.cpp
+++ b/layout/base/TouchCaret.cpp
@@ -453,17 +453,18 @@ TouchCaret::IsDisplayable()
   }
 
   if (!nsContentUtils::HasNonEmptyTextContent(
          editingHost, nsContentUtils::eRecurseIntoChildren)) {
     TOUCHCARET_LOG("The content is empty!");
     return false;
   }
 
-  if (!nsLayoutUtils::IsRectVisibleInScrollFrames(focusFrame, focusRect)) {
+  if (mState != TOUCHCARET_TOUCHDRAG_ACTIVE &&
+        !nsLayoutUtils::IsRectVisibleInScrollFrames(focusFrame, focusRect)) {
     TOUCHCARET_LOG("Caret does not show in the scrollable frame!");
     return false;
   }
 
   TOUCHCARET_LOG("Touch caret is displayable!");
   return true;
 }