Source/core/loader/FrameLoader.cpp - Issue 180523003: Move ContentSecurityPolicy to core/frame/csp

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

Issue 180523003: Move ContentSecurityPolicy to core/frame/csp (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 6 years, 9 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/DocumentThreadableLoader.cpp ('k') | Source/core/page/EventSource.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 31 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
42 #include "core/dom/Document.h"	42 #include "core/dom/Document.h"

43 #include "core/dom/Element.h"	43 #include "core/dom/Element.h"

44 #include "core/editing/Editor.h"	44 #include "core/editing/Editor.h"

45 #include "core/editing/UndoStack.h"	45 #include "core/editing/UndoStack.h"

46 #include "core/events/Event.h"	46 #include "core/events/Event.h"

47 #include "core/events/PageTransitionEvent.h"	47 #include "core/events/PageTransitionEvent.h"

48 #include "core/events/ThreadLocalEventNames.h"	48 #include "core/events/ThreadLocalEventNames.h"

49 #include "core/fetch/FetchContext.h"	49 #include "core/fetch/FetchContext.h"

50 #include "core/fetch/ResourceFetcher.h"	50 #include "core/fetch/ResourceFetcher.h"

51 #include "core/fetch/ResourceLoader.h"	51 #include "core/fetch/ResourceLoader.h"

52 #include "core/frame/ContentSecurityPolicy.h"

53 #include "core/frame/DOMWindow.h"	52 #include "core/frame/DOMWindow.h"

54 #include "core/frame/FrameView.h"	53 #include "core/frame/FrameView.h"

55 #include "core/frame/LocalFrame.h"	54 #include "core/frame/LocalFrame.h"

	55 #include "core/frame/csp/ContentSecurityPolicy.h"

56 #include "core/html/HTMLFormElement.h"	56 #include "core/html/HTMLFormElement.h"

57 #include "core/html/HTMLFrameOwnerElement.h"	57 #include "core/html/HTMLFrameOwnerElement.h"

58 #include "core/html/parser/HTMLParserIdioms.h"	58 #include "core/html/parser/HTMLParserIdioms.h"

59 #include "core/inspector/InspectorController.h"	59 #include "core/inspector/InspectorController.h"

60 #include "core/inspector/InspectorInstrumentation.h"	60 #include "core/inspector/InspectorInstrumentation.h"

61 #include "core/loader/DocumentLoadTiming.h"	61 #include "core/loader/DocumentLoadTiming.h"

62 #include "core/loader/DocumentLoader.h"	62 #include "core/loader/DocumentLoader.h"

63 #include "core/loader/FormState.h"	63 #include "core/loader/FormState.h"

64 #include "core/loader/FormSubmission.h"	64 #include "core/loader/FormSubmission.h"

65 #include "core/loader/FrameFetchContext.h"	65 #include "core/loader/FrameFetchContext.h"

(...skipping 1394 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1460 {	1460 {

1461 SandboxFlags flags = m_forcedSandboxFlags;	1461 SandboxFlags flags = m_forcedSandboxFlags;

1462 if (LocalFrame* parentFrame = m_frame->tree().parent())	1462 if (LocalFrame* parentFrame = m_frame->tree().parent())

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

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

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

1466 return flags;	1466 return flags;

1467 }	1467 }

1468	1468

1469 } // namespace WebCore	1469 } // namespace WebCore

OLD	NEW