[Line Layout API] Some harder SVGTextLayoutEngine changes

third_party/WebKit/Source/core/svg/SVGTextContentElement.cpp

Index: third_party/WebKit/Source/core/svg/SVGTextContentElement.cpp
diff --git a/third_party/WebKit/Source/core/svg/SVGTextContentElement.cpp b/third_party/WebKit/Source/core/svg/SVGTextContentElement.cpp
index 7f134aca6fdab2c5f0ed47e0f1936b624bf86703..cf975e5bc596ac0f92e435b043b94cf2a51de364 100644
--- a/third_party/WebKit/Source/core/svg/SVGTextContentElement.cpp
+++ b/third_party/WebKit/Source/core/svg/SVGTextContentElement.cpp
@@ -31,6 +31,7 @@
 #include "core/frame/LocalFrame.h"
 #include "core/frame/UseCounter.h"
 #include "core/layout/LayoutObject.h"
+#include "core/layout/api/LineLayoutAPIShim.h"
 #include "core/layout/svg/SVGTextQuery.h"
 
 namespace blink {
@@ -250,15 +251,12 @@ bool SVGTextContentElement::selfHasRelativeLengths() const
     return true;
 }
 
-SVGTextContentElement* SVGTextContentElement::elementFromLayoutObject(LayoutObject* layoutObject)
+SVGTextContentElement* SVGTextContentElement::elementFromLineLayoutItem(LineLayoutItem lineLayoutItem)
 {
-    if (!layoutObject)

[dgrogan, 2016/02/11 23:36:02]

In the meantime this nullptr check lives on as isNull().

+    if (lineLayoutItem.isNull() || (!lineLayoutItem.isSVGText() && !lineLayoutItem.isSVGInline()))
         return nullptr;
 
-    if (!layoutObject->isSVGText() && !layoutObject->isSVGInline())
-        return nullptr;
-
-    SVGElement* element = toSVGElement(layoutObject->node());
+    SVGElement* element = toSVGElement(lineLayoutItem.node());
     ASSERT(element);
     return isSVGTextContentElement(*element) ? toSVGTextContentElement(element) : 0;
 }