[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)
 {

[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;
 
     if (!layoutObject->isSVGText() && !layoutObject->isSVGInline())
         return nullptr;
 
     SVGElement* element = toSVGElement(layoutObject->node());
     ASSERT(element);
     return isSVGTextContentElement(*element) ? toSVGTextContentElement(element) : 0;
 }
 
 } // namespace blink