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

Unified Diff: Source/web/WebViewImpl.cpp

Issue 642203002: Make input event forwarding work in --site-per-process. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix merge conflict. Created 6 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
Index: Source/web/WebViewImpl.cpp
diff --git a/Source/web/WebViewImpl.cpp b/Source/web/WebViewImpl.cpp
index 38a0553d0af224ed7fd473dcc023b28adf606ec6..e59c157b3c53b047b3358f12ec1a3a6f0c4a8318 100644
--- a/Source/web/WebViewImpl.cpp
+++ b/Source/web/WebViewImpl.cpp
@@ -989,8 +989,8 @@ bool WebViewImpl::handleKeyEvent(const WebKeyboardEvent& event)
}
RefPtrWillBeRawPtr<Frame> focusedFrame = focusedCoreFrame();
- if (focusedFrame && focusedFrame->isRemoteFrameTemporary()) {
- WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(toLocalFrameTemporary(focusedFrame.get()));
+ if (focusedFrame && focusedFrame->isRemoteFrame()) {
+ WebRemoteFrameImpl* webFrame = WebRemoteFrameImpl::fromFrame(*toRemoteFrame(focusedFrame.get()));
webFrame->client()->forwardInputEvent(&event);
return true;
}
@@ -2088,7 +2088,8 @@ bool WebViewImpl::handleInputEvent(const WebInputEvent& inputEvent)
return true;
}
- return PageWidgetDelegate::handleInputEvent(*this, inputEvent, m_page->deprecatedLocalMainFrame());
+ // FIXME: This should take in the intended frame, not the local frame root.
+ return PageWidgetDelegate::handleInputEvent(*this, inputEvent, localFrameRootTemporary()->frame());
}
void WebViewImpl::setCursorVisibilityState(bool isVisible)

Powered by Google App Engine
This is Rietveld 408576698