Source/core/loader/FrameLoader.cpp - Issue 25195003: Prepare to move core/platform/text into blink_platform.dll

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

Issue 25195003: Prepare to move core/platform/text into blink_platform.dll (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: re-attempt upload Created 7 years, 2 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/DocumentLoader.cpp ('k') | Source/core/loader/HistoryController.cpp » ('j') | no next file with comments »

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/ContentSecurityPolicy.h"	72 #include "core/page/ContentSecurityPolicy.h"

73 #include "core/page/ContentSecurityPolicyResponseHeaders.h"	73 #include "core/page/ContentSecurityPolicyResponseHeaders.h"

74 #include "core/page/DOMWindow.h"	74 #include "core/page/DOMWindow.h"

75 #include "core/page/EventHandler.h"	75 #include "core/page/EventHandler.h"

76 #include "core/page/Frame.h"	76 #include "core/page/Frame.h"

77 #include "core/page/FrameTree.h"	77 #include "core/page/FrameTree.h"

78 #include "core/page/FrameView.h"	78 #include "core/page/FrameView.h"

79 #include "core/page/Page.h"	79 #include "core/page/Page.h"

80 #include "core/page/Settings.h"	80 #include "core/page/Settings.h"

81 #include "core/page/WindowFeatures.h"	81 #include "core/page/WindowFeatures.h"

82 #include "core/platform/Logging.h"	82 #include "platform/Logging.h"

83 #include "core/platform/ScrollAnimator.h"	83 #include "core/platform/ScrollAnimator.h"

84 #include "core/platform/graphics/FloatRect.h"	84 #include "core/platform/graphics/FloatRect.h"

85 #include "core/platform/network/HTTPParsers.h"	85 #include "core/platform/network/HTTPParsers.h"

86 #include "core/platform/network/ResourceRequest.h"	86 #include "core/platform/network/ResourceRequest.h"

87 #include "core/xml/parser/XMLDocumentParser.h"	87 #include "core/xml/parser/XMLDocumentParser.h"

88 #include "modules/webdatabase/DatabaseManager.h"	88 #include "modules/webdatabase/DatabaseManager.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"

(...skipping 1507 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1600 {	1600 {

1601 SandboxFlags flags = m_forcedSandboxFlags;	1601 SandboxFlags flags = m_forcedSandboxFlags;

1602 if (Frame* parentFrame = m_frame->tree()->parent())	1602 if (Frame* parentFrame = m_frame->tree()->parent())

1603 flags \|= parentFrame->document()->sandboxFlags();	1603 flags \|= parentFrame->document()->sandboxFlags();

1604 if (HTMLFrameOwnerElement* ownerElement = m_frame->ownerElement())	1604 if (HTMLFrameOwnerElement* ownerElement = m_frame->ownerElement())

1605 flags \|= ownerElement->sandboxFlags();	1605 flags \|= ownerElement->sandboxFlags();

1606 return flags;	1606 return flags;

1607 }	1607 }

1608	1608

1609 } // namespace WebCore	1609 } // namespace WebCore

OLD	NEW