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

Unified Diff: third_party/WebKit/Source/core/html/PluginDocument.cpp

Issue 2845583002: Remove FrameViewBase as base class of RemoteFrameView. (Closed)
Patch Set: fix scrollbar inactive Created 3 years, 8 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/core/html/PluginDocument.cpp
diff --git a/third_party/WebKit/Source/core/html/PluginDocument.cpp b/third_party/WebKit/Source/core/html/PluginDocument.cpp
index 3dec97cd8ea0c36703735b7d0132d34f2cd777ea..06fb5f64fb95e84388793bf55764f2556ce47dae 100644
--- a/third_party/WebKit/Source/core/html/PluginDocument.cpp
+++ b/third_party/WebKit/Source/core/html/PluginDocument.cpp
@@ -27,6 +27,7 @@
#include "bindings/core/v8/ExceptionState.h"
#include "core/HTMLNames.h"
#include "core/dom/RawDataDocumentParser.h"
+#include "core/frame/FrameOrPlugin.h"
#include "core/frame/FrameView.h"
#include "core/frame/LocalFrame.h"
#include "core/frame/LocalFrameClient.h"
@@ -119,7 +120,7 @@ void PluginDocumentParser::CreateDocumentStructure() {
return;
}
- ToPluginDocument(GetDocument())->SetPluginNode(embed_element_.Get());
+ ToPluginDocument(GetDocument())->SetPluginNode(embed_element_);
GetDocument()->UpdateStyleAndLayout();
@@ -176,13 +177,7 @@ DocumentParser* PluginDocument::CreateParser() {
}
PluginView* PluginDocument::GetPluginView() {
- return plugin_node_ && IsHTMLPlugInElement(plugin_node_)
- ? ToHTMLPlugInElement(plugin_node_)->Plugin()
- : nullptr;
-}
-
-Node* PluginDocument::PluginNode() {
- return plugin_node_.Get();
+ return plugin_node_ ? plugin_node_->OwnedPlugin() : nullptr;
}
void PluginDocument::Shutdown() {

Powered by Google App Engine
This is Rietveld 408576698