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

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

Issue 602353002: Removed duplicated virtual computePreferredLogicalWidths() (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 3 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/RenderSlider.cpp
diff --git a/Source/core/rendering/RenderSlider.cpp b/Source/core/rendering/RenderSlider.cpp
index 1ed4a116fd9cc9f2f7a948d84d147d11f2f9c696..fa4bf07dbd28d02b952c5eb99a57da5e12e1f559 100644
--- a/Source/core/rendering/RenderSlider.cpp
+++ b/Source/core/rendering/RenderSlider.cpp
@@ -60,34 +60,6 @@ void RenderSlider::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, La
minLogicalWidth = maxLogicalWidth;
}
-void RenderSlider::computePreferredLogicalWidths()
-{
- m_minPreferredLogicalWidth = 0;
- m_maxPreferredLogicalWidth = 0;
- RenderStyle* styleToUse = style();
-
- if (styleToUse->width().isFixed() && styleToUse->width().value() > 0)
- m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = adjustContentBoxLogicalWidthForBoxSizing(styleToUse->width().value());
- else
- computeIntrinsicLogicalWidths(m_minPreferredLogicalWidth, m_maxPreferredLogicalWidth);
-
- if (styleToUse->minWidth().isFixed() && styleToUse->minWidth().value() > 0) {
- m_maxPreferredLogicalWidth = max(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse->minWidth().value()));
- m_minPreferredLogicalWidth = max(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse->minWidth().value()));
- }
-
- if (styleToUse->maxWidth().isFixed()) {
- m_maxPreferredLogicalWidth = min(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse->maxWidth().value()));
- m_minPreferredLogicalWidth = min(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse->maxWidth().value()));
- }
-
- LayoutUnit toAdd = borderAndPaddingWidth();
- m_minPreferredLogicalWidth += toAdd;
- m_maxPreferredLogicalWidth += toAdd;
-
- clearPreferredLogicalWidthsDirty();
-}
-
inline SliderThumbElement* RenderSlider::sliderThumbElement() const
{
return toSliderThumbElement(toElement(node())->userAgentShadowRoot()->getElementById(ShadowElementNames::sliderThumb()));
« Source/core/rendering/RenderMenuList.cpp ('K') | « Source/core/rendering/RenderSlider.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698