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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
100 bool isBackForwardLoadType(FrameLoadType type) | 100 bool isBackForwardLoadType(FrameLoadType type) |
101 { | 101 { |
102 return type == FrameLoadTypeBackForward; | 102 return type == FrameLoadTypeBackForward; |
103 } | 103 } |
104 | 104 |
105 // This is not in the FrameLoader class to emphasize that it does not depend on | 105 // This is not in the FrameLoader class to emphasize that it does not depend on |
106 // private FrameLoader data, and to avoid increasing the number of public functi ons | 106 // private FrameLoader data, and to avoid increasing the number of public functi ons |
107 // with access to private data. Since only this .cpp file needs it, making it | 107 // with access to private data. Since only this .cpp file needs it, making it |
108 // non-member lets us exclude it from the header file, thus keeping core/loader/ FrameLoader.h's | 108 // non-member lets us exclude it from the header file, thus keeping core/loader/ FrameLoader.h's |
109 // API simpler. | 109 // API simpler. |
110 // | 110 // |
Nico
2013/10/29 23:07:44
remove this comment too?
lgombos
2013/10/30 03:37:56
Yep, I missed that.
| |
111 static bool isDocumentSandboxed(Frame* frame, SandboxFlags mask) | |
112 { | |
113 return frame->document() && frame->document()->isSandboxed(mask); | |
114 } | |
115 | |
116 class FrameLoader::FrameProgressTracker { | 111 class FrameLoader::FrameProgressTracker { |
117 public: | 112 public: |
118 static PassOwnPtr<FrameProgressTracker> create(Frame* frame) { return adoptP tr(new FrameProgressTracker(frame)); } | 113 static PassOwnPtr<FrameProgressTracker> create(Frame* frame) { return adoptP tr(new FrameProgressTracker(frame)); } |
119 ~FrameProgressTracker() | 114 ~FrameProgressTracker() |
120 { | 115 { |
121 ASSERT(!m_inProgress || m_frame->page()); | 116 ASSERT(!m_inProgress || m_frame->page()); |
122 if (m_inProgress) | 117 if (m_inProgress) |
123 m_frame->page()->progress().progressCompleted(m_frame); | 118 m_frame->page()->progress().progressCompleted(m_frame); |
124 } | 119 } |
125 | 120 |
(...skipping 1475 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1601 { | 1596 { |
1602 SandboxFlags flags = m_forcedSandboxFlags; | 1597 SandboxFlags flags = m_forcedSandboxFlags; |
1603 if (Frame* parentFrame = m_frame->tree().parent()) | 1598 if (Frame* parentFrame = m_frame->tree().parent()) |
1604 flags |= parentFrame->document()->sandboxFlags(); | 1599 flags |= parentFrame->document()->sandboxFlags(); |
1605 if (HTMLFrameOwnerElement* ownerElement = m_frame->ownerElement()) | 1600 if (HTMLFrameOwnerElement* ownerElement = m_frame->ownerElement()) |
1606 flags |= ownerElement->sandboxFlags(); | 1601 flags |= ownerElement->sandboxFlags(); |
1607 return flags; | 1602 return flags; |
1608 } | 1603 } |
1609 | 1604 |
1610 } // namespace WebCore | 1605 } // namespace WebCore |
OLD | NEW |