[webkit-changes] [158178] trunk/Source/WebCore

Mon, 28 Oct 2013 22:21:33 -0700

Title: [158178] trunk/Source/WebCore

Diff

Modified: trunk/Source/WebCore/ChangeLog (158177 => 158178)


--- trunk/Source/WebCore/ChangeLog	2013-10-29 04:42:47 UTC (rev 158177)
+++ trunk/Source/WebCore/ChangeLog	2013-10-29 05:09:22 UTC (rev 158178)
@@ -1,3 +1,10 @@
+2013-10-28  Andreas Kling  <[email protected]>
+
+        Remove unused RenderTextControl::textBaseStyle().
+        <https://webkit.org/b/123423>
+
+        Reviewed by Anders Carlsson.
+
 2013-10-28  Zan Dobersek  <[email protected]>
 
         HTML input type objects should be managed through std::unique_ptr

Modified: trunk/Source/WebCore/rendering/RenderTextControl.h (158177 => 158178)


--- trunk/Source/WebCore/rendering/RenderTextControl.h	2013-10-29 04:42:47 UTC (rev 158177)
+++ trunk/Source/WebCore/rendering/RenderTextControl.h	2013-10-29 05:09:22 UTC (rev 158178)
@@ -59,7 +59,6 @@
     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;

Modified: trunk/Source/WebCore/rendering/RenderTextControlMultiLine.cpp (158177 => 158178)


--- trunk/Source/WebCore/rendering/RenderTextControlMultiLine.cpp	2013-10-29 04:42:47 UTC (rev 158177)
+++ trunk/Source/WebCore/rendering/RenderTextControlMultiLine.cpp	2013-10-29 05:09:22 UTC (rev 158178)
@@ -94,11 +94,6 @@
     return textBlockStyle;
 }
 
-RenderStyle* RenderTextControlMultiLine::textBaseStyle() const
-{
-    return &style();
-}
-
 RenderObject* RenderTextControlMultiLine::layoutSpecialExcludedChild(bool relayoutChildren)
 {
     RenderObject* placeholderRenderer = RenderTextControl::layoutSpecialExcludedChild(relayoutChildren);

Modified: trunk/Source/WebCore/rendering/RenderTextControlMultiLine.h (158177 => 158178)


--- trunk/Source/WebCore/rendering/RenderTextControlMultiLine.h	2013-10-29 04:42:47 UTC (rev 158177)
+++ trunk/Source/WebCore/rendering/RenderTextControlMultiLine.h	2013-10-29 05:09:22 UTC (rev 158178)
@@ -47,7 +47,6 @@
     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);
 };

Modified: trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp (158177 => 158178)


--- trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp	2013-10-29 04:42:47 UTC (rev 158177)
+++ trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp	2013-10-29 05:09:22 UTC (rev 158178)
@@ -67,12 +67,6 @@
     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);

Modified: trunk/Source/WebCore/rendering/RenderTextControlSingleLine.h (158177 => 158178)


--- trunk/Source/WebCore/rendering/RenderTextControlSingleLine.h	2013-10-29 04:42:47 UTC (rev 158177)
+++ trunk/Source/WebCore/rendering/RenderTextControlSingleLine.h	2013-10-29 05:09:22 UTC (rev 158178)
@@ -78,8 +78,6 @@
     
     virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE;
 
-    virtual RenderStyle* textBaseStyle() const OVERRIDE;
-
     bool textShouldBeTruncated() const;
 
     HTMLElement* innerSpinButtonElement() const;

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to