OLD | NEW |
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 Loading... |
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 |
1062 void FrameLoader::detachChildren() | 1070 void FrameLoader::detachChildren() |
1063 { | 1071 { |
1064 typedef Vector<RefPtr<LocalFrame> > FrameVector; | 1072 typedef Vector<RefPtr<LocalFrame> > FrameVector; |
1065 FrameVector childrenToDetach; | 1073 FrameVector childrenToDetach; |
1066 childrenToDetach.reserveCapacity(m_frame->tree().childCount()); | 1074 childrenToDetach.reserveCapacity(m_frame->tree().childCount()); |
1067 for (Frame* child = m_frame->tree().lastChild(); child; child = child->tree(
).previousSibling()) { | 1075 for (Frame* child = m_frame->tree().lastChild(); child; child = child->tree(
).previousSibling()) { |
1068 if (child->isLocalFrame()) | 1076 if (child->isLocalFrame()) |
1069 childrenToDetach.append(toLocalFrame(child)); | 1077 childrenToDetach.append(toLocalFrame(child)); |
1070 } | 1078 } |
1071 FrameVector::iterator end = childrenToDetach.end(); | 1079 FrameVector::iterator end = childrenToDetach.end(); |
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1474 // FIXME: We need a way to propagate sandbox flags to out-of-process frames. | 1482 // FIXME: We need a way to propagate sandbox flags to out-of-process frames. |
1475 Frame* parentFrame = m_frame->tree().parent(); | 1483 Frame* parentFrame = m_frame->tree().parent(); |
1476 if (parentFrame && parentFrame->isLocalFrame()) | 1484 if (parentFrame && parentFrame->isLocalFrame()) |
1477 flags |= toLocalFrame(parentFrame)->document()->sandboxFlags(); | 1485 flags |= toLocalFrame(parentFrame)->document()->sandboxFlags(); |
1478 if (FrameOwner* frameOwner = m_frame->owner()) | 1486 if (FrameOwner* frameOwner = m_frame->owner()) |
1479 flags |= frameOwner->sandboxFlags(); | 1487 flags |= frameOwner->sandboxFlags(); |
1480 return flags; | 1488 return flags; |
1481 } | 1489 } |
1482 | 1490 |
1483 } // namespace WebCore | 1491 } // namespace WebCore |
OLD | NEW |