Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(809)

Unified Diff: Source/core/page/DragController.cpp

Issue 640303002: Enable Oilpan for core/clipboard/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: remove some slightly pointy edges Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/html/forms/FileInputTypeTest.cpp ('k') | Source/core/page/DragData.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/page/DragController.cpp
diff --git a/Source/core/page/DragController.cpp b/Source/core/page/DragController.cpp
index 94ef4a3200624dae7c307de9b9a1e06442d9a3d7..d6dc92eaeb5501c15f7679e237d47de85b7599cb 100644
--- a/Source/core/page/DragController.cpp
+++ b/Source/core/page/DragController.cpp
@@ -117,7 +117,7 @@ static PlatformMouseEvent createMouseEvent(DragData* dragData)
PlatformMouseEvent::RealOrIndistinguishable, currentTime());
}
-static PassRefPtrWillBeRawPtr<DataTransfer> createDraggingDataTransfer(DataTransferAccessPolicy policy, DragData* dragData)
+static DataTransfer* createDraggingDataTransfer(DataTransferAccessPolicy policy, DragData* dragData)
{
return DataTransfer::create(DataTransfer::DragAndDrop, policy, dragData->platformData());
}
@@ -214,9 +214,9 @@ void DragController::dragExited(DragData* dragData)
RefPtrWillBeRawPtr<FrameView> frameView(mainFrame->view());
if (frameView) {
DataTransferAccessPolicy policy = (!m_documentUnderMouse || m_documentUnderMouse->securityOrigin()->isLocal()) ? DataTransferReadable : DataTransferTypesReadable;
- RefPtrWillBeRawPtr<DataTransfer> dataTransfer = createDraggingDataTransfer(policy, dragData);
+ DataTransfer* dataTransfer = createDraggingDataTransfer(policy, dragData);
dataTransfer->setSourceOperation(dragData->draggingSourceOperationMask());
- mainFrame->eventHandler().cancelDragAndDrop(createMouseEvent(dragData), dataTransfer.get());
+ mainFrame->eventHandler().cancelDragAndDrop(createMouseEvent(dragData), dataTransfer);
dataTransfer->setAccessPolicy(DataTransferNumb); // invalidate clipboard here for security
}
mouseMovedIntoDocument(nullptr);
@@ -239,9 +239,9 @@ bool DragController::performDrag(DragData* dragData)
bool preventedDefault = false;
if (mainFrame->view()) {
// Sending an event can result in the destruction of the view and part.
- RefPtrWillBeRawPtr<DataTransfer> dataTransfer = createDraggingDataTransfer(DataTransferReadable, dragData);
+ DataTransfer* dataTransfer = createDraggingDataTransfer(DataTransferReadable, dragData);
dataTransfer->setSourceOperation(dragData->draggingSourceOperationMask());
- preventedDefault = mainFrame->eventHandler().performDragAndDrop(createMouseEvent(dragData), dataTransfer.get());
+ preventedDefault = mainFrame->eventHandler().performDragAndDrop(createMouseEvent(dragData), dataTransfer);
dataTransfer->setAccessPolicy(DataTransferNumb); // Invalidate clipboard here for security
}
if (preventedDefault) {
@@ -595,12 +595,12 @@ bool DragController::tryDHTMLDrag(DragData* dragData, DragOperation& operation)
RefPtrWillBeRawPtr<FrameView> viewProtector(mainFrame->view());
DataTransferAccessPolicy policy = m_documentUnderMouse->securityOrigin()->isLocal() ? DataTransferReadable : DataTransferTypesReadable;
- RefPtrWillBeRawPtr<DataTransfer> dataTransfer = createDraggingDataTransfer(policy, dragData);
+ DataTransfer* dataTransfer = createDraggingDataTransfer(policy, dragData);
DragOperation srcOpMask = dragData->draggingSourceOperationMask();
dataTransfer->setSourceOperation(srcOpMask);
PlatformMouseEvent event = createMouseEvent(dragData);
- if (!mainFrame->eventHandler().updateDragAndDrop(event, dataTransfer.get())) {
+ if (!mainFrame->eventHandler().updateDragAndDrop(event, dataTransfer)) {
dataTransfer->setAccessPolicy(DataTransferNumb); // invalidate clipboard here for security
return false;
}
« no previous file with comments | « Source/core/html/forms/FileInputTypeTest.cpp ('k') | Source/core/page/DragData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698