Rename RenderText to LayoutText

Source/modules/accessibility/AXLayoutObject.cpp

 /*
 * Copyright (C) 2008 Apple Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1.  Redistributions of source code must retain the above copyright
 *     notice, this list of conditions and the following disclaimer.
 * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 39 matching lines @@
 #include "core/layout/HitTestResult.h"
 #include "core/layout/Layer.h"
 #include "core/layout/LayoutFieldset.h"
 #include "core/layout/LayoutFileUploadControl.h"
 #include "core/layout/LayoutHTMLCanvas.h"
 #include "core/layout/LayoutImage.h"
 #include "core/layout/LayoutInline.h"
 #include "core/layout/LayoutListMarker.h"
 #include "core/layout/LayoutPart.h"
 #include "core/layout/LayoutTextControlSingleLine.h"
+#include "core/layout/LayoutTextFragment.h"
 #include "core/layout/LayoutView.h"
 #include "core/loader/ProgressTracker.h"
 #include "core/page/Page.h"
 #include "core/rendering/RenderMenuList.h"
-#include "core/rendering/RenderTextFragment.h"
 #include "core/svg/SVGDocumentExtensions.h"
 #include "core/svg/SVGSVGElement.h"
 #include "core/svg/graphics/SVGImage.h"
 #include "modules/accessibility/AXImageMapLink.h"
 #include "modules/accessibility/AXInlineTextBox.h"
 #include "modules/accessibility/AXObjectCacheImpl.h"
 #include "modules/accessibility/AXSVGRoot.h"
 #include "modules/accessibility/AXSpinButton.h"
 #include "modules/accessibility/AXTable.h"
 #include "platform/text/PlatformLocale.h"
@@ skipping 514 matching lines @@
 
     if (m_renderer->isBR())
         return false;
 
     // NOTE: BRs always have text boxes now, so the text box check here can be removed
     if (m_renderer->isText()) {
         // static text beneath MenuItems and MenuButtons are just reported along with the menu item, so it's ignored on an individual level
         AXObject* parent = parentObjectUnignored();
         if (parent && (parent->ariaRoleAttribute() == MenuItemRole || parent->ariaRoleAttribute() == MenuButtonRole))
             return true;
-        RenderText* renderText = toRenderText(m_renderer);
+        LayoutText* renderText = toLayoutText(m_renderer);
         if (m_renderer->isBR() || !renderText->firstTextBox())
             return true;
 
         // Don't ignore static text in editable text controls.
         for (AXObject* parent = parentObject(); parent; parent = parent->parentObject()) {
             if (parent->roleValue() == TextFieldRole || parent->roleValue() == TextAreaRole)
                 return false;
         }
 
         // text elements that are just empty whitespace should not be returned
@@ skipping 586 matching lines @@
 
 String AXLayoutObject::textUnderElement(TextUnderElementMode mode) const
 {
     if (!m_renderer)
         return String();
 
     if (m_renderer->isFileUploadControl())
         return toLayoutFileUploadControl(m_renderer)->buttonValue();
 
     if (m_renderer->isText())
-        return toRenderText(m_renderer)->plainText();
+        return toLayoutText(m_renderer)->plainText();
 
     return AXNodeObject::textUnderElement(mode);
 }
 
 //
 // Accessibility Text - (To be deprecated).
 //
 
 String AXLayoutObject::helpText() const
 {
@@ skipping 657 matching lines @@
 void AXLayoutObject::addInlineTextBoxChildren(bool force)
 {
     Settings* settings = document()->settings();
     if (!force && (!settings || !settings->inlineTextBoxAccessibilityEnabled()))
         return;
 
     if (!renderer() || !renderer()->isText())
         return;
 
     if (renderer()->needsLayout()) {
-        // If a RenderText needs layout, its inline text boxes are either
+        // If a LayoutText needs layout, its inline text boxes are either
         // nonexistent or invalid, so defer until the layout happens and
         // the renderer calls AXObjectCacheImpl::inlineTextBoxesUpdated.
         return;
     }
 
-    RenderText* renderText = toRenderText(renderer());
+    LayoutText* renderText = toLayoutText(renderer());
     for (RefPtr<AbstractInlineTextBox> box = renderText->firstAbstractInlineTextBox(); box.get(); box = box->nextInlineTextBox()) {
         AXObject* axObject = axObjectCache()->getOrCreate(box.get());
         if (!axObject->accessibilityIsIgnored())
             m_children.append(axObject);
     }
 }
 
 void AXLayoutObject::lineBreaks(Vector<int>& lineBreaks) const
 {
     if (!isTextControl())
@@ skipping 476 matching lines @@
     if (obj->node()) // If we are a continuation, we want to make sure to use the primary renderer.
         obj = obj->node()->renderer();
 
     // absoluteFocusRingBoundingBox will query the hierarchy below this element, which for large webpages can be very slow.
     // For a web area, which will have the most elements of any element, absoluteQuads should be used.
     // We should also use absoluteQuads for SVG elements, otherwise transforms won't be applied.
 
     LayoutRect result;
     if (obj->isText()) {
         Vector<FloatQuad> quads;
-        toRenderText(obj)->absoluteQuads(quads, 0, RenderText::ClipToEllipsis);
+        toLayoutText(obj)->absoluteQuads(quads, 0, LayoutText::ClipToEllipsis);
         result = LayoutRect(boundingBoxForQuads(obj, quads));
     } else if (isWebArea() || obj->isSVGRoot()) {
         result = LayoutRect(obj->absoluteBoundingBoxRect());
     } else {
         result = LayoutRect(obj->absoluteFocusRingBoundingBoxRect());
     }
 
     Document* document = this->document();
     if (document && document->isSVGDocument())
         offsetBoundingBoxForRemoteSVGElement(result);
@@ skipping 13 matching lines @@
         if (label && label->renderer()) {
             LayoutRect labelRect = axObjectCache()->getOrCreate(label)->elementRect();
             result.unite(labelRect);
         }
     }
 
     return result;
 }
 
 } // namespace blink