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

Side by Side Diff: Source/modules/accessibility/AXScrollbar.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, 6 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 unified diff | Download patch
« no previous file with comments | « Source/modules/accessibility/AXScrollbar.h ('k') | Source/modules/accessibility/AXSlider.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 24 matching lines...) Expand all
35 35
36 namespace blink { 36 namespace blink {
37 37
38 AXScrollbar::AXScrollbar(Scrollbar* scrollbar, AXObjectCacheImpl& axObjectCache) 38 AXScrollbar::AXScrollbar(Scrollbar* scrollbar, AXObjectCacheImpl& axObjectCache)
39 : AXMockObject(axObjectCache) 39 : AXMockObject(axObjectCache)
40 , m_scrollbar(scrollbar) 40 , m_scrollbar(scrollbar)
41 { 41 {
42 ASSERT(scrollbar); 42 ASSERT(scrollbar);
43 } 43 }
44 44
45 AXScrollbar::~AXScrollbar()
46 {
47 ASSERT(!m_scrollbar);
48 }
49
45 void AXScrollbar::detachFromParent() 50 void AXScrollbar::detachFromParent()
46 { 51 {
47 m_scrollbar = nullptr; 52 m_scrollbar = nullptr;
48 AXMockObject::detachFromParent(); 53 AXMockObject::detachFromParent();
49 } 54 }
50 55
51 PassRefPtr<AXScrollbar> AXScrollbar::create(Scrollbar* scrollbar, AXObjectCacheI mpl& axObjectCache) 56 PassRefPtrWillBeRawPtr<AXScrollbar> AXScrollbar::create(Scrollbar* scrollbar, AX ObjectCacheImpl& axObjectCache)
52 { 57 {
53 return adoptRef(new AXScrollbar(scrollbar, axObjectCache)); 58 return adoptRefWillBeNoop(new AXScrollbar(scrollbar, axObjectCache));
54 } 59 }
55 60
56 LayoutRect AXScrollbar::elementRect() const 61 LayoutRect AXScrollbar::elementRect() const
57 { 62 {
58 if (!m_scrollbar) 63 if (!m_scrollbar)
59 return LayoutRect(); 64 return LayoutRect();
60 65
61 return LayoutRect(m_scrollbar->frameRect()); 66 return LayoutRect(m_scrollbar->frameRect());
62 } 67 }
63 68
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 109
105 if (!m_scrollbar->scrollableArea()) 110 if (!m_scrollbar->scrollableArea())
106 return; 111 return;
107 112
108 float newValue = value * m_scrollbar->maximum(); 113 float newValue = value * m_scrollbar->maximum();
109 114
110 // TODO(bokan): This should potentially be a UserScroll. 115 // TODO(bokan): This should potentially be a UserScroll.
111 m_scrollbar->scrollableArea()->setScrollPositionSingleAxis(m_scrollbar->orie ntation(), newValue, ProgrammaticScroll); 116 m_scrollbar->scrollableArea()->setScrollPositionSingleAxis(m_scrollbar->orie ntation(), newValue, ProgrammaticScroll);
112 } 117 }
113 118
119 DEFINE_TRACE(AXScrollbar)
120 {
121 visitor->trace(m_scrollbar);
122 AXMockObject::trace(visitor);
123 }
124
114 } // namespace blink 125 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/accessibility/AXScrollbar.h ('k') | Source/modules/accessibility/AXSlider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698