[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 efcbd806b15d2529edddc7c7d038821d9544940f..8b1d28a1ad73cd1c942b937143178e9d833f3320 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)
 {
+    const LayoutObject* layoutObject = LineLayoutAPIShim::constLayoutObjectFrom(lineLayoutItem);

[dgrogan, 2016/01/23 03:34:16]

This feels like a cop-out but it appears that the rule you've been following is
anything not in core/layout/ gets the shim for now?

     if (!layoutObject)
         return nullptr;