third_party/WebKit/Source/core/page/DragController.cpp - Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: clash-modules: rebase-fixes Created 4 years, 9 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 | « third_party/WebKit/Source/core/origin_trials/testing/InternalsFrobulate.cpp ('k') | third_party/WebKit/Source/core/page/EventSource.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/page/DragController.cpp

diff --git a/third_party/WebKit/Source/core/page/DragController.cpp b/third_party/WebKit/Source/core/page/DragController.cpp

index 5288d403f90a8345ba44440160c2bb1194f2044f..0abda3ecba97769428d9fbd3ed9893e6cb9b3b50 100644

--- a/third_party/WebKit/Source/core/page/DragController.cpp

+++ b/third_party/WebKit/Source/core/page/DragController.cpp

@@ -215,7 +215,7 @@ void DragController::dragExited(DragData* dragData)

RefPtrWillBeRawPtr<FrameView> frameView(mainFrame->view());

if (frameView) {

- DataTransferAccessPolicy policy = (!m_documentUnderMouse || m_documentUnderMouse->securityOrigin()->isLocal()) ? DataTransferReadable : DataTransferTypesReadable;

+ DataTransferAccessPolicy policy = (!m_documentUnderMouse || m_documentUnderMouse->getSecurityOrigin()->isLocal()) ? DataTransferReadable : DataTransferTypesReadable;

DataTransfer* dataTransfer = createDraggingDataTransfer(policy, dragData);

dataTransfer->setSourceOperation(dragData->draggingSourceOperationMask());

mainFrame->eventHandler().cancelDragAndDrop(createMouseEvent(dragData), dataTransfer);

@@ -331,7 +331,7 @@ bool DragController::tryDocumentDrag(DragData* dragData, DragDestinationAction a

if (!m_documentUnderMouse)

return false;

- if (m_dragInitiator && !m_documentUnderMouse->securityOrigin()->canAccess(m_dragInitiator->securityOrigin()))

+ if (m_dragInitiator && !m_documentUnderMouse->getSecurityOrigin()->canAccess(m_dragInitiator->getSecurityOrigin()))

return false;

bool isHandlingDrag = false;

@@ -589,7 +589,7 @@ bool DragController::tryDHTMLDrag(DragData* dragData, DragOperation& operation)

return false;

RefPtrWillBeRawPtr<FrameView> viewProtector(mainFrame->view());

- DataTransferAccessPolicy policy = m_documentUnderMouse->securityOrigin()->isLocal() ? DataTransferReadable : DataTransferTypesReadable;

+ DataTransferAccessPolicy policy = m_documentUnderMouse->getSecurityOrigin()->isLocal() ? DataTransferReadable : DataTransferTypesReadable;

DataTransfer* dataTransfer = createDraggingDataTransfer(policy, dragData);

DragOperation srcOpMask = dragData->draggingSourceOperationMask();

dataTransfer->setSourceOperation(srcOpMask);