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

Unified Diff: Source/web/WebViewImpl.cpp

Issue 625073002: Merge RenderWidget into single subclass, RenderPart (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Address comments Created 6 years, 2 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 | « Source/web/WebNode.cpp ('k') | Source/web/tests/ScrollingCoordinatorChromiumTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebViewImpl.cpp
diff --git a/Source/web/WebViewImpl.cpp b/Source/web/WebViewImpl.cpp
index 38a0553d0af224ed7fd473dcc023b28adf606ec6..e9e646ddec887e459d974bdbfd48a5b10637f56f 100644
--- a/Source/web/WebViewImpl.cpp
+++ b/Source/web/WebViewImpl.cpp
@@ -80,8 +80,8 @@
#include "core/page/PointerLockController.h"
#include "core/page/ScopedPageLoadDeferrer.h"
#include "core/page/TouchDisambiguation.h"
+#include "core/rendering/RenderPart.h"
#include "core/rendering/RenderView.h"
-#include "core/rendering/RenderWidget.h"
#include "core/rendering/TextAutosizer.h"
#include "core/rendering/compositing/RenderLayerCompositor.h"
#include "modules/credentialmanager/CredentialManagerClient.h"
@@ -1661,7 +1661,7 @@ WebLocalFrameImpl* WebViewImpl::localFrameRootTemporary() const
{
// FIXME: This is a temporary method that finds the first localFrame in a traversal.
// This is equivalent to mainFrame() if the mainFrame is in-process. We need to create
- // separate WebWidgets to be created by RenderWidgets, which are associated with *all*
+ // separate WebWidgets to be created by RenderParts, which are associated with *all*
// local frame roots, not just the first one in the tree. Until then, this limits us
// to having only one functioning connected LocalFrame subtree per process.
for (Frame* frame = page()->mainFrame(); frame; frame = frame->tree().traverseNext()) {
@@ -3389,8 +3389,8 @@ void WebViewImpl::performPluginAction(const WebPluginAction& action,
return;
RenderObject* object = node->renderer();
- if (object && object->isWidget()) {
- Widget* widget = toRenderWidget(object)->widget();
+ if (object && object->isRenderPart()) {
+ Widget* widget = toRenderPart(object)->widget();
if (widget && widget->isPluginContainer()) {
WebPluginContainerImpl* plugin = toWebPluginContainerImpl(widget);
switch (action.type) {
« no previous file with comments | « Source/web/WebNode.cpp ('k') | Source/web/tests/ScrollingCoordinatorChromiumTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698