Support address detection

Change-Id: I88b6ebfb4c967e954a2420592a58af3ed188226d

2 files changed, 90 insertions, 3 deletions

diff --git a/Source/WebCore/editing/TextIterator.cpp b/Source/WebCore/editing/TextIterator.cpp
index c3be277..3aa68af 100644
--- a/Source/WebCore/editing/TextIterator.cpp
+++ b/Source/WebCore/editing/TextIterator.cpp
@@ -239,6 +239,20 @@ static void setUpFullyClippedStack(BitStack& stack, Node* node)
     ASSERT(stack.size() == 1 + depthCrossingShadowBoundaries(node));
 }
 
+#if OS(ANDROID)
+static bool checkFormControlElement(Node* startNode)
+{
+    Node* node = startNode;
+    while (node) {
+        if (node->isElementNode() && static_cast<Element*>(node)->isFormControlElement())
+            return true;
+        node = node->parentNode();
+    }
+    return false;
+}
+#endif
+
+
 // --------
 
 TextIterator::TextIterator()
@@ -258,6 +272,10 @@ TextIterator::TextIterator()
     , m_handledFirstLetter(false)
     , m_ignoresStyleVisibility(false)
     , m_emitsObjectReplacementCharacters(false)
+#if OS(ANDROID)
+    , m_stopsOnFormControls(false)
+    , m_shouldStop(false)
+#endif
 {
 }
 
@@ -277,6 +295,10 @@ TextIterator::TextIterator(const Range* r, TextIteratorBehavior behavior)
     , m_handledFirstLetter(false)
     , m_ignoresStyleVisibility(behavior & TextIteratorIgnoresStyleVisibility)
     , m_emitsObjectReplacementCharacters(behavior & TextIteratorEmitsObjectReplacementCharacters)
+#if OS(ANDROID)
+    , m_stopsOnFormControls(behavior & TextIteratorStopsOnFormControls)
+    , m_shouldStop(false)
+#endif
 {
     if (!r)
         return;
@@ -334,8 +356,21 @@ TextIterator::~TextIterator()
 {
 }
 
+bool TextIterator::atEnd() const
+{
+#if OS(ANDROID)
+    return !m_positionNode || m_shouldStop;
+#else
+    return !m_positionNode;
+#endif
+}
+
 void TextIterator::advance()
 {
+#if OS(ANDROID)
+    if (m_shouldStop)
+        return;
+#endif
     // reset the run information
     m_positionNode = 0;
     m_textLength = 0;
@@ -368,6 +403,10 @@ void TextIterator::advance()
     }
 
     while (m_node && m_node != m_pastEndNode) {
+#if OS(ANDROID)
+        if (!m_shouldStop && m_stopsOnFormControls && checkFormControlElement(m_node))
+            m_shouldStop = true;
+#endif
         // if the range ends at offset 0 of an element, represent the
         // position, but not the content, of that element e.g. if the
         // node is a blockflow element, emit a newline that
@@ -1034,6 +1073,10 @@ SimplifiedBackwardsTextIterator::SimplifiedBackwardsTextIterator()
     : m_behavior(TextIteratorDefaultBehavior)
     , m_node(0)
     , m_positionNode(0)
+#if OS(ANDROID)
+    , m_stopsOnFormControls(false)
+    , m_shouldStop(false)
+#endif
 {
 }
 
@@ -1041,8 +1084,16 @@ SimplifiedBackwardsTextIterator::SimplifiedBackwardsTextIterator(const Range* r,
     : m_behavior(behavior)
     , m_node(0)
     , m_positionNode(0)
+#if OS(ANDROID)
+    , m_stopsOnFormControls(behavior & TextIteratorStopsOnFormControls)
+    , m_shouldStop(false)
+#endif
 {
+#if OS(ANDROID)
+    ASSERT(m_behavior == TextIteratorDefaultBehavior || m_behavior == TextIteratorStopsOnFormControls);
+#else
     ASSERT(m_behavior == TextIteratorDefaultBehavior);
+#endif
 
     if (!r)
         return;
@@ -1091,10 +1142,30 @@ SimplifiedBackwardsTextIterator::SimplifiedBackwardsTextIterator(const Range* r,
     advance();
 }
 
+bool SimplifiedBackwardsTextIterator::atEnd() const
+{
+#if OS(ANDROID)
+    return !m_positionNode || m_shouldStop;
+#else
+    return !m_positionNode;
+#endif
+}
+
 void SimplifiedBackwardsTextIterator::advance()
 {
     ASSERT(m_positionNode);
 
+#if OS(ANDROID)
+    if (m_shouldStop)
+        return;
+
+    // Prevent changing the iterator position if a form control element was found and advance should stop on it.
+    if (m_stopsOnFormControls && checkFormControlElement(m_node)) {
+        m_shouldStop = true;
+        return;
+    }
+#endif
+
     m_positionNode = 0;
     m_textLength = 0;
 
diff --git a/Source/WebCore/editing/TextIterator.h b/Source/WebCore/editing/TextIterator.h
index 9fe4ceb..c4fc264 100644
--- a/Source/WebCore/editing/TextIterator.h
+++ b/Source/WebCore/editing/TextIterator.h
@@ -42,7 +42,10 @@ enum TextIteratorBehavior {
     TextIteratorEntersTextControls = 1 << 1,
     TextIteratorEmitsTextsWithoutTranscoding = 1 << 2,
     TextIteratorIgnoresStyleVisibility = 1 << 3,
-    TextIteratorEmitsObjectReplacementCharacters = 1 << 4
+    TextIteratorEmitsObjectReplacementCharacters = 1 << 4,
+#if OS(ANDROID)
+    TextIteratorStopsOnFormControls = 1 << 6
+#endif
 };
     
 // FIXME: Can't really answer this question correctly without knowing the white-space mode.
@@ -88,7 +91,7 @@ public:
     ~TextIterator();
     explicit TextIterator(const Range*, TextIteratorBehavior = TextIteratorDefaultBehavior);
 
-    bool atEnd() const { return !m_positionNode; }
+    bool atEnd() const;
     void advance();
     
     int length() const { return m_textLength; }
@@ -182,6 +185,12 @@ private:
     bool m_ignoresStyleVisibility;
     // Used when emitting the special 0xFFFC character is required.
     bool m_emitsObjectReplacementCharacters;
+#if OS(ANDROID)
+    // Used when the iteration should stop if form controls are reached.
+    bool m_stopsOnFormControls;
+    // Used when m_stopsOnFormControls is set to determine if the iterator should keep advancing.
+    bool m_shouldStop;
+#endif
 };
 
 // Iterates through the DOM range, returning all the text, and 0-length boundaries
@@ -192,7 +201,7 @@ public:
     SimplifiedBackwardsTextIterator();
     explicit SimplifiedBackwardsTextIterator(const Range*, TextIteratorBehavior = TextIteratorDefaultBehavior);
     
-    bool atEnd() const { return !m_positionNode; }
+    bool atEnd() const;
     void advance();
     
     int length() const { return m_textLength; }
@@ -240,6 +249,13 @@ private:
 
     // Whether m_node has advanced beyond the iteration range (i.e. m_startNode).
     bool m_havePassedStartNode;
+
+#if OS(ANDROID)
+    // Used when the iteration should stop if form controls are reached.
+    bool m_stopsOnFormControls;
+    // Used when m_stopsOnFormControls is set to determine if the iterator should keep advancing.
+    bool m_shouldStop;
+#endif
 };
 
 // Builds on the text iterator, adding a character position so we can walk one