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

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

Issue 1175533004: Refactor: Clear m_axObjectCache when AXObject detaches (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Added ASSERT 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 17 matching lines...) Expand all
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 "modules/accessibility/AXObjectCacheImpl.h" 32 #include "modules/accessibility/AXObjectCacheImpl.h"
33 #include "platform/scroll/ScrollableArea.h" 33 #include "platform/scroll/ScrollableArea.h"
34 #include "platform/scroll/Scrollbar.h" 34 #include "platform/scroll/Scrollbar.h"
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 void AXScrollbar::detachFromParent() 45 void AXScrollbar::detachFromParent()
46 { 46 {
47 m_scrollbar = nullptr; 47 m_scrollbar = nullptr;
48 AXMockObject::detachFromParent(); 48 AXMockObject::detachFromParent();
49 } 49 }
50 50
51 PassRefPtr<AXScrollbar> AXScrollbar::create(Scrollbar* scrollbar, AXObjectCacheI mpl* axObjectCache) 51 PassRefPtr<AXScrollbar> AXScrollbar::create(Scrollbar* scrollbar, AXObjectCacheI mpl& axObjectCache)
52 { 52 {
53 return adoptRef(new AXScrollbar(scrollbar, axObjectCache)); 53 return adoptRef(new AXScrollbar(scrollbar, axObjectCache));
54 } 54 }
55 55
56 LayoutRect AXScrollbar::elementRect() const 56 LayoutRect AXScrollbar::elementRect() const
57 { 57 {
58 if (!m_scrollbar) 58 if (!m_scrollbar)
59 return LayoutRect(); 59 return LayoutRect();
60 60
61 return LayoutRect(m_scrollbar->frameRect()); 61 return LayoutRect(m_scrollbar->frameRect());
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 if (!m_scrollbar->scrollableArea()) 105 if (!m_scrollbar->scrollableArea())
106 return; 106 return;
107 107
108 float newValue = value * m_scrollbar->maximum(); 108 float newValue = value * m_scrollbar->maximum();
109 109
110 // TODO(bokan): This should potentially be a UserScroll. 110 // TODO(bokan): This should potentially be a UserScroll.
111 m_scrollbar->scrollableArea()->setScrollPositionSingleAxis(m_scrollbar->orie ntation(), newValue, ProgrammaticScroll); 111 m_scrollbar->scrollableArea()->setScrollPositionSingleAxis(m_scrollbar->orie ntation(), newValue, ProgrammaticScroll);
112 } 112 }
113 113
114 } // namespace blink 114 } // 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