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

Side by Side Diff: Source/modules/accessibility/AXScrollbar.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 * 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/AXScrollbar.h" 30 #include "modules/accessibility/AXScrollbar.h"
31 31
32 #include "core/dom/AXObjectCache.h"
32 #include "platform/scroll/ScrollableArea.h" 33 #include "platform/scroll/ScrollableArea.h"
33 #include "platform/scroll/Scrollbar.h" 34 #include "platform/scroll/Scrollbar.h"
34 35
35 namespace blink { 36 namespace blink {
36 37
37 AXScrollbar::AXScrollbar(Scrollbar* scrollbar) 38 AXScrollbar::AXScrollbar(Scrollbar* scrollbar, AXObjectCache* axObjectCache)
38 : m_scrollbar(scrollbar) 39 : AXMockObject(axObjectCache)
40 , m_scrollbar(scrollbar)
39 { 41 {
40 ASSERT(scrollbar); 42 ASSERT(scrollbar);
41 } 43 }
42 44
43 void AXScrollbar::detachFromParent() 45 void AXScrollbar::detachFromParent()
44 { 46 {
45 m_scrollbar = nullptr; 47 m_scrollbar = nullptr;
46 AXMockObject::detachFromParent(); 48 AXMockObject::detachFromParent();
47 } 49 }
48 50
49 PassRefPtr<AXScrollbar> AXScrollbar::create(Scrollbar* scrollbar) 51 PassRefPtr<AXScrollbar> AXScrollbar::create(Scrollbar* scrollbar, AXObjectCache* axObjectCache)
50 { 52 {
51 return adoptRef(new AXScrollbar(scrollbar)); 53 return adoptRef(new AXScrollbar(scrollbar, axObjectCache));
52 } 54 }
53 55
54 LayoutRect AXScrollbar::elementRect() const 56 LayoutRect AXScrollbar::elementRect() const
55 { 57 {
56 if (!m_scrollbar) 58 if (!m_scrollbar)
57 return LayoutRect(); 59 return LayoutRect();
58 60
59 return m_scrollbar->frameRect(); 61 return m_scrollbar->frameRect();
60 } 62 }
61 63
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 return; 103 return;
102 104
103 if (!m_scrollbar->scrollableArea()) 105 if (!m_scrollbar->scrollableArea())
104 return; 106 return;
105 107
106 float newValue = value * m_scrollbar->maximum(); 108 float newValue = value * m_scrollbar->maximum();
107 m_scrollbar->scrollableArea()->scrollToOffsetWithoutAnimation(m_scrollbar->o rientation(), newValue); 109 m_scrollbar->scrollableArea()->scrollToOffsetWithoutAnimation(m_scrollbar->o rientation(), newValue);
108 } 110 }
109 111
110 } // namespace blink 112 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698