OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2015, Google Inc. All rights reserved. | 2 * Copyright (c) 2015, 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 415 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
426 // Child frame as part of reload | 426 // Child frame as part of reload |
427 document->frame()->loader().setLoadType(FrameLoadTypeReload); | 427 document->frame()->loader().setLoadType(FrameLoadTypeReload); |
428 EXPECT_EQ(ReloadIgnoringCacheData, childFetchContext->resourceRequestCachePo
licy(request, Resource::MainResource)); | 428 EXPECT_EQ(ReloadIgnoringCacheData, childFetchContext->resourceRequestCachePo
licy(request, Resource::MainResource)); |
429 | 429 |
430 // Child frame as part of end to end reload | 430 // Child frame as part of end to end reload |
431 document->frame()->loader().setLoadType(FrameLoadTypeReloadFromOrigin); | 431 document->frame()->loader().setLoadType(FrameLoadTypeReloadFromOrigin); |
432 EXPECT_EQ(ReloadBypassingCache, childFetchContext->resourceRequestCachePolic
y(request, Resource::MainResource)); | 432 EXPECT_EQ(ReloadBypassingCache, childFetchContext->resourceRequestCachePolic
y(request, Resource::MainResource)); |
433 | 433 |
434 childDocumentLoader->detachFromFrame(); | 434 childDocumentLoader->detachFromFrame(); |
435 childDocumentLoader.clear(); | 435 childDocumentLoader.clear(); |
| 436 childFrame->detach(FrameDetachType::Remove); |
436 } | 437 } |
437 | 438 |
438 } // namespace | 439 } // namespace |
OLD | NEW |