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

Unified Diff: third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp

Issue 2910233002: Do not fallback to FocusedOrMainFrame() in FocusedLocalFrameInWidget() (Closed)
Patch Set: Fixed a crashing test Created 3 years, 7 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: third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp b/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
index 76d4b0beec8e11c5bccccaa769bebd331ab89ab3..67c91b0cc8e71bb9511e32014ab2d07820303011 100644
--- a/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
+++ b/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
@@ -118,7 +118,6 @@ WebFrameWidgetImpl::WebFrameWidgetImpl(WebWidgetClient* client,
background_color_override_(Color::kTransparent),
base_background_color_override_enabled_(false),
base_background_color_override_(Color::kTransparent),
- ime_accept_events_(true),
self_keep_alive_(this) {
DCHECK(local_root_->GetFrame()->IsLocalRoot());
InitializeLayerTreeView();
@@ -1188,17 +1187,4 @@ HitTestResult WebFrameWidgetImpl::HitTestResultForRootFramePos(
return result;
}
-LocalFrame* WebFrameWidgetImpl::FocusedLocalFrameInWidget() const {
- LocalFrame* frame = GetPage()->GetFocusController().FocusedFrame();
- return (frame && frame->LocalFrameRoot() == local_root_->GetFrame())
- ? frame
- : nullptr;
-}
-
-LocalFrame* WebFrameWidgetImpl::FocusedLocalFrameAvailableForIme() const {
- if (!ime_accept_events_)
- return nullptr;
- return FocusedLocalFrameInWidget();
-}
-
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698