[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..d2402156b700dee4b66911df7a2b8730a7c27459 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,8 +251,9 @@ bool SVGTextContentElement::selfHasRelativeLengths() const
     return true;
 }
 
-SVGTextContentElement* SVGTextContentElement::elementFromLayoutObject(LayoutObject* layoutObject)
+SVGTextContentElement* SVGTextContentElement::elementFromLayoutObject(LineLayoutItem lineLayoutItem)
 {

[pilgrim_google, 2016/02/11 17:46:33]

Rename this to elementFromLineLayoutItem

[dgrogan, 2016/02/11 18:05:10]

Done.

+    const LayoutObject* layoutObject = LineLayoutAPIShim::constLayoutObjectFrom(lineLayoutItem);

[pilgrim_google, 2016/02/11 17:46:33]

I don't think we need the shim at all. The only methods called on the
layoutObject are isSVGText(), isSVGInline(), and node(). All of these exist on
LineLayoutItem (and if they don't, we need to add them!)

[dgrogan, 2016/02/11 18:05:10]

You're right. Done.

     if (!layoutObject)

[dgrogan, 2016/02/11 18:05:10]

I'm a little nervous about getting rid of this check but fast/svg/ and svg/ pass
locally...

         return nullptr;