[Line Layout API] Some harder SVGTextLayoutEngine changes

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

 /*
  * Copyright (C) 2004, 2005, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Rob Buis <buis@kde.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 13 matching lines @@
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ExceptionStatePlaceholder.h"
 #include "core/CSSPropertyNames.h"
 #include "core/CSSValueKeywords.h"
 #include "core/SVGNames.h"
 #include "core/XMLNames.h"
 #include "core/editing/FrameSelection.h"
 #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 {
 
 template<> const SVGEnumerationStringEntries& getStaticStringEntries<SVGLengthAdjustType>()
 {
     DEFINE_STATIC_LOCAL(SVGEnumerationStringEntries, entries, ());
     if (entries.isEmpty()) {
         entries.append(std::make_pair(SVGLengthAdjustSpacing, "spacing"));
         entries.append(std::make_pair(SVGLengthAdjustSpacingAndGlyphs, "spacingAndGlyphs"));
@@ skipping 199 matching lines @@
 }
 
 bool SVGTextContentElement::selfHasRelativeLengths() const
 {
     // Any element of the <text> subtree is advertized as using relative lengths.
     // On any window size change, we have to relayout the text subtree, as the
     // effective 'on-screen' font size may change.
     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;
 
     if (!layoutObject->isSVGText() && !layoutObject->isSVGInline())
         return nullptr;
 
     SVGElement* element = toSVGElement(layoutObject->node());
     ASSERT(element);
     return isSVGTextContentElement(*element) ? toSVGTextContentElement(element) : 0;
 }
 
 }