| Index: third_party/WebKit/Source/web/WebViewImpl.cpp
|
| diff --git a/third_party/WebKit/Source/web/WebViewImpl.cpp b/third_party/WebKit/Source/web/WebViewImpl.cpp
|
| index 8cc7d34fdd4e19c7c383787aadecacf3ba504892..58e0ace33d93a780c51686cc100f9ffaaa39e84c 100644
|
| --- a/third_party/WebKit/Source/web/WebViewImpl.cpp
|
| +++ b/third_party/WebKit/Source/web/WebViewImpl.cpp
|
| @@ -2418,16 +2418,6 @@ bool WebViewImpl::SelectionBounds(WebRect& anchor, WebRect& focus) const {
|
|
|
| // TODO(ekaramad):This method is almost duplicated in WebFrameWidgetImpl as
|
| // well. This code needs to be refactored (http://crbug.com/629721).
|
| -WebPlugin* WebViewImpl::FocusedPluginIfInputMethodSupported(LocalFrame* frame) {
|
| - WebPluginContainerBase* container =
|
| - WebLocalFrameImpl::CurrentPluginContainer(frame);
|
| - if (container && container->SupportsInputMethod())
|
| - return container->Plugin();
|
| - return nullptr;
|
| -}
|
| -
|
| -// TODO(ekaramad):This method is almost duplicated in WebFrameWidgetImpl as
|
| -// well. This code needs to be refactored (http://crbug.com/629721).
|
| bool WebViewImpl::SelectionTextDirection(WebTextDirection& start,
|
| WebTextDirection& end) const {
|
| const LocalFrame* frame = FocusedLocalFrameInWidget();
|
| @@ -2909,7 +2899,7 @@ void WebViewImpl::PropagateZoomFactorToLocalFrameRoots(Frame* frame,
|
| float zoom_factor) {
|
| if (frame->IsLocalRoot()) {
|
| LocalFrame* local_frame = ToLocalFrame(frame);
|
| - if (!WebLocalFrameImpl::PluginContainerFromFrame(local_frame))
|
| + if (!local_frame->GetWebPluginContainerBase())
|
| local_frame->SetPageZoomFactor(zoom_factor);
|
| }
|
|
|
| @@ -2961,7 +2951,7 @@ float WebViewImpl::TextZoomFactor() {
|
|
|
| float WebViewImpl::SetTextZoomFactor(float text_zoom_factor) {
|
| LocalFrame* frame = MainFrameImpl()->GetFrame();
|
| - if (WebLocalFrameImpl::PluginContainerFromFrame(frame))
|
| + if (frame->GetWebPluginContainerBase())
|
| return 1;
|
|
|
| frame->SetTextZoomFactor(text_zoom_factor);
|
|
|