Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / rendering / svg / RenderSVGInlineText.cpp

diff --git a/src/third_party/WebKit/Source/core/rendering/svg/RenderSVGInlineText.cpp b/src/third_party/WebKit/Source/core/rendering/svg/RenderSVGInlineText.cpp
index a239929..a21c099 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/svg/RenderSVGInlineText.cpp
+++ b/src/third_party/WebKit/Source/core/rendering/svg/RenderSVGInlineText.cpp
@@ -80,13 +80,8 @@ void RenderSVGInlineText::styleDidChange(StyleDifference diff, const RenderStyle
 
     bool newPreserves = style() ? style()->whiteSpace() == PRE : false;
     bool oldPreserves = oldStyle ? oldStyle->whiteSpace() == PRE : false;
-    if (oldPreserves && !newPreserves) {
-        setText(applySVGWhitespaceRules(originalText(), false), true);
-        return;
-    }
-
-    if (!oldPreserves && newPreserves) {
-        setText(applySVGWhitespaceRules(originalText(), true), true);
+    if (oldPreserves != newPreserves) {
+        setText(originalText(), true);
         return;
     }
 
@@ -98,9 +93,9 @@ void RenderSVGInlineText::styleDidChange(StyleDifference diff, const RenderStyle
         textRenderer->setNeedsLayoutAndFullPaintInvalidation();
 }
 
-InlineTextBox* RenderSVGInlineText::createTextBox()
+InlineTextBox* RenderSVGInlineText::createTextBox(int start, unsigned short length)
 {
-    InlineTextBox* box = new SVGInlineTextBox(*this);
+    InlineTextBox* box = new SVGInlineTextBox(*this, start, length);
     box->setHasVirtualLogicalHeight();
     return box;
 }
@@ -239,4 +234,20 @@ void RenderSVGInlineText::computeNewScaledFontForStyle(RenderObject* renderer, c
     scaledFont.update(document.styleEngine()->fontSelector());
 }
 
+LayoutRect RenderSVGInlineText::clippedOverflowRectForPaintInvalidation(const RenderLayerModelObject* paintInvalidationContainer, const PaintInvalidationState* paintInvalidationState) const
+{
+    // FIXME: The following works because RenderSVGBlock has forced slow rect mapping of the paintInvalidationState.
+    // Should let this really work with paintInvalidationState's fast mapping and remove the assert.
+    ASSERT(!paintInvalidationState || !paintInvalidationState->canMapToContainer(paintInvalidationContainer));
+    return parent()->clippedOverflowRectForPaintInvalidation(paintInvalidationContainer, paintInvalidationState);
+}
+
+PassRefPtr<StringImpl> RenderSVGInlineText::originalText() const
+{
+    RefPtr<StringImpl> result = RenderText::originalText();
+    if (!result)
+        return nullptr;
+    return applySVGWhitespaceRules(result, style() && style()->whiteSpace() == PRE);
+}
+
 }