third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp - Issue 2892393002: Move WebInputMethodControllerImpl to core/exported/ & break dependencies.

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/WebFrameWidgetImpl.cpp

Issue 2892393002: Move WebInputMethodControllerImpl to core/exported/ & break dependencies. (Closed)

Patch Set: Rebase. 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:

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 ce41639574de91756b960ca8632733ca2be19d3e..e3806f2d42ac8a65017ab413962f3f1832fb76ee 100644

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

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

@@ -72,7 +72,6 @@

#include "web/CompositorMutatorImpl.h"

#include "web/CompositorWorkerProxyClientImpl.h"

#include "web/WebDevToolsAgentImpl.h"

-#include "web/WebInputMethodControllerImpl.h"

#include "web/WebPagePopupImpl.h"

#include "web/WebRemoteFrameImpl.h"

#include "web/WebViewFrameWidget.h"

@@ -459,9 +458,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() {