Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor some image drag and drop codepaths #4244

Closed
wants to merge 0 commits into from

Conversation

whsieh
Copy link
Member

@whsieh whsieh commented Sep 12, 2022

a703b40

Refactor some image drag and drop codepaths
https://bugs.webkit.org/show_bug.cgi?id=245058
rdar://98992054

Reviewed by Ryosuke Niwa.

Refactor some codepaths related to dragging and dropping images.

* Source/WebCore/dom/DataTransfer.cpp:
(WebCore::DataTransfer::types const):
(WebCore::DataTransfer::filesFromPasteboardAndItemList const):
* Source/WebCore/dom/DataTransfer.h:
(WebCore::DataTransfer::allowsFileAccess const):
* Source/WebCore/page/DragController.cpp:
(WebCore::DragController::dragEntered):
(WebCore::DragController::dragExited):
(WebCore::DragController::dragUpdated):
(WebCore::DragController::performDragOperation):
(WebCore::DragController::dragEnteredOrUpdated):
(WebCore::DragController::disallowFileAccessIfNeeded):
* Source/WebCore/page/DragController.h:
* Source/WebCore/page/DragState.h:
* Source/WebCore/page/EventHandler.cpp:
(WebCore::EventHandler::canDropCurrentlyDraggedImageAsFile const):
(WebCore::EventHandler::handleDrag):
* Source/WebCore/page/EventHandler.h:
* Source/WebCore/page/SecurityOrigin.cpp:
(WebCore::SecurityOrigin::canReceiveDragData const):
* Source/WebCore/platform/DragData.cpp:
(WebCore::DragData::disallowFileAccess):
* Source/WebCore/platform/DragData.h:
* Source/WebCore/platform/cocoa/DragDataCocoa.mm:
(WebCore::DragData::containsFiles const):
(WebCore::DragData::numberOfFiles const):
(WebCore::DragData::asFilenames const):
(WebCore::DragData::containsCompatibleContent const):
(WebCore::DragData::containsPromise const):
* Source/WebKit/WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::performDragControllerAction):
* Source/WebKit/WebProcess/WebPage/WebPage.h:
* Source/WebKitLegacy/mac/WebView/WebView.mm:
(-[WebView _enteredDataInteraction:client:global:operation:]):
(-[WebView _updatedDataInteraction:client:global:operation:]):
(-[WebView _exitedDataInteraction:client:global:operation:]):
(-[WebView _tryToPerformDataInteraction:client:global:operation:]):
(-[WebView draggingEntered:]):
(-[WebView draggingUpdated:]):
(-[WebView draggingExited:]):
(-[WebView performDragOperation:]):
* Source/WebKitLegacy/win/WebView.cpp:
(WebView::DragEnter):
(WebView::DragOver):
(WebView::DragLeave):
(WebView::Drop):

Use `WTFMove()` when handing the `DragData` over to `DragController`.

* Tools/TestWebKitAPI/Tests/WebKitCocoa/DragAndDropTests.mm:

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

34d8b50

Misc iOS, tvOS & watchOS macOS Linux Windows
βœ… πŸ§ͺ style βœ… πŸ›  ios βœ… πŸ›  mac βœ… πŸ›  wpe   πŸ›  πŸ§ͺ win
βœ… πŸ§ͺ bindings βœ… πŸ›  ios-sim βœ… πŸ›  mac-debug βœ… πŸ›  gtk βœ… πŸ›  wincairo
βœ… πŸ§ͺ webkitperl βœ… πŸ§ͺ ios-wk2 βœ… πŸ›  mac-AS-debug βœ… πŸ§ͺ gtk-wk2
βœ… πŸ§ͺ api-ios βœ… πŸ§ͺ api-mac βœ… πŸ§ͺ api-gtk
βœ… πŸ›  tv βœ… πŸ§ͺ mac-wk1
βœ… πŸ›  tv-sim βœ… πŸ§ͺ mac-wk2
βœ… πŸ›  πŸ§ͺ merge βœ… πŸ›  watch βœ… πŸ§ͺ mac-AS-debug-wk2
βœ… πŸ›  watch-sim βœ… πŸ§ͺ mac-wk2-stress

@whsieh whsieh self-assigned this Sep 12, 2022
@whsieh whsieh added HTML Editing For bugs in HTML editing support (including designMode and contentEditable). WebKit Nightly Build labels Sep 12, 2022
@whsieh whsieh added the merge-queue Applied to send a pull request to merge-queue label Sep 12, 2022
@webkit-commit-queue
Copy link
Collaborator

Committed 254380@main (a703b40): https://commits.webkit.org/254380@main

Reviewed commits have been landed. Closing PR #4244 and removing active labels.

@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Sep 12, 2022
@whsieh whsieh deleted the eng/245058 branch May 17, 2024 22:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
HTML Editing For bugs in HTML editing support (including designMode and contentEditable).
Projects
None yet
3 participants