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

Side by Side Diff: Source/modules/websockets/WebSocket.cpp

Issue 14323004: Make Frame's ScriptController an OwnPtr and remove the #include (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fix Created 7 years, 8 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/xml/XMLTreeViewer.cpp ('k') | no next file » | 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 30 matching lines...) Expand all
41 #include "Event.h" 41 #include "Event.h"
42 #include "EventException.h" 42 #include "EventException.h"
43 #include "EventListener.h" 43 #include "EventListener.h"
44 #include "EventNames.h" 44 #include "EventNames.h"
45 #include "ExceptionCode.h" 45 #include "ExceptionCode.h"
46 #include "Frame.h" 46 #include "Frame.h"
47 #include "Logging.h" 47 #include "Logging.h"
48 #include "MainThreadWebSocketChannel.h" 48 #include "MainThreadWebSocketChannel.h"
49 #include "MessageEvent.h" 49 #include "MessageEvent.h"
50 #include "ScriptCallStack.h" 50 #include "ScriptCallStack.h"
51 #include "ScriptController.h"
51 #include "ScriptExecutionContext.h" 52 #include "ScriptExecutionContext.h"
52 #include "SecurityOrigin.h" 53 #include "SecurityOrigin.h"
53 #include "WebSocketChannel.h" 54 #include "WebSocketChannel.h"
54 #include <wtf/ArrayBuffer.h> 55 #include <wtf/ArrayBuffer.h>
55 #include <wtf/ArrayBufferView.h> 56 #include <wtf/ArrayBufferView.h>
56 #include <wtf/HashSet.h> 57 #include <wtf/HashSet.h>
57 #include <wtf/OwnPtr.h> 58 #include <wtf/OwnPtr.h>
58 #include <wtf/PassOwnPtr.h> 59 #include <wtf/PassOwnPtr.h>
59 #include <wtf/StdLibExtras.h> 60 #include <wtf/StdLibExtras.h>
60 #include <wtf/text/CString.h> 61 #include <wtf/text/CString.h>
(...skipping 523 matching lines...) Expand 10 before | Expand all | Expand 10 after
584 static const size_t minimumPayloadSizeWithEightByteExtendedPayloadLength = 0 x10000; 585 static const size_t minimumPayloadSizeWithEightByteExtendedPayloadLength = 0 x10000;
585 size_t overhead = hybiBaseFramingOverhead + hybiMaskingKeyLength; 586 size_t overhead = hybiBaseFramingOverhead + hybiMaskingKeyLength;
586 if (payloadSize >= minimumPayloadSizeWithEightByteExtendedPayloadLength) 587 if (payloadSize >= minimumPayloadSizeWithEightByteExtendedPayloadLength)
587 overhead += 8; 588 overhead += 8;
588 else if (payloadSize >= minimumPayloadSizeWithTwoByteExtendedPayloadLength) 589 else if (payloadSize >= minimumPayloadSizeWithTwoByteExtendedPayloadLength)
589 overhead += 2; 590 overhead += 2;
590 return overhead; 591 return overhead;
591 } 592 }
592 593
593 } // namespace WebCore 594 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/xml/XMLTreeViewer.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698