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

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

Issue 25195003: Prepare to move core/platform/text into blink_platform.dll (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: re-attempt upload Created 7 years, 2 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) 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 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 29 matching lines...) Expand all
40 #include "core/fileapi/FileReaderLoader.h" 40 #include "core/fileapi/FileReaderLoader.h"
41 #include "core/inspector/InspectorInstrumentation.h" 41 #include "core/inspector/InspectorInstrumentation.h"
42 #include "core/inspector/ScriptCallStack.h" 42 #include "core/inspector/ScriptCallStack.h"
43 #include "core/loader/CookieJar.h" 43 #include "core/loader/CookieJar.h"
44 #include "core/loader/FrameLoader.h" 44 #include "core/loader/FrameLoader.h"
45 #include "core/loader/FrameLoaderClient.h" 45 #include "core/loader/FrameLoaderClient.h"
46 #include "core/loader/UniqueIdentifier.h" 46 #include "core/loader/UniqueIdentifier.h"
47 #include "core/page/Frame.h" 47 #include "core/page/Frame.h"
48 #include "core/page/Page.h" 48 #include "core/page/Page.h"
49 #include "core/page/Settings.h" 49 #include "core/page/Settings.h"
50 #include "core/platform/Logging.h" 50 #include "platform/Logging.h"
51 #include "core/platform/network/SocketStreamError.h" 51 #include "core/platform/network/SocketStreamError.h"
52 #include "core/platform/network/SocketStreamHandle.h" 52 #include "core/platform/network/SocketStreamHandle.h"
53 #include "modules/websockets/WebSocketChannel.h" 53 #include "modules/websockets/WebSocketChannel.h"
54 #include "modules/websockets/WebSocketChannelClient.h" 54 #include "modules/websockets/WebSocketChannelClient.h"
55 #include "modules/websockets/WebSocketHandshake.h" 55 #include "modules/websockets/WebSocketHandshake.h"
56 #include "wtf/ArrayBuffer.h" 56 #include "wtf/ArrayBuffer.h"
57 #include "wtf/Deque.h" 57 #include "wtf/Deque.h"
58 #include "wtf/FastMalloc.h" 58 #include "wtf/FastMalloc.h"
59 #include "wtf/HashMap.h" 59 #include "wtf/HashMap.h"
60 #include "wtf/OwnPtr.h" 60 #include "wtf/OwnPtr.h"
(...skipping 747 matching lines...) Expand 10 before | Expand all | Expand 10 after
808 } 808 }
809 809
810 Vector<char> frameData; 810 Vector<char> frameData;
811 frame.makeFrameData(frameData); 811 frame.makeFrameData(frameData);
812 812
813 m_perMessageDeflate.resetDeflateBuffer(); 813 m_perMessageDeflate.resetDeflateBuffer();
814 return m_handle->send(frameData.data(), frameData.size()); 814 return m_handle->send(frameData.data(), frameData.size());
815 } 815 }
816 816
817 } // namespace WebCore 817 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/modules/webdatabase/SQLTransactionStateMachine.cpp ('k') | Source/modules/websockets/NewWebSocketChannelImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698