| 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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 #include "core/page/ContentSecurityPolicyResponseHeaders.h" | 72 #include "core/page/ContentSecurityPolicyResponseHeaders.h" |
| 73 #include "core/frame/DOMWindow.h" | 73 #include "core/frame/DOMWindow.h" |
| 74 #include "core/page/EventHandler.h" | 74 #include "core/page/EventHandler.h" |
| 75 #include "core/frame/Frame.h" | 75 #include "core/frame/Frame.h" |
| 76 #include "core/page/FrameTree.h" | 76 #include "core/page/FrameTree.h" |
| 77 #include "core/frame/FrameView.h" | 77 #include "core/frame/FrameView.h" |
| 78 #include "core/page/Page.h" | 78 #include "core/page/Page.h" |
| 79 #include "core/page/Settings.h" | 79 #include "core/page/Settings.h" |
| 80 #include "core/page/WindowFeatures.h" | 80 #include "core/page/WindowFeatures.h" |
| 81 #include "core/platform/ScrollAnimator.h" | 81 #include "core/platform/ScrollAnimator.h" |
| 82 #include "core/platform/network/HTTPParsers.h" | |
| 83 #include "core/platform/network/ResourceRequest.h" | 82 #include "core/platform/network/ResourceRequest.h" |
| 84 #include "core/xml/parser/XMLDocumentParser.h" | 83 #include "core/xml/parser/XMLDocumentParser.h" |
| 85 #include "modules/webdatabase/DatabaseManager.h" | 84 #include "modules/webdatabase/DatabaseManager.h" |
| 86 #include "platform/Logging.h" | 85 #include "platform/Logging.h" |
| 87 #include "platform/UserGestureIndicator.h" | 86 #include "platform/UserGestureIndicator.h" |
| 88 #include "platform/geometry/FloatRect.h" | 87 #include "platform/geometry/FloatRect.h" |
| 88 #include "platform/network/HTTPParsers.h" |
| 89 #include "weborigin/SecurityOrigin.h" | 89 #include "weborigin/SecurityOrigin.h" |
| 90 #include "weborigin/SecurityPolicy.h" | 90 #include "weborigin/SecurityPolicy.h" |
| 91 #include "wtf/TemporaryChange.h" | 91 #include "wtf/TemporaryChange.h" |
| 92 #include "wtf/text/CString.h" | 92 #include "wtf/text/CString.h" |
| 93 #include "wtf/text/WTFString.h" | 93 #include "wtf/text/WTFString.h" |
| 94 | 94 |
| 95 namespace WebCore { | 95 namespace WebCore { |
| 96 | 96 |
| 97 using namespace HTMLNames; | 97 using namespace HTMLNames; |
| 98 | 98 |
| (...skipping 1506 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1605 { | 1605 { |
| 1606 SandboxFlags flags = m_forcedSandboxFlags; | 1606 SandboxFlags flags = m_forcedSandboxFlags; |
| 1607 if (Frame* parentFrame = m_frame->tree()->parent()) | 1607 if (Frame* parentFrame = m_frame->tree()->parent()) |
| 1608 flags |= parentFrame->document()->sandboxFlags(); | 1608 flags |= parentFrame->document()->sandboxFlags(); |
| 1609 if (HTMLFrameOwnerElement* ownerElement = m_frame->ownerElement()) | 1609 if (HTMLFrameOwnerElement* ownerElement = m_frame->ownerElement()) |
| 1610 flags |= ownerElement->sandboxFlags(); | 1610 flags |= ownerElement->sandboxFlags(); |
| 1611 return flags; | 1611 return flags; |
| 1612 } | 1612 } |
| 1613 | 1613 |
| 1614 } // namespace WebCore | 1614 } // namespace WebCore |
| OLD | NEW |