Merge 124556

Source/WebCore/rendering/RenderSlider.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 41 matching lines @@
     : RenderBlock(element)
 {
     // We assume RenderSlider works only with <input type=range>.
     ASSERT(element->isRangeControl());
 }
 
 RenderSlider::~RenderSlider()
 {
 }
 
+bool RenderSlider::canBeReplacedWithInlineRunIn() const
+{
+    return false;
+}
+
 LayoutUnit RenderSlider::baselinePosition(FontBaseline, bool /*firstLine*/, LineDirectionMode, LinePositionMode) const
 {
     // FIXME: Patch this function for writing-mode.
     return height() + marginTop();
 }
 
 void RenderSlider::computePreferredLogicalWidths()
 {
     m_minPreferredLogicalWidth = 0;
     m_maxPreferredLogicalWidth = 0;
@@ skipping 43 matching lines @@
     if (heightDiff > 0)
         thumbBox->setY(thumbBox->y() - (heightDiff / 2));
 }
 
 bool RenderSlider::inDragMode() const
 {
     return sliderThumbElementOf(node())->active();
 }
 
 } // namespace WebCore