third_party/WebKit/Source/web/InspectorOverlay.cpp - Issue 1382593004: Allow out-of-process iframes to update the mouse cursor

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/web/InspectorOverlay.cpp

Issue 1382593004: Allow out-of-process iframes to update the mouse cursor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Improved feng shui Created 5 years, 2 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

« content/renderer/render_frame_impl.cc ('K') | « third_party/WebKit/Source/web/ChromeClientImpl.cpp ('k') | third_party/WebKit/Source/web/WebPagePopupImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/web/InspectorOverlay.cpp

diff --git a/third_party/WebKit/Source/web/InspectorOverlay.cpp b/third_party/WebKit/Source/web/InspectorOverlay.cpp

index dca32a78b2c36ec640425acf43ac5bebcdee2e14..6bfb1eba1f68a34cc4600b21ee4fb126b0dd771c 100644

--- a/third_party/WebKit/Source/web/InspectorOverlay.cpp

+++ b/third_party/WebKit/Source/web/InspectorOverlay.cpp

@@ -137,10 +137,10 @@ public:

EmptyChromeClient::trace(visitor);

}

- void setCursor(const Cursor& cursor) override

+ void setCursor(const Cursor& cursor, LocalFrame* localRoot) override

{

toChromeClientImpl(m_client)->setCursorOverridden(false);

- toChromeClientImpl(m_client)->setCursor(cursor);

+ toChromeClientImpl(m_client)->setCursor(cursor, localRoot);

bool overrideCursor = m_overlay->m_layoutEditor;

toChromeClientImpl(m_client)->setCursorOverridden(overrideCursor);

}

@@ -624,7 +624,7 @@ void InspectorOverlay::overlayClearSelection(bool commitChanges)

highlightNode(m_hoveredNodeForInspectMode.get(), *m_inspectModeHighlightConfig, false);

toChromeClientImpl(m_webViewImpl->page()->chromeClient()).setCursorOverridden(false);

- toChromeClientImpl(m_webViewImpl->page()->chromeClient()).setCursor(pointerCursor());

+ toChromeClientImpl(m_webViewImpl->page()->chromeClient()).setCursor(pointerCursor(), overlayMainFrame());

}

void InspectorOverlay::profilingStarted()