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

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

Issue 2886113002: Introduce WebPluginContainerBase to abstract WebPluginContainerImpl. (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:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
index be5e936f1efa958f40815058c62bfd99f0760267..d52034415f655c8f04992fd214c97c203ddecdbf 100644
--- a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
+++ b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
@@ -122,6 +122,7 @@
#include "core/exported/SharedWorkerRepositoryClientImpl.h"
#include "core/exported/WebAssociatedURLLoaderImpl.h"
#include "core/exported/WebDataSourceImpl.h"
+#include "core/exported/WebPluginContainerBase.h"
#include "core/exported/WebViewBase.h"
#include "core/frame/FrameView.h"
#include "core/frame/LocalDOMWindow.h"
@@ -231,7 +232,6 @@
#include "web/TextFinder.h"
#include "web/WebDevToolsAgentImpl.h"
#include "web/WebFrameWidgetImpl.h"
-#include "web/WebPluginContainerImpl.h"
#include "web/WebRemoteFrameImpl.h"
namespace blink {
@@ -246,20 +246,20 @@ static HeapVector<ScriptSourceCode> CreateSourcesVector(
return sources;
}
-WebPluginContainerImpl* WebLocalFrameImpl::PluginContainerFromFrame(
+WebPluginContainerBase* WebLocalFrameImpl::PluginContainerFromFrame(
LocalFrame* frame) {
if (!frame)
return 0;
if (!frame->GetDocument() || !frame->GetDocument()->IsPluginDocument())
return 0;
PluginDocument* plugin_document = ToPluginDocument(frame->GetDocument());
- return ToWebPluginContainerImpl(plugin_document->GetPluginView());
+ return ToWebPluginContainerBase(plugin_document->GetPluginView());
}
-WebPluginContainerImpl* WebLocalFrameImpl::CurrentPluginContainer(
+WebPluginContainerBase* WebLocalFrameImpl::CurrentPluginContainer(
LocalFrame* frame,
Node* node) {
- WebPluginContainerImpl* plugin_container = PluginContainerFromFrame(frame);
+ WebPluginContainerBase* plugin_container = PluginContainerFromFrame(frame);
if (plugin_container)
return plugin_container;
@@ -267,7 +267,7 @@ WebPluginContainerImpl* WebLocalFrameImpl::CurrentPluginContainer(
DCHECK(frame->GetDocument());
node = frame->GetDocument()->FocusedElement();
}
- return ToWebPluginContainerImpl(WebNode::PluginContainerFromNode(node));
+ return ToWebPluginContainerBase(WebNode::PluginContainerFromNode(node));
}
// Simple class to override some of PrintContext behavior. Some of the methods
@@ -442,7 +442,7 @@ class ChromePrintContext : public PrintContext {
class ChromePluginPrintContext final : public ChromePrintContext {
public:
ChromePluginPrintContext(LocalFrame* frame,
- WebPluginContainerImpl* plugin,
+ WebPluginContainerBase* plugin,
const WebPrintParams& print_params)
: ChromePrintContext(frame),
plugin_(plugin),
@@ -496,7 +496,7 @@ class ChromePluginPrintContext final : public ChromePrintContext {
private:
// Set when printing.
- Member<WebPluginContainerImpl> plugin_;
+ Member<WebPluginContainerBase> plugin_;
WebPrintParams print_params_;
};
@@ -1062,7 +1062,7 @@ bool WebLocalFrameImpl::ExecuteCommand(const WebString& name) {
Node* plugin_lookup_context_node =
context_menu_node_ && name == "Copy" ? context_menu_node_ : nullptr;
- WebPluginContainerImpl* plugin_container =
+ WebPluginContainerBase* plugin_container =
CurrentPluginContainer(GetFrame(), plugin_lookup_context_node);
if (plugin_container && plugin_container->ExecuteEditCommand(name))
return true;
@@ -1074,7 +1074,7 @@ bool WebLocalFrameImpl::ExecuteCommand(const WebString& name,
const WebString& value) {
DCHECK(GetFrame());
- WebPluginContainerImpl* plugin_container = CurrentPluginContainer(GetFrame());
+ WebPluginContainerBase* plugin_container = CurrentPluginContainer(GetFrame());
if (plugin_container && plugin_container->ExecuteEditCommand(name, value))
return true;
@@ -1122,7 +1122,7 @@ void WebLocalFrameImpl::RemoveSpellingMarkersUnderWords(
}
bool WebLocalFrameImpl::HasSelection() const {
- WebPluginContainerImpl* plugin_container =
+ WebPluginContainerBase* plugin_container =
PluginContainerFromFrame(GetFrame());
if (plugin_container)
return plugin_container->Plugin()->HasSelection();
@@ -1149,7 +1149,7 @@ WebRange WebLocalFrameImpl::SelectionRange() const {
}
WebString WebLocalFrameImpl::SelectionAsText() const {
- WebPluginContainerImpl* plugin_container =
+ WebPluginContainerBase* plugin_container =
PluginContainerFromFrame(GetFrame());
if (plugin_container)
return plugin_container->Plugin()->SelectionAsText();
@@ -1168,7 +1168,7 @@ WebString WebLocalFrameImpl::SelectionAsText() const {
}
WebString WebLocalFrameImpl::SelectionAsMarkup() const {
- WebPluginContainerImpl* plugin_container =
+ WebPluginContainerBase* plugin_container =
PluginContainerFromFrame(GetFrame());
if (plugin_container)
return plugin_container->Plugin()->SelectionAsMarkup();
@@ -1381,7 +1381,7 @@ VisiblePosition WebLocalFrameImpl::VisiblePositionForViewportPoint(
}
WebPlugin* WebLocalFrameImpl::FocusedPluginIfInputMethodSupported() {
- WebPluginContainerImpl* container =
+ WebPluginContainerBase* container =
WebLocalFrameImpl::CurrentPluginContainer(GetFrame());
if (container && container->SupportsInputMethod())
return container->Plugin();
@@ -1391,7 +1391,7 @@ WebPlugin* WebLocalFrameImpl::FocusedPluginIfInputMethodSupported() {
int WebLocalFrameImpl::PrintBegin(const WebPrintParams& print_params,
const WebNode& constrain_to_node) {
DCHECK(!GetFrame()->GetDocument()->IsFrameSet());
- WebPluginContainerImpl* plugin_container;
+ WebPluginContainerBase* plugin_container = nullptr;
if (constrain_to_node.IsNull()) {
// If this is a plugin document, check if the plugin supports its own
// printing. If it does, we will delegate all printing to that.
@@ -1399,7 +1399,7 @@ int WebLocalFrameImpl::PrintBegin(const WebPrintParams& print_params,
} else {
// We only support printing plugin nodes for now.
plugin_container =
- ToWebPluginContainerImpl(constrain_to_node.PluginContainer());
+ ToWebPluginContainerBase(constrain_to_node.PluginContainer());
}
if (plugin_container && plugin_container->SupportsPaginatedPrint()) {
@@ -1440,9 +1440,9 @@ void WebLocalFrameImpl::PrintEnd() {
}
bool WebLocalFrameImpl::IsPrintScalingDisabledForPlugin(const WebNode& node) {
- WebPluginContainerImpl* plugin_container =
+ WebPluginContainerBase* plugin_container =
node.IsNull() ? PluginContainerFromFrame(GetFrame())
- : ToWebPluginContainerImpl(node.PluginContainer());
+ : ToWebPluginContainerBase(node.PluginContainer());
if (!plugin_container || !plugin_container->SupportsPaginatedPrint())
return false;
@@ -1453,9 +1453,9 @@ bool WebLocalFrameImpl::IsPrintScalingDisabledForPlugin(const WebNode& node) {
bool WebLocalFrameImpl::GetPrintPresetOptionsForPlugin(
const WebNode& node,
WebPrintPresetOptions* preset_options) {
- WebPluginContainerImpl* plugin_container =
+ WebPluginContainerBase* plugin_container =
node.IsNull() ? PluginContainerFromFrame(GetFrame())
- : ToWebPluginContainerImpl(node.PluginContainer());
+ : ToWebPluginContainerBase(node.PluginContainer());
if (!plugin_container || !plugin_container->SupportsPaginatedPrint())
return false;
@@ -1915,7 +1915,7 @@ void WebLocalFrameImpl::DidFail(const ResourceError& error,
WebHistoryCommitType web_commit_type =
static_cast<WebHistoryCommitType>(commit_type);
- if (WebPluginContainerImpl* plugin = PluginContainerFromFrame(GetFrame()))
+ if (WebPluginContainerBase* plugin = PluginContainerFromFrame(GetFrame()))
plugin->DidFailLoading(error);
if (was_provisional)
@@ -1928,7 +1928,7 @@ void WebLocalFrameImpl::DidFinish() {
if (!Client())
return;
- if (WebPluginContainerImpl* plugin = PluginContainerFromFrame(GetFrame()))
+ if (WebPluginContainerBase* plugin = PluginContainerFromFrame(GetFrame()))
plugin->DidFinishLoading();
Client()->DidFinishLoad();

Powered by Google App Engine
This is Rietveld 408576698