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

Unified Diff: Source/core/rendering/RenderMenuList.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/rendering/RenderMenuList.h ('k') | Source/core/rendering/RenderMeter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderMenuList.cpp
diff --git a/Source/core/rendering/RenderMenuList.cpp b/Source/core/rendering/RenderMenuList.cpp
index d51719b4f911a2235ae0fa2adae81377ed563fbb..238601afc2d9e3817527229c69ae44204cc366f8 100644
--- a/Source/core/rendering/RenderMenuList.cpp
+++ b/Source/core/rendering/RenderMenuList.cpp
@@ -78,7 +78,7 @@ void RenderMenuList::destroy()
// FIXME: Instead of this hack we should add a ShadowRoot to <select> with no insertion point
// to prevent children from rendering.
-bool RenderMenuList::isChildAllowed(RenderObject* object, const RenderStyle&) const
+bool RenderMenuList::isChildAllowed(LayoutObject* object, const RenderStyle&) const
{
return object->isAnonymous() && !object->isRenderFullScreen();
}
@@ -131,7 +131,7 @@ inline HTMLSelectElement* RenderMenuList::selectElement() const
return toHTMLSelectElement(node());
}
-void RenderMenuList::addChild(RenderObject* newChild, RenderObject* beforeChild)
+void RenderMenuList::addChild(LayoutObject* newChild, LayoutObject* beforeChild)
{
createInnerBlock();
m_innerBlock->addChild(newChild, beforeChild);
@@ -141,7 +141,7 @@ void RenderMenuList::addChild(RenderObject* newChild, RenderObject* beforeChild)
cache->childrenChanged(this);
}
-void RenderMenuList::removeChild(RenderObject* oldChild)
+void RenderMenuList::removeChild(LayoutObject* oldChild)
{
if (oldChild == m_innerBlock || !m_innerBlock) {
RenderFlexibleBox::removeChild(oldChild);
@@ -528,7 +528,7 @@ void RenderMenuList::getItemBackgroundColor(unsigned listIndex, Color& itemBackg
PopupMenuStyle RenderMenuList::menuStyle() const
{
- const RenderObject* o = m_innerBlock ? m_innerBlock : this;
+ const LayoutObject* o = m_innerBlock ? m_innerBlock : this;
const RenderStyle* s = o->style();
return PopupMenuStyle(o->resolveColor(CSSPropertyColor), o->resolveColor(CSSPropertyBackgroundColor), s->font(), s->visibility() == VISIBLE,
s->display() == NONE, s->textIndent(), style()->direction(), isOverride(style()->unicodeBidi()));
« no previous file with comments | « Source/core/rendering/RenderMenuList.h ('k') | Source/core/rendering/RenderMeter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698