Changeset 157146 in webkit

Timestamp:

Oct 8, 2013 4:49:16 PM (11 years ago)

Author:

weinig@apple.com

Message:

Consolidate findString functions
​https://bugs.webkit.org/show_bug.cgi?id=122480

Reviewed by Darin Adler.

../WebCore:

• editing/Editor.cpp:
• editing/Editor.h:
• editing/EditorCommand.cpp:

(WebCore::executeFindString):

• page/DOMWindow.cpp:

(WebCore::DOMWindow::find):

• page/Page.cpp:
• page/Page.h:

Fix a long standing FIXME.

../WebKit/efl:

• ewk/ewk_frame.cpp:

(ewk_frame_text_search):

• ewk/ewk_view.cpp:

(ewk_view_text_search):

../WebKit/gtk:

• webkit/webkitwebview.cpp:

(webkit_web_view_search_text):

../WebKit/win:

• WebView.cpp:

(WebView::searchFor):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/Editor.cpp (modified) (1 diff)
• WebCore/editing/Editor.h (modified) (1 diff)
• WebCore/editing/EditorCommand.cpp (modified) (1 diff)
• WebCore/page/DOMWindow.cpp (modified) (1 diff)
• WebCore/page/Page.cpp (modified) (1 diff)
• WebCore/page/Page.h (modified) (1 diff)
• WebKit/efl/ChangeLog (modified) (1 diff)
• WebKit/efl/ewk/ewk_frame.cpp (modified) (1 diff)
• WebKit/efl/ewk/ewk_view.cpp (modified) (1 diff)
• WebKit/gtk/ChangeLog (modified) (1 diff)
• WebKit/gtk/webkit/webkitwebview.cpp (modified) (1 diff)
• WebKit/win/ChangeLog (modified) (1 diff)
• WebKit/win/WebView.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-10-07  Sam Weinig  <sam@webkit.org>
+
+        Consolidate findString functions
+        https://bugs.webkit.org/show_bug.cgi?id=122480
+
+        Reviewed by Darin Adler.
+
+        * editing/Editor.cpp:
+        * editing/Editor.h:
+        * editing/EditorCommand.cpp:
+        (WebCore::executeFindString):
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::find):
+        * page/Page.cpp:
+        * page/Page.h:
+        Fix a long standing FIXME.
+
 2013-10-08  Bem Jones-Bey  <bjonesbe@adobe.com>
 

trunk/Source/WebCore/editing/Editor.cpp

@@ -2826 +2826 @@
 }
 
-// Searches from the beginning of the document if nothing is selected.
-bool Editor::findString(const String& target, bool forward, bool caseFlag, bool wrapFlag, bool startInSelection)
-{
-    FindOptions options = (forward ? 0 : Backwards) | (caseFlag ? 0 : CaseInsensitive) | (wrapFlag ? WrapAround : 0) | (startInSelection ? StartInSelection : 0);
-    return findString(target, options);
-}
-
 bool Editor::findString(const String& target, FindOptions options)
 {

trunk/Source/WebCore/editing/Editor.h

@@ -326 +326 @@
     String selectedTextForClipboard() const;
     bool findString(const String&, FindOptions);
-    // FIXME: Switch callers over to the FindOptions version and retire this one.
-    bool findString(const String&, bool forward, bool caseFlag, bool wrapFlag, bool startInSelection);
 
     PassRefPtr<Range> rangeOfString(const String&, Range*, FindOptions);

trunk/Source/WebCore/editing/EditorCommand.cpp

@@ -413 +413 @@
 static bool executeFindString(Frame& frame, Event*, EditorCommandSource, const String& value)
 {
-    return frame.editor().findString(value, true, false, true, false);
+    return frame.editor().findString(value, CaseInsensitive | WrapAround);
 }
 

trunk/Source/WebCore/page/DOMWindow.cpp

@@ -1099 +1099 @@
         return false;
 
-    // FIXME (13016): Support wholeWord, searchInFrames and showDialog
-    return m_frame->editor().findString(string, !backwards, caseSensitive, wrap, false);
+    // FIXME (13016): Support wholeWord, searchInFrames and showDialog.    
+    FindOptions options = (backwards ? Backwards : 0) | (caseSensitive ? 0 : CaseInsensitive) | (wrap ? WrapAround : 0);
+    return m_frame->editor().findString(string, options);
 }
 

trunk/Source/WebCore/page/Page.cpp

@@ -548 +548 @@
 }
 
-bool Page::findString(const String& target, TextCaseSensitivity caseSensitivity, FindDirection direction, bool shouldWrap)
-{
-    return findString(target, (caseSensitivity == TextCaseInsensitive ? CaseInsensitive : 0) | (direction == FindDirectionBackward ? Backwards : 0) | (shouldWrap ? WrapAround : 0));
-}
-
 bool Page::findString(const String& target, FindOptions options)
 {

trunk/Source/WebCore/page/Page.h

@@ -237 +237 @@
 
     bool findString(const String&, FindOptions);
-    // FIXME: Switch callers over to the FindOptions version and retire this one.
-    bool findString(const String&, TextCaseSensitivity, FindDirection, bool shouldWrap);
 
     PassRefPtr<Range> rangeOfString(const String&, Range*, FindOptions);

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2013-10-07  Sam Weinig  <sam@webkit.org>
+
+        Consolidate findString functions
+        https://bugs.webkit.org/show_bug.cgi?id=122480
+
+        Reviewed by Darin Adler.
+
+        * ewk/ewk_frame.cpp:
+        (ewk_frame_text_search):
+        * ewk/ewk_view.cpp:
+        (ewk_view_text_search):
+
 2013-10-07  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebKit/efl/ewk/ewk_frame.cpp

@@ -499 +499 @@
     EINA_SAFETY_ON_NULL_RETURN_VAL(text, false);
 
-    return smartData->frame->editor().findString(WTF::String::fromUTF8(text), forward, caseSensitive, wrap, true);
+    WebCore::FindOptions options = (caseSensitive ? 0 : WebCore::CaseInsensitive) | (forward ? 0 : WebCore::Backwards) | (wrap ? WebCore::WrapAround : 0) | WebCore::StartInSelection;
+    return smartData->frame->editor().findString(WTF::String::fromUTF8(text), options);
 }
 

trunk/Source/WebKit/efl/ewk/ewk_view.cpp

@@ -1497 +1497 @@
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false);
     EINA_SAFETY_ON_NULL_RETURN_VAL(string, false);
-    WTF::TextCaseSensitivity sensitive;
-    WebCore::FindDirection direction;
-
-    if (caseSensitive)
-        sensitive = WTF::TextCaseSensitive;
-    else
-        sensitive = WTF::TextCaseInsensitive;
-
-    if (forward)
-        direction = WebCore::FindDirectionForward;
-    else
-        direction = WebCore::FindDirectionBackward;
-
-    return priv->page->findString(String::fromUTF8(string), sensitive, direction, wrap);
+
+    WebCore::FindOptions options = (caseSensitive ? 0 : WebCore::CaseInsensitive) | (forward ? 0 : WebCore::Backwards) | (wrap ? WebCore::WrapAround : 0);
+    return priv->page->findString(String::fromUTF8(string), options);
 }
 

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2013-10-07  Sam Weinig  <sam@webkit.org>
+
+        Consolidate findString functions
+        https://bugs.webkit.org/show_bug.cgi?id=122480
+
+        Reviewed by Darin Adler.
+
+        * webkit/webkitwebview.cpp:
+        (webkit_web_view_search_text):
+
 2013-10-07  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp

@@ -4376 +4376 @@
     g_return_val_if_fail(string, FALSE);
 
-    TextCaseSensitivity caseSensitivity = caseSensitive ? TextCaseSensitive : TextCaseInsensitive;
-    FindDirection direction = forward ? FindDirectionForward : FindDirectionBackward;
-
-    return core(webView)->findString(String::fromUTF8(string), caseSensitivity, direction, shouldWrap);
+    FindOptions options = (caseSensitive ? 0 : CaseInsensitive) | (forward ? 0 : Backwards) | (shouldWrap ? WrapAround : 0);
+    return core(webView)->findString(String::fromUTF8(string), options);
 }
 

trunk/Source/WebKit/win/ChangeLog

@@ +1 @@
+2013-10-07  Sam Weinig  <sam@webkit.org>
+
+        Consolidate findString functions
+        https://bugs.webkit.org/show_bug.cgi?id=122480
+
+        Reviewed by Darin Adler.
+
+        * WebView.cpp:
+        (WebView::searchFor):
+
 2013-10-07  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebKit/win/WebView.cpp

@@ -3512 +3512 @@
         return E_INVALIDARG;
 
-    *found = m_page->findString(toString(str), caseFlag ? TextCaseSensitive : TextCaseInsensitive, forward ? FindDirectionForward : FindDirectionBackward, wrapFlag);
+    FindOptions options = (caseFlag ? 0 : CaseInsensitive) | (forward ? 0 : Backwards) | (wrapFlag ? WrapAround : 0);
+    *found = m_page->findString(toString(str), options);
     return S_OK;
 }