OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 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 Loading... |
34 #include "bindings/v8/ScriptCallStackFactory.h" | 34 #include "bindings/v8/ScriptCallStackFactory.h" |
35 #include "core/dom/Document.h" | 35 #include "core/dom/Document.h" |
36 #include "core/dom/ExecutionContext.h" | 36 #include "core/dom/ExecutionContext.h" |
37 #include "core/fileapi/FileReaderLoader.h" | 37 #include "core/fileapi/FileReaderLoader.h" |
38 #include "core/fileapi/FileReaderLoaderClient.h" | 38 #include "core/fileapi/FileReaderLoaderClient.h" |
39 #include "core/inspector/InspectorInstrumentation.h" | 39 #include "core/inspector/InspectorInstrumentation.h" |
40 #include "core/inspector/ScriptCallStack.h" | 40 #include "core/inspector/ScriptCallStack.h" |
41 #include "core/loader/UniqueIdentifier.h" | 41 #include "core/loader/UniqueIdentifier.h" |
42 #include "modules/websockets/WebSocketChannelClient.h" | 42 #include "modules/websockets/WebSocketChannelClient.h" |
43 #include "platform/Logging.h" | 43 #include "platform/Logging.h" |
| 44 #include "platform/weborigin/SecurityOrigin.h" |
44 #include "public/platform/Platform.h" | 45 #include "public/platform/Platform.h" |
45 #include "public/platform/WebString.h" | 46 #include "public/platform/WebString.h" |
46 #include "public/platform/WebURL.h" | 47 #include "public/platform/WebURL.h" |
47 #include "public/platform/WebVector.h" | 48 #include "public/platform/WebVector.h" |
48 #include "weborigin/SecurityOrigin.h" | 49 #include "wtf/ArrayBuffer.h" |
| 50 #include "wtf/Vector.h" |
| 51 #include "wtf/text/WTFString.h" |
49 | 52 |
50 using blink::WebSocketHandle; | 53 using blink::WebSocketHandle; |
51 | 54 |
52 namespace WebCore { | 55 namespace WebCore { |
53 | 56 |
54 namespace { | 57 namespace { |
55 | 58 |
56 bool isClean(int code) | 59 bool isClean(int code) |
57 { | 60 { |
58 return code == WebSocketChannel::CloseEventCodeNormalClosure | 61 return code == WebSocketChannel::CloseEventCodeNormalClosure |
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
485 if (errorCode == FileError::ABORT_ERR) { | 488 if (errorCode == FileError::ABORT_ERR) { |
486 // The error is caused by cancel(). | 489 // The error is caused by cancel(). |
487 return; | 490 return; |
488 } | 491 } |
489 // FIXME: Generate human-friendly reason message. | 492 // FIXME: Generate human-friendly reason message. |
490 failAsError("Failed to load Blob: error code = " + String::number(errorCode)
); | 493 failAsError("Failed to load Blob: error code = " + String::number(errorCode)
); |
491 // |this| can be deleted here. | 494 // |this| can be deleted here. |
492 } | 495 } |
493 | 496 |
494 } // namespace WebCore | 497 } // namespace WebCore |
OLD | NEW |