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

Side by Side Diff: third_party/WebKit/Source/core/page/Page.cpp

Issue 2696183002: Migrate WTF::HashSet::remove() to ::erase() [part 1] (Closed)
Patch Set: one more platform-specific reference 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) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All
3 * Rights Reserved. 3 * Rights Reserved.
4 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. 4 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved.
5 * (http://www.torchmobile.com/) 5 * (http://www.torchmobile.com/)
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 506 matching lines...) Expand 10 before | Expand all | Expand 10 after
517 if (m_scrollingCoordinator) 517 if (m_scrollingCoordinator)
518 m_scrollingCoordinator->willCloseLayerTreeView(layerTreeView, view); 518 m_scrollingCoordinator->willCloseLayerTreeView(layerTreeView, view);
519 } 519 }
520 520
521 void Page::willBeDestroyed() { 521 void Page::willBeDestroyed() {
522 Frame* mainFrame = m_mainFrame; 522 Frame* mainFrame = m_mainFrame;
523 523
524 mainFrame->detach(FrameDetachType::Remove); 524 mainFrame->detach(FrameDetachType::Remove);
525 525
526 ASSERT(allPages().contains(this)); 526 ASSERT(allPages().contains(this));
527 allPages().remove(this); 527 allPages().erase(this);
528 ordinaryPages().remove(this); 528 ordinaryPages().erase(this);
529 529
530 if (m_scrollingCoordinator) 530 if (m_scrollingCoordinator)
531 m_scrollingCoordinator->willBeDestroyed(); 531 m_scrollingCoordinator->willBeDestroyed();
532 532
533 chromeClient().chromeDestroyed(); 533 chromeClient().chromeDestroyed();
534 if (m_validationMessageClient) 534 if (m_validationMessageClient)
535 m_validationMessageClient->willBeDestroyed(); 535 m_validationMessageClient->willBeDestroyed();
536 m_mainFrame = nullptr; 536 m_mainFrame = nullptr;
537 537
538 PageVisibilityNotifier::notifyContextDestroyed(); 538 PageVisibilityNotifier::notifyContextDestroyed();
539 } 539 }
540 540
541 Page::PageClients::PageClients() 541 Page::PageClients::PageClients()
542 : chromeClient(nullptr), 542 : chromeClient(nullptr),
543 contextMenuClient(nullptr), 543 contextMenuClient(nullptr),
544 editorClient(nullptr), 544 editorClient(nullptr),
545 spellCheckerClient(nullptr) {} 545 spellCheckerClient(nullptr) {}
546 546
547 Page::PageClients::~PageClients() {} 547 Page::PageClients::~PageClients() {}
548 548
549 template class CORE_TEMPLATE_EXPORT Supplement<Page>; 549 template class CORE_TEMPLATE_EXPORT Supplement<Page>;
550 550
551 } // namespace blink 551 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698