Changeset 191422 in webkit


Ignore:
Timestamp:
Oct 21, 2015 5:50:27 PM (9 years ago)
Author:
andersca@apple.com
Message:

Get rid of WebContextMenuClient::customizeMenu, it's no longer used
​https://bugs.webkit.org/show_bug.cgi?id=150427

Reviewed by Tim Horton.
Source/WebCore:

  • loader/EmptyClients.cpp:

(WebCore::EmptyContextMenuClient::customizeMenu): Deleted.

  • loader/EmptyClients.h:
  • page/ContextMenuController.cpp:

(WebCore::ContextMenuController::showContextMenu):

Source/WebKit/win:

  • WebCoreSupport/WebContextMenuClient.cpp:

(WebContextMenuClient::customizeMenu): Deleted.

  • WebCoreSupport/WebContextMenuClient.h:

Source/WebKit2:

  • WebProcess/WebCoreSupport/WebContextMenuClient.cpp:

(WebKit::WebContextMenuClient::customizeMenu): Deleted.

  • WebProcess/WebCoreSupport/WebContextMenuClient.h:
Location:
trunk/Source
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r191420 r191422  
     12015-10-21  Anders Carlsson  <andersca@apple.com>
     2
     3        Get rid of WebContextMenuClient::customizeMenu, it's no longer used
     4        https://bugs.webkit.org/show_bug.cgi?id=150427
     5
     6        Reviewed by Tim Horton.
     7        * loader/EmptyClients.cpp:
     8        (WebCore::EmptyContextMenuClient::customizeMenu): Deleted.
     9        * loader/EmptyClients.h:
     10        * page/ContextMenuController.cpp:
     11        (WebCore::ContextMenuController::showContextMenu):
     12
    1132015-10-21  Anders Carlsson  <andersca@apple.com>
    214

  • trunk/Source/WebCore/loader/EmptyClients.cpp

    r191369 r191422  
    233233}
    234234
    235 #if ENABLE(CONTEXT_MENUS)
    236 #if USE(CROSS_PLATFORM_CONTEXT_MENUS)
    237 std::unique_ptr<ContextMenu> EmptyContextMenuClient::customizeMenu(std::unique_ptr<ContextMenu>)
    238 {
    239     return nullptr;
    240 }
    241 #endif
    242 #endif
    243 
    244 }
     235}

  • trunk/Source/WebCore/loader/EmptyClients.h

    r191381 r191422  
    550550    virtual void contextMenuDestroyed() override { }
    551551
    552 #if USE(CROSS_PLATFORM_CONTEXT_MENUS)
    553     virtual std::unique_ptr<ContextMenu> customizeMenu(std::unique_ptr<ContextMenu>) override;
    554 #else
     552#if !USE(CROSS_PLATFORM_CONTEXT_MENUS)
    555553    virtual PlatformMenuDescription getCustomMenuFromDefaultItems(ContextMenu*) override { return nullptr; }
    556554#endif

  • trunk/Source/WebCore/page/ContextMenuController.cpp

    r189182 r191422  
    182182        addInspectElementItem();
    183183
    184 #if USE(CROSS_PLATFORM_CONTEXT_MENUS)
    185     m_contextMenu = m_client.customizeMenu(WTF::move(m_contextMenu));
    186 #else
     184#if !USE(CROSS_PLATFORM_CONTEXT_MENUS)
    187185    PlatformMenuDescription customMenu = m_client.getCustomMenuFromDefaultItems(m_contextMenu.get());
    188186    m_contextMenu->setPlatformDescription(customMenu);

  • trunk/Source/WebKit/win/ChangeLog

    r191413 r191422  
     12015-10-21  Anders Carlsson  <andersca@apple.com>
     2
     3        Get rid of WebContextMenuClient::customizeMenu, it's no longer used
     4        https://bugs.webkit.org/show_bug.cgi?id=150427
     5
     6        Reviewed by Tim Horton.
     7
     8        * WebCoreSupport/WebContextMenuClient.cpp:
     9        (WebContextMenuClient::customizeMenu): Deleted.
     10        * WebCoreSupport/WebContextMenuClient.h:
     11
    1122015-10-21  Anders Carlsson  <andersca@apple.com>
    213

  • trunk/Source/WebKit/win/WebCoreSupport/WebContextMenuClient.cpp

    r191413 r191422  
    5151{
    5252    delete this;
    53 }
    54 
    55 std::unique_ptr<ContextMenu> WebContextMenuClient::customizeMenu(std::unique_ptr<ContextMenu> menu)
    56 {
    57     return WTF::move(menu);
    5853}
    5954

  • trunk/Source/WebKit/win/WebCoreSupport/WebContextMenuClient.h

    r182573 r191422  
    3636    virtual void contextMenuDestroyed();
    3737
    38     virtual std::unique_ptr<WebCore::ContextMenu> customizeMenu(std::unique_ptr<WebCore::ContextMenu>);
    3938    virtual void contextMenuItemSelected(WebCore::ContextMenuItem*, const WebCore::ContextMenu*);
    4039   

  • trunk/Source/WebKit2/ChangeLog

    r191415 r191422  
     12015-10-21  Anders Carlsson  <andersca@apple.com>
     2
     3        Get rid of WebContextMenuClient::customizeMenu, it's no longer used
     4        https://bugs.webkit.org/show_bug.cgi?id=150427
     5
     6        Reviewed by Tim Horton.
     7
     8        * WebProcess/WebCoreSupport/WebContextMenuClient.cpp:
     9        (WebKit::WebContextMenuClient::customizeMenu): Deleted.
     10        * WebProcess/WebCoreSupport/WebContextMenuClient.h:
     11
    1122015-10-21  Tim Horton  <timothy_horton@apple.com>
    213

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp

    r185111 r191422  
    5050}
    5151
    52 #if USE(CROSS_PLATFORM_CONTEXT_MENUS)
    53 std::unique_ptr<ContextMenu> WebContextMenuClient::customizeMenu(std::unique_ptr<ContextMenu> menu)
    54 {
    55     // WebKit2 ignores this client callback and does context menu customization when it is told to show the menu.
    56     return menu;
    57 }
    58 #else
     52#if !USE(CROSS_PLATFORM_CONTEXT_MENUS)
    5953PlatformMenuDescription WebContextMenuClient::getCustomMenuFromDefaultItems(ContextMenu* menu)
    6054{

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

    r182573 r191422  
    4545    virtual void contextMenuDestroyed() override;
    4646   
    47 #if USE(CROSS_PLATFORM_CONTEXT_MENUS)
    48     virtual std::unique_ptr<WebCore::ContextMenu> customizeMenu(std::unique_ptr<WebCore::ContextMenu>) override;
    49 #else
     47#if !USE(CROSS_PLATFORM_CONTEXT_MENUS)
    5048    virtual WebCore::PlatformMenuDescription getCustomMenuFromDefaultItems(WebCore::ContextMenu*) override;
    5149#endif
Note: See TracChangeset for help on using the changeset viewer.