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

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

Issue 1072273006: Oilpan: Prepare moving AXObject to heap (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 8 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/AXSlider.cpp
diff --git a/Source/modules/accessibility/AXSlider.cpp b/Source/modules/accessibility/AXSlider.cpp
index a5dba4554488380f7a7c49974c1329f202d2da60..68d9aebef15e3dc7d42c19d46edcf64a5b8e5b7e 100644
--- a/Source/modules/accessibility/AXSlider.cpp
+++ b/Source/modules/accessibility/AXSlider.cpp
@@ -44,9 +44,9 @@ AXSlider::AXSlider(LayoutObject* layoutObject, AXObjectCacheImpl* axObjectCache)
{
}
-PassRefPtr<AXSlider> AXSlider::create(LayoutObject* layoutObject, AXObjectCacheImpl* axObjectCache)
+PassRefPtrWillBeRawPtr<AXSlider> AXSlider::create(LayoutObject* layoutObject, AXObjectCacheImpl* axObjectCache)
{
- return adoptRef(new AXSlider(layoutObject, axObjectCache));
+ return adoptRefWillBeNoop(new AXSlider(layoutObject, axObjectCache));
}
AccessibilityRole AXSlider::determineAccessibilityRole()
@@ -98,10 +98,15 @@ void AXSlider::addChildren()
// Before actually adding the value indicator to the hierarchy,
// allow the platform to make a final decision about it.
- if (thumb->accessibilityIsIgnored())
+ if (thumb->accessibilityIsIgnored()) {
+#if ENABLE(OILPAN)
+ cache->remove(thumb);
+#else
cache->remove(thumb->axObjectID());
- else
+#endif
+ } else {
m_children.append(thumb);
+ }
}
const AtomicString& AXSlider::getAttribute(const QualifiedName& attribute) const
@@ -143,9 +148,9 @@ AXSliderThumb::AXSliderThumb(AXObjectCacheImpl* axObjectCache)
{
}
-PassRefPtr<AXSliderThumb> AXSliderThumb::create(AXObjectCacheImpl* axObjectCache)
+PassRefPtrWillBeRawPtr<AXSliderThumb> AXSliderThumb::create(AXObjectCacheImpl* axObjectCache)
{
- return adoptRef(new AXSliderThumb(axObjectCache));
+ return adoptRefWillBeNoop(new AXSliderThumb(axObjectCache));
}
LayoutRect AXSliderThumb::elementRect() const

Powered by Google App Engine
This is Rietveld 408576698