Changeset 75093 in webkit

Timestamp:

Jan 5, 2011 12:19:04 PM (13 years ago)

Author:

andersca@apple.com

Message:

2011-01-05 Anders Carlsson <​andersca@apple.com>

Reviewed by Adele Peterson.

Implement word transformation
​https://bugs.webkit.org/show_bug.cgi?id=51943

Export Editor functions needed by WebKit2.

• WebCore.exp.in:

2011-01-05 Anders Carlsson <​andersca@apple.com>

Reviewed by Adele Peterson.

Implement word transformation
​https://bugs.webkit.org/show_bug.cgi?id=51943

• UIProcess/API/mac/WKView.mm: (-[WKView validateUserInterfaceItem:]): Handle the word transformation selectors.

(-[WKView uppercaseWord:]):
(-[WKView lowercaseWord:]):
(-[WKView capitalizeWord:]):
Call down to the WebPageProxy.

• UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::uppercaseWord): (WebKit::WebPageProxy::lowercaseWord): (WebKit::WebPageProxy::capitalizeWord): Send messages to the WebPage.

• WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm: (WebKit::changeWordCase): Add helper function.

(WebKit::WebEditorClient::uppercaseWord):
(WebKit::WebEditorClient::lowercaseWord):
(WebKit::WebEditorClient::capitalizeWord):
Call helper function.

• WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::changeSpellingToWord): Call replaceSelectionWithText.

(WebKit::WebPage::uppercaseWord):
(WebKit::WebPage::lowercaseWord):
(WebKit::WebPage::capitalizeWord):
Call the editor functions.

(WebKit::WebPage::replaceSelectionWithText):
New helper function that replaces the selected string with another string.

• WebProcess/WebPage/WebPage.messages.in: Add new messages.

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/mac/WKView.mm (modified) (2 diffs)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)
• UIProcess/WebPageProxy.h (modified) (1 diff)
• WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm (modified) (2 diffs)
• WebProcess/WebPage/WebPage.cpp (modified) (3 diffs)
• WebProcess/WebPage/WebPage.h (modified) (2 diffs)
• WebProcess/WebPage/WebPage.messages.in (modified) (1 diff)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2011-01-05  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Adele Peterson.
+
+        Implement word transformation
+        https://bugs.webkit.org/show_bug.cgi?id=51943
+
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView validateUserInterfaceItem:]):
+        Handle the word transformation selectors.
+
+        (-[WKView uppercaseWord:]):
+        (-[WKView lowercaseWord:]):
+        (-[WKView capitalizeWord:]):
+        Call down to the WebPageProxy.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::uppercaseWord):
+        (WebKit::WebPageProxy::lowercaseWord):
+        (WebKit::WebPageProxy::capitalizeWord):
+        Send messages to the WebPage.
+
+        * WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm:
+        (WebKit::changeWordCase):
+        Add helper function.
+
+        (WebKit::WebEditorClient::uppercaseWord):
+        (WebKit::WebEditorClient::lowercaseWord):
+        (WebKit::WebEditorClient::capitalizeWord):
+        Call helper function.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::changeSpellingToWord):
+        Call replaceSelectionWithText.
+
+        (WebKit::WebPage::uppercaseWord):
+        (WebKit::WebPage::lowercaseWord):
+        (WebKit::WebPage::capitalizeWord):
+        Call the editor functions.
+
+        (WebKit::WebPage::replaceSelectionWithText):
+        New helper function that replaces the selected string with another string.
+
+        * WebProcess/WebPage/WebPage.messages.in:
+        Add new messages.
+
 2011-01-05  Alexey Proskuryakov  <ap@apple.com>
 

trunk/WebKit2/UIProcess/API/mac/WKView.mm

@@ -412 +412 @@
     }
 
+    if (action == @selector(uppercaseWord:) || action == @selector(lowercaseWord:) || action == @selector(capitalizeWord:))
+        return _data->_page->selectionState().selectedRangeLength && _data->_page->selectionState().isContentEditable;
+    
     if (action == @selector(stopSpeaking:))
         return [NSApp isSpeaking];
@@ -612 +615 @@
     TextChecker::setAutomaticTextReplacementEnabled(!TextChecker::state().isAutomaticTextReplacementEnabled);
     _data->_page->process()->updateTextCheckerState();
+}
+
+- (void)uppercaseWord:(id)sender
+{
+    _data->_page->uppercaseWord();
+}
+
+- (void)lowercaseWord:(id)sender
+{
+    _data->_page->lowercaseWord();
+}
+
+- (void)capitalizeWord:(id)sender
+{
+    _data->_page->capitalizeWord();
 }
 

trunk/WebKit2/UIProcess/WebPageProxy.cpp

@@ -1783 +1783 @@
 }
 
+#if PLATFORM(MAC)
+void WebPageProxy::uppercaseWord()
+{
+    process()->send(Messages::WebPage::UppercaseWord(), m_pageID);
+}
+
+void WebPageProxy::lowercaseWord()
+{
+    process()->send(Messages::WebPage::LowercaseWord(), m_pageID);
+}
+
+void WebPageProxy::capitalizeWord()
+{
+    process()->send(Messages::WebPage::CapitalizeWord(), m_pageID);
+}
+#endif
+
 void WebPageProxy::registerEditCommand(PassRefPtr<WebEditCommandProxy> commandProxy, UndoOrRedo undoOrRedo)
 {

trunk/WebKit2/UIProcess/WebPageProxy.h

@@ -304 +304 @@
     void unmarkAllMisspellings();
     void unmarkAllBadGrammar();
+#if PLATFORM(MAC)
+    void uppercaseWord();
+    void lowercaseWord();
+    void capitalizeWord();
+#endif
 
 private:

trunk/WebKit2/WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm

@@ -131 +131 @@
 #endif
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+static void changeWordCase(WebPage* page, SEL selector)
+{
+    Frame* frame = page->corePage()->focusController()->focusedOrMainFrame();
+    if (!frame->editor()->canEdit())
+        return;
+
+    frame->editor()->command("selectWord").execute();
+
+    NSString *selectedString = frame->displayStringModifiedByEncoding(frame->editor()->selectedText());
+    page->replaceSelectionWithText(frame, [selectedString performSelector:selector]);
+}
+
 void WebEditorClient::uppercaseWord()
 {
-    notImplemented();
+    changeWordCase(m_page, @selector(uppercaseString));
 }
 
 void WebEditorClient::lowercaseWord()
 {
-    notImplemented();
+    changeWordCase(m_page, @selector(lowercaseString));
 }
 
 void WebEditorClient::capitalizeWord()
 {
-    notImplemented();
+    changeWordCase(m_page, @selector(capitalizedString));
 }
 
@@ -222 +233 @@
     m_page->sendSync(Messages::WebPageProxy::CheckTextOfParagraph(String(text, length), checkingTypes), Messages::WebPageProxy::CheckTextOfParagraph::Reply(results));
 }
-#endif
 
 #if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)

trunk/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -1268 +1268 @@
 void WebPage::changeSpellingToWord(const String& word)
 {
-    Frame* frame = m_page->focusController()->focusedOrMainFrame();
-    if (frame->selection()->isNone())
-        return;
-
-    RefPtr<DocumentFragment> textFragment = createFragmentFromText(frame->selection()->toNormalizedRange().get(), word);
-    applyCommand(ReplaceSelectionCommand::create(frame->document(), textFragment.release(), true, false, true));
-    frame->selection()->revealSelection(ScrollAlignment::alignToEdgeIfNeeded);
+    replaceSelectionWithText(m_page->focusController()->focusedOrMainFrame(), word);
 }
 
@@ -1293 +1287 @@
 }
 
+void WebPage::uppercaseWord()
+{
+    m_page->focusController()->focusedOrMainFrame()->editor()->uppercaseWord();
+}
+
+void WebPage::lowercaseWord()
+{
+    m_page->focusController()->focusedOrMainFrame()->editor()->lowercaseWord();
+}
+
+void WebPage::capitalizeWord()
+{
+    m_page->focusController()->focusedOrMainFrame()->editor()->capitalizeWord();
+}
+    
 void WebPage::setTextForActivePopupMenu(int32_t index)
 {
@@ -1306 +1315 @@
     m_contextMenu->itemSelected(item);
     m_contextMenu = 0;
+}
+
+void WebPage::replaceSelectionWithText(Frame* frame, const String& text)
+{
+    if (frame->selection()->isNone())
+        return;
+    
+    RefPtr<DocumentFragment> textFragment = createFragmentFromText(frame->selection()->toNormalizedRange().get(), text);
+    applyCommand(ReplaceSelectionCommand::create(frame->document(), textFragment.release(), true, false, true));
+    frame->selection()->revealSelection(ScrollAlignment::alignToEdgeIfNeeded);
 }
 

trunk/WebKit2/WebProcess/WebPage/WebPage.h

@@ -289 +289 @@
 #endif
 
+    void replaceSelectionWithText(WebCore::Frame*, const String&);
+
 private:
     WebPage(uint64_t pageID, const WebPageCreationParameters&);
@@ -379 +381 @@
     void unmarkAllMisspellings();
     void unmarkAllBadGrammar();
+#if PLATFORM(MAC)
+    void uppercaseWord();
+    void lowercaseWord();
+    void capitalizeWord();
+#endif
 
 #if ENABLE(CONTEXT_MENUS)

trunk/WebKit2/WebProcess/WebPage/WebPage.messages.in

@@ -106 +106 @@
     UnmarkAllMisspellings()
     UnmarkAllBadGrammar()
+#if PLATFORM(MAC)
+    UppercaseWord();
+    LowercaseWord();
+    CapitalizeWord();
+#endif
 
     SetWindowResizerSize(WebCore::IntSize intersectsView)