[webkit-changes] [WebKit/WebKit] 9643b2: _WKContextMenuElementInfo should expose a hasEntir...

Jeff Miller noreply at github.com
Fri Mar 17 08:05:07 PDT 2023


  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 9643b29c75f08b2aed6b8abd2ae1b45f73e42015
      https://github.com/WebKit/WebKit/commit/9643b29c75f08b2aed6b8abd2ae1b45f73e42015
  Author: Jeff Miller <jeffm at apple.com>
  Date:   2023-03-17 (Fri, 17 Mar 2023)

  Changed paths:
    M Source/WebCore/page/ContextMenuContext.cpp
    M Source/WebCore/page/ContextMenuContext.h
    M Source/WebCore/page/Page.cpp
    M Source/WebCore/page/Page.h
    M Source/WebCore/rendering/HitTestResult.cpp
    M Source/WebCore/rendering/HitTestResult.h
    M Source/WebKit/Shared/ContextMenuContextData.cpp
    M Source/WebKit/Shared/ContextMenuContextData.h
    M Source/WebKit/UIProcess/API/APIContextMenuElementInfoMac.h
    M Source/WebKit/UIProcess/API/Cocoa/_WKContextMenuElementInfo.h
    M Source/WebKit/UIProcess/API/Cocoa/_WKContextMenuElementInfo.mm
    M Source/WebKit/UIProcess/Cocoa/UIDelegate.mm
    M Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp
    M Source/WebKit/WebProcess/WebPage/WebPage.cpp
    M Source/WebKit/WebProcess/WebPage/WebPage.h
    M Tools/TestWebKitAPI/Tests/mac/ContextMenuTests.mm

  Log Message:
  -----------
  _WKContextMenuElementInfo should expose a hasEntireImage property
https://bugs.webkit.org/show_bug.cgi?id=253258
<rdar://106152692>

Reviewed by Aditya Keerthi.

Add a hasEntireImage property to _WKContextMenuElementInfo. This property is true if we're showing a
context menu for an image and the image has been loaded.

As part of this I moved hasLocalDataForURL() from WebKit::WebPage to WebCore::Page so we can can use
it from HitTestResult::hasEntireImage() in WebCore. I also changed
API::ContextMenuElementInfoMac::create() to take a single const WebKit::ContextMenuContextData&
parameter rather than adding a third parameter since all of the information needed to create this
class is derived from ContextMenuContextData.

* Source/WebCore/page/ContextMenuContext.cpp:
(WebCore::ContextMenuContext::ContextMenuContext):
* Source/WebCore/page/ContextMenuContext.h:
(WebCore::ContextMenuContext::hasEntireImage const):
* Source/WebCore/page/Page.cpp:
(WebCore::Page::hasLocalDataForURL):
Moved from WebKit::WebPage.

* Source/WebCore/page/Page.h:
* Source/WebCore/rendering/HitTestResult.cpp:
(WebCore::HitTestResult::hasEntireImage const):
Returns true if the context menu is for an image, the image rectangle isn't empty, and the page has
loaded the image data.

* Source/WebCore/rendering/HitTestResult.h:
* Source/WebKit/Shared/ContextMenuContextData.cpp:
(WebKit::ContextMenuContextData::encode const):
(WebKit::ContextMenuContextData::decode):
* Source/WebKit/Shared/ContextMenuContextData.h:
(WebKit::ContextMenuContextData::hasEntireImage const):
* Source/WebKit/UIProcess/API/APIContextMenuElementInfoMac.h:
* Source/WebKit/UIProcess/API/Cocoa/_WKContextMenuElementInfo.h:
* Source/WebKit/UIProcess/API/Cocoa/_WKContextMenuElementInfo.mm:
(-[_WKContextMenuElementInfo hasEntireImage]):
* Source/WebKit/UIProcess/Cocoa/UIDelegate.mm:
(WebKit::UIDelegate::ContextMenuClient::menuFromProposedMenu):
* Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
(WKBundlePageHasLocalDataForURL):
Call hasLocalDataForURL() on the WebCore::Page instead of the WebKit::WebPage. This was the only
caller of this function.

* Source/WebKit/WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::hasLocalDataForURL): Deleted.
* Source/WebKit/WebProcess/WebPage/WebPage.h:
* Tools/TestWebKitAPI/Tests/mac/ContextMenuTests.mm:
(TestWebKitAPI::TEST):
Added a new ContextMenuElementInfoHasEntireImage test.

Canonical link: https://commits.webkit.org/261793@main




More information about the webkit-changes mailing list