Remove unused RenderTextControl::textBaseStyle().
authorakling@apple.com <akling@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 29 Oct 2013 05:09:22 +0000 (05:09 +0000)
committerakling@apple.com <akling@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 29 Oct 2013 05:09:22 +0000 (05:09 +0000)
<https://webkit.org/b/123423>

Reviewed by Anders Carlsson.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@158178 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/rendering/RenderTextControl.h
Source/WebCore/rendering/RenderTextControlMultiLine.cpp
Source/WebCore/rendering/RenderTextControlMultiLine.h
Source/WebCore/rendering/RenderTextControlSingleLine.cpp
Source/WebCore/rendering/RenderTextControlSingleLine.h

index a8415f1..19dd4ff 100644 (file)
@@ -1,3 +1,10 @@
+2013-10-28  Andreas Kling  <akling@apple.com>
+
+        Remove unused RenderTextControl::textBaseStyle().
+        <https://webkit.org/b/123423>
+
+        Reviewed by Anders Carlsson.
+
 2013-10-28  Zan Dobersek  <zdobersek@igalia.com>
 
         HTML input type objects should be managed through std::unique_ptr
index 7661ef5..7c38a21 100644 (file)
@@ -59,7 +59,6 @@ protected:
     virtual float getAvgCharWidth(AtomicString family);
     virtual LayoutUnit preferredContentLogicalWidth(float charWidth) const = 0;
     virtual LayoutUnit computeControlLogicalHeight(LayoutUnit lineHeight, LayoutUnit nonContentHeight) const = 0;
-    virtual RenderStyle* textBaseStyle() const = 0;
 
     virtual void updateFromElement() OVERRIDE;
     virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const OVERRIDE;
index 4f08d1e..0eb554a 100644 (file)
@@ -94,11 +94,6 @@ PassRef<RenderStyle> RenderTextControlMultiLine::createInnerTextStyle(const Rend
     return textBlockStyle;
 }
 
-RenderStyle* RenderTextControlMultiLine::textBaseStyle() const
-{
-    return &style();
-}
-
 RenderObject* RenderTextControlMultiLine::layoutSpecialExcludedChild(bool relayoutChildren)
 {
     RenderObject* placeholderRenderer = RenderTextControl::layoutSpecialExcludedChild(relayoutChildren);
index 2831265..cb1fa10 100644 (file)
@@ -47,7 +47,6 @@ private:
     virtual LayoutUnit computeControlLogicalHeight(LayoutUnit lineHeight, LayoutUnit nonContentHeight) const OVERRIDE;
     virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const;
 
-    virtual RenderStyle* textBaseStyle() const;
     virtual PassRef<RenderStyle> createInnerTextStyle(const RenderStyle* startStyle) const;
     virtual RenderObject* layoutSpecialExcludedChild(bool relayoutChildren);
 };
index 83850ee..90cb361 100644 (file)
@@ -67,12 +67,6 @@ inline HTMLElement* RenderTextControlSingleLine::innerSpinButtonElement() const
     return inputElement().innerSpinButtonElement();
 }
 
-RenderStyle* RenderTextControlSingleLine::textBaseStyle() const
-{
-    HTMLElement* innerBlock = innerBlockElement();
-    return innerBlock ? &innerBlock->renderer()->style() : &style();
-}
-
 void RenderTextControlSingleLine::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
     RenderTextControl::paint(paintInfo, paintOffset);
index 8b7c88b..381cbe5 100644 (file)
@@ -78,8 +78,6 @@ private:
     
     virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE;
 
-    virtual RenderStyle* textBaseStyle() const OVERRIDE;
-
     bool textShouldBeTruncated() const;
 
     HTMLElement* innerSpinButtonElement() const;