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

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

Issue 2892393002: Move WebInputMethodControllerImpl to core/exported/ & break dependencies. (Closed)
Patch Set: Move WebInputMethodControllerImpl to core/exported/ 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 3082bf7c55d41eb82968523d001f1a915a8f6c16..68a8e8252949b3bba7d791f90128552322b9150e 100644
--- a/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
+++ b/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
@@ -71,7 +71,6 @@
#include "web/CompositorWorkerProxyClientImpl.h"
#include "web/ContextMenuAllowedScope.h"
#include "web/WebDevToolsAgentImpl.h"
-#include "web/WebInputMethodControllerImpl.h"
#include "web/WebLocalFrameImpl.h"
#include "web/WebPagePopupImpl.h"
#include "web/WebRemoteFrameImpl.h"
@@ -458,9 +457,11 @@ void WebFrameWidgetImpl::UpdateBaseBackgroundColor() {
local_root_->GetFrameView()->SetBaseBackgroundColor(BaseBackgroundColor());
}
-WebInputMethodControllerImpl*
+WebInputMethodController*
WebFrameWidgetImpl::GetActiveWebInputMethodController() const {
- return WebInputMethodControllerImpl::FromFrame(FocusedLocalFrameInWidget());
+ WebLocalFrameBase* local_frame =
+ WebLocalFrameBase::FromFrame(FocusedLocalFrameInWidget());
+ return local_frame ? local_frame->GetInputMethodController() : nullptr;
}
void WebFrameWidgetImpl::ScheduleAnimation() {

Powered by Google App Engine
This is Rietveld 408576698