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

Side by Side Diff: Source/core/loader/FrameLoader.cpp

Issue 338253007: Revert "DevTools: Load document (html) content from disk cache in page agent enabling." (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/loader/FrameLoader.h ('k') | Source/devtools/protocol.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed.
3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> 5 * Copyright (C) 2008 Alp Toker <alp@atoker.com>
6 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> 7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
8 * Copyright (C) 2011 Google Inc. All rights reserved. 8 * Copyright (C) 2011 Google Inc. All rights reserved.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
(...skipping 1041 matching lines...) Expand 10 before | Expand all | Expand 10 after
1052 } else { 1052 } else {
1053 view->setScrollPositionNonProgrammatically(m_currentItem->scrollPoint()) ; 1053 view->setScrollPositionNonProgrammatically(m_currentItem->scrollPoint()) ;
1054 } 1054 }
1055 1055
1056 if (m_frame->isMainFrame()) { 1056 if (m_frame->isMainFrame()) {
1057 if (ScrollingCoordinator* scrollingCoordinator = m_frame->page()->scroll ingCoordinator()) 1057 if (ScrollingCoordinator* scrollingCoordinator = m_frame->page()->scroll ingCoordinator())
1058 scrollingCoordinator->frameViewRootLayerDidChange(view); 1058 scrollingCoordinator->frameViewRootLayerDidChange(view);
1059 } 1059 }
1060 } 1060 }
1061 1061
1062 bool FrameLoader::requestFromHistoryForInspector(ResourceRequestCachePolicy cach ePolicy, ResourceRequest* request)
1063 {
1064 if (!m_currentItem)
1065 return false;
1066 *request = requestFromHistoryItem(m_currentItem.get(), cachePolicy);
1067 return true;
1068 }
1069
1070 void FrameLoader::detachChildren() 1062 void FrameLoader::detachChildren()
1071 { 1063 {
1072 typedef Vector<RefPtr<LocalFrame> > FrameVector; 1064 typedef Vector<RefPtr<LocalFrame> > FrameVector;
1073 FrameVector childrenToDetach; 1065 FrameVector childrenToDetach;
1074 childrenToDetach.reserveCapacity(m_frame->tree().childCount()); 1066 childrenToDetach.reserveCapacity(m_frame->tree().childCount());
1075 for (Frame* child = m_frame->tree().lastChild(); child; child = child->tree( ).previousSibling()) { 1067 for (Frame* child = m_frame->tree().lastChild(); child; child = child->tree( ).previousSibling()) {
1076 if (child->isLocalFrame()) 1068 if (child->isLocalFrame())
1077 childrenToDetach.append(toLocalFrame(child)); 1069 childrenToDetach.append(toLocalFrame(child));
1078 } 1070 }
1079 FrameVector::iterator end = childrenToDetach.end(); 1071 FrameVector::iterator end = childrenToDetach.end();
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after
1482 // FIXME: We need a way to propagate sandbox flags to out-of-process frames. 1474 // FIXME: We need a way to propagate sandbox flags to out-of-process frames.
1483 Frame* parentFrame = m_frame->tree().parent(); 1475 Frame* parentFrame = m_frame->tree().parent();
1484 if (parentFrame && parentFrame->isLocalFrame()) 1476 if (parentFrame && parentFrame->isLocalFrame())
1485 flags |= toLocalFrame(parentFrame)->document()->sandboxFlags(); 1477 flags |= toLocalFrame(parentFrame)->document()->sandboxFlags();
1486 if (FrameOwner* frameOwner = m_frame->owner()) 1478 if (FrameOwner* frameOwner = m_frame->owner())
1487 flags |= frameOwner->sandboxFlags(); 1479 flags |= frameOwner->sandboxFlags();
1488 return flags; 1480 return flags;
1489 } 1481 }
1490 1482
1491 } // namespace WebCore 1483 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/loader/FrameLoader.h ('k') | Source/devtools/protocol.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698