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

Side by Side Diff: Source/modules/websockets/WebSocket.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/modules/serviceworkers/ServiceWorkerThread.h ('k') | Source/web/AssertMatchingEnums.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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 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 23 matching lines...) Expand all
34 34
35 #include "bindings/v8/ExceptionState.h" 35 #include "bindings/v8/ExceptionState.h"
36 #include "bindings/v8/ScriptController.h" 36 #include "bindings/v8/ScriptController.h"
37 #include "core/dom/Document.h" 37 #include "core/dom/Document.h"
38 #include "core/dom/ExceptionCode.h" 38 #include "core/dom/ExceptionCode.h"
39 #include "core/dom/ExecutionContext.h" 39 #include "core/dom/ExecutionContext.h"
40 #include "core/events/Event.h" 40 #include "core/events/Event.h"
41 #include "core/events/MessageEvent.h" 41 #include "core/events/MessageEvent.h"
42 #include "core/fileapi/Blob.h" 42 #include "core/fileapi/Blob.h"
43 #include "core/frame/ConsoleTypes.h" 43 #include "core/frame/ConsoleTypes.h"
44 #include "core/frame/ContentSecurityPolicy.h"
45 #include "core/frame/DOMWindow.h" 44 #include "core/frame/DOMWindow.h"
46 #include "core/frame/LocalFrame.h" 45 #include "core/frame/LocalFrame.h"
46 #include "core/frame/csp/ContentSecurityPolicy.h"
47 #include "core/inspector/ScriptCallStack.h" 47 #include "core/inspector/ScriptCallStack.h"
48 #include "heap/Handle.h" 48 #include "heap/Handle.h"
49 #include "modules/websockets/CloseEvent.h" 49 #include "modules/websockets/CloseEvent.h"
50 #include "platform/Logging.h" 50 #include "platform/Logging.h"
51 #include "platform/blob/BlobData.h" 51 #include "platform/blob/BlobData.h"
52 #include "platform/weborigin/KnownPorts.h" 52 #include "platform/weborigin/KnownPorts.h"
53 #include "platform/weborigin/SecurityOrigin.h" 53 #include "platform/weborigin/SecurityOrigin.h"
54 #include "wtf/ArrayBuffer.h" 54 #include "wtf/ArrayBuffer.h"
55 #include "wtf/ArrayBufferView.h" 55 #include "wtf/ArrayBufferView.h"
56 #include "wtf/HashSet.h" 56 #include "wtf/HashSet.h"
(...skipping 624 matching lines...) Expand 10 before | Expand all | Expand 10 after
681 static const size_t minimumPayloadSizeWithEightByteExtendedPayloadLength = 0 x10000; 681 static const size_t minimumPayloadSizeWithEightByteExtendedPayloadLength = 0 x10000;
682 size_t overhead = hybiBaseFramingOverhead + hybiMaskingKeyLength; 682 size_t overhead = hybiBaseFramingOverhead + hybiMaskingKeyLength;
683 if (payloadSize >= minimumPayloadSizeWithEightByteExtendedPayloadLength) 683 if (payloadSize >= minimumPayloadSizeWithEightByteExtendedPayloadLength)
684 overhead += 8; 684 overhead += 8;
685 else if (payloadSize >= minimumPayloadSizeWithTwoByteExtendedPayloadLength) 685 else if (payloadSize >= minimumPayloadSizeWithTwoByteExtendedPayloadLength)
686 overhead += 2; 686 overhead += 2;
687 return overhead; 687 return overhead;
688 } 688 }
689 689
690 } // namespace WebCore 690 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/modules/serviceworkers/ServiceWorkerThread.h ('k') | Source/web/AssertMatchingEnums.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698