Diff
Modified: trunk/Source/WebCore/ChangeLog (148530 => 148531)
--- trunk/Source/WebCore/ChangeLog 2013-04-16 18:55:24 UTC (rev 148530)
+++ trunk/Source/WebCore/ChangeLog 2013-04-16 18:56:15 UTC (rev 148531)
@@ -1,3 +1,16 @@
+2013-04-16 Alexey Proskuryakov <[email protected]>
+
+ Remove unused AlternativeTextClient::dismissDictationAlternativeUI
+ https://bugs.webkit.org/show_bug.cgi?id=114598
+
+ Reviewed by Ryosuke Niwa.
+
+ Removing dead code.
+
+ * WebCore.exp.in:
+ * editing/mac/AlternativeTextUIController.h: Made dismissAlternatives() private.
+ * page/AlternativeTextClient.h:
+
2013-04-16 Robert Hogan <[email protected]>
Float at exact multiple of line-height affects too many lines
Modified: trunk/Source/WebCore/WebCore.exp.in (148530 => 148531)
--- trunk/Source/WebCore/WebCore.exp.in 2013-04-16 18:55:24 UTC (rev 148530)
+++ trunk/Source/WebCore/WebCore.exp.in 2013-04-16 18:56:15 UTC (rev 148531)
@@ -2721,7 +2721,6 @@
__ZN7WebCore27AlternativeTextUIController15addAlternativesERKN3WTF9RetainPtrI18NSTextAlternativesEE
__ZN7WebCore27AlternativeTextUIController22alternativesForContextEy
__ZN7WebCore27AlternativeTextUIController5clearEv
-__ZN7WebCore27AlternativeTextUIController19dismissAlternativesEv
__ZN7WebCore27AlternativeTextUIController18removeAlternativesEy
__ZN7WebCore27AlternativeTextUIController16showAlternativesEP6NSViewRKNS_9FloatRectEyU13block_pointerFvP8NSStringE
__ZN7WebCore24TextAlternativeWithRangeC1EP18NSTextAlternatives8_NSRange
Modified: trunk/Source/WebCore/editing/mac/AlternativeTextUIController.h (148530 => 148531)
--- trunk/Source/WebCore/editing/mac/AlternativeTextUIController.h 2013-04-16 18:55:24 UTC (rev 148530)
+++ trunk/Source/WebCore/editing/mac/AlternativeTextUIController.h 2013-04-16 18:56:15 UTC (rev 148531)
@@ -44,13 +44,14 @@
uint64_t addAlternatives(const RetainPtr<NSTextAlternatives>&);
void clear();
void showAlternatives(NSView*, const FloatRect& boundingBoxOfPrimaryString, uint64_t context, void(^acceptanceHandler)(NSString*));
- void dismissAlternatives();
void removeAlternatives(uint64_t context);
Vector<String> alternativesForContext(uint64_t context);
private:
void handleAcceptedAlternative(NSString* acceptedAlternative, uint64_t context, NSTextAlternatives*);
+ void dismissAlternatives();
+
class AlernativeTextContextController {
public:
AlernativeTextContextController() { }
Modified: trunk/Source/WebCore/page/AlternativeTextClient.h (148530 => 148531)
--- trunk/Source/WebCore/page/AlternativeTextClient.h 2013-04-16 18:55:24 UTC (rev 148530)
+++ trunk/Source/WebCore/page/AlternativeTextClient.h 2013-04-16 18:56:15 UTC (rev 148531)
@@ -68,7 +68,6 @@
#endif
#if USE(DICTATION_ALTERNATIVES)
virtual void showDictationAlternativeUI(const WebCore::FloatRect& boundingBoxOfDictatedText, uint64_t dictationContext) = 0;
- virtual void dismissDictationAlternativeUI() = 0;
virtual void removeDictationAlternatives(uint64_t dictationContext) = 0;
virtual Vector<String> dictationAlternatives(uint64_t dictationContext) = 0;
#endif
Modified: trunk/Source/WebKit/mac/ChangeLog (148530 => 148531)
--- trunk/Source/WebKit/mac/ChangeLog 2013-04-16 18:55:24 UTC (rev 148530)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-04-16 18:56:15 UTC (rev 148531)
@@ -1,3 +1,15 @@
+2013-04-16 Alexey Proskuryakov <[email protected]>
+
+ Remove unused AlternativeTextClient::dismissDictationAlternativeUI
+ https://bugs.webkit.org/show_bug.cgi?id=114598
+
+ Reviewed by Ryosuke Niwa.
+
+ * WebCoreSupport/WebAlternativeTextClient.h:
+ * WebCoreSupport/WebAlternativeTextClient.mm:
+ * WebView/WebView.mm:
+ * WebView/WebViewInternal.h:
+
2013-04-15 Ryosuke Niwa <[email protected]>
REGRESSION(r146025): WebKit applications can't apply underline or strike through
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebAlternativeTextClient.h (148530 => 148531)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebAlternativeTextClient.h 2013-04-16 18:55:24 UTC (rev 148530)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebAlternativeTextClient.h 2013-04-16 18:56:15 UTC (rev 148531)
@@ -45,7 +45,6 @@
#endif
#if USE(DICTATION_ALTERNATIVES)
virtual void showDictationAlternativeUI(const WebCore::FloatRect& boundingBoxOfDictatedText, uint64_t dictationContext) OVERRIDE;
- virtual void dismissDictationAlternativeUI() OVERRIDE;
virtual void removeDictationAlternatives(uint64_t dictationContext) OVERRIDE;
virtual Vector<String> dictationAlternatives(uint64_t dictationContext) OVERRIDE;
#endif
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebAlternativeTextClient.mm (148530 => 148531)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebAlternativeTextClient.mm 2013-04-16 18:55:24 UTC (rev 148530)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebAlternativeTextClient.mm 2013-04-16 18:56:15 UTC (rev 148531)
@@ -80,11 +80,6 @@
[m_webView _showDictationAlternativeUI:boundingBoxOfDictatedText forDictationContext:dictationContext];
}
-void WebAlternativeTextClient::dismissDictationAlternativeUI()
-{
- [m_webView _dismissDictationAlternativeUI];
-}
-
Vector<String> WebAlternativeTextClient::dictationAlternatives(uint64_t dictationContext)
{
return [m_webView _dictationAlternatives:dictationContext];
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (148530 => 148531)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2013-04-16 18:55:24 UTC (rev 148530)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2013-04-16 18:56:15 UTC (rev 148531)
@@ -6510,11 +6510,6 @@
});
}
-- (void)_dismissDictationAlternativeUI
-{
- _private->m_alternativeTextUIController->dismissAlternatives();
-}
-
- (void)_removeDictationAlternatives:(uint64_t)dictationContext
{
_private->m_alternativeTextUIController->removeAlternatives(dictationContext);
Modified: trunk/Source/WebKit/mac/WebView/WebViewInternal.h (148530 => 148531)
--- trunk/Source/WebKit/mac/WebView/WebViewInternal.h 2013-04-16 18:55:24 UTC (rev 148530)
+++ trunk/Source/WebKit/mac/WebView/WebViewInternal.h 2013-04-16 18:56:15 UTC (rev 148531)
@@ -116,7 +116,6 @@
#if USE(DICTATION_ALTERNATIVES)
- (void)_getWebCoreDictationAlternatives:(Vector<WebCore::DictationAlternative>&)alternatives fromTextAlternatives:(const Vector<WebCore::TextAlternativeWithRange>&)alternativesWithRange;
- (void)_showDictationAlternativeUI:(const WebCore::FloatRect&)boundingBoxOfDictatedText forDictationContext:(uint64_t)dictationContext;
-- (void)_dismissDictationAlternativeUI;
- (void)_removeDictationAlternatives:(uint64_t)dictationContext;
- (Vector<String>)_dictationAlternatives:(uint64_t)dictationContext;
#endif
Modified: trunk/Source/WebKit2/ChangeLog (148530 => 148531)
--- trunk/Source/WebKit2/ChangeLog 2013-04-16 18:55:24 UTC (rev 148530)
+++ trunk/Source/WebKit2/ChangeLog 2013-04-16 18:56:15 UTC (rev 148531)
@@ -1,3 +1,20 @@
+2013-04-16 Alexey Proskuryakov <[email protected]>
+
+ Remove unused AlternativeTextClient::dismissDictationAlternativeUI
+ https://bugs.webkit.org/show_bug.cgi?id=114598
+
+ Reviewed by Ryosuke Niwa.
+
+ * UIProcess/API/mac/PageClientImpl.h:
+ * UIProcess/API/mac/PageClientImpl.mm:
+ (WebKit::PageClientImpl::dictationAlternatives):
+ * UIProcess/PageClient.h:
+ * UIProcess/WebPageProxy.cpp:
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * WebProcess/WebCoreSupport/WebAlternativeTextClient.h:
+ * WebProcess/WebCoreSupport/mac/WebAlternativeTextClient.cpp:
+
2013-04-16 Claudio Saavedra <[email protected]>
[GTK][WK2] Add API to retrieve a snapshot from a webview
Modified: trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h (148530 => 148531)
--- trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h 2013-04-16 18:55:24 UTC (rev 148530)
+++ trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h 2013-04-16 18:56:15 UTC (rev 148531)
@@ -144,7 +144,6 @@
virtual uint64_t addDictationAlternatives(const RetainPtr<NSTextAlternatives>&);
virtual void removeDictationAlternatives(uint64_t dictationContext);
virtual void showDictationAlternativeUI(const WebCore::FloatRect& boundingBoxOfDictatedText, uint64_t dictationContext);
- virtual void dismissDictationAlternativeUI();
virtual Vector<String> dictationAlternatives(uint64_t dictationContext);
#endif
Modified: trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm (148530 => 148531)
--- trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm 2013-04-16 18:55:24 UTC (rev 148530)
+++ trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm 2013-04-16 18:56:15 UTC (rev 148531)
@@ -589,11 +589,6 @@
{
return m_alternativeTextUIController->alternativesForContext(dictationContext);
}
-
-void PageClientImpl::dismissDictationAlternativeUI()
-{
- m_alternativeTextUIController->dismissAlternatives();
-}
#endif
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/PageClient.h (148530 => 148531)
--- trunk/Source/WebKit2/UIProcess/PageClient.h 2013-04-16 18:55:24 UTC (rev 148530)
+++ trunk/Source/WebKit2/UIProcess/PageClient.h 2013-04-16 18:56:15 UTC (rev 148531)
@@ -215,7 +215,6 @@
virtual uint64_t addDictationAlternatives(const RetainPtr<NSTextAlternatives>&) = 0;
virtual void removeDictationAlternatives(uint64_t dictationContext) = 0;
virtual void showDictationAlternativeUI(const WebCore::FloatRect& boundingBoxOfDictatedText, uint64_t dictationContext) = 0;
- virtual void dismissDictationAlternativeUI() = 0;
virtual Vector<String> dictationAlternatives(uint64_t dictationContext) = 0;
#endif // USE(DICTATION_ALTERNATIVES)
#endif // USE(APPKIT)
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (148530 => 148531)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-04-16 18:55:24 UTC (rev 148530)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-04-16 18:56:15 UTC (rev 148531)
@@ -4382,11 +4382,6 @@
m_pageClient->showDictationAlternativeUI(boundingBoxOfDictatedText, dictationContext);
}
-void WebPageProxy::dismissDictationAlternativeUI()
-{
- m_pageClient->dismissDictationAlternativeUI();
-}
-
void WebPageProxy::removeDictationAlternatives(uint64_t dictationContext)
{
m_pageClient->removeDictationAlternatives(dictationContext);
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (148530 => 148531)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2013-04-16 18:55:24 UTC (rev 148530)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2013-04-16 18:56:15 UTC (rev 148531)
@@ -1022,7 +1022,6 @@
#if USE(DICTATION_ALTERNATIVES)
void showDictationAlternativeUI(const WebCore::FloatRect& boundingBoxOfDictatedText, uint64_t dictationContext);
- void dismissDictationAlternativeUI();
void removeDictationAlternatives(uint64_t dictationContext);
void dictationAlternatives(uint64_t dictationContext, Vector<String>& result);
#endif
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (148530 => 148531)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2013-04-16 18:55:24 UTC (rev 148530)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2013-04-16 18:56:15 UTC (rev 148531)
@@ -288,7 +288,6 @@
#if USE(DICTATION_ALTERNATIVES)
ShowDictationAlternativeUI(WebCore::FloatRect boundingBoxOfDictatedText, uint64_t dictationContext)
- DismissDictationAlternativeUI()
RemoveDictationAlternatives(uint64_t dictationContext)
DictationAlternatives(uint64_t dictationContext) -> (Vector<String> alternatives)
#endif
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebAlternativeTextClient.h (148530 => 148531)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebAlternativeTextClient.h 2013-04-16 18:55:24 UTC (rev 148530)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebAlternativeTextClient.h 2013-04-16 18:56:15 UTC (rev 148531)
@@ -46,7 +46,6 @@
#endif
#if USE(DICTATION_ALTERNATIVES)
virtual void showDictationAlternativeUI(const WebCore::FloatRect& boundingBoxOfDictatedText, uint64_t dictationContext) OVERRIDE;
- virtual void dismissDictationAlternativeUI() OVERRIDE;
virtual void removeDictationAlternatives(uint64_t dictationContext) OVERRIDE;
virtual Vector<String> dictationAlternatives(uint64_t dictationContext) OVERRIDE;
#endif
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebAlternativeTextClient.cpp (148530 => 148531)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebAlternativeTextClient.cpp 2013-04-16 18:55:24 UTC (rev 148530)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebAlternativeTextClient.cpp 2013-04-16 18:56:15 UTC (rev 148531)
@@ -86,11 +86,6 @@
m_page->send(Messages::WebPageProxy::ShowDictationAlternativeUI(boundingBoxOfDictatedText, dictationContext));
}
-void WebAlternativeTextClient::dismissDictationAlternativeUI()
-{
- m_page->send(Messages::WebPageProxy::DismissDictationAlternativeUI());
-}
-
Vector<String> WebAlternativeTextClient::dictationAlternatives(uint64_t dictationContext)
{
Vector<String> result;
