Changeset 75098 in webkit

Timestamp:

Jan 5, 2011 1:22: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 Sam Weinig.

Handle smart insert/delete
​https://bugs.webkit.org/show_bug.cgi?id=51946

• Shared/WebPageCreationParameters.cpp: (WebKit::WebPageCreationParameters::encode): (WebKit::WebPageCreationParameters::decode):
• Shared/WebPageCreationParameters.h: Add isSmartInsertDelete enabled.

• UIProcess/API/mac/WKView.mm: (-[WKView validateUserInterfaceItem:]): Handle toggleSmartInsertDelete:.

(-[WKView toggleSmartInsertDelete:]):
Toggle the smart insert/delete state.

• UIProcess/TextChecker.h: Add isSmartInsertDeleteEnabled and setSmartInsertDeleteEnabled.

• UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::WebPageProxy): Initialize m_isSmartInsertDeleteEnabled.

(WebKit::WebPageProxy::contextMenuItemSelected):
Handle ContextMenuItemTagSmartCopyPaste.

(WebKit::WebPageProxy::setSmartInsertDeleteEnabled):
Update the state and send a SetSmartInsertDeleteEnabled message.

(WebKit::WebPageProxy::creationParameters):
Initialize isSmartInsertDeleteEnabled.

• UIProcess/WebPageProxy.h: (WebKit::WebPageProxy::isSmartInsertDeleteEnabled): Return m_isSmartInsertDeleteEnabled.

• UIProcess/mac/TextCheckerMac.mm: (WebKit::TextChecker::isSmartInsertDeleteEnabled): (WebKit::TextChecker::setSmartInsertDeleteEnabled): Store and fetch the smart insert delete state.

• WebProcess/WebCoreSupport/WebEditorClient.cpp: (WebKit::WebEditorClient::smartInsertDeleteEnabled): Call WebPage::isSmartInsertDeleteEnabled.

• WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm: (WebKit::WebEditorClient::toggleSmartInsertDelete): Assert that this is never called.

• WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::WebPage): Initialize m_isSmartInsertDeleteEnabled

• WebProcess/WebPage/WebPage.h: (WebKit::WebPage::isSmartInsertDeleteEnabled): (WebKit::WebPage::setSmartInsertDeleteEnabled): Add getter and setter.

• WebProcess/WebPage/WebPage.messages.in: Add SetSmartInsertDeleteEnabled message.

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/WebPageCreationParameters.cpp (modified) (2 diffs)
• Shared/WebPageCreationParameters.h (modified) (1 diff)
• UIProcess/API/mac/WKView.mm (modified) (2 diffs)
• UIProcess/TextChecker.h (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (4 diffs)
• UIProcess/WebPageProxy.h (modified) (2 diffs)
• UIProcess/mac/TextCheckerMac.mm (modified) (2 diffs)
• WebProcess/WebCoreSupport/WebEditorClient.cpp (modified) (1 diff)
• WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm (modified) (5 diffs)
• WebProcess/WebPage/WebPage.cpp (modified) (1 diff)
• WebProcess/WebPage/WebPage.h (modified) (3 diffs)
• WebProcess/WebPage/WebPage.messages.in (modified) (1 diff)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2011-01-05  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Handle smart insert/delete
+        https://bugs.webkit.org/show_bug.cgi?id=51946
+
+        * Shared/WebPageCreationParameters.cpp:
+        (WebKit::WebPageCreationParameters::encode):
+        (WebKit::WebPageCreationParameters::decode):
+        * Shared/WebPageCreationParameters.h:
+        Add isSmartInsertDelete enabled.
+
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView validateUserInterfaceItem:]):
+        Handle toggleSmartInsertDelete:.
+
+        (-[WKView toggleSmartInsertDelete:]):
+        Toggle the smart insert/delete state.
+
+        * UIProcess/TextChecker.h:
+        Add isSmartInsertDeleteEnabled and setSmartInsertDeleteEnabled.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::WebPageProxy):
+        Initialize m_isSmartInsertDeleteEnabled.
+
+        (WebKit::WebPageProxy::contextMenuItemSelected):
+        Handle ContextMenuItemTagSmartCopyPaste.
+
+        (WebKit::WebPageProxy::setSmartInsertDeleteEnabled):
+        Update the state and send a SetSmartInsertDeleteEnabled message.
+
+        (WebKit::WebPageProxy::creationParameters):
+        Initialize isSmartInsertDeleteEnabled.
+
+        * UIProcess/WebPageProxy.h:
+        (WebKit::WebPageProxy::isSmartInsertDeleteEnabled):
+        Return m_isSmartInsertDeleteEnabled.
+
+        * UIProcess/mac/TextCheckerMac.mm:
+        (WebKit::TextChecker::isSmartInsertDeleteEnabled):
+        (WebKit::TextChecker::setSmartInsertDeleteEnabled):
+        Store and fetch the smart insert delete state.
+
+        * WebProcess/WebCoreSupport/WebEditorClient.cpp:
+        (WebKit::WebEditorClient::smartInsertDeleteEnabled):
+        Call WebPage::isSmartInsertDeleteEnabled.
+
+        * WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm:
+        (WebKit::WebEditorClient::toggleSmartInsertDelete):
+        Assert that this is never called.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::WebPage):
+        Initialize m_isSmartInsertDeleteEnabled
+
+        * WebProcess/WebPage/WebPage.h:
+        (WebKit::WebPage::isSmartInsertDeleteEnabled):
+        (WebKit::WebPage::setSmartInsertDeleteEnabled):
+        Add getter and setter.
+
+        * WebProcess/WebPage/WebPage.messages.in:
+        Add SetSmartInsertDeleteEnabled message.
+
 2011-01-05  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKit2/Shared/WebPageCreationParameters.cpp

@@ -40 +40 @@
     encoder->encode(userAgent);
 
+#if PLATFORM(MAC)
+    encoder->encode(isSmartInsertDeleteEnabled);
+#endif
+
 #if PLATFORM(WIN)
     encoder->encode(reinterpret_cast<uint64_t>(nativeWindow));
@@ -61 +65 @@
     if (!decoder->decode(parameters.userAgent))
         return false;
+#if PLATFORM(MAC)
+    if (!decoder->decode(parameters.isSmartInsertDeleteEnabled))
+        return false;
+#endif
 
 #if PLATFORM(WIN)

trunk/WebKit2/Shared/WebPageCreationParameters.h

@@ -54 +54 @@
     String userAgent;
 
+#if PLATFORM(MAC)
+    bool isSmartInsertDeleteEnabled;
+#endif
 #if PLATFORM(WIN)
     HWND nativeWindow;

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

@@ -388 +388 @@
     }
 
+    if (action == @selector(toggleSmartInsertDelete:)) {
+        bool checked = _data->_page->isSmartInsertDeleteEnabled();
+        [menuItem(item) setState:checked ? NSOnState : NSOffState];
+        return _data->_page->selectionState().isContentEditable;
+    }
+
     if (action == @selector(toggleAutomaticQuoteSubstitution:)) {
         bool checked = TextChecker::state().isAutomaticQuoteSubstitutionEnabled;
@@ -535 +541 @@
     }
     [substitutionsPanel orderFront:sender];
+}
+
+- (IBAction)toggleSmartInsertDelete:(id)sender
+{
+    _data->_page->setSmartInsertDeleteEnabled(!_data->_page->isSmartInsertDeleteEnabled());
 }
 

trunk/WebKit2/UIProcess/TextChecker.h

@@ -47 +47 @@
     static void setAutomaticLinkDetectionEnabled(bool);
     static void setAutomaticTextReplacementEnabled(bool);
+
+    static bool isSmartInsertDeleteEnabled();
+    static void setSmartInsertDeleteEnabled(bool);
 #endif
 

trunk/WebKit2/UIProcess/WebPageProxy.cpp

@@ -114 +114 @@
     , m_processingMouseMoveEvent(false)
     , m_pageID(pageID)
+#if PLATFORM(MAC)
+    , m_isSmartInsertDeleteEnabled(TextChecker::isSmartInsertDeleteEnabled())
+#endif
     , m_spellDocumentTag(0)
     , m_hasSpellDocumentTag(false)
@@ -1709 +1712 @@
 
 #if PLATFORM(MAC)
+    if (item.action() == ContextMenuItemTagSmartCopyPaste) {
+        setSmartInsertDeleteEnabled(!isSmartInsertDeleteEnabled());
+        return;
+    }
     if (item.action() == ContextMenuItemTagSmartQuotes) {
         TextChecker::setAutomaticQuoteSubstitutionEnabled(!TextChecker::state().isAutomaticQuoteSubstitutionEnabled);
@@ -1797 +1804 @@
 {
     process()->send(Messages::WebPage::CapitalizeWord(), m_pageID);
+}
+
+void WebPageProxy::setSmartInsertDeleteEnabled(bool isSmartInsertDeleteEnabled)
+{ 
+    if (m_isSmartInsertDeleteEnabled == isSmartInsertDeleteEnabled)
+        return;
+
+    TextChecker::setSmartInsertDeleteEnabled(isSmartInsertDeleteEnabled);
+    m_isSmartInsertDeleteEnabled = isSmartInsertDeleteEnabled;
+    process()->send(Messages::WebPage::SetSmartInsertDeleteEnabled(isSmartInsertDeleteEnabled), m_pageID);
 }
 #endif
@@ -2079 +2096 @@
     parameters.userAgent = userAgent();
 
+#if PLATFORM(MAC)
+    parameters.isSmartInsertDeleteEnabled = m_isSmartInsertDeleteEnabled;
+#endif
+
 #if PLATFORM(WIN)
     parameters.nativeWindow = m_pageClient->nativeWindow();

trunk/WebKit2/UIProcess/WebPageProxy.h

@@ -308 +308 @@
     void lowercaseWord();
     void capitalizeWord();
+
+    bool isSmartInsertDeleteEnabled() const { return m_isSmartInsertDeleteEnabled; }
+    void setSmartInsertDeleteEnabled(bool);
 #endif
 
@@ -550 +553 @@
     uint64_t m_pageID;
 
+#if PLATFORM(MAC)
+    bool m_isSmartInsertDeleteEnabled;
+#endif
+
     int64_t m_spellDocumentTag;
     bool m_hasSpellDocumentTag;

trunk/WebKit2/UIProcess/mac/TextCheckerMac.mm

@@ -36 +36 @@
 static const NSString * const WebContinuousSpellCheckingEnabled = @"WebContinuousSpellCheckingEnabled";
 static const NSString * const WebGrammarCheckingEnabled = @"WebGrammarCheckingEnabled";
+static const NSString * const WebSmartInsertDeleteEnabled = @"WebSmartInsertDeleteEnabled";
 static const NSString * const WebAutomaticQuoteSubstitutionEnabled = @"WebAutomaticQuoteSubstitutionEnabled";
 static const NSString * const WebAutomaticDashSubstitutionEnabled = @"WebAutomaticDashSubstitutionEnabled";
@@ -167 +168 @@
 
     [[NSSpellChecker sharedSpellChecker] updatePanels];
+}
+
+static bool smartInsertDeleteEnabled;
+    
+bool TextChecker::isSmartInsertDeleteEnabled()
+{
+    static bool readSmartInsertDeleteEnabledDefault;
+
+    if (!readSmartInsertDeleteEnabledDefault) {
+        smartInsertDeleteEnabled = [[NSUserDefaults standardUserDefaults] boolForKey:WebSmartInsertDeleteEnabled];
+
+        readSmartInsertDeleteEnabledDefault = true;
+    }
+
+    return smartInsertDeleteEnabled;
+}
+
+void TextChecker::setSmartInsertDeleteEnabled(bool flag)
+{
+    if (flag == isSmartInsertDeleteEnabled())
+        return;
+
+    smartInsertDeleteEnabled = flag;
+
+    [[NSUserDefaults standardUserDefaults] setBool:flag forKey:WebSmartInsertDeleteEnabled];
 }
 

trunk/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp

@@ -71 +71 @@
 bool WebEditorClient::smartInsertDeleteEnabled()
 {
-    notImplemented();
+    // FIXME: Why isn't this Mac specific like toggleSmartInsertDeleteEnabled?
+#if PLATFORM(MAC)
+    return m_page->isSmartInsertDeleteEnabled();
+#else
     return true;
+#endif
 }
  

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

@@ -171 +171 @@
 void WebEditorClient::toggleSmartInsertDelete()
 {
-    notImplemented();
+    // This is handled in the UI process.
+    ASSERT_NOT_REACHED();
 }
 
@@ -181 +182 @@
 void WebEditorClient::toggleAutomaticQuoteSubstitution()
 {
-    // This should be handled in the UI process.
+    // This is handled in the UI process.
     ASSERT_NOT_REACHED();
 }
@@ -192 +193 @@
 void WebEditorClient::toggleAutomaticLinkDetection()
 {
-    // This should be handled in the UI process.
+    // This is handled in the UI process.
     ASSERT_NOT_REACHED();
 }
@@ -203 +204 @@
 void WebEditorClient::toggleAutomaticDashSubstitution()
 {
-    // This should be handled in the UI process.
+    // This is handled in the UI process.
     ASSERT_NOT_REACHED();
 }
@@ -214 +215 @@
 void WebEditorClient::toggleAutomaticTextReplacement()
 {
-    // This should be handled in the UI process.
+    // This is handled in the UI process.
     ASSERT_NOT_REACHED();
 }

trunk/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -131 +131 @@
 #if PLATFORM(MAC)
     , m_windowIsVisible(false)
+    , m_isSmartInsertDeleteEnabled(parameters.isSmartInsertDeleteEnabled)
 #elif PLATFORM(WIN)
     , m_nativeWindow(parameters.nativeWindow)

trunk/WebKit2/WebProcess/WebPage/WebPage.h

@@ -287 +287 @@
     void speak(const String&);
     void stopSpeaking();
+
+    bool isSmartInsertDeleteEnabled() const { return m_isSmartInsertDeleteEnabled; }
 #endif
 
@@ -385 +387 @@
     void lowercaseWord();
     void capitalizeWord();
+
+    void setSmartInsertDeleteEnabled(bool isSmartInsertDeleteEnabled) { m_isSmartInsertDeleteEnabled = isSmartInsertDeleteEnabled; }
 #endif
 
@@ -413 +417 @@
     // Whether the containing window is visible or not.
     bool m_windowIsVisible;
+
+    // Whether smart insert/delete is enabled or not.
+    bool m_isSmartInsertDeleteEnabled;
 
     // The frame of the containing window in screen coordinates.

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

@@ -110 +110 @@
     LowercaseWord();
     CapitalizeWord();
+
+    SetSmartInsertDeleteEnabled(bool isSmartInsertDeleteEnabled);
 #endif