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

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

Issue 2703833002: Migrate WTF::HashSet::remove() to ::erase() [part 2] (Closed)
Patch Set: Created 3 years, 10 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
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 3672 matching lines...) Expand 10 before | Expand all | Expand 10 after
3683 m_resizerAreas = WTF::wrapUnique(new ResizerAreaSet); 3683 m_resizerAreas = WTF::wrapUnique(new ResizerAreaSet);
3684 m_resizerAreas->insert(&resizerBox); 3684 m_resizerAreas->insert(&resizerBox);
3685 } 3685 }
3686 3686
3687 void FrameView::removeResizerArea(LayoutBox& resizerBox) { 3687 void FrameView::removeResizerArea(LayoutBox& resizerBox) {
3688 if (!m_resizerAreas) 3688 if (!m_resizerAreas)
3689 return; 3689 return;
3690 3690
3691 ResizerAreaSet::iterator it = m_resizerAreas->find(&resizerBox); 3691 ResizerAreaSet::iterator it = m_resizerAreas->find(&resizerBox);
3692 if (it != m_resizerAreas->end()) 3692 if (it != m_resizerAreas->end())
3693 m_resizerAreas->remove(it); 3693 m_resizerAreas->erase(it);
3694 } 3694 }
3695 3695
3696 void FrameView::addScrollableArea(ScrollableArea* scrollableArea) { 3696 void FrameView::addScrollableArea(ScrollableArea* scrollableArea) {
3697 ASSERT(scrollableArea); 3697 ASSERT(scrollableArea);
3698 if (!m_scrollableAreas) 3698 if (!m_scrollableAreas)
3699 m_scrollableAreas = new ScrollableAreaSet; 3699 m_scrollableAreas = new ScrollableAreaSet;
3700 m_scrollableAreas->insert(scrollableArea); 3700 m_scrollableAreas->insert(scrollableArea);
3701 3701
3702 if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator()) 3702 if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
3703 scrollingCoordinator->scrollableAreasDidChange(); 3703 scrollingCoordinator->scrollableAreasDidChange();
(...skipping 1487 matching lines...) Expand 10 before | Expand all | Expand 10 after
5191 void FrameView::setAnimationHost( 5191 void FrameView::setAnimationHost(
5192 std::unique_ptr<CompositorAnimationHost> host) { 5192 std::unique_ptr<CompositorAnimationHost> host) {
5193 m_animationHost = std::move(host); 5193 m_animationHost = std::move(host);
5194 } 5194 }
5195 5195
5196 LayoutUnit FrameView::caretWidth() const { 5196 LayoutUnit FrameView::caretWidth() const {
5197 return LayoutUnit(getHostWindow()->windowToViewportScalar(1)); 5197 return LayoutUnit(getHostWindow()->windowToViewportScalar(1));
5198 } 5198 }
5199 5199
5200 } // namespace blink 5200 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698