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

Unified Diff: Source/core/html/HTMLPlugInElement.cpp

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 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/core/html/HTMLPlugInElement.h ('k') | Source/core/html/HTMLProgressElement.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/HTMLPlugInElement.cpp
diff --git a/Source/core/html/HTMLPlugInElement.cpp b/Source/core/html/HTMLPlugInElement.cpp
index f073489a1fa87c5f1c4094a4bba6f8ba6f8124d0..4d610e473d386f77e6fbdd29fc74effc6dec91bb 100644
--- a/Source/core/html/HTMLPlugInElement.cpp
+++ b/Source/core/html/HTMLPlugInElement.cpp
@@ -140,7 +140,7 @@ bool HTMLPlugInElement::willRespondToMouseClickEvents()
{
if (isDisabledFormControl())
return false;
- RenderObject* r = renderer();
+ LayoutObject* r = renderer();
return r && (r->isEmbeddedObject() || r->isRenderPart());
}
@@ -263,13 +263,13 @@ void HTMLPlugInElement::detach(const AttachContext& context)
HTMLFrameOwnerElement::detach(context);
}
-RenderObject* HTMLPlugInElement::createRenderer(const RenderStyle& style)
+LayoutObject* HTMLPlugInElement::createRenderer(const RenderStyle& style)
{
// Fallback content breaks the DOM->Renderer class relationship of this
// class and all superclasses because createObject won't necessarily return
// a RenderEmbeddedObject or RenderPart.
if (useFallbackContent())
- return RenderObject::createObject(this, style);
+ return LayoutObject::createObject(this, style);
if (isImageType()) {
RenderImage* image = new RenderImage(this);
@@ -374,7 +374,7 @@ void HTMLPlugInElement::defaultEventHandler(Event* event)
// FIXME: Mouse down and scroll events are passed down to plug-in via custom
// code in EventHandler; these code paths should be united.
- RenderObject* r = renderer();
+ LayoutObject* r = renderer();
if (!r || !r->isRenderPart())
return;
if (r->isEmbeddedObject()) {
« no previous file with comments | « Source/core/html/HTMLPlugInElement.h ('k') | Source/core/html/HTMLProgressElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698