Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1674)

Unified Diff: Source/modules/accessibility/AXRenderObject.cpp

Issue 940373003: Rename RenderText to LayoutText (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Merge w/HEAD again Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/modules/accessibility/AXRenderObject.cpp
diff --git a/Source/modules/accessibility/AXRenderObject.cpp b/Source/modules/accessibility/AXRenderObject.cpp
index ddebda3cd2541d9c629a32766b2822cf9bda5219..315afabd32a50448d07d5f7d0b86567ef2a5e074 100644
--- a/Source/modules/accessibility/AXRenderObject.cpp
+++ b/Source/modules/accessibility/AXRenderObject.cpp
@@ -56,12 +56,12 @@
#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/RenderInline.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"
@@ -596,7 +596,7 @@ bool AXRenderObject::computeAccessibilityIsIgnored() const
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;
@@ -1203,7 +1203,7 @@ String AXRenderObject::textUnderElement(TextUnderElementMode mode) const
return toLayoutFileUploadControl(m_renderer)->buttonValue();
if (m_renderer->isText())
- return toRenderText(m_renderer)->plainText();
+ return toLayoutText(m_renderer)->plainText();
return AXNodeObject::textUnderElement(mode);
}
@@ -1881,13 +1881,13 @@ void AXRenderObject::addInlineTextBoxChildren(bool force)
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())
@@ -2384,7 +2384,7 @@ LayoutRect AXRenderObject::computeElementRect() const
LayoutRect result;
if (obj->isText()) {
Vector<FloatQuad> quads;
- toRenderText(obj)->absoluteQuads(quads, 0, RenderText::ClipToEllipsis);
+ toLayoutText(obj)->absoluteQuads(quads, 0, LayoutText::ClipToEllipsis);
result = boundingBoxForQuads(obj, quads);
} else if (isWebArea() || obj->isSVGRoot()) {
result = obj->absoluteBoundingBoxRect();

Powered by Google App Engine
This is Rietveld 408576698