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

Unified Diff: third_party/WebKit/Source/core/frame/LocalFrame.cpp

Issue 2953503004: Transfer ownership of InputMethodController from LocalFrame to DOMWindow
Patch Set: Created 3 years, 6 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/frame/LocalFrame.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/frame/LocalFrame.cpp
diff --git a/third_party/WebKit/Source/core/frame/LocalFrame.cpp b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
index f64499cace3090cb8a1f0c2b51782436600182e2..6315e9b92d00cf63a4da883710a13667a43fdff9 100644
--- a/third_party/WebKit/Source/core/frame/LocalFrame.cpp
+++ b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
@@ -384,7 +384,6 @@ DEFINE_TRACE(LocalFrame) {
visitor->Trace(selection_);
visitor->Trace(event_handler_);
visitor->Trace(console_);
- visitor->Trace(input_method_controller_);
visitor->Trace(frame_resource_coordinator_);
Frame::Trace(visitor);
Supplementable<LocalFrame>::Trace(visitor);
@@ -935,7 +934,6 @@ inline LocalFrame::LocalFrame(LocalFrameClient* client,
selection_(FrameSelection::Create(*this)),
event_handler_(new EventHandler(*this)),
console_(FrameConsole::Create(*this)),
- input_method_controller_(InputMethodController::Create(*this)),
navigation_disable_count_(0),
page_zoom_factor_(ParentPageZoomFactor(this)),
text_zoom_factor_(ParentTextZoomFactor(this)),
@@ -1255,4 +1253,8 @@ void LocalFrame::SetViewportIntersectionFromParent(
}
}
+InputMethodController& LocalFrame::GetInputMethodController() const {
+ return *DomWindow()->GetInputMethodController();
+}
+
} // namespace blink
« no previous file with comments | « third_party/WebKit/Source/core/frame/LocalFrame.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698