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

Side by Side Diff: third_party/WebKit/Source/web/WebViewImpl.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) 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 Google 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * 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 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 1731 matching lines...) Expand 10 before | Expand all | Expand 10 after
1742 1742
1743 WebViewImpl* WebViewImpl::fromPage(Page* page) { 1743 WebViewImpl* WebViewImpl::fromPage(Page* page) {
1744 return page ? static_cast<WebViewImpl*>(page->chromeClient().webView()) 1744 return page ? static_cast<WebViewImpl*>(page->chromeClient().webView())
1745 : nullptr; 1745 : nullptr;
1746 } 1746 }
1747 1747
1748 // WebWidget ------------------------------------------------------------------ 1748 // WebWidget ------------------------------------------------------------------
1749 1749
1750 void WebViewImpl::close() { 1750 void WebViewImpl::close() {
1751 DCHECK(allInstances().contains(this)); 1751 DCHECK(allInstances().contains(this));
1752 allInstances().remove(this); 1752 allInstances().erase(this);
1753 1753
1754 if (m_page) { 1754 if (m_page) {
1755 // Initiate shutdown for the entire frameset. This will cause a lot of 1755 // Initiate shutdown for the entire frameset. This will cause a lot of
1756 // notifications to be sent. 1756 // notifications to be sent.
1757 m_page->willBeDestroyed(); 1757 m_page->willBeDestroyed();
1758 m_page.clear(); 1758 m_page.clear();
1759 } 1759 }
1760 1760
1761 // Reset the delegate to prevent notifications being sent as we're being 1761 // Reset the delegate to prevent notifications being sent as we're being
1762 // deleted. 1762 // deleted.
(...skipping 2373 matching lines...) Expand 10 before | Expand all | Expand 10 after
4136 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame()) 4136 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame())
4137 return nullptr; 4137 return nullptr;
4138 return focusedFrame; 4138 return focusedFrame;
4139 } 4139 }
4140 4140
4141 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const { 4141 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const {
4142 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr; 4142 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr;
4143 } 4143 }
4144 4144
4145 } // namespace blink 4145 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp ('k') | third_party/WebKit/Source/wtf/DequeTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698