Title: [233749] trunk/Source/WebKit
- Revision
- 233749
- Author
- [email protected]
- Date
- 2018-07-11 17:52:52 -0700 (Wed, 11 Jul 2018)
Log Message
Release logging dumps "Cleaning up dragging state…" every time gesture recognizers are reset in WKContentView
https://bugs.webkit.org/show_bug.cgi?id=187562
Reviewed by Tim Horton.
Tweaks up a release logging statement, such that it only logs when performing a drag or drop.
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView cleanUpDragSourceSessionState]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (233748 => 233749)
--- trunk/Source/WebKit/ChangeLog 2018-07-12 00:44:24 UTC (rev 233748)
+++ trunk/Source/WebKit/ChangeLog 2018-07-12 00:52:52 UTC (rev 233749)
@@ -1,3 +1,15 @@
+2018-07-11 Wenson Hsieh <[email protected]>
+
+ Release logging dumps "Cleaning up dragging state…" every time gesture recognizers are reset in WKContentView
+ https://bugs.webkit.org/show_bug.cgi?id=187562
+
+ Reviewed by Tim Horton.
+
+ Tweaks up a release logging statement, such that it only logs when performing a drag or drop.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView cleanUpDragSourceSessionState]):
+
2018-07-11 Commit Queue <[email protected]>
Unreviewed, rolling out r233741.
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (233748 => 233749)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2018-07-12 00:44:24 UTC (rev 233748)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2018-07-12 00:52:52 UTC (rev 233749)
@@ -4930,7 +4930,9 @@
- (void)cleanUpDragSourceSessionState
{
- RELEASE_LOG(DragAndDrop, "Cleaning up dragging state (has pending operation: %d)", [[WebItemProviderPasteboard sharedInstance] hasPendingOperation]);
+ if (_dragDropInteractionState.dragSession() || _dragDropInteractionState.isPerformingDrop())
+ RELEASE_LOG(DragAndDrop, "Cleaning up dragging state (has pending operation: %d)", [[WebItemProviderPasteboard sharedInstance] hasPendingOperation]);
+
if (![[WebItemProviderPasteboard sharedInstance] hasPendingOperation]) {
// If we're performing a drag operation, don't clear out the pasteboard yet, since another web view may still require access to it.
// The pasteboard will be cleared after the last client is finished performing a drag operation using the item providers.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
