| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 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 835 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 846 // TODO(clamy): Remove this function once RenderFrame calls load for all | 846 // TODO(clamy): Remove this function once RenderFrame calls load for all |
| 847 // requests. | 847 // requests. |
| 848 reloadWithOverrideURL(KURL(), loadType); | 848 reloadWithOverrideURL(KURL(), loadType); |
| 849 } | 849 } |
| 850 | 850 |
| 851 void WebLocalFrameImpl::reloadWithOverrideURL(const WebURL& overrideUrl, | 851 void WebLocalFrameImpl::reloadWithOverrideURL(const WebURL& overrideUrl, |
| 852 WebFrameLoadType loadType) { | 852 WebFrameLoadType loadType) { |
| 853 // TODO(clamy): Remove this function once RenderFrame calls load for all | 853 // TODO(clamy): Remove this function once RenderFrame calls load for all |
| 854 // requests. | 854 // requests. |
| 855 DCHECK(frame()); | 855 DCHECK(frame()); |
| 856 DCHECK(loadType == WebFrameLoadType::Reload || | 856 DCHECK(isReloadLoadType(static_cast<FrameLoadType>(loadType))); |
| 857 loadType == WebFrameLoadType::ReloadBypassingCache); | |
| 858 WebURLRequest request = requestForReload(loadType, overrideUrl); | 857 WebURLRequest request = requestForReload(loadType, overrideUrl); |
| 859 if (request.isNull()) | 858 if (request.isNull()) |
| 860 return; | 859 return; |
| 861 load(request, loadType, WebHistoryItem(), WebHistoryDifferentDocumentLoad, | 860 load(request, loadType, WebHistoryItem(), WebHistoryDifferentDocumentLoad, |
| 862 false); | 861 false); |
| 863 } | 862 } |
| 864 | 863 |
| 865 void WebLocalFrameImpl::reloadImage(const WebNode& webNode) { | 864 void WebLocalFrameImpl::reloadImage(const WebNode& webNode) { |
| 866 const Node* node = webNode.constUnwrap<Node>(); | 865 const Node* node = webNode.constUnwrap<Node>(); |
| 867 if (isHTMLImageElement(*node)) { | 866 if (isHTMLImageElement(*node)) { |
| (...skipping 1473 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2341 feature = UseCounter::ChromeLoadTimesConnectionInfo; | 2340 feature = UseCounter::ChromeLoadTimesConnectionInfo; |
| 2342 } | 2341 } |
| 2343 UseCounter::count(frame(), feature); | 2342 UseCounter::count(frame(), feature); |
| 2344 } | 2343 } |
| 2345 | 2344 |
| 2346 WebInputMethodControllerImpl* WebLocalFrameImpl::inputMethodController() const { | 2345 WebInputMethodControllerImpl* WebLocalFrameImpl::inputMethodController() const { |
| 2347 return m_inputMethodController.get(); | 2346 return m_inputMethodController.get(); |
| 2348 } | 2347 } |
| 2349 | 2348 |
| 2350 } // namespace blink | 2349 } // namespace blink |
| OLD | NEW |