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

Side by Side Diff: Source/modules/accessibility/AXMenuList.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) 2010 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2010 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 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "modules/accessibility/AXMenuList.h" 27 #include "modules/accessibility/AXMenuList.h"
28 28
29 #include "core/dom/AXObjectCache.h"
29 #include "core/rendering/RenderMenuList.h" 30 #include "core/rendering/RenderMenuList.h"
30 #include "modules/accessibility/AXMenuListPopup.h" 31 #include "modules/accessibility/AXMenuListPopup.h"
31 #include "modules/accessibility/AXObjectCacheImpl.h" 32 #include "modules/accessibility/AXObjectCacheImpl.h"
32 33
33 namespace blink { 34 namespace blink {
34 35
35 AXMenuList::AXMenuList(RenderMenuList* renderer) 36 AXMenuList::AXMenuList(RenderMenuList* renderer, AXObjectCache* axObjectCache)
36 : AXRenderObject(renderer) 37 : AXRenderObject(renderer, axObjectCache)
37 { 38 {
38 } 39 }
39 40
40 PassRefPtr<AXMenuList> AXMenuList::create(RenderMenuList* renderer) 41 PassRefPtr<AXMenuList> AXMenuList::create(RenderMenuList* renderer, AXObjectCach e* axObjectCache)
41 { 42 {
42 return adoptRef(new AXMenuList(renderer)); 43 return adoptRef(new AXMenuList(renderer, axObjectCache));
43 } 44 }
44 45
45 bool AXMenuList::press() const 46 bool AXMenuList::press() const
46 { 47 {
47 RenderMenuList* menuList = toRenderMenuList(m_renderer); 48 RenderMenuList* menuList = toRenderMenuList(m_renderer);
48 if (menuList->popupIsVisible()) 49 if (menuList->popupIsVisible())
49 menuList->hidePopup(); 50 menuList->hidePopup();
50 else 51 else
51 menuList->showPopup(); 52 menuList->showPopup();
52 return true; 53 return true;
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 if (childObjects[0]->isMenuListPopup()) { 117 if (childObjects[0]->isMenuListPopup()) {
117 if (AXMenuListPopup* popup = toAXMenuListPopup(childObjects[0].get() )) 118 if (AXMenuListPopup* popup = toAXMenuListPopup(childObjects[0].get() ))
118 popup->didUpdateActiveOption(optionIndex); 119 popup->didUpdateActiveOption(optionIndex);
119 } 120 }
120 } 121 }
121 122
122 cache->postNotification(this, document.get(), AXObjectCacheImpl::AXMenuListV alueChanged, true); 123 cache->postNotification(this, document.get(), AXObjectCacheImpl::AXMenuListV alueChanged, true);
123 } 124 }
124 125
125 } // namespace blink 126 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698