| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/renderer/render_view_impl.h" | 5 #include "content/renderer/render_view_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 1696 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1707 } | 1707 } |
| 1708 | 1708 |
| 1709 return false; | 1709 return false; |
| 1710 } | 1710 } |
| 1711 | 1711 |
| 1712 // Stop loading the current page | 1712 // Stop loading the current page |
| 1713 void RenderViewImpl::OnStop() { | 1713 void RenderViewImpl::OnStop() { |
| 1714 if (webview()) { | 1714 if (webview()) { |
| 1715 WebFrame* main_frame = webview()->mainFrame(); | 1715 WebFrame* main_frame = webview()->mainFrame(); |
| 1716 // Stop the alt error page fetcher. If we let it continue it may complete | 1716 // Stop the alt error page fetcher. If we let it continue it may complete |
| 1717 // and cause RenderViewHostManager to swap to this RenderView, even though | 1717 // and cause RenderFrameHostManager to swap to this RenderView, even though |
| 1718 // it may no longer be active. | 1718 // it may no longer be active. |
| 1719 StopAltErrorPageFetcher(main_frame->provisionalDataSource()); | 1719 StopAltErrorPageFetcher(main_frame->provisionalDataSource()); |
| 1720 StopAltErrorPageFetcher(main_frame->dataSource()); | 1720 StopAltErrorPageFetcher(main_frame->dataSource()); |
| 1721 main_frame->stopLoading(); | 1721 main_frame->stopLoading(); |
| 1722 } | 1722 } |
| 1723 } | 1723 } |
| 1724 | 1724 |
| 1725 // Reload current focused frame. | 1725 // Reload current focused frame. |
| 1726 // E.g. called by right-clicking on the frame and picking "reload this frame". | 1726 // E.g. called by right-clicking on the frame and picking "reload this frame". |
| 1727 void RenderViewImpl::OnReloadFrame() { | 1727 void RenderViewImpl::OnReloadFrame() { |
| (...skipping 4951 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6679 for (size_t i = 0; i < icon_urls.size(); i++) { | 6679 for (size_t i = 0; i < icon_urls.size(); i++) { |
| 6680 WebURL url = icon_urls[i].iconURL(); | 6680 WebURL url = icon_urls[i].iconURL(); |
| 6681 if (!url.isEmpty()) | 6681 if (!url.isEmpty()) |
| 6682 urls.push_back(FaviconURL(url, | 6682 urls.push_back(FaviconURL(url, |
| 6683 ToFaviconType(icon_urls[i].iconType()))); | 6683 ToFaviconType(icon_urls[i].iconType()))); |
| 6684 } | 6684 } |
| 6685 SendUpdateFaviconURL(urls); | 6685 SendUpdateFaviconURL(urls); |
| 6686 } | 6686 } |
| 6687 | 6687 |
| 6688 } // namespace content | 6688 } // namespace content |
| OLD | NEW |