diff options
| author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
|---|---|---|
| committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
| commit | 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c (patch) | |
| tree | 46dcd36c86e7fbc6e5df36deb463b33e9967a6f7 /Source/WebCore/rendering/RenderSlider.cpp | |
| parent | 32761a6cee1d0dee366b885b7b9c777e67885688 (diff) | |
| download | WebKitGtk-tarball-master.tar.gz | |
webkitgtk-2.16.5HEADwebkitgtk-2.16.5master
Diffstat (limited to 'Source/WebCore/rendering/RenderSlider.cpp')
| -rw-r--r-- | Source/WebCore/rendering/RenderSlider.cpp | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/Source/WebCore/rendering/RenderSlider.cpp b/Source/WebCore/rendering/RenderSlider.cpp index c644f3184..0dd07d96a 100644 --- a/Source/WebCore/rendering/RenderSlider.cpp +++ b/Source/WebCore/rendering/RenderSlider.cpp @@ -24,8 +24,6 @@ #include "CSSPropertyNames.h" #include "Document.h" #include "Event.h" -#include "EventHandler.h" -#include "EventNames.h" #include "Frame.h" #include "HTMLInputElement.h" #include "HTMLNames.h" @@ -47,8 +45,8 @@ namespace WebCore { const int RenderSlider::defaultTrackLength = 129; -RenderSlider::RenderSlider(HTMLInputElement& element, PassRef<RenderStyle> style) - : RenderFlexibleBox(element, std::move(style)) +RenderSlider::RenderSlider(HTMLInputElement& element, RenderStyle&& style) + : RenderFlexibleBox(element, WTFMove(style)) { // We assume RenderSlider works only with <input type=range>. ASSERT(element.isRangeControl()); @@ -60,12 +58,7 @@ RenderSlider::~RenderSlider() HTMLInputElement& RenderSlider::element() const { - return toHTMLInputElement(nodeForNonAnonymous()); -} - -bool RenderSlider::canBeReplacedWithInlineRunIn() const -{ - return false; + return downcast<HTMLInputElement>(nodeForNonAnonymous()); } int RenderSlider::baselinePosition(FontBaseline, bool /*firstLine*/, LineDirectionMode, LinePositionMode) const @@ -77,7 +70,7 @@ int RenderSlider::baselinePosition(FontBaseline, bool /*firstLine*/, LineDirecti void RenderSlider::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const { maxLogicalWidth = defaultTrackLength * style().effectiveZoom(); - if (!style().width().isPercent()) + if (!style().width().isPercentOrCalculated()) minLogicalWidth = maxLogicalWidth; } @@ -101,7 +94,7 @@ void RenderSlider::computePreferredLogicalWidths() m_minPreferredLogicalWidth = std::min(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().maxWidth().value())); } - LayoutUnit toAdd = borderAndPaddingWidth(); + LayoutUnit toAdd = horizontalBorderAndPaddingExtent(); m_minPreferredLogicalWidth += toAdd; m_maxPreferredLogicalWidth += toAdd; |