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

Side by Side Diff: Source/modules/accessibility/AXInlineTextBox.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) 2013, Google Inc. All rights reserved. 2 * Copyright (C) 2013, Google 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/AXInlineTextBox.h" 30 #include "modules/accessibility/AXInlineTextBox.h"
31 31
32 #include "core/dom/AXObjectCache.h"
32 #include "core/dom/Range.h" 33 #include "core/dom/Range.h"
33 #include "core/rendering/RenderText.h" 34 #include "core/rendering/RenderText.h"
34 #include "modules/accessibility/AXObjectCacheImpl.h" 35 #include "modules/accessibility/AXObjectCacheImpl.h"
35 #include "platform/LayoutUnit.h" 36 #include "platform/LayoutUnit.h"
36 37
37 38
38 namespace blink { 39 namespace blink {
39 40
40 using namespace HTMLNames; 41 using namespace HTMLNames;
41 42
42 AXInlineTextBox::AXInlineTextBox(PassRefPtr<AbstractInlineTextBox> inlineTextBox ) 43 AXInlineTextBox::AXInlineTextBox(PassRefPtr<AbstractInlineTextBox> inlineTextBox , AXObjectCache* axObjectCache)
43 : m_inlineTextBox(inlineTextBox) 44 : AXObject(axObjectCache)
45 , m_inlineTextBox(inlineTextBox)
44 { 46 {
45 RenderText* renderText = m_inlineTextBox->renderText();
46 m_axObjectCache = toAXObjectCacheImpl(renderText->document().axObjectCache() );
47 } 47 }
48 48
49 AXInlineTextBox::~AXInlineTextBox() 49 AXInlineTextBox::~AXInlineTextBox()
50 { 50 {
51 if (m_axObjectCache && m_inlineTextBox) 51 if (m_axObjectCache && m_inlineTextBox)
52 m_axObjectCache->remove(m_inlineTextBox.get()); 52 m_axObjectCache->remove(m_inlineTextBox.get());
53 } 53 }
54 54
55 PassRefPtr<AXInlineTextBox> AXInlineTextBox::create(PassRefPtr<AbstractInlineTex tBox> inlineTextBox) 55 PassRefPtr<AXInlineTextBox> AXInlineTextBox::create(PassRefPtr<AbstractInlineTex tBox> inlineTextBox, AXObjectCache* axObjectCache)
56 { 56 {
57 return adoptRef(new AXInlineTextBox(inlineTextBox)); 57 return adoptRef(new AXInlineTextBox(inlineTextBox, axObjectCache));
58 } 58 }
59 59
60 void AXInlineTextBox::init() 60 void AXInlineTextBox::init()
61 { 61 {
62 } 62 }
63 63
64 void AXInlineTextBox::detach() 64 void AXInlineTextBox::detach()
65 { 65 {
66 m_inlineTextBox = nullptr; 66 m_inlineTextBox = nullptr;
67 m_axObjectCache = 0; 67 m_axObjectCache = 0;
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 case AbstractInlineTextBox::TopToBottom: 144 case AbstractInlineTextBox::TopToBottom:
145 return AccessibilityTextDirectionTopToBottom; 145 return AccessibilityTextDirectionTopToBottom;
146 case AbstractInlineTextBox::BottomToTop: 146 case AbstractInlineTextBox::BottomToTop:
147 return AccessibilityTextDirectionBottomToTop; 147 return AccessibilityTextDirectionBottomToTop;
148 } 148 }
149 149
150 return AccessibilityTextDirectionLeftToRight; 150 return AccessibilityTextDirectionLeftToRight;
151 } 151 }
152 152
153 } // namespace blink 153 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698