| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004, 2006, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2004, 2006, 2008 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2005-2007 Alexey Proskuryakov <ap@webkit.org> | 3 * Copyright (C) 2005-2007 Alexey Proskuryakov <ap@webkit.org> |
| 4 * Copyright (C) 2007, 2008 Julien Chaffraix <jchaffraix@webkit.org> | 4 * Copyright (C) 2007, 2008 Julien Chaffraix <jchaffraix@webkit.org> |
| 5 * Copyright (C) 2008, 2011 Google Inc. All rights reserved. | 5 * Copyright (C) 2008, 2011 Google Inc. All rights reserved. |
| 6 * Copyright (C) 2012 Intel Corporation | 6 * Copyright (C) 2012 Intel Corporation |
| 7 * | 7 * |
| 8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
| 9 * modify it under the terms of the GNU Lesser General Public | 9 * modify it under the terms of the GNU Lesser General Public |
| 10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
| (...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 196 loader_( | 196 loader_( |
| 197 FileReaderLoader::Create(FileReaderLoader::kReadByClient, this)) { | 197 FileReaderLoader::Create(FileReaderLoader::kReadByClient, this)) { |
| 198 loader_->Start(xhr_->GetExecutionContext(), std::move(handle)); | 198 loader_->Start(xhr_->GetExecutionContext(), std::move(handle)); |
| 199 } | 199 } |
| 200 | 200 |
| 201 Member<XMLHttpRequest> xhr_; | 201 Member<XMLHttpRequest> xhr_; |
| 202 std::unique_ptr<FileReaderLoader> loader_; | 202 std::unique_ptr<FileReaderLoader> loader_; |
| 203 }; | 203 }; |
| 204 | 204 |
| 205 XMLHttpRequest* XMLHttpRequest::Create(ScriptState* script_state) { | 205 XMLHttpRequest* XMLHttpRequest::Create(ScriptState* script_state) { |
| 206 ExecutionContext* context = script_state->GetExecutionContext(); | 206 ExecutionContext* context = ExecutionContext::From(script_state); |
| 207 DOMWrapperWorld& world = script_state->World(); | 207 DOMWrapperWorld& world = script_state->World(); |
| 208 if (!world.IsIsolatedWorld()) | 208 if (!world.IsIsolatedWorld()) |
| 209 return Create(context); | 209 return Create(context); |
| 210 | 210 |
| 211 XMLHttpRequest* xml_http_request = | 211 XMLHttpRequest* xml_http_request = |
| 212 new XMLHttpRequest(context, true, world.IsolatedWorldSecurityOrigin()); | 212 new XMLHttpRequest(context, true, world.IsolatedWorldSecurityOrigin()); |
| 213 xml_http_request->SuspendIfNeeded(); | 213 xml_http_request->SuspendIfNeeded(); |
| 214 | 214 |
| 215 return xml_http_request; | 215 return xml_http_request; |
| 216 } | 216 } |
| (...skipping 1674 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1891 visitor->TraceWrappers(response_document_); | 1891 visitor->TraceWrappers(response_document_); |
| 1892 visitor->TraceWrappers(response_array_buffer_); | 1892 visitor->TraceWrappers(response_array_buffer_); |
| 1893 XMLHttpRequestEventTarget::TraceWrappers(visitor); | 1893 XMLHttpRequestEventTarget::TraceWrappers(visitor); |
| 1894 } | 1894 } |
| 1895 | 1895 |
| 1896 std::ostream& operator<<(std::ostream& ostream, const XMLHttpRequest* xhr) { | 1896 std::ostream& operator<<(std::ostream& ostream, const XMLHttpRequest* xhr) { |
| 1897 return ostream << "XMLHttpRequest " << static_cast<const void*>(xhr); | 1897 return ostream << "XMLHttpRequest " << static_cast<const void*>(xhr); |
| 1898 } | 1898 } |
| 1899 | 1899 |
| 1900 } // namespace blink | 1900 } // namespace blink |
| OLD | NEW |