Diff
Modified: trunk/Source/WebCore/ChangeLog (217223 => 217224)
--- trunk/Source/WebCore/ChangeLog 2017-05-22 17:38:38 UTC (rev 217223)
+++ trunk/Source/WebCore/ChangeLog 2017-05-22 18:02:33 UTC (rev 217224)
@@ -1,3 +1,16 @@
+2017-05-22 Wenson Hsieh <[email protected]>
+
+ Remove unused documentIsHandlingNonDefaultDrag plumbing for WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=172453
+
+ Reviewed by Tim Horton.
+
+ Removes unused plumbing that was originally added to support file uploads. No new tests, since there is no
+ change in behavior.
+
+ * page/DragController.h:
+ (WebCore::DragController::documentIsHandlingNonDefaultDrag): Deleted.
+
2017-05-22 Jer Noble <[email protected]>
Media element thinks its hidden when in PiP mode and tab is backgrounded.
Modified: trunk/Source/WebCore/page/DragController.h (217223 => 217224)
--- trunk/Source/WebCore/page/DragController.h 2017-05-22 17:38:38 UTC (rev 217223)
+++ trunk/Source/WebCore/page/DragController.h 2017-05-22 18:02:33 UTC (rev 217224)
@@ -81,7 +81,6 @@
DragSourceAction dragSourceAction() const { return m_dragSourceAction; }
enum class DragHandlingMethod { None, EditPlainText, EditRichText, UploadFile, PageLoad, SetColor, NonDefault };
- bool documentIsHandlingNonDefaultDrag() const { return m_dragHandlingMethod == DragHandlingMethod::NonDefault; }
Document* documentUnderMouse() const { return m_documentUnderMouse.get(); }
DragDestinationAction dragDestinationAction() const { return m_dragDestinationAction; }
DragSourceAction delegateDragSourceAction(const IntPoint& rootViewPoint);
Modified: trunk/Source/WebKit2/ChangeLog (217223 => 217224)
--- trunk/Source/WebKit2/ChangeLog 2017-05-22 17:38:38 UTC (rev 217223)
+++ trunk/Source/WebKit2/ChangeLog 2017-05-22 18:02:33 UTC (rev 217224)
@@ -1,3 +1,22 @@
+2017-05-22 Wenson Hsieh <[email protected]>
+
+ Remove unused documentIsHandlingNonDefaultDrag plumbing for WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=172453
+
+ Reviewed by Tim Horton.
+
+ Removes unused plumbing that was originally added to support file uploads.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didPerformDragControllerAction):
+ (WebKit::WebPageProxy::resetCurrentDragInformation):
+ * UIProcess/WebPageProxy.h:
+ (WebKit::WebPageProxy::currentDragCaretRect):
+ (WebKit::WebPageProxy::documentIsHandlingNonDefaultDrag): Deleted.
+ * UIProcess/WebPageProxy.messages.in:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::performDragControllerAction):
+
2017-05-22 Michael Catanzaro <[email protected]>
Add even more input validation in Connection::processMessage()
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (217223 => 217224)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-05-22 17:38:38 UTC (rev 217223)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-05-22 18:02:33 UTC (rev 217224)
@@ -405,7 +405,6 @@
, m_currentDragOperation(DragOperationNone)
, m_currentDragIsOverFileInput(false)
, m_currentDragNumberOfFilesToBeAccepted(0)
- , m_documentIsHandlingNonDefaultDrag(false)
#endif
, m_pageLoadState(*this)
, m_delegatesScrolling(false)
@@ -1795,7 +1794,7 @@
#endif
}
-void WebPageProxy::didPerformDragControllerAction(uint64_t dragOperation, bool mouseIsOverFileInput, unsigned numberOfItemsToBeAccepted, const IntRect& insertionRect, bool isHandlingNonDefaultDrag)
+void WebPageProxy::didPerformDragControllerAction(uint64_t dragOperation, bool mouseIsOverFileInput, unsigned numberOfItemsToBeAccepted, const IntRect& insertionRect)
{
MESSAGE_CHECK(dragOperation <= DragOperationDelete);
@@ -1802,7 +1801,6 @@
m_currentDragOperation = static_cast<DragOperation>(dragOperation);
m_currentDragIsOverFileInput = mouseIsOverFileInput;
m_currentDragNumberOfFilesToBeAccepted = numberOfItemsToBeAccepted;
- m_documentIsHandlingNonDefaultDrag = isHandlingNonDefaultDrag;
setDragCaretRect(insertionRect);
}
@@ -1845,7 +1843,6 @@
{
m_currentDragOperation = WebCore::DragOperationNone;
m_currentDragIsOverFileInput = false;
- m_documentIsHandlingNonDefaultDrag = false;
m_currentDragNumberOfFilesToBeAccepted = 0;
setDragCaretRect({ });
}
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (217223 => 217224)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2017-05-22 17:38:38 UTC (rev 217223)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2017-05-22 18:02:33 UTC (rev 217224)
@@ -814,7 +814,7 @@
void dragExited(WebCore::DragData&, const String& dragStorageName = String());
void performDragOperation(WebCore::DragData&, const String& dragStorageName, const SandboxExtension::Handle&, const SandboxExtension::HandleArray&);
- void didPerformDragControllerAction(uint64_t dragOperation, bool mouseIsOverFileInput, unsigned numberOfItemsToBeAccepted, const WebCore::IntRect& insertionRect, bool isHandlingNonDefaultDrag);
+ void didPerformDragControllerAction(uint64_t dragOperation, bool mouseIsOverFileInput, unsigned numberOfItemsToBeAccepted, const WebCore::IntRect& insertionRect);
void dragEnded(const WebCore::IntPoint& clientPosition, const WebCore::IntPoint& globalPosition, uint64_t operation);
void didStartDrag();
void dragCancelled();
@@ -873,7 +873,6 @@
bool currentDragIsOverFileInput() const { return m_currentDragIsOverFileInput; }
unsigned currentDragNumberOfFilesToBeAccepted() const { return m_currentDragNumberOfFilesToBeAccepted; }
WebCore::IntRect currentDragCaretRect() const { return m_currentDragCaretRect; }
- bool documentIsHandlingNonDefaultDrag() const { return m_documentIsHandlingNonDefaultDrag; }
void resetCurrentDragInformation();
void didEndDragging();
#endif
@@ -1856,7 +1855,6 @@
bool m_currentDragIsOverFileInput;
unsigned m_currentDragNumberOfFilesToBeAccepted;
WebCore::IntRect m_currentDragCaretRect;
- bool m_documentIsHandlingNonDefaultDrag;
#endif
PageLoadState m_pageLoadState;
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (217223 => 217224)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2017-05-22 17:38:38 UTC (rev 217223)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2017-05-22 18:02:33 UTC (rev 217224)
@@ -295,7 +295,7 @@
# Drag and drop messages
#if ENABLE(DRAG_SUPPORT)
- DidPerformDragControllerAction(uint64_t dragOperation, bool mouseIsOverFileInput, unsigned numberOfItemsToBeAccepted, WebCore::IntRect insertionRect, bool isHandlingNonDefaultDrag)
+ DidPerformDragControllerAction(uint64_t dragOperation, bool mouseIsOverFileInput, unsigned numberOfItemsToBeAccepted, WebCore::IntRect insertionRect)
DidEndDragging();
#endif
#if PLATFORM(COCOA) && ENABLE(DRAG_SUPPORT)
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (217223 => 217224)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2017-05-22 17:38:38 UTC (rev 217223)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2017-05-22 18:02:33 UTC (rev 217224)
@@ -3554,7 +3554,7 @@
void WebPage::performDragControllerAction(uint64_t action, const IntPoint& clientPosition, const IntPoint& globalPosition, uint64_t draggingSourceOperationMask, WebSelectionData&& selection, uint32_t flags)
{
if (!m_page) {
- send(Messages::WebPageProxy::DidPerformDragControllerAction(DragOperationNone, false, 0, { }, false));
+ send(Messages::WebPageProxy::DidPerformDragControllerAction(DragOperationNone, false, 0, { }));
return;
}
@@ -3562,12 +3562,12 @@
switch (action) {
case DragControllerActionEntered: {
DragOperation resolvedDragOperation = m_page->dragController().dragEntered(dragData);
- send(Messages::WebPageProxy::DidPerformDragControllerAction(resolvedDragOperation, m_page->dragController().mouseIsOverFileInput(), m_page->dragController().numberOfItemsToBeAccepted(), { }, false));
+ send(Messages::WebPageProxy::DidPerformDragControllerAction(resolvedDragOperation, m_page->dragController().mouseIsOverFileInput(), m_page->dragController().numberOfItemsToBeAccepted(), { }));
break;
}
case DragControllerActionUpdated: {
DragOperation resolvedDragOperation = m_page->dragController().dragEntered(dragData);
- send(Messages::WebPageProxy::DidPerformDragControllerAction(resolvedDragOperation, m_page->dragController().mouseIsOverFileInput(), m_page->dragController().numberOfItemsToBeAccepted(), { }, false));
+ send(Messages::WebPageProxy::DidPerformDragControllerAction(resolvedDragOperation, m_page->dragController().mouseIsOverFileInput(), m_page->dragController().numberOfItemsToBeAccepted(), { }));
break;
}
case DragControllerActionExited:
@@ -3587,7 +3587,7 @@
void WebPage::performDragControllerAction(uint64_t action, const WebCore::DragData& dragData, const SandboxExtension::Handle& sandboxExtensionHandle, const SandboxExtension::HandleArray& sandboxExtensionsHandleArray)
{
if (!m_page) {
- send(Messages::WebPageProxy::DidPerformDragControllerAction(DragOperationNone, false, 0, { }, false));
+ send(Messages::WebPageProxy::DidPerformDragControllerAction(DragOperationNone, false, 0, { }));
return;
}
@@ -3594,18 +3594,18 @@
switch (action) {
case DragControllerActionEntered: {
DragOperation resolvedDragOperation = m_page->dragController().dragEntered(dragData);
- send(Messages::WebPageProxy::DidPerformDragControllerAction(resolvedDragOperation, m_page->dragController().mouseIsOverFileInput(), m_page->dragController().numberOfItemsToBeAccepted(), m_page->dragCaretController().caretPosition().absoluteCaretBounds(), m_page->dragController().documentIsHandlingNonDefaultDrag()));
+ send(Messages::WebPageProxy::DidPerformDragControllerAction(resolvedDragOperation, m_page->dragController().mouseIsOverFileInput(), m_page->dragController().numberOfItemsToBeAccepted(), m_page->dragCaretController().caretPosition().absoluteCaretBounds()));
break;
}
case DragControllerActionUpdated: {
DragOperation resolvedDragOperation = m_page->dragController().dragUpdated(dragData);
- send(Messages::WebPageProxy::DidPerformDragControllerAction(resolvedDragOperation, m_page->dragController().mouseIsOverFileInput(), m_page->dragController().numberOfItemsToBeAccepted(), m_page->dragCaretController().caretPosition().absoluteCaretBounds(), m_page->dragController().documentIsHandlingNonDefaultDrag()));
+ send(Messages::WebPageProxy::DidPerformDragControllerAction(resolvedDragOperation, m_page->dragController().mouseIsOverFileInput(), m_page->dragController().numberOfItemsToBeAccepted(), m_page->dragCaretController().caretPosition().absoluteCaretBounds()));
break;
}
case DragControllerActionExited:
m_page->dragController().dragExited(dragData);
- send(Messages::WebPageProxy::DidPerformDragControllerAction(DragOperationNone, false, 0, { }, false));
+ send(Messages::WebPageProxy::DidPerformDragControllerAction(DragOperationNone, false, 0, { }));
break;
case DragControllerActionPerformDragOperation: {
