Diff
Modified: trunk/Source/WebCore/ChangeLog (119686 => 119687)
--- trunk/Source/WebCore/ChangeLog 2012-06-07 06:14:31 UTC (rev 119686)
+++ trunk/Source/WebCore/ChangeLog 2012-06-07 06:20:18 UTC (rev 119687)
@@ -1,3 +1,21 @@
+2012-06-06 Andy Estes <[email protected]>
+
+ Wrap uppercaseWord, lowercaseWord, and capitalizeWord with USE(APPKIT)
+ https://bugs.webkit.org/show_bug.cgi?id=88504
+
+ Reviewed by Dan Bernstein.
+
+ uppercaseWord, lowercaseWord, and capitalizeWord are methods declared
+ by NSResponder that subclasses are expected to implement. WebKit should
+ only support these implementations on platforms that use AppKit.
+
+ * WebCore.exp.in:
+ * editing/Editor.cpp:
+ * editing/Editor.h:
+ * loader/EmptyClients.h:
+ * page/ContextMenuController.cpp:
+ * page/EditorClient.h:
+
2012-06-06 Sheriff Bot <[email protected]>
Unreviewed, rolling out r119683.
Modified: trunk/Source/WebCore/WebCore.exp.in (119686 => 119687)
--- trunk/Source/WebCore/WebCore.exp.in 2012-06-07 06:14:31 UTC (rev 119686)
+++ trunk/Source/WebCore/WebCore.exp.in 2012-06-07 06:20:18 UTC (rev 119687)
@@ -2121,7 +2121,7 @@
__ZN7WebCore23ApplicationCacheStorage5emptyEv
__ZNK7WebCore23ApplicationCacheStorage11maximumSizeEv
-#ifndef BUILDING_ON_LEOPARD
+#if USE(APPKIT)
__ZN7WebCore6Editor13lowercaseWordEv
__ZN7WebCore6Editor13uppercaseWordEv
__ZN7WebCore6Editor14capitalizeWordEv
Modified: trunk/Source/WebCore/editing/Editor.cpp (119686 => 119687)
--- trunk/Source/WebCore/editing/Editor.cpp 2012-06-07 06:14:31 UTC (rev 119686)
+++ trunk/Source/WebCore/editing/Editor.cpp 2012-06-07 06:20:18 UTC (rev 119687)
@@ -1116,7 +1116,7 @@
return client() ? client()->spellCheckerDocumentTag() : 0;
}
-#if PLATFORM(MAC)
+#if USE(APPKIT)
void Editor::uppercaseWord()
{
Modified: trunk/Source/WebCore/editing/Editor.h (119686 => 119687)
--- trunk/Source/WebCore/editing/Editor.h 2012-06-07 06:14:31 UTC (rev 119686)
+++ trunk/Source/WebCore/editing/Editor.h 2012-06-07 06:20:18 UTC (rev 119687)
@@ -233,7 +233,7 @@
void markMisspellingsAndBadGrammar(const VisibleSelection& spellingSelection, bool markGrammar, const VisibleSelection& grammarSelection);
void markAndReplaceFor(PassRefPtr<SpellCheckRequest>, const Vector<TextCheckingResult>&);
-#if PLATFORM(MAC)
+#if USE(APPKIT)
void uppercaseWord();
void lowercaseWord();
void capitalizeWord();
Modified: trunk/Source/WebCore/loader/EmptyClients.h (119686 => 119687)
--- trunk/Source/WebCore/loader/EmptyClients.h 2012-06-07 06:14:31 UTC (rev 119686)
+++ trunk/Source/WebCore/loader/EmptyClients.h 2012-06-07 06:20:18 UTC (rev 119687)
@@ -474,7 +474,7 @@
virtual NSURL* canonicalizeURLString(NSString*) { return 0; }
#endif
-#if PLATFORM(MAC)
+#if USE(APPKIT)
virtual void uppercaseWord() { }
virtual void lowercaseWord() { }
virtual void capitalizeWord() { }
Modified: trunk/Source/WebCore/page/ContextMenuController.cpp (119686 => 119687)
--- trunk/Source/WebCore/page/ContextMenuController.cpp 2012-06-07 06:14:31 UTC (rev 119686)
+++ trunk/Source/WebCore/page/ContextMenuController.cpp 2012-06-07 06:20:18 UTC (rev 119687)
@@ -436,7 +436,7 @@
frame->editor()->showColorPanel();
break;
#endif
-#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD)
+#if USE(APPKIT)
case ContextMenuItemTagMakeUpperCase:
frame->editor()->uppercaseWord();
break;
@@ -446,6 +446,8 @@
case ContextMenuItemTagCapitalize:
frame->editor()->capitalizeWord();
break;
+#endif
+#if PLATFORM(MAC)
case ContextMenuItemTagChangeBack:
frame->editor()->changeBackToReplacedString(m_hitTestResult.replacedString());
break;
Modified: trunk/Source/WebCore/page/EditorClient.h (119686 => 119687)
--- trunk/Source/WebCore/page/EditorClient.h 2012-06-07 06:14:31 UTC (rev 119686)
+++ trunk/Source/WebCore/page/EditorClient.h 2012-06-07 06:20:18 UTC (rev 119687)
@@ -122,7 +122,7 @@
virtual NSURL* canonicalizeURLString(NSString*) = 0;
#endif
-#if PLATFORM(MAC)
+#if USE(APPKIT)
virtual void uppercaseWord() = 0;
virtual void lowercaseWord() = 0;
virtual void capitalizeWord() = 0;
Modified: trunk/Source/WebKit/mac/ChangeLog (119686 => 119687)
--- trunk/Source/WebKit/mac/ChangeLog 2012-06-07 06:14:31 UTC (rev 119686)
+++ trunk/Source/WebKit/mac/ChangeLog 2012-06-07 06:20:18 UTC (rev 119687)
@@ -1,3 +1,17 @@
+2012-06-06 Andy Estes <[email protected]>
+
+ Wrap uppercaseWord, lowercaseWord, and capitalizeWord with USE(APPKIT)
+ https://bugs.webkit.org/show_bug.cgi?id=88504
+
+ Reviewed by Dan Bernstein.
+
+ uppercaseWord, lowercaseWord, and capitalizeWord are methods declared
+ by NSResponder that subclasses are expected to implement. WebKit should
+ only support these implementations on platforms that use AppKit.
+
+ * WebCoreSupport/WebEditorClient.h:
+ * WebCoreSupport/WebEditorClient.mm:
+
2012-06-05 Anders Carlsson <[email protected]>
Build fix.
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h (119686 => 119687)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h 2012-06-07 06:14:31 UTC (rev 119686)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h 2012-06-07 06:20:18 UTC (rev 119687)
@@ -76,9 +76,11 @@
virtual NSURL* canonicalizeURL(NSURL*) OVERRIDE;
virtual NSURL* canonicalizeURLString(NSString*) OVERRIDE;
+#if USE(APPKIT)
virtual void uppercaseWord() OVERRIDE;
virtual void lowercaseWord() OVERRIDE;
virtual void capitalizeWord() OVERRIDE;
+#endif
#if USE(AUTOMATIC_TEXT_REPLACEMENT)
virtual void showSubstitutionsPanel(bool show) OVERRIDE;
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm (119686 => 119687)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2012-06-07 06:14:31 UTC (rev 119686)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2012-06-07 06:20:18 UTC (rev 119687)
@@ -376,6 +376,7 @@
[m_webView _setInsertionPasteboard:pasteboard];
}
+#if USE(APPKIT)
void WebEditorClient::uppercaseWord()
{
[m_webView uppercaseWord:nil];
@@ -390,6 +391,7 @@
{
[m_webView capitalizeWord:nil];
}
+#endif
#if USE(AUTOMATIC_TEXT_REPLACEMENT)
void WebEditorClient::showSubstitutionsPanel(bool show)
Modified: trunk/Source/WebKit2/ChangeLog (119686 => 119687)
--- trunk/Source/WebKit2/ChangeLog 2012-06-07 06:14:31 UTC (rev 119686)
+++ trunk/Source/WebKit2/ChangeLog 2012-06-07 06:20:18 UTC (rev 119687)
@@ -1,3 +1,21 @@
+2012-06-06 Andy Estes <[email protected]>
+
+ Wrap uppercaseWord, lowercaseWord, and capitalizeWord with USE(APPKIT)
+ https://bugs.webkit.org/show_bug.cgi?id=88504
+
+ Reviewed by Dan Bernstein.
+
+ uppercaseWord, lowercaseWord, and capitalizeWord are methods declared
+ by NSResponder that subclasses are expected to implement. WebKit should
+ only support these implementations on platforms that use AppKit.
+
+ * UIProcess/WebPageProxy.h:
+ * WebProcess/WebCoreSupport/WebEditorClient.h:
+ * WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm:
+ * WebProcess/WebPage/WebPage.cpp:
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+
2012-06-06 chandra Shekar Vallala <[email protected]>
[WK2-Gtk]Compilation errors with flag CONTEXT_MENUS=0
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (119686 => 119687)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2012-06-07 06:14:31 UTC (rev 119686)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2012-06-07 06:20:18 UTC (rev 119687)
@@ -606,11 +606,13 @@
void advanceToNextMisspelling(bool startBeforeSelection) const;
void changeSpellingToWord(const String& word) const;
-#if PLATFORM(MAC)
+#if USE(APPKIT)
void uppercaseWord();
void lowercaseWord();
void capitalizeWord();
+#endif
+#if PLATFORM(MAC)
bool isSmartInsertDeleteEnabled() const { return m_isSmartInsertDeleteEnabled; }
void setSmartInsertDeleteEnabled(bool);
#endif
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h (119686 => 119687)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h 2012-06-07 06:14:31 UTC (rev 119686)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h 2012-06-07 06:20:18 UTC (rev 119687)
@@ -100,7 +100,7 @@
virtual NSURL* canonicalizeURLString(NSString*) OVERRIDE;
#endif
-#if PLATFORM(MAC)
+#if USE(APPKIT)
virtual void uppercaseWord() OVERRIDE;
virtual void lowercaseWord() OVERRIDE;
virtual void capitalizeWord() OVERRIDE;
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm (119686 => 119687)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm 2012-06-07 06:14:31 UTC (rev 119686)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm 2012-06-07 06:20:18 UTC (rev 119687)
@@ -145,6 +145,7 @@
page->replaceSelectionWithText(frame, [selectedString performSelector:selector]);
}
+#if USE(APPKIT)
void WebEditorClient::uppercaseWord()
{
changeWordCase(m_page, @selector(uppercaseString));
@@ -159,6 +160,7 @@
{
changeWordCase(m_page, @selector(capitalizedString));
}
+#endif
#if USE(AUTOMATIC_TEXT_REPLACEMENT)
void WebEditorClient::showSubstitutionsPanel(bool)
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (119686 => 119687)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-06-07 06:14:31 UTC (rev 119686)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-06-07 06:20:18 UTC (rev 119687)
@@ -2404,7 +2404,7 @@
}
}
-#if PLATFORM(MAC)
+#if USE(APPKIT)
void WebPage::uppercaseWord()
{
m_page->focusController()->focusedOrMainFrame()->editor()->uppercaseWord();
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (119686 => 119687)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2012-06-07 06:14:31 UTC (rev 119686)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2012-06-07 06:20:18 UTC (rev 119687)
@@ -682,11 +682,13 @@
void advanceToNextMisspelling(bool startBeforeSelection);
void changeSpellingToWord(const String& word);
-#if PLATFORM(MAC)
+#if USE(APPKIT)
void uppercaseWord();
void lowercaseWord();
void capitalizeWord();
+#endif
+#if PLATFORM(MAC)
void setSmartInsertDeleteEnabled(bool isSmartInsertDeleteEnabled) { m_isSmartInsertDeleteEnabled = isSmartInsertDeleteEnabled; }
#endif
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (119686 => 119687)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2012-06-07 06:14:31 UTC (rev 119686)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2012-06-07 06:20:18 UTC (rev 119687)
@@ -178,7 +178,7 @@
# Spelling and grammar.
AdvanceToNextMisspelling(bool startBeforeSelection)
ChangeSpellingToWord(WTF::String word)
-#if PLATFORM(MAC)
+#if USE(APPKIT)
UppercaseWord();
LowercaseWord();
CapitalizeWord();
