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

Unified Diff: Source/core/accessibility/AccessibilityNodeObject.cpp

Issue 23890025: WIP (Introduce WTF::NonNullPtr<T>.) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 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
« no previous file with comments | « no previous file | Source/core/accessibility/AccessibilityRenderObject.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/accessibility/AccessibilityNodeObject.cpp
diff --git a/Source/core/accessibility/AccessibilityNodeObject.cpp b/Source/core/accessibility/AccessibilityNodeObject.cpp
index 7e7bc64e6132e24a03c3843f751ff7c03d6d7ffe..668ec8c7f11d029671d0d18bbe9adef5a6a3225d 100644
--- a/Source/core/accessibility/AccessibilityNodeObject.cpp
+++ b/Source/core/accessibility/AccessibilityNodeObject.cpp
@@ -259,7 +259,7 @@ void AccessibilityNodeObject::elementsFromAttribute(Vector<Element*>& elements,
if (!node || !node->isElementNode())
return;
- TreeScope& scope = node->treeScope();
+ NonNullPtr<TreeScope> scope = node->treeScope();
String idList = getAttribute(attribute).string();
if (idList.isEmpty())
@@ -272,7 +272,7 @@ void AccessibilityNodeObject::elementsFromAttribute(Vector<Element*>& elements,
unsigned size = idVector.size();
for (unsigned i = 0; i < size; ++i) {
AtomicString idName(idVector[i]);
- Element* idElement = scope.getElementById(idName);
+ Element* idElement = scope->getElementById(idName);
if (idElement)
elements.append(idElement);
}
@@ -341,7 +341,7 @@ HTMLLabelElement* AccessibilityNodeObject::labelForElement(Element* element) con
const AtomicString& id = element->getIdAttribute();
if (!id.isEmpty()) {
- if (HTMLLabelElement* label = element->treeScope().labelElementForId(id))
+ if (HTMLLabelElement* label = element->treeScope()->labelElementForId(id))
return label;
}
« no previous file with comments | « no previous file | Source/core/accessibility/AccessibilityRenderObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698