diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/websockets | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebCore/websockets')
| -rw-r--r-- | Source/WebCore/websockets/WebSocketHandshake.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/WebCore/websockets/WebSocketHandshake.cpp b/Source/WebCore/websockets/WebSocketHandshake.cpp index f653415..84779f5 100644 --- a/Source/WebCore/websockets/WebSocketHandshake.cpp +++ b/Source/WebCore/websockets/WebSocketHandshake.cpp @@ -35,7 +35,6 @@ #include "WebSocketHandshake.h" -#include "CharacterNames.h" #include "Cookie.h" #include "CookieJar.h" #include "Document.h" @@ -45,7 +44,6 @@ #include "ScriptCallStack.h" #include "ScriptExecutionContext.h" #include "SecurityOrigin.h" - #include <wtf/MD5.h> #include <wtf/RandomNumber.h> #include <wtf/StdLibExtras.h> @@ -55,6 +53,7 @@ #include <wtf/text/CString.h> #include <wtf/text/StringBuilder.h> #include <wtf/text/StringConcatenate.h> +#include <wtf/unicode/CharacterNames.h> namespace WebCore { |