Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(236)

Side by Side Diff: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

Issue 2167623002: Reload: propagate FrameLoadType to child frames Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add some comments Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1530 matching lines...) Expand 10 before | Expand all | Expand 10 after
1541 if (isBackForwardLoadType(frame()->loader().loadType()) && !frame()->documen t()->loadEventFinished()) 1541 if (isBackForwardLoadType(frame()->loader().loadType()) && !frame()->documen t()->loadEventFinished())
1542 childItem = webframeChild->client()->historyItemForNewChildFrame(); 1542 childItem = webframeChild->client()->historyItemForNewChildFrame();
1543 1543
1544 FrameLoadRequest newRequest = request; 1544 FrameLoadRequest newRequest = request;
1545 FrameLoadType loadType = FrameLoadTypeStandard; 1545 FrameLoadType loadType = FrameLoadTypeStandard;
1546 if (childItem) { 1546 if (childItem) {
1547 newRequest = FrameLoadRequest(request.originDocument(), 1547 newRequest = FrameLoadRequest(request.originDocument(),
1548 FrameLoader::resourceRequestFromHistoryItem(childItem, WebCachePolic y::UseProtocolCachePolicy)); 1548 FrameLoader::resourceRequestFromHistoryItem(childItem, WebCachePolic y::UseProtocolCachePolicy));
1549 loadType = FrameLoadTypeInitialHistoryLoad; 1549 loadType = FrameLoadTypeInitialHistoryLoad;
1550 } 1550 }
1551 if (isReloadLoadType(frame()->loader().loadType()) && !frame()->document()-> loadEventFinished())
1552 loadType = frame()->loader().loadType();
Charlie Reis 2016/07/22 20:44:00 I don't think this will work for the new SiteIsola
1551 webframeChild->frame()->loader().load(newRequest, loadType, childItem); 1553 webframeChild->frame()->loader().load(newRequest, loadType, childItem);
1552 1554
1553 // Note a synchronous navigation (about:blank) would have already processed 1555 // Note a synchronous navigation (about:blank) would have already processed
1554 // onload, so it is possible for the child frame to have already been 1556 // onload, so it is possible for the child frame to have already been
1555 // detached by script in the page. 1557 // detached by script in the page.
1556 if (!webframeChild->parent()) 1558 if (!webframeChild->parent())
1557 return nullptr; 1559 return nullptr;
1558 return webframeChild->frame(); 1560 return webframeChild->frame();
1559 } 1561 }
1560 1562
(...skipping 586 matching lines...) Expand 10 before | Expand all | Expand 10 after
2147 { 2149 {
2148 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags)); 2150 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags));
2149 } 2151 }
2150 2152
2151 void WebLocalFrameImpl::clearActiveFindMatch() 2153 void WebLocalFrameImpl::clearActiveFindMatch()
2152 { 2154 {
2153 ensureTextFinder().clearActiveFindMatch(); 2155 ensureTextFinder().clearActiveFindMatch();
2154 } 2156 }
2155 2157
2156 } // namespace blink 2158 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698