| 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 845 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 856 // requests. | 856 // requests. |
| 857 reloadWithOverrideURL(KURL(), ignoreCache); | 857 reloadWithOverrideURL(KURL(), ignoreCache); |
| 858 } | 858 } |
| 859 | 859 |
| 860 void WebLocalFrameImpl::reloadWithOverrideURL(const WebURL& overrideUrl, bool ig
noreCache) | 860 void WebLocalFrameImpl::reloadWithOverrideURL(const WebURL& overrideUrl, bool ig
noreCache) |
| 861 { | 861 { |
| 862 // TODO(clamy): Remove this function once RenderFrame calls load for all | 862 // TODO(clamy): Remove this function once RenderFrame calls load for all |
| 863 // requests. | 863 // requests. |
| 864 ASSERT(frame()); | 864 ASSERT(frame()); |
| 865 WebFrameLoadType loadType = ignoreCache ? | 865 WebFrameLoadType loadType = ignoreCache ? |
| 866 WebFrameLoadType::ReloadFromOrigin : WebFrameLoadType::Reload; | 866 WebFrameLoadType::ReloadBypassingCache : WebFrameLoadType::Reload; |
| 867 WebURLRequest request = requestForReload(loadType, overrideUrl); | 867 WebURLRequest request = requestForReload(loadType, overrideUrl); |
| 868 if (request.isNull()) | 868 if (request.isNull()) |
| 869 return; | 869 return; |
| 870 load(request, loadType, WebHistoryItem(), WebHistoryDifferentDocumentLoad, f
alse); | 870 load(request, loadType, WebHistoryItem(), WebHistoryDifferentDocumentLoad, f
alse); |
| 871 } | 871 } |
| 872 | 872 |
| 873 void WebLocalFrameImpl::reloadImage(const WebNode& webNode) | 873 void WebLocalFrameImpl::reloadImage(const WebNode& webNode) |
| 874 { | 874 { |
| 875 const Node* node = webNode.constUnwrap<Node>(); | 875 const Node* node = webNode.constUnwrap<Node>(); |
| 876 if (isHTMLImageElement(*node)) { | 876 if (isHTMLImageElement(*node)) { |
| (...skipping 1293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2170 return WebSandboxFlags::None; | 2170 return WebSandboxFlags::None; |
| 2171 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags(
)); | 2171 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags(
)); |
| 2172 } | 2172 } |
| 2173 | 2173 |
| 2174 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags) | 2174 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags) |
| 2175 { | 2175 { |
| 2176 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags)); | 2176 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags)); |
| 2177 } | 2177 } |
| 2178 | 2178 |
| 2179 } // namespace blink | 2179 } // namespace blink |
| OLD | NEW |