Bug 170874 – Dragging a few items over MiniBrowser has 0 in the red indicator.

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit2

[Per Arne Vollan]

When MiniBrowser doesn't accept the drag, the NSDraggingInfo member numberOfValidItemsForDrop should not be set to zero.

[Per Arne Vollan]

Created attachment 307196 [details]
Patch

[Per Arne Vollan]

rdar://problem/11141060

[David Kilzer (:ddkilzer)]

Comment on attachment 307196 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=307196&action=review

r=me

> Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm:3620
> +    if (numberOfValidItemsForDrop <= 0)

Or "< 1"?

[Per Arne Vollan]

Created attachment 307387 [details]
Patch

[Per Arne Vollan]

(In reply to David Kilzer (:ddkilzer) from comment #3)
> Comment on attachment 307196 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=307196&action=review
> 
> r=me
> 
> > Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm:3620
> > +    if (numberOfValidItemsForDrop <= 0)
> 
> Or "< 1"?

Thanks for reviewing! My previous patch was incorrect, since it turns out  that Page::currentDragNumberOfFilesToBeAccepted() can return zero also when WebKit accepts the drag items. This should be fixed in the latest patch.

[Build Bot]

Comment on attachment 307387 [details]
Patch

Attachment 307387 [details] did not pass mac-debug-ews (mac):
Output: http://webkit-queues.webkit.org/results/3557973

New failing tests:
http/tests/inspector/network/resource-sizes-network.html

[Build Bot]

Created attachment 307391 [details]
Archive of layout-test-results from ews117 for mac-elcapitan

The attached test failures were seen while running run-webkit-tests on the mac-debug-ews.
Bot: ews117  Port: mac-elcapitan  Platform: Mac OS X 10.11.6

[David Kilzer (:ddkilzer)]

Comment on attachment 307387 [details]
Patch

r=me

[David Kilzer (:ddkilzer)]

Comment on attachment 307387 [details]
Patch

Oops, I can't review this as it's WebKit2.

[Wenson Hsieh]

Comment on attachment 307387 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=307387&action=review

r=me! I'm not a WebKit2 reviewer though, so a WebKit2 reviewer will have to r+ as well.

> Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm:3603
> +    m_initialNumberOfValidItemsForDrop = [draggingInfo numberOfValidItemsForDrop];

Nit - I think we prefer dot notation here.

> Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm:3625
>      if (m_page->currentDragIsOverFileInput() && numberOfValidItemsForDrop > 0)

If the idea is to revert to the initial number of items when the drag operation is None, should we also apply similar treatment to the dragging formation and revert to the initial dragging formation? Maybe it's not needed for this bug though, since it's only dealing with the badge.

> Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm:3643
> +    [draggingInfo setNumberOfValidItemsForDrop:m_initialNumberOfValidItemsForDrop];

Dot notation here too.

[Tim Horton]

Comment on attachment 307387 [details]
Patch

wk2r+ with Wenson's comments addressed

[Per Arne Vollan]

Committed <https://trac.webkit.org/changeset/215504/webkit>