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

Side by Side Diff: Source/modules/accessibility/AXImageMapLink.cpp

Issue 977113003: Rename renderer() to layoutObject(). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/testing/Internals.cpp ('k') | Source/modules/accessibility/AXLayoutObject.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2008 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 PassRefPtr<AXImageMapLink> AXImageMapLink::create(AXObjectCacheImpl* axObjectCac he) 57 PassRefPtr<AXImageMapLink> AXImageMapLink::create(AXObjectCacheImpl* axObjectCac he)
58 { 58 {
59 return adoptRef(new AXImageMapLink(axObjectCache)); 59 return adoptRef(new AXImageMapLink(axObjectCache));
60 } 60 }
61 61
62 AXObject* AXImageMapLink::computeParent() const 62 AXObject* AXImageMapLink::computeParent() const
63 { 63 {
64 if (m_parent) 64 if (m_parent)
65 return m_parent; 65 return m_parent;
66 66
67 if (!m_mapElement.get() || !m_mapElement->renderer()) 67 if (!m_mapElement.get() || !m_mapElement->layoutObject())
68 return 0; 68 return 0;
69 69
70 return axObjectCache()->getOrCreate(m_mapElement->renderer()); 70 return axObjectCache()->getOrCreate(m_mapElement->layoutObject());
71 } 71 }
72 72
73 AccessibilityRole AXImageMapLink::roleValue() const 73 AccessibilityRole AXImageMapLink::roleValue() const
74 { 74 {
75 if (!m_areaElement) 75 if (!m_areaElement)
76 return LinkRole; 76 return LinkRole;
77 77
78 const AtomicString& ariaRole = getAttribute(roleAttr); 78 const AtomicString& ariaRole = getAttribute(roleAttr);
79 if (!ariaRole.isEmpty()) 79 if (!ariaRole.isEmpty())
80 return AXObject::ariaRoleToWebCoreRole(ariaRole); 80 return AXObject::ariaRoleToWebCoreRole(ariaRole);
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 return String(); 124 return String();
125 } 125 }
126 126
127 LayoutRect AXImageMapLink::elementRect() const 127 LayoutRect AXImageMapLink::elementRect() const
128 { 128 {
129 if (!m_mapElement.get() || !m_areaElement.get()) 129 if (!m_mapElement.get() || !m_areaElement.get())
130 return LayoutRect(); 130 return LayoutRect();
131 131
132 LayoutObject* layoutObject; 132 LayoutObject* layoutObject;
133 if (m_parent && m_parent->isAXLayoutObject()) 133 if (m_parent && m_parent->isAXLayoutObject())
134 layoutObject = toAXLayoutObject(m_parent)->renderer(); 134 layoutObject = toAXLayoutObject(m_parent)->layoutObject();
135 else 135 else
136 layoutObject = m_mapElement->renderer(); 136 layoutObject = m_mapElement->layoutObject();
137 137
138 if (!layoutObject) 138 if (!layoutObject)
139 return LayoutRect(); 139 return LayoutRect();
140 140
141 return m_areaElement->computeRect(layoutObject); 141 return m_areaElement->computeRect(layoutObject);
142 } 142 }
143 143
144 } // namespace blink 144 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/testing/Internals.cpp ('k') | Source/modules/accessibility/AXLayoutObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698