Changeset 148531 in webkit


Ignore:
Timestamp:
Apr 16, 2013 11:56:15 AM (11 years ago)
Author:
ap@apple.com
Message:

Remove unused AlternativeTextClient::dismissDictationAlternativeUI
​https://bugs.webkit.org/show_bug.cgi?id=114598

Reviewed by Ryosuke Niwa.

Source/WebCore:

Removing dead code.

  • WebCore.exp.in:
  • editing/mac/AlternativeTextUIController.h: Made dismissAlternatives() private.
  • page/AlternativeTextClient.h:

Source/WebKit/mac:

  • WebCoreSupport/WebAlternativeTextClient.h:
  • WebCoreSupport/WebAlternativeTextClient.mm:
  • WebView/WebView.mm:
  • WebView/WebViewInternal.h:

Source/WebKit2:

  • 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:
Location:
trunk/Source
Files:
18 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r148523 r148531  
     12013-04-16  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Remove unused AlternativeTextClient::dismissDictationAlternativeUI
     4        https://bugs.webkit.org/show_bug.cgi?id=114598
     5
     6        Reviewed by Ryosuke Niwa.
     7
     8        Removing dead code.
     9
     10        * WebCore.exp.in:
     11        * editing/mac/AlternativeTextUIController.h: Made dismissAlternatives() private.
     12        * page/AlternativeTextClient.h:
     13
    1142013-04-16  Robert Hogan  <robert@webkit.org>
    215

  • trunk/Source/WebCore/WebCore.exp.in

    r148413 r148531  
    27222722__ZN7WebCore27AlternativeTextUIController22alternativesForContextEy
    27232723__ZN7WebCore27AlternativeTextUIController5clearEv
    2724 __ZN7WebCore27AlternativeTextUIController19dismissAlternativesEv
    27252724__ZN7WebCore27AlternativeTextUIController18removeAlternativesEy
    27262725__ZN7WebCore27AlternativeTextUIController16showAlternativesEP6NSViewRKNS_9FloatRectEyU13block_pointerFvP8NSStringE

  • trunk/Source/WebCore/editing/mac/AlternativeTextUIController.h

    r120357 r148531  
    4545    void clear();
    4646    void showAlternatives(NSView*, const FloatRect& boundingBoxOfPrimaryString, uint64_t context, void(^acceptanceHandler)(NSString*));
    47     void dismissAlternatives();
    4847    void removeAlternatives(uint64_t context);
    4948    Vector<String> alternativesForContext(uint64_t context);
    … …  
    5150private:
    5251    void handleAcceptedAlternative(NSString* acceptedAlternative, uint64_t context, NSTextAlternatives*);
     52
     53    void dismissAlternatives();
    5354
    5455    class AlernativeTextContextController {

  • trunk/Source/WebCore/page/AlternativeTextClient.h

    r122670 r148531  
    6969#if USE(DICTATION_ALTERNATIVES)
    7070    virtual void showDictationAlternativeUI(const WebCore::FloatRect& boundingBoxOfDictatedText, uint64_t dictationContext) = 0;
    71     virtual void dismissDictationAlternativeUI() = 0;
    7271    virtual void removeDictationAlternatives(uint64_t dictationContext) = 0;
    7372    virtual Vector<String> dictationAlternatives(uint64_t dictationContext) = 0;

  • trunk/Source/WebKit/mac/ChangeLog

    r148525 r148531  
     12013-04-16  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Remove unused AlternativeTextClient::dismissDictationAlternativeUI
     4        https://bugs.webkit.org/show_bug.cgi?id=114598
     5
     6        Reviewed by Ryosuke Niwa.
     7
     8        * WebCoreSupport/WebAlternativeTextClient.h:
     9        * WebCoreSupport/WebAlternativeTextClient.mm:
     10        * WebView/WebView.mm:
     11        * WebView/WebViewInternal.h:
     12
    1132013-04-15  Ryosuke Niwa  <rniwa@webkit.org>
    214

  • trunk/Source/WebKit/mac/WebCoreSupport/WebAlternativeTextClient.h

    r120357 r148531  
    4646#if USE(DICTATION_ALTERNATIVES)
    4747    virtual void showDictationAlternativeUI(const WebCore::FloatRect& boundingBoxOfDictatedText, uint64_t dictationContext) OVERRIDE;
    48     virtual void dismissDictationAlternativeUI() OVERRIDE;
    4948    virtual void removeDictationAlternatives(uint64_t dictationContext) OVERRIDE;
    5049    virtual Vector<String> dictationAlternatives(uint64_t dictationContext) OVERRIDE;

  • trunk/Source/WebKit/mac/WebCoreSupport/WebAlternativeTextClient.mm

    r120357 r148531  
    8181}
    8282
    83 void WebAlternativeTextClient::dismissDictationAlternativeUI()
    84 {
    85     [m_webView _dismissDictationAlternativeUI];
    86 }
    87 
    8883Vector<String> WebAlternativeTextClient::dictationAlternatives(uint64_t dictationContext)
    8984{

  • trunk/Source/WebKit/mac/WebView/WebView.mm

    r148365 r148531  
    65116511}
    65126512
    6513 - (void)_dismissDictationAlternativeUI
    6514 {
    6515     _private->m_alternativeTextUIController->dismissAlternatives();
    6516 }
    6517 
    65186513- (void)_removeDictationAlternatives:(uint64_t)dictationContext
    65196514{

  • trunk/Source/WebKit/mac/WebView/WebViewInternal.h

    r142395 r148531  
    117117- (void)_getWebCoreDictationAlternatives:(Vector<WebCore::DictationAlternative>&)alternatives fromTextAlternatives:(const Vector<WebCore::TextAlternativeWithRange>&)alternativesWithRange;
    118118- (void)_showDictationAlternativeUI:(const WebCore::FloatRect&)boundingBoxOfDictatedText forDictationContext:(uint64_t)dictationContext;
    119 - (void)_dismissDictationAlternativeUI;
    120119- (void)_removeDictationAlternatives:(uint64_t)dictationContext;
    121120- (Vector<String>)_dictationAlternatives:(uint64_t)dictationContext;

  • trunk/Source/WebKit2/ChangeLog

    r148526 r148531  
     12013-04-16  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Remove unused AlternativeTextClient::dismissDictationAlternativeUI
     4        https://bugs.webkit.org/show_bug.cgi?id=114598
     5
     6        Reviewed by Ryosuke Niwa.
     7
     8        * UIProcess/API/mac/PageClientImpl.h:
     9        * UIProcess/API/mac/PageClientImpl.mm:
     10        (WebKit::PageClientImpl::dictationAlternatives):
     11        * UIProcess/PageClient.h:
     12        * UIProcess/WebPageProxy.cpp:
     13        * UIProcess/WebPageProxy.h:
     14        * UIProcess/WebPageProxy.messages.in:
     15        * WebProcess/WebCoreSupport/WebAlternativeTextClient.h:
     16        * WebProcess/WebCoreSupport/mac/WebAlternativeTextClient.cpp:
     17
    1182013-04-16  Claudio Saavedra  <csaavedra@igalia.com>
    219

  • trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h

    r138973 r148531  
    145145    virtual void removeDictationAlternatives(uint64_t dictationContext);
    146146    virtual void showDictationAlternativeUI(const WebCore::FloatRect& boundingBoxOfDictatedText, uint64_t dictationContext);
    147     virtual void dismissDictationAlternativeUI();
    148147    virtual Vector<String> dictationAlternatives(uint64_t dictationContext);
    149148#endif

  • trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm

    r148464 r148531  
    590590    return m_alternativeTextUIController->alternativesForContext(dictationContext);
    591591}
    592 
    593 void PageClientImpl::dismissDictationAlternativeUI()
    594 {
    595     m_alternativeTextUIController->dismissAlternatives();
    596 }
    597592#endif
    598593

  • trunk/Source/WebKit2/UIProcess/PageClient.h

    r145515 r148531  
    216216    virtual void removeDictationAlternatives(uint64_t dictationContext) = 0;
    217217    virtual void showDictationAlternativeUI(const WebCore::FloatRect& boundingBoxOfDictatedText, uint64_t dictationContext) = 0;
    218     virtual void dismissDictationAlternativeUI() = 0;
    219218    virtual Vector<String> dictationAlternatives(uint64_t dictationContext) = 0;
    220219#endif // USE(DICTATION_ALTERNATIVES)

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

    r148420 r148531  
    43834383}
    43844384
    4385 void WebPageProxy::dismissDictationAlternativeUI()
    4386 {
    4387     m_pageClient->dismissDictationAlternativeUI();
    4388 }
    4389 
    43904385void WebPageProxy::removeDictationAlternatives(uint64_t dictationContext)
    43914386{

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.h

    r148373 r148531  
    10231023#if USE(DICTATION_ALTERNATIVES)
    10241024    void showDictationAlternativeUI(const WebCore::FloatRect& boundingBoxOfDictatedText, uint64_t dictationContext);
    1025     void dismissDictationAlternativeUI();
    10261025    void removeDictationAlternatives(uint64_t dictationContext);
    10271026    void dictationAlternatives(uint64_t dictationContext, Vector<String>& result);

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in

    r145390 r148531  
    289289#if USE(DICTATION_ALTERNATIVES)
    290290    ShowDictationAlternativeUI(WebCore::FloatRect boundingBoxOfDictatedText, uint64_t dictationContext)
    291     DismissDictationAlternativeUI()
    292291    RemoveDictationAlternatives(uint64_t dictationContext)
    293292    DictationAlternatives(uint64_t dictationContext) -> (Vector<String> alternatives)

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebAlternativeTextClient.h

    r120357 r148531  
    4747#if USE(DICTATION_ALTERNATIVES)
    4848    virtual void showDictationAlternativeUI(const WebCore::FloatRect& boundingBoxOfDictatedText, uint64_t dictationContext) OVERRIDE;
    49     virtual void dismissDictationAlternativeUI() OVERRIDE;
    5049    virtual void removeDictationAlternatives(uint64_t dictationContext) OVERRIDE;
    5150    virtual Vector<String> dictationAlternatives(uint64_t dictationContext) OVERRIDE;

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebAlternativeTextClient.cpp

    r120357 r148531  
    8787}
    8888
    89 void WebAlternativeTextClient::dismissDictationAlternativeUI()
    90 {
    91     m_page->send(Messages::WebPageProxy::DismissDictationAlternativeUI());
    92 }
    93 
    9489Vector<String> WebAlternativeTextClient::dictationAlternatives(uint64_t dictationContext)
    9590{
Note: See TracChangeset for help on using the changeset viewer.