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

Side by Side Diff: Source/bindings/v8/custom/V8WindowCustom.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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009, 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2009, 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 #include "bindings/v8/V8EventListener.h" 44 #include "bindings/v8/V8EventListener.h"
45 #include "bindings/v8/V8EventListenerList.h" 45 #include "bindings/v8/V8EventListenerList.h"
46 #include "bindings/v8/V8GCForContextDispose.h" 46 #include "bindings/v8/V8GCForContextDispose.h"
47 #include "core/dom/ExceptionCode.h" 47 #include "core/dom/ExceptionCode.h"
48 #include "core/dom/MessagePort.h" 48 #include "core/dom/MessagePort.h"
49 #include "core/html/HTMLCollection.h" 49 #include "core/html/HTMLCollection.h"
50 #include "core/html/HTMLDocument.h" 50 #include "core/html/HTMLDocument.h"
51 #include "core/inspector/ScriptCallStack.h" 51 #include "core/inspector/ScriptCallStack.h"
52 #include "core/loader/FrameLoadRequest.h" 52 #include "core/loader/FrameLoadRequest.h"
53 #include "core/loader/FrameLoader.h" 53 #include "core/loader/FrameLoader.h"
54 #include "core/frame/ContentSecurityPolicy.h"
55 #include "core/frame/DOMTimer.h" 54 #include "core/frame/DOMTimer.h"
56 #include "core/frame/DOMWindow.h" 55 #include "core/frame/DOMWindow.h"
57 #include "core/frame/DOMWindowTimers.h" 56 #include "core/frame/DOMWindowTimers.h"
58 #include "core/frame/FrameView.h" 57 #include "core/frame/FrameView.h"
59 #include "core/frame/LocalFrame.h" 58 #include "core/frame/LocalFrame.h"
60 #include "core/frame/Settings.h" 59 #include "core/frame/Settings.h"
60 #include "core/frame/csp/ContentSecurityPolicy.h"
61 #include "core/storage/Storage.h" 61 #include "core/storage/Storage.h"
62 #include "platform/PlatformScreen.h" 62 #include "platform/PlatformScreen.h"
63 #include "platform/graphics/media/MediaPlayer.h" 63 #include "platform/graphics/media/MediaPlayer.h"
64 #include "wtf/ArrayBuffer.h" 64 #include "wtf/ArrayBuffer.h"
65 #include "wtf/Assertions.h" 65 #include "wtf/Assertions.h"
66 #include "wtf/OwnPtr.h" 66 #include "wtf/OwnPtr.h"
67 67
68 namespace WebCore { 68 namespace WebCore {
69 69
70 // FIXME: There is a lot of duplication with SetTimeoutOrInterval() in V8WorkerG lobalScopeCustom.cpp. 70 // FIXME: There is a lot of duplication with SetTimeoutOrInterval() in V8WorkerG lobalScopeCustom.cpp.
(...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after
490 v8::Handle<v8::Context> context = toV8Context(isolate, frame, DOMWrapperWorl d::current(isolate)); 490 v8::Handle<v8::Context> context = toV8Context(isolate, frame, DOMWrapperWorl d::current(isolate));
491 if (context.IsEmpty()) 491 if (context.IsEmpty())
492 return v8Undefined(); 492 return v8Undefined();
493 493
494 v8::Handle<v8::Object> global = context->Global(); 494 v8::Handle<v8::Object> global = context->Global();
495 ASSERT(!global.IsEmpty()); 495 ASSERT(!global.IsEmpty());
496 return global; 496 return global;
497 } 497 }
498 498
499 } // namespace WebCore 499 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/bindings/v8/V8WindowShell.cpp ('k') | Source/bindings/v8/custom/V8WorkerGlobalScopeCustom.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698