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

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

Issue 977113003: Rename renderer() to layoutObject(). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase to master 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/AXObjectCacheImpl.cpp
diff --git a/Source/modules/accessibility/AXObjectCacheImpl.cpp b/Source/modules/accessibility/AXObjectCacheImpl.cpp
index 5ceb4279d55b46a280d55de53c7d1b80e8acad3c..16bf828a92d1f05f6bec094157a280752aeff164 100644
--- a/Source/modules/accessibility/AXObjectCacheImpl.cpp
+++ b/Source/modules/accessibility/AXObjectCacheImpl.cpp
@@ -206,13 +206,13 @@ AXObject* AXObjectCacheImpl::get(Node* node)
if (!node)
return 0;
- AXID layoutID = node->renderer() ? m_layoutObjectMapping.get(node->renderer()) : 0;
+ AXID layoutID = node->layoutObject() ? m_layoutObjectMapping.get(node->layoutObject()) : 0;
ASSERT(!HashTraits<AXID>::isDeletedValue(layoutID));
AXID nodeID = m_nodeObjectMapping.get(node);
ASSERT(!HashTraits<AXID>::isDeletedValue(nodeID));
- if (node->renderer() && nodeID && !layoutID) {
+ if (node->layoutObject() && nodeID && !layoutID) {
// This can happen if an AXNodeObject is created for a node that's not
// laid out, but later something changes and it gets a renderer (like if it's
// reparented).
@@ -356,8 +356,8 @@ AXObject* AXObjectCacheImpl::getOrCreate(Node* node)
if (AXObject* obj = get(node))
return obj;
- if (node->renderer())
- return getOrCreate(node->renderer());
+ if (node->layoutObject())
+ return getOrCreate(node->layoutObject());
if (!node->parentElement())
return 0;
@@ -365,7 +365,7 @@ AXObject* AXObjectCacheImpl::getOrCreate(Node* node)
// It's only allowed to create an AXObject from a Node if it's in a canvas subtree.
// Or if it's a hidden element, but we still want to expose it because of other ARIA attributes.
bool inCanvasSubtree = node->parentElement()->isInCanvasSubtree();
- bool isHidden = !node->renderer() && isNodeAriaVisible(node);
+ bool isHidden = !node->layoutObject() && isNodeAriaVisible(node);
if (!inCanvasSubtree && !isHidden)
return 0;
@@ -524,8 +524,8 @@ void AXObjectCacheImpl::remove(Node* node)
remove(axID);
m_nodeObjectMapping.remove(node);
- if (node->renderer()) {
- remove(node->renderer());
+ if (node->layoutObject()) {
+ remove(node->layoutObject());
return;
}
}
@@ -697,7 +697,7 @@ void AXObjectCacheImpl::notificationPostTimerFired(Timer<AXObjectCacheImpl>*)
// Notifications should only be sent after the renderer has finished
if (obj->isAXLayoutObject()) {
AXLayoutObject* layoutObj = toAXLayoutObject(obj);
- LayoutObject* renderer = layoutObj->renderer();
+ LayoutObject* renderer = layoutObj->layoutObject();
if (renderer && renderer->view())
ASSERT(!renderer->view()->layoutState());
}
@@ -936,17 +936,17 @@ AXObject* AXObjectCacheImpl::firstAccessibleObjectFromNode(const Node* node)
if (!node)
return 0;
- AXObject* accessibleObject = getOrCreate(node->renderer());
+ AXObject* accessibleObject = getOrCreate(node->layoutObject());
while (accessibleObject && accessibleObject->accessibilityIsIgnored()) {
node = NodeTraversal::next(*node);
- while (node && !node->renderer())
+ while (node && !node->layoutObject())
node = NodeTraversal::nextSkippingChildren(*node);
if (!node)
return 0;
- accessibleObject = getOrCreate(node->renderer());
+ accessibleObject = getOrCreate(node->layoutObject());
}
return accessibleObject;

Powered by Google App Engine
This is Rietveld 408576698