| Index: third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp
|
| diff --git a/third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp b/third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp
|
| index 71497f19b4e7d726b137fc59243de4674977f0d5..f035f90de33f13d5674931e5cde8bcb0966d636b 100644
|
| --- a/third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp
|
| +++ b/third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp
|
| @@ -26,13 +26,6 @@
|
|
|
| namespace blink {
|
|
|
| -static inline bool textShouldBePainted(const LayoutSVGInlineText& textLayoutObject)
|
| -{
|
| - // Font::pixelSize(), returns FontDescription::computedPixelSize(), which returns "int(x + 0.5)".
|
| - // If the absolute font size on screen is below x=0.5, don't render anything.
|
| - return textLayoutObject.scaledFont().getFontDescription().computedPixelSize();
|
| -}
|
| -
|
| bool SVGInlineTextBoxPainter::shouldPaintSelection(const PaintInfo& paintInfo) const
|
| {
|
| return !paintInfo.isPrinting() && m_svgInlineTextBox.getSelectionState() != SelectionNone;
|
| @@ -70,12 +63,9 @@ void SVGInlineTextBoxPainter::paint(const PaintInfo& paintInfo, const LayoutPoin
|
| if (!haveSelection && paintInfo.phase == PaintPhaseSelection)
|
| return;
|
|
|
| - LayoutSVGInlineText& textLayoutObject = toLayoutSVGInlineText(*LineLayoutAPIShim::layoutObjectFrom(m_svgInlineTextBox.getLineLayoutItem()));
|
| - if (!textShouldBePainted(textLayoutObject))
|
| - return;
|
| -
|
| DisplayItem::Type displayItemType = DisplayItem::paintPhaseToDrawingType(paintInfo.phase);
|
| if (!DrawingRecorder::useCachedDrawingIfPossible(paintInfo.context, m_svgInlineTextBox, displayItemType)) {
|
| + LayoutSVGInlineText& textLayoutObject = toLayoutSVGInlineText(*LineLayoutAPIShim::layoutObjectFrom(m_svgInlineTextBox.getLineLayoutItem()));
|
| LayoutObject& parentLayoutObject = *LineLayoutAPIShim::layoutObjectFrom(m_svgInlineTextBox.parent()->getLineLayoutItem());
|
| const ComputedStyle& style = parentLayoutObject.styleRef();
|
|
|
| @@ -181,10 +171,6 @@ void SVGInlineTextBoxPainter::paintSelectionBackground(const PaintInfo& paintInf
|
| if (!backgroundColor.alpha())
|
| return;
|
|
|
| - LayoutSVGInlineText& textLayoutObject = toLayoutSVGInlineText(*LineLayoutAPIShim::layoutObjectFrom(m_svgInlineTextBox.getLineLayoutItem()));
|
| - if (!textShouldBePainted(textLayoutObject))
|
| - return;
|
| -
|
| const ComputedStyle& style = m_svgInlineTextBox.parent()->getLineLayoutItem().styleRef();
|
|
|
| int startPosition, endPosition;
|
|
|