Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Side by Side Diff: Source/bindings/v8/ScriptController.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 | « no previous file | Source/bindings/v8/V8Initializer.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008, 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2008, 2009 Google Inc. All rights reserved.
3 * Copyright (C) 2009 Apple Inc. All rights reserved. 3 * Copyright (C) 2009 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 #include "bindings/v8/V8ScriptRunner.h" 47 #include "bindings/v8/V8ScriptRunner.h"
48 #include "bindings/v8/V8WindowShell.h" 48 #include "bindings/v8/V8WindowShell.h"
49 #include "bindings/v8/npruntime_impl.h" 49 #include "bindings/v8/npruntime_impl.h"
50 #include "bindings/v8/npruntime_priv.h" 50 #include "bindings/v8/npruntime_priv.h"
51 #include "core/dom/Document.h" 51 #include "core/dom/Document.h"
52 #include "core/dom/Node.h" 52 #include "core/dom/Node.h"
53 #include "core/dom/ScriptableDocumentParser.h" 53 #include "core/dom/ScriptableDocumentParser.h"
54 #include "core/events/Event.h" 54 #include "core/events/Event.h"
55 #include "core/events/EventListener.h" 55 #include "core/events/EventListener.h"
56 #include "core/events/ThreadLocalEventNames.h" 56 #include "core/events/ThreadLocalEventNames.h"
57 #include "core/frame/DOMWindow.h"
58 #include "core/frame/LocalFrame.h"
59 #include "core/frame/Settings.h"
60 #include "core/frame/csp/ContentSecurityPolicy.h"
57 #include "core/html/HTMLPlugInElement.h" 61 #include "core/html/HTMLPlugInElement.h"
58 #include "core/inspector/InspectorInstrumentation.h" 62 #include "core/inspector/InspectorInstrumentation.h"
59 #include "core/inspector/ScriptCallStack.h" 63 #include "core/inspector/ScriptCallStack.h"
60 #include "core/loader/DocumentLoader.h" 64 #include "core/loader/DocumentLoader.h"
61 #include "core/loader/FrameLoader.h" 65 #include "core/loader/FrameLoader.h"
62 #include "core/loader/FrameLoaderClient.h" 66 #include "core/loader/FrameLoaderClient.h"
63 #include "core/frame/ContentSecurityPolicy.h"
64 #include "core/frame/DOMWindow.h"
65 #include "core/frame/LocalFrame.h"
66 #include "core/frame/Settings.h"
67 #include "core/plugins/PluginView.h" 67 #include "core/plugins/PluginView.h"
68 #include "platform/NotImplemented.h" 68 #include "platform/NotImplemented.h"
69 #include "platform/TraceEvent.h" 69 #include "platform/TraceEvent.h"
70 #include "platform/UserGestureIndicator.h" 70 #include "platform/UserGestureIndicator.h"
71 #include "platform/Widget.h" 71 #include "platform/Widget.h"
72 #include "platform/weborigin/SecurityOrigin.h" 72 #include "platform/weborigin/SecurityOrigin.h"
73 #include "public/platform/Platform.h" 73 #include "public/platform/Platform.h"
74 #include "wtf/CurrentTime.h" 74 #include "wtf/CurrentTime.h"
75 #include "wtf/StdLibExtras.h" 75 #include "wtf/StdLibExtras.h"
76 #include "wtf/StringExtras.h" 76 #include "wtf/StringExtras.h"
(...skipping 571 matching lines...) Expand 10 before | Expand all | Expand 10 after
648 v8Results = evaluateHandleScope.Escape(resultArray); 648 v8Results = evaluateHandleScope.Escape(resultArray);
649 } 649 }
650 650
651 if (results && !v8Results.IsEmpty()) { 651 if (results && !v8Results.IsEmpty()) {
652 for (size_t i = 0; i < v8Results->Length(); ++i) 652 for (size_t i = 0; i < v8Results->Length(); ++i)
653 results->append(ScriptValue(v8Results->Get(i), m_isolate)); 653 results->append(ScriptValue(v8Results->Get(i), m_isolate));
654 } 654 }
655 } 655 }
656 656
657 } // namespace WebCore 657 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/bindings/v8/V8Initializer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698