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

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

Issue 889563002: Make RenderObject::style() return a const object (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix a crashers (everything is building!) Created 5 years, 11 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
Index: Source/core/rendering/RenderTextControlSingleLine.cpp
diff --git a/Source/core/rendering/RenderTextControlSingleLine.cpp b/Source/core/rendering/RenderTextControlSingleLine.cpp
index 33ffa36bd2b49b4c20f1edbee83a1a5306ccd48f..886764c2791ad0a5cb63ce5b59fe14289ce965e0 100644
--- a/Source/core/rendering/RenderTextControlSingleLine.cpp
+++ b/Source/core/rendering/RenderTextControlSingleLine.cpp
@@ -110,14 +110,14 @@ void RenderTextControlSingleLine::layout()
// To ensure consistency between layouts, we need to reset any conditionally overriden height.
if (innerEditorRenderer && !innerEditorRenderer->style()->logicalHeight().isAuto()) {
- innerEditorRenderer->style()->setLogicalHeight(Length(Auto));
+ innerEditorRenderer->deprecatedMutableStyle()->setLogicalHeight(Length(Auto));
layoutScope.setNeedsLayout(innerEditorRenderer);
HTMLElement* placeholderElement = inputElement()->placeholderElement();
if (RenderBox* placeholderBox = placeholderElement ? placeholderElement->renderBox() : 0)
layoutScope.setNeedsLayout(placeholderBox);
}
if (viewPortRenderer && !viewPortRenderer->style()->logicalHeight().isAuto()) {
- viewPortRenderer->style()->setLogicalHeight(Length(Auto));
+ viewPortRenderer->deprecatedMutableStyle()->setLogicalHeight(Length(Auto));
layoutScope.setNeedsLayout(viewPortRenderer);
}
@@ -135,10 +135,10 @@ void RenderTextControlSingleLine::layout()
m_desiredInnerEditorLogicalHeight = desiredLogicalHeight;
- innerEditorRenderer->style()->setLogicalHeight(Length(desiredLogicalHeight, Fixed));
+ innerEditorRenderer->deprecatedMutableStyle()->setLogicalHeight(Length(desiredLogicalHeight, Fixed));
layoutScope.setNeedsLayout(innerEditorRenderer);
if (viewPortRenderer) {
- viewPortRenderer->style()->setLogicalHeight(Length(desiredLogicalHeight, Fixed));
+ viewPortRenderer->deprecatedMutableStyle()->setLogicalHeight(Length(desiredLogicalHeight, Fixed));
layoutScope.setNeedsLayout(viewPortRenderer);
}
}
@@ -147,13 +147,14 @@ void RenderTextControlSingleLine::layout()
containerRenderer->layoutIfNeeded();
LayoutUnit containerLogicalHeight = containerRenderer->logicalHeight();
if (containerLogicalHeight > logicalHeightLimit) {
- containerRenderer->style()->setLogicalHeight(Length(logicalHeightLimit, Fixed));
+ containerRenderer->deprecatedMutableStyle()->setLogicalHeight(Length(logicalHeightLimit, Fixed));
layoutScope.setNeedsLayout(this);
} else if (containerRenderer->logicalHeight() < contentLogicalHeight()) {
- containerRenderer->style()->setLogicalHeight(Length(contentLogicalHeight(), Fixed));
+ containerRenderer->deprecatedMutableStyle()->setLogicalHeight(Length(contentLogicalHeight(), Fixed));
layoutScope.setNeedsLayout(this);
- } else
- containerRenderer->style()->setLogicalHeight(Length(containerLogicalHeight, Fixed));
+ } else {
+ containerRenderer->deprecatedMutableStyle()->setLogicalHeight(Length(containerLogicalHeight, Fixed));
+ }
}
// If we need another layout pass, we have changed one of children's height so we need to relayout them.
@@ -173,8 +174,8 @@ void RenderTextControlSingleLine::layout()
if (innerEditorRenderer)
innerEditorSize = innerEditorRenderer->size();
- placeholderBox->style()->setWidth(Length(innerEditorSize.width() - placeholderBox->borderAndPaddingWidth(), Fixed));
- placeholderBox->style()->setHeight(Length(innerEditorSize.height() - placeholderBox->borderAndPaddingHeight(), Fixed));
+ placeholderBox->deprecatedMutableStyle()->setWidth(Length(innerEditorSize.width() - placeholderBox->borderAndPaddingWidth(), Fixed));
+ placeholderBox->deprecatedMutableStyle()->setHeight(Length(innerEditorSize.height() - placeholderBox->borderAndPaddingHeight(), Fixed));
bool neededLayout = placeholderBox->needsLayout();
placeholderBox->layoutIfNeeded();
LayoutPoint textOffset;
@@ -225,13 +226,13 @@ void RenderTextControlSingleLine::styleDidChange(StyleDifference diff, const Ren
// Reset them now to avoid getting a spurious layout hint.
Element* viewPort = editingViewPortElement();
if (RenderObject* viewPortRenderer = viewPort ? viewPort->renderer() : 0) {
- viewPortRenderer->style()->setHeight(Length());
- viewPortRenderer->style()->setWidth(Length());
+ viewPortRenderer->deprecatedMutableStyle()->setHeight(Length());
+ viewPortRenderer->deprecatedMutableStyle()->setWidth(Length());
}
Element* container = containerElement();
if (RenderObject* containerRenderer = container ? container->renderer() : 0) {
- containerRenderer->style()->setHeight(Length());
- containerRenderer->style()->setWidth(Length());
+ containerRenderer->deprecatedMutableStyle()->setHeight(Length());
+ containerRenderer->deprecatedMutableStyle()->setWidth(Length());
}
RenderObject* innerEditorRenderer = innerEditorElement()->renderer();
if (innerEditorRenderer && diff.needsFullLayout())

Powered by Google App Engine
This is Rietveld 408576698