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

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

Issue 948053002: Revert 190605 "Make RenderObject::style() return a const object" (Closed) Base URL: svn://svn.chromium.org/blink/
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 | « trunk/Source/core/rendering/RenderListMarker.cpp ('k') | trunk/Source/core/svg/SVGElement.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/Source/core/rendering/RenderMenuList.cpp
===================================================================
--- trunk/Source/core/rendering/RenderMenuList.cpp (revision 190671)
+++ trunk/Source/core/rendering/RenderMenuList.cpp (working copy)
@@ -155,7 +155,7 @@
RenderBlock::styleDidChange(diff, oldStyle);
if (m_buttonText)
- m_buttonText->setStyle(mutableStyle());
+ m_buttonText->setStyle(style());
if (m_innerBlock) // RenderBlock handled updating the anonymous block's style.
adjustInnerStyle();
@@ -244,7 +244,7 @@
HTMLOptionElement* selectedOptionElement = toHTMLOptionElement(listItems[firstSelectedIndex]);
ASSERT(selectedOptionElement->selected());
text = selectedOptionElement->textIndentedToRespectGroupLabel();
- m_optionStyle = selectedOptionElement->mutableLayoutStyle();
+ m_optionStyle = selectedOptionElement->layoutStyle();
} else {
Locale& locale = select->locale();
String localizedNumberString = locale.convertToLocalizedNumber(String::number(selectedCount));
@@ -257,7 +257,7 @@
Element* element = listItems[i];
if (isHTMLOptionElement(*element)) {
text = toHTMLOptionElement(element)->textIndentedToRespectGroupLabel();
- m_optionStyle = element->mutableLayoutStyle();
+ m_optionStyle = element->layoutStyle();
}
}
}
@@ -277,7 +277,7 @@
if (m_buttonText)
m_buttonText->destroy();
m_buttonText = new LayoutBR(&document());
- m_buttonText->setStyle(mutableStyle());
+ m_buttonText->setStyle(style());
addChild(m_buttonText);
}
} else {
@@ -290,7 +290,7 @@
if (m_buttonText)
m_buttonText->destroy();
m_buttonText = new RenderText(&document(), s.impl());
- m_buttonText->setStyle(mutableStyle());
+ m_buttonText->setStyle(style());
// We need to set the text explicitly though it was specified in the
// constructor because RenderText doesn't refer to the text
// specified in the constructor in a case of re-transforming.
@@ -390,7 +390,7 @@
const LayoutStyle* RenderMenuList::layoutStyleForItem(Element& element) const
{
- return element.layoutStyle() ? element.mutableLayoutStyle() : element.computedStyle();
+ return element.layoutStyle() ? element.layoutStyle() : element.computedStyle();
}
void RenderMenuList::didSetSelectedIndex(int listIndex)
« no previous file with comments | « trunk/Source/core/rendering/RenderListMarker.cpp ('k') | trunk/Source/core/svg/SVGElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698