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

Unified Diff: Source/core/rendering/RenderMenuList.cpp

Issue 869323003: Oilpan: move RenderObjects off heap. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: review-induced improvements 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/RenderObject.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 ea821c5f7b406677c36fde93707f1bbf63a75bf6..d5cec7d94c236e7ff7677e3ce608728ec4fcbcef 100644
--- a/Source/core/rendering/RenderMenuList.cpp
+++ b/Source/core/rendering/RenderMenuList.cpp
@@ -76,14 +76,6 @@ void RenderMenuList::destroy()
RenderFlexibleBox::destroy();
}
-void RenderMenuList::trace(Visitor* visitor)
-{
- visitor->trace(m_buttonText);
- visitor->trace(m_innerBlock);
- visitor->trace(m_popup);
- RenderFlexibleBox::trace(visitor);
-}
-
// 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, RenderStyle*) const
@@ -521,7 +513,7 @@ void RenderMenuList::getItemBackgroundColor(unsigned listIndex, Color& itemBackg
PopupMenuStyle RenderMenuList::menuStyle() const
{
- const RenderObject* o = m_innerBlock ? m_innerBlock.get() : this;
+ const RenderObject* 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/RenderObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698