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 2053 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2064 ResourceRequest request = frame()->loader().resourceRequestForReload( | 2064 ResourceRequest request = frame()->loader().resourceRequestForReload( |
2065 static_cast<FrameLoadType>(loadType), overrideUrl); | 2065 static_cast<FrameLoadType>(loadType), overrideUrl); |
2066 return WrappedResourceRequest(request); | 2066 return WrappedResourceRequest(request); |
2067 } | 2067 } |
2068 | 2068 |
2069 void WebLocalFrameImpl::load(const WebURLRequest& request, WebFrameLoadType webF
rameLoadType, | 2069 void WebLocalFrameImpl::load(const WebURLRequest& request, WebFrameLoadType webF
rameLoadType, |
2070 const WebHistoryItem& item, WebHistoryLoadType webHistoryLoadType) | 2070 const WebHistoryItem& item, WebHistoryLoadType webHistoryLoadType) |
2071 { | 2071 { |
2072 ASSERT(frame()); | 2072 ASSERT(frame()); |
2073 ASSERT(!request.isNull()); | 2073 ASSERT(!request.isNull()); |
2074 ASSERT(webFrameLoadType != WebFrameLoadType::RedirectWithLockedBackForwardLi
st); | |
2075 const ResourceRequest& resourceRequest = request.toResourceRequest(); | 2074 const ResourceRequest& resourceRequest = request.toResourceRequest(); |
2076 | 2075 |
2077 if (resourceRequest.url().protocolIs("javascript") | 2076 if (resourceRequest.url().protocolIs("javascript") |
2078 && webFrameLoadType == WebFrameLoadType::Standard) { | 2077 && webFrameLoadType == WebFrameLoadType::Standard) { |
2079 loadJavaScriptURL(resourceRequest.url()); | 2078 loadJavaScriptURL(resourceRequest.url()); |
2080 return; | 2079 return; |
2081 } | 2080 } |
2082 | 2081 |
2083 FrameLoadRequest frameRequest = FrameLoadRequest(nullptr, resourceRequest); | 2082 FrameLoadRequest frameRequest = FrameLoadRequest(nullptr, resourceRequest); |
2084 RefPtrWillBeRawPtr<HistoryItem> historyItem = PassRefPtrWillBeRawPtr<History
Item>(item); | 2083 RefPtrWillBeRawPtr<HistoryItem> historyItem = PassRefPtrWillBeRawPtr<History
Item>(item); |
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2191 } | 2190 } |
2192 | 2191 |
2193 WebSandboxFlags WebLocalFrameImpl::effectiveSandboxFlags() const | 2192 WebSandboxFlags WebLocalFrameImpl::effectiveSandboxFlags() const |
2194 { | 2193 { |
2195 if (!frame()) | 2194 if (!frame()) |
2196 return WebSandboxFlags::None; | 2195 return WebSandboxFlags::None; |
2197 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags(
)); | 2196 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags(
)); |
2198 } | 2197 } |
2199 | 2198 |
2200 } // namespace blink | 2199 } // namespace blink |
OLD | NEW |