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

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

Issue 2888203006: Move the logic to retrieve the WebPluginContainer to LocalFrame and Node. (Closed)
Patch Set: Ensure we have a valid PluginView before using it. 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
« no previous file with comments | « third_party/WebKit/Source/web/WebViewImpl.h ('k') | third_party/WebKit/public/web/WebNode.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1f74c7660f156f70ea7ed1bd1c9e00a192452a4f..6496744c596bb2088bdb063cbfe72955a15e45f5 100644
--- a/third_party/WebKit/Source/web/WebViewImpl.cpp
+++ b/third_party/WebKit/Source/web/WebViewImpl.cpp
@@ -2417,16 +2417,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();
@@ -2908,7 +2898,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);
}
@@ -2960,7 +2950,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);
« no previous file with comments | « third_party/WebKit/Source/web/WebViewImpl.h ('k') | third_party/WebKit/public/web/WebNode.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698