Changeset 167542 in webkit

Timestamp:

Apr 19, 2014 12:47:27 PM (10 years ago)

Author:

Darin Adler

Message:

Telephone number detection should respect its setting consistently
​https://bugs.webkit.org/show_bug.cgi?id=131893
rdar://problem/16597639

Reviewed by Tim Horton.

• editing/Editor.cpp:

(WebCore::Editor::respondToChangedSelection): Only start the timer
if shouldDetectTelephoneNumbers returns true.
(WebCore::Editor::shouldDetectTelephoneNumbers): Added. Calls both
isTelephoneNumberParsingEnabled and TelephoneNumberDetector::isSupported.
(WebCore::Editor::scanSelectionForTelephoneNumbers): Use
shouldDetectTelephoneNumbers.
(WebCore::Editor::clearDataDetectedTelephoneNumbers): Use document()
instead of m_frame.document().

• editing/Editor.h: Added declaration of shouldDetectTelephoneNumbers.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/Editor.cpp (modified) (3 diffs)
• editing/Editor.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-19  Darin Adler  <darin@apple.com>
+
+        Telephone number detection should respect its setting consistently
+        https://bugs.webkit.org/show_bug.cgi?id=131893
+        rdar://problem/16597639
+
+        Reviewed by Tim Horton.
+
+        * editing/Editor.cpp:
+        (WebCore::Editor::respondToChangedSelection): Only start the timer
+        if shouldDetectTelephoneNumbers returns true.
+        (WebCore::Editor::shouldDetectTelephoneNumbers): Added. Calls both
+        isTelephoneNumberParsingEnabled and TelephoneNumberDetector::isSupported.
+        (WebCore::Editor::scanSelectionForTelephoneNumbers): Use
+        shouldDetectTelephoneNumbers.
+        (WebCore::Editor::clearDataDetectedTelephoneNumbers): Use document()
+        instead of m_frame.document().
+
+        * editing/Editor.h: Added declaration of shouldDetectTelephoneNumbers.
+
 2014-04-19  Andrei Bucur  <abucur@adobe.com>
 

trunk/Source/WebCore/editing/Editor.cpp

@@ -3325 +3325 @@
 
 #if ENABLE(TELEPHONE_NUMBER_DETECTION) && !PLATFORM(IOS)
-    m_telephoneNumberDetectionUpdateTimer.startOneShot(0);
+    if (shouldDetectTelephoneNumbers())
+        m_telephoneNumberDetectionUpdateTimer.startOneShot(0);
 #endif
 
@@ -3341 +3342 @@
 
 #if ENABLE(TELEPHONE_NUMBER_DETECTION) && !PLATFORM(IOS)
+
+bool Editor::shouldDetectTelephoneNumbers()
+{
+    if (!m_frame.document())
+        return false;
+    return document().isTelephoneNumberParsingEnabled() && TelephoneNumberDetector::isSupported();
+}
+
 void Editor::scanSelectionForTelephoneNumbers(Timer<Editor>&)
 {
-    if (!TelephoneNumberDetector::isSupported())
-        return;
-
-    if (!m_frame.document())
-        return;
-
-    clearDataDetectedTelephoneNumbers();
+    if (!shouldDetectTelephoneNumbers())
+        return;
 
     Vector<RefPtr<Range>> markedRanges;
@@ -3410 +3414 @@
 void Editor::clearDataDetectedTelephoneNumbers()
 {
-    m_frame.document()->markers().removeMarkers(DocumentMarker::TelephoneNumber);
+    document().markers().removeMarkers(DocumentMarker::TelephoneNumber);
 
     // FIXME: Do other UI cleanup here once we have other UI.
 }
+
 #endif // ENABLE(TELEPHONE_NUMBER_DETECTION) && !PLATFORM(IOS)
 

trunk/Source/WebCore/editing/Editor.h

@@ -508 +508 @@
 
 #if ENABLE(TELEPHONE_NUMBER_DETECTION) && !PLATFORM(IOS)
+    bool shouldDetectTelephoneNumbers();
     void scanSelectionForTelephoneNumbers(Timer<Editor>&);
     void scanRangeForTelephoneNumbers(Range&, const StringView&, Vector<RefPtr<Range>>& markedRanges);