Changeset 181072 in webkit

Timestamp:

Mar 5, 2015 12:56:22 AM (9 years ago)

Author:

g.czajkowski@samsung.com

Message:

TextCheckingParagraph::isEmpty() is sufficient to check whether paragraph is empty
​https://bugs.webkit.org/show_bug.cgi?id=142276

Reviewed by Darin Adler.

TextCheckingParagraph::isEmpty() already calls TextCheckingParagraph::isRangeEmpty().
There is no need to call them both at the caller site.

No new tests. No behavior change.

• editing/Editor.cpp:

(WebCore::Editor::markAllMisspellingsAndBadGrammarInRanges):
Update caller site.

• editing/TextCheckingHelper.cpp:

(WebCore::TextCheckingParagraph::isEmpty):
Avoid using helepers here to get rid of them as they are
no longer needed outside TextCheckingParagraph.

• editing/TextCheckingHelper.h:

(WebCore::TextCheckingParagraph::isTextEmpty): Deleted.
(WebCore::TextCheckingParagraph::isRangeEmpty): Deleted.
Do not expose isTextEmpty() and isRangeEmpty().

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-05  Grzegorz Czajkowski  <g.czajkowski@samsung.com>
+
+        TextCheckingParagraph::isEmpty() is sufficient to check whether paragraph is empty
+        https://bugs.webkit.org/show_bug.cgi?id=142276
+
+        Reviewed by Darin Adler.
+
+        TextCheckingParagraph::isEmpty() already calls TextCheckingParagraph::isRangeEmpty().
+        There is no need to call them both at the caller site.
+
+        No new tests. No behavior change.
+
+        * editing/Editor.cpp:
+        (WebCore::Editor::markAllMisspellingsAndBadGrammarInRanges):
+        Update caller site.
+
+        * editing/TextCheckingHelper.cpp:
+        (WebCore::TextCheckingParagraph::isEmpty):
+        Avoid using helepers here to get rid of them as they are
+        no longer needed outside TextCheckingParagraph.
+
+        * editing/TextCheckingHelper.h:
+        (WebCore::TextCheckingParagraph::isTextEmpty): Deleted.
+        (WebCore::TextCheckingParagraph::isRangeEmpty): Deleted.
+        Do not expose isTextEmpty() and isRangeEmpty().
+
 2015-03-04  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/editing/Editor.cpp

@@ -2353 +2353 @@
     Range* rangeToCheck = shouldMarkGrammar ? grammarRange : spellingRange;
     TextCheckingParagraph paragraphToCheck(rangeToCheck);
-    if (paragraphToCheck.isRangeEmpty() || paragraphToCheck.isEmpty())
+    if (paragraphToCheck.isEmpty())
         return;
     RefPtr<Range> paragraphRange = paragraphToCheck.paragraphRange();

trunk/Source/WebCore/editing/TextCheckingHelper.cpp

@@ -185 +185 @@
     // Both predicates should have same result, but we check both just for sure.
     // We need to investigate to remove this redundancy.
-    return isRangeEmpty() || isTextEmpty();
+    return checkingStart() >= checkingEnd() || text().isEmpty();
 }
 

trunk/Source/WebCore/editing/TextCheckingHelper.h

@@ -51 +51 @@
     String textSubstring(unsigned pos, unsigned len = UINT_MAX) const { return text().substring(pos, len); }
     UChar textCharAt(int index) const { return text()[static_cast<unsigned>(index)]; }
-    bool isTextEmpty() const { return text().isEmpty(); }
 
     bool isEmpty() const;
-    bool isRangeEmpty() const { return checkingStart() >= checkingEnd(); }
 
     int checkingStart() const;