Changeset 167148 in webkit

Timestamp:

Apr 11, 2014 2:09:13 PM (10 years ago)

Author:

beidson@apple.com

Message:

Aggregate multiple "respondToChangedSelection" calls to one scan for telephone numbers
​https://bugs.webkit.org/show_bug.cgi?id=131559

Reviewed by Gavin Barraclough.

No new tests (Perf-only change to an untested feature)

• editing/Editor.cpp:

(WebCore::Editor::Editor):
(WebCore::Editor::respondToChangedSelection): Start a one shot timer for scanSelectionForTelephoneNumbers

instead of scanning synchronously.

(WebCore::Editor::scanSelectionForTelephoneNumbers):

• editing/Editor.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-11  Brady Eidson  <beidson@apple.com>
+
+        Aggregate multiple "respondToChangedSelection" calls to one scan for telephone numbers
+        https://bugs.webkit.org/show_bug.cgi?id=131559
+
+        Reviewed by Gavin Barraclough.
+
+        No new tests (Perf-only change to an untested feature)
+
+        * editing/Editor.cpp:
+        (WebCore::Editor::Editor):
+        (WebCore::Editor::respondToChangedSelection): Start a one shot timer for scanSelectionForTelephoneNumbers
+          instead of scanning synchronously.
+        (WebCore::Editor::scanSelectionForTelephoneNumbers):
+        * editing/Editor.h:
+
 2014-04-11  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/editing/Editor.cpp

@@ -1153 +1153 @@
     , m_editorUIUpdateTimerShouldCheckSpellingAndGrammar(false)
     , m_editorUIUpdateTimerWasTriggeredByDictation(false)
+#if ENABLE(TELEPHONE_NUMBER_DETECTION) && !PLATFORM(IOS)
+    , m_telephoneNumberDetectionUpdateTimer(this, &Editor::scanSelectionForTelephoneNumbers)
+#endif
 {
 }
@@ -3319 +3322 @@
 
 #if ENABLE(TELEPHONE_NUMBER_DETECTION) && !PLATFORM(IOS)
-    Vector<RefPtr<Range>> markedRanges;
-    scanSelectionForTelephoneNumbers(markedRanges);
-    if (client())
-        client()->selectedTelephoneNumberRangesChanged(markedRanges);
+    m_telephoneNumberDetectionUpdateTimer.startOneShot(0);
 #endif
 
@@ -3338 +3338 @@
 
 #if ENABLE(TELEPHONE_NUMBER_DETECTION) && !PLATFORM(IOS)
-void Editor::scanSelectionForTelephoneNumbers(Vector<RefPtr<Range>>& markedRanges)
+void Editor::scanSelectionForTelephoneNumbers(Timer<Editor>&)
 {
     if (!TelephoneNumberDetector::isSupported())
@@ -3348 +3348 @@
     clearDataDetectedTelephoneNumbers();
 
+    Vector<RefPtr<Range>> markedRanges;
+
     RefPtr<Range> selectedRange = m_frame.selection().toNormalizedRange();
-    if (!selectedRange || (selectedRange->startContainer() == selectedRange->endContainer() && selectedRange->startOffset() == selectedRange->endOffset()))
-        return;
+    if (!selectedRange || (selectedRange->startContainer() == selectedRange->endContainer() && selectedRange->startOffset() == selectedRange->endOffset())) {
+        if (client())
+            client()->selectedTelephoneNumberRangesChanged(markedRanges);
+        return;
+    }
 
     // FIXME: This won't work if a phone number spans multiple chunks of text from the perspective of the TextIterator
@@ -3361 +3366 @@
         scanRangeForTelephoneNumbers(*textChunk.range(), textChunk.text(), markedRanges);
     }
+
+    if (client())
+        client()->selectedTelephoneNumberRangesChanged(markedRanges);
 }
 

trunk/Source/WebCore/editing/Editor.h

@@ -474 +474 @@
     bool unifiedTextCheckerEnabled() const;
 
-#if ENABLE(TELEPHONE_NUMBER_DETECTION) && !PLATFORM(IOS)
-    void scanSelectionForTelephoneNumbers(Vector<RefPtr<Range>>& markedRanges);
-    void scanRangeForTelephoneNumbers(Range&, const StringView&, Vector<RefPtr<Range>>& markedRanges);
-    void clearDataDetectedTelephoneNumbers();
-#endif
-
 #if PLATFORM(COCOA)
     PassRefPtr<SharedBuffer> selectionInWebArchiveFormat();
@@ -512 +506 @@
     bool m_editorUIUpdateTimerShouldCheckSpellingAndGrammar;
     bool m_editorUIUpdateTimerWasTriggeredByDictation;
+
+#if ENABLE(TELEPHONE_NUMBER_DETECTION) && !PLATFORM(IOS)
+    void scanSelectionForTelephoneNumbers(Timer<Editor>&);
+    void scanRangeForTelephoneNumbers(Range&, const StringView&, Vector<RefPtr<Range>>& markedRanges);
+    void clearDataDetectedTelephoneNumbers();
+
+    Timer<Editor> m_telephoneNumberDetectionUpdateTimer;
+#endif
 };