| 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 945 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 956 // requests. | 956 // requests. |
| 957 ASSERT(frame()); | 957 ASSERT(frame()); |
| 958 WebFrameLoadType loadType = ignoreCache ? | 958 WebFrameLoadType loadType = ignoreCache ? |
| 959 WebFrameLoadType::ReloadFromOrigin : WebFrameLoadType::Reload; | 959 WebFrameLoadType::ReloadFromOrigin : WebFrameLoadType::Reload; |
| 960 WebURLRequest request = requestForReload(loadType, overrideUrl); | 960 WebURLRequest request = requestForReload(loadType, overrideUrl); |
| 961 if (request.isNull()) | 961 if (request.isNull()) |
| 962 return; | 962 return; |
| 963 load(request, loadType, WebHistoryItem(), WebHistoryDifferentDocumentLoad); | 963 load(request, loadType, WebHistoryItem(), WebHistoryDifferentDocumentLoad); |
| 964 } | 964 } |
| 965 | 965 |
| 966 void WebLocalFrameImpl::reloadImage(const WebNode& webNode) | 966 void WebLocalFrameImpl::reloadImage(const WebNode& webNode, WebURLRequest::Extra
Data* extraData) |
| 967 { | 967 { |
| 968 const Node* node = webNode.constUnwrap<Node>(); | 968 const Node* node = webNode.constUnwrap<Node>(); |
| 969 if (isHTMLImageElement(*node)) { | 969 if (isHTMLImageElement(*node)) { |
| 970 const HTMLImageElement& imageElement = toHTMLImageElement(*node); | 970 const HTMLImageElement& imageElement = toHTMLImageElement(*node); |
| 971 imageElement.forceReload(); | 971 imageElement.forceReload(extraData); |
| 972 } | 972 } |
| 973 } | 973 } |
| 974 | 974 |
| 975 void WebLocalFrameImpl::loadRequest(const WebURLRequest& request) | 975 void WebLocalFrameImpl::loadRequest(const WebURLRequest& request) |
| 976 { | 976 { |
| 977 // TODO(clamy): Remove this function once RenderFrame calls load for all | 977 // TODO(clamy): Remove this function once RenderFrame calls load for all |
| 978 // requests. | 978 // requests. |
| 979 load(request, WebFrameLoadType::Standard, WebHistoryItem(), WebHistoryDiffer
entDocumentLoad); | 979 load(request, WebFrameLoadType::Standard, WebHistoryItem(), WebHistoryDiffer
entDocumentLoad); |
| 980 } | 980 } |
| 981 | 981 |
| (...skipping 1209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2191 } | 2191 } |
| 2192 | 2192 |
| 2193 WebSandboxFlags WebLocalFrameImpl::effectiveSandboxFlags() const | 2193 WebSandboxFlags WebLocalFrameImpl::effectiveSandboxFlags() const |
| 2194 { | 2194 { |
| 2195 if (!frame()) | 2195 if (!frame()) |
| 2196 return WebSandboxFlags::None; | 2196 return WebSandboxFlags::None; |
| 2197 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags(
)); | 2197 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags(
)); |
| 2198 } | 2198 } |
| 2199 | 2199 |
| 2200 } // namespace blink | 2200 } // namespace blink |
| OLD | NEW |