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

Side by Side Diff: Source/core/frame/FrameView.cpp

Issue 235903003: Remove FrameView::containsScrollableArea (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/frame/FrameView.h ('k') | Source/core/page/EventHandler.cpp » ('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) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Dirk Mueller <mueller@kde.org> 5 * 2000 Dirk Mueller <mueller@kde.org>
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com)
8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
9 * Copyright (C) 2009 Google Inc. All rights reserved. 9 * Copyright (C) 2009 Google Inc. All rights reserved.
10 * 10 *
(...skipping 3104 matching lines...) Expand 10 before | Expand all | Expand 10 after
3115 return false; 3115 return false;
3116 3116
3117 ScrollableAreaSet::iterator it = m_scrollableAreas->find(scrollableArea); 3117 ScrollableAreaSet::iterator it = m_scrollableAreas->find(scrollableArea);
3118 if (it == m_scrollableAreas->end()) 3118 if (it == m_scrollableAreas->end())
3119 return false; 3119 return false;
3120 3120
3121 m_scrollableAreas->remove(it); 3121 m_scrollableAreas->remove(it);
3122 return true; 3122 return true;
3123 } 3123 }
3124 3124
3125 bool FrameView::containsScrollableArea(const ScrollableArea* scrollableArea) con st
3126 {
3127 ASSERT(scrollableArea);
3128 if (!m_scrollableAreas || !scrollableArea)
3129 return false;
3130 return m_scrollableAreas->contains(const_cast<ScrollableArea*>(scrollableAre a));
3131 }
3132
3133 void FrameView::removeChild(Widget* widget) 3125 void FrameView::removeChild(Widget* widget)
3134 { 3126 {
3135 if (widget->isFrameView()) 3127 if (widget->isFrameView())
3136 removeScrollableArea(toFrameView(widget)); 3128 removeScrollableArea(toFrameView(widget));
3137 3129
3138 ScrollView::removeChild(widget); 3130 ScrollView::removeChild(widget);
3139 } 3131 }
3140 3132
3141 bool FrameView::wheelEvent(const PlatformWheelEvent& wheelEvent) 3133 bool FrameView::wheelEvent(const PlatformWheelEvent& wheelEvent)
3142 { 3134 {
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
3219 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation) 3211 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation)
3220 { 3212 {
3221 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); 3213 ScrollableArea::willRemoveScrollbar(scrollbar, orientation);
3222 if (AXObjectCache* cache = axObjectCache()) { 3214 if (AXObjectCache* cache = axObjectCache()) {
3223 cache->remove(scrollbar); 3215 cache->remove(scrollbar);
3224 cache->handleScrollbarUpdate(this); 3216 cache->handleScrollbarUpdate(this);
3225 } 3217 }
3226 } 3218 }
3227 3219
3228 } // namespace WebCore 3220 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/frame/FrameView.h ('k') | Source/core/page/EventHandler.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698