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

Side by Side Diff: Source/bindings/v8/V8WindowShell.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) 2008, 2009, 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2008, 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 #include "bindings/v8/V8GCForContextDispose.h" 42 #include "bindings/v8/V8GCForContextDispose.h"
43 #include "bindings/v8/V8Initializer.h" 43 #include "bindings/v8/V8Initializer.h"
44 #include "bindings/v8/V8ObjectConstructor.h" 44 #include "bindings/v8/V8ObjectConstructor.h"
45 #include "bindings/v8/V8PerContextData.h" 45 #include "bindings/v8/V8PerContextData.h"
46 #include "core/html/HTMLCollection.h" 46 #include "core/html/HTMLCollection.h"
47 #include "core/html/HTMLIFrameElement.h" 47 #include "core/html/HTMLIFrameElement.h"
48 #include "core/inspector/InspectorInstrumentation.h" 48 #include "core/inspector/InspectorInstrumentation.h"
49 #include "core/loader/DocumentLoader.h" 49 #include "core/loader/DocumentLoader.h"
50 #include "core/loader/FrameLoader.h" 50 #include "core/loader/FrameLoader.h"
51 #include "core/loader/FrameLoaderClient.h" 51 #include "core/loader/FrameLoaderClient.h"
52 #include "core/frame/ContentSecurityPolicy.h"
53 #include "core/frame/LocalFrame.h" 52 #include "core/frame/LocalFrame.h"
53 #include "core/frame/csp/ContentSecurityPolicy.h"
54 #include "platform/TraceEvent.h" 54 #include "platform/TraceEvent.h"
55 #include "platform/weborigin/SecurityOrigin.h" 55 #include "platform/weborigin/SecurityOrigin.h"
56 #include "public/platform/Platform.h" 56 #include "public/platform/Platform.h"
57 #include "wtf/Assertions.h" 57 #include "wtf/Assertions.h"
58 #include "wtf/OwnPtr.h" 58 #include "wtf/OwnPtr.h"
59 #include "wtf/StringExtras.h" 59 #include "wtf/StringExtras.h"
60 #include "wtf/text/CString.h" 60 #include "wtf/text/CString.h"
61 #include <algorithm> 61 #include <algorithm>
62 #include <utility> 62 #include <utility>
63 #include <v8-debug.h> 63 #include <v8-debug.h>
(...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after
505 if (!isMainThread()) 505 if (!isMainThread())
506 return true; 506 return true;
507 // We're initializing the context, so it is not yet in a status where we can 507 // We're initializing the context, so it is not yet in a status where we can
508 // validate the context. 508 // validate the context.
509 if (contextBeingInitialized) 509 if (contextBeingInitialized)
510 return true; 510 return true;
511 return !!toDOMWindow(context); 511 return !!toDOMWindow(context);
512 } 512 }
513 513
514 } // WebCore 514 } // WebCore
OLDNEW
« no previous file with comments | « Source/bindings/v8/V8LazyEventListener.cpp ('k') | Source/bindings/v8/custom/V8WindowCustom.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698