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

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

Issue 2888283004: Revert of Introduce WebPluginContainerBase to abstract WebPluginContainerImpl. (Closed)
Patch Set: 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/WebViewImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebViewImpl.cpp b/third_party/WebKit/Source/web/WebViewImpl.cpp
index 00d4d9451be2025446f9a5673b8f381118a0e256..c4cd4937d34739020a99e91f508d035d17f7625f 100644
--- a/third_party/WebKit/Source/web/WebViewImpl.cpp
+++ b/third_party/WebKit/Source/web/WebViewImpl.cpp
@@ -51,7 +51,6 @@
#include "core/events/UIEventWithKeyState.h"
#include "core/events/WebInputEventConversion.h"
#include "core/events/WheelEvent.h"
-#include "core/exported/WebPluginContainerBase.h"
#include "core/frame/BrowserControls.h"
#include "core/frame/EventHandlerRegistry.h"
#include "core/frame/FrameView.h"
@@ -172,6 +171,7 @@
#include "web/WebDevToolsAgentImpl.h"
#include "web/WebInputMethodControllerImpl.h"
#include "web/WebLocalFrameImpl.h"
+#include "web/WebPluginContainerImpl.h"
#include "web/WebRemoteFrameImpl.h"
#include "web/WebSettingsImpl.h"
@@ -1176,8 +1176,8 @@
PluginView* plugin_view =
ToLayoutPart(element->GetLayoutObject())->Plugin();
if (plugin_view && plugin_view->IsPluginContainer()) {
- WebPluginContainerBase* plugin =
- ToWebPluginContainerBase(plugin_view);
+ WebPluginContainerImpl* plugin =
+ ToWebPluginContainerImpl(plugin_view);
if (plugin && plugin->SupportsKeyboardFocus())
suppress_next_keypress_event_ = true;
}
@@ -2419,7 +2419,7 @@
// 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 =
+ WebPluginContainerImpl* container =
WebLocalFrameImpl::CurrentPluginContainer(frame);
if (container && container->SupportsInputMethod())
return container->Plugin();
@@ -3379,7 +3379,7 @@
if (object && object->IsLayoutPart()) {
PluginView* plugin_view = ToLayoutPart(object)->Plugin();
if (plugin_view && plugin_view->IsPluginContainer()) {
- WebPluginContainerBase* plugin = ToWebPluginContainerBase(plugin_view);
+ WebPluginContainerImpl* plugin = ToWebPluginContainerImpl(plugin_view);
switch (action.type) {
case WebPluginAction::kRotate90Clockwise:
plugin->Plugin()->RotateView(WebPlugin::kRotationType90Clockwise);
« no previous file with comments | « third_party/WebKit/Source/web/WebPluginDocument.cpp ('k') | third_party/WebKit/Source/web/tests/WebPluginContainerTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698