| 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 992 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1003 // unreachableURL informs FrameLoader::reload to load unreachableURL | 1003 // unreachableURL informs FrameLoader::reload to load unreachableURL |
| 1004 // instead of the currently loaded URL. | 1004 // instead of the currently loaded URL. |
| 1005 ResourceRequest request; | 1005 ResourceRequest request; |
| 1006 if (replace && !unreachableURL.isEmpty() && frame()->loader().provisionalDoc
umentLoader()) | 1006 if (replace && !unreachableURL.isEmpty() && frame()->loader().provisionalDoc
umentLoader()) |
| 1007 request = frame()->loader().provisionalDocumentLoader()->originalRequest
(); | 1007 request = frame()->loader().provisionalDocumentLoader()->originalRequest
(); |
| 1008 request.setURL(baseURL); | 1008 request.setURL(baseURL); |
| 1009 request.setCheckForBrowserSideNavigation(false); | 1009 request.setCheckForBrowserSideNavigation(false); |
| 1010 | 1010 |
| 1011 FrameLoadRequest frameRequest(0, request, SubstituteData(data, mimeType, tex
tEncoding, unreachableURL)); | 1011 FrameLoadRequest frameRequest(0, request, SubstituteData(data, mimeType, tex
tEncoding, unreachableURL)); |
| 1012 ASSERT(frameRequest.substituteData().isValid()); | 1012 ASSERT(frameRequest.substituteData().isValid()); |
| 1013 frameRequest.setLockBackForwardList(replace); | 1013 frameRequest.setReplacesCurrentItem(replace); |
| 1014 frame()->loader().load(frameRequest); | 1014 frame()->loader().load(frameRequest); |
| 1015 } | 1015 } |
| 1016 | 1016 |
| 1017 void WebLocalFrameImpl::loadHTMLString(const WebData& data, const WebURL& baseUR
L, const WebURL& unreachableURL, bool replace) | 1017 void WebLocalFrameImpl::loadHTMLString(const WebData& data, const WebURL& baseUR
L, const WebURL& unreachableURL, bool replace) |
| 1018 { | 1018 { |
| 1019 ASSERT(frame()); | 1019 ASSERT(frame()); |
| 1020 loadData(data, WebString::fromUTF8("text/html"), WebString::fromUTF8("UTF-8"
), baseURL, unreachableURL, replace); | 1020 loadData(data, WebString::fromUTF8("text/html"), WebString::fromUTF8("UTF-8"
), baseURL, unreachableURL, replace); |
| 1021 } | 1021 } |
| 1022 | 1022 |
| 1023 void WebLocalFrameImpl::stopLoading() | 1023 void WebLocalFrameImpl::stopLoading() |
| (...skipping 1170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2194 } | 2194 } |
| 2195 | 2195 |
| 2196 WebSandboxFlags WebLocalFrameImpl::effectiveSandboxFlags() const | 2196 WebSandboxFlags WebLocalFrameImpl::effectiveSandboxFlags() const |
| 2197 { | 2197 { |
| 2198 if (!frame()) | 2198 if (!frame()) |
| 2199 return WebSandboxFlags::None; | 2199 return WebSandboxFlags::None; |
| 2200 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags(
)); | 2200 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags(
)); |
| 2201 } | 2201 } |
| 2202 | 2202 |
| 2203 } // namespace blink | 2203 } // namespace blink |
| OLD | NEW |