| 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 1527 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1538 if (isBackForwardLoadType(frame()->loader().loadType()) && !frame()->documen
t()->loadEventFinished()) | 1538 if (isBackForwardLoadType(frame()->loader().loadType()) && !frame()->documen
t()->loadEventFinished()) |
| 1539 childItem = webframeChild->client()->historyItemForNewChildFrame(); | 1539 childItem = webframeChild->client()->historyItemForNewChildFrame(); |
| 1540 | 1540 |
| 1541 FrameLoadRequest newRequest = request; | 1541 FrameLoadRequest newRequest = request; |
| 1542 FrameLoadType loadType = FrameLoadTypeStandard; | 1542 FrameLoadType loadType = FrameLoadTypeStandard; |
| 1543 if (childItem) { | 1543 if (childItem) { |
| 1544 newRequest = FrameLoadRequest(request.originDocument(), | 1544 newRequest = FrameLoadRequest(request.originDocument(), |
| 1545 FrameLoader::resourceRequestFromHistoryItem(childItem, WebCachePolic
y::UseProtocolCachePolicy)); | 1545 FrameLoader::resourceRequestFromHistoryItem(childItem, WebCachePolic
y::UseProtocolCachePolicy)); |
| 1546 loadType = FrameLoadTypeInitialHistoryLoad; | 1546 loadType = FrameLoadTypeInitialHistoryLoad; |
| 1547 } | 1547 } |
| 1548 FrameLoadType parentLoadType = frame()->loader().loadType(); |
| 1549 if (parentLoadType == FrameLoadTypeReload || parentLoadType == FrameLoadType
ReloadMainResource || parentLoadType == FrameLoadTypeReloadBypassingCache) |
| 1550 loadType = parentLoadType; |
| 1548 webframeChild->frame()->loader().load(newRequest, loadType, childItem); | 1551 webframeChild->frame()->loader().load(newRequest, loadType, childItem); |
| 1549 | 1552 |
| 1550 // Note a synchronous navigation (about:blank) would have already processed | 1553 // Note a synchronous navigation (about:blank) would have already processed |
| 1551 // onload, so it is possible for the child frame to have already been | 1554 // onload, so it is possible for the child frame to have already been |
| 1552 // detached by script in the page. | 1555 // detached by script in the page. |
| 1553 if (!webframeChild->parent()) | 1556 if (!webframeChild->parent()) |
| 1554 return nullptr; | 1557 return nullptr; |
| 1555 return webframeChild->frame(); | 1558 return webframeChild->frame(); |
| 1556 } | 1559 } |
| 1557 | 1560 |
| (...skipping 596 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2154 { | 2157 { |
| 2155 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags)); | 2158 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags)); |
| 2156 } | 2159 } |
| 2157 | 2160 |
| 2158 void WebLocalFrameImpl::clearActiveFindMatch() | 2161 void WebLocalFrameImpl::clearActiveFindMatch() |
| 2159 { | 2162 { |
| 2160 ensureTextFinder().clearActiveFindMatch(); | 2163 ensureTextFinder().clearActiveFindMatch(); |
| 2161 } | 2164 } |
| 2162 | 2165 |
| 2163 } // namespace blink | 2166 } // namespace blink |
| OLD | NEW |