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

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

Issue 742353004: Implement computedRole and computedName (behind a flag) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Finished pulling out ScopedAXObjectCache etc. Many fprintfs remain. Created 6 years 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2012 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 11 matching lines...) Expand all
22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */ 27 */
28 28
29 #include "config.h" 29 #include "config.h"
30 #include "modules/accessibility/AXSVGRoot.h" 30 #include "modules/accessibility/AXSVGRoot.h"
31 31
32 #include "core/dom/AXObjectCache.h"
32 33
33 namespace blink { 34 namespace blink {
34 35
35 AXSVGRoot::AXSVGRoot(RenderObject* renderer) 36 AXSVGRoot::AXSVGRoot(RenderObject* renderer, AXObjectCache* axObjectCache)
36 : AXRenderObject(renderer) 37 : AXRenderObject(renderer, axObjectCache)
37 { 38 {
38 } 39 }
39 40
40 AXSVGRoot::~AXSVGRoot() 41 AXSVGRoot::~AXSVGRoot()
41 { 42 {
42 } 43 }
43 44
44 PassRefPtr<AXSVGRoot> AXSVGRoot::create(RenderObject* renderer) 45 PassRefPtr<AXSVGRoot> AXSVGRoot::create(RenderObject* renderer, AXObjectCache* a xObjectCache)
45 { 46 {
46 return adoptRef(new AXSVGRoot(renderer)); 47 return adoptRef(new AXSVGRoot(renderer, axObjectCache));
47 } 48 }
48 49
49 void AXSVGRoot::setParent(AXObject* parent) 50 void AXSVGRoot::setParent(AXObject* parent)
50 { 51 {
51 // Only update the parent to another objcet if it wasn't already set to 52 // Only update the parent to another objcet if it wasn't already set to
52 // something. Multiple elements in an HTML document can reference 53 // something. Multiple elements in an HTML document can reference
53 // the same remote SVG document, and in that case the parent should just 54 // the same remote SVG document, and in that case the parent should just
54 // stay with the first one. 55 // stay with the first one.
55 if (!m_parent || !parent) 56 if (!m_parent || !parent)
56 m_parent = parent; 57 m_parent = parent;
57 } 58 }
58 59
59 AXObject* AXSVGRoot::computeParent() const 60 AXObject* AXSVGRoot::computeParent() const
60 { 61 {
61 // If a parent was set because this is a remote SVG resource, use that 62 // If a parent was set because this is a remote SVG resource, use that
62 // but otherwise, we should rely on the standard render tree for the parent. 63 // but otherwise, we should rely on the standard render tree for the parent.
63 if (m_parent) 64 if (m_parent)
64 return m_parent; 65 return m_parent;
65 66
66 return AXRenderObject::computeParent(); 67 return AXRenderObject::computeParent();
67 } 68 }
68 69
69 70
70 } // namespace blink 71 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698