| 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 819 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 830 | 830 |
| 831 // We also remember whether upload events should be allowed for this request
in case the upload listeners are | 831 // We also remember whether upload events should be allowed for this request
in case the upload listeners are |
| 832 // added after the request is started. | 832 // added after the request is started. |
| 833 m_uploadEventsAllowed = m_sameOriginRequest || uploadEvents || !isSimpleCros
sOriginAccessRequest(m_method, m_requestHeaders); | 833 m_uploadEventsAllowed = m_sameOriginRequest || uploadEvents || !isSimpleCros
sOriginAccessRequest(m_method, m_requestHeaders); |
| 834 | 834 |
| 835 ASSERT(executionContext()); | 835 ASSERT(executionContext()); |
| 836 ExecutionContext& executionContext = *this->executionContext(); | 836 ExecutionContext& executionContext = *this->executionContext(); |
| 837 | 837 |
| 838 ResourceRequest request(m_url); | 838 ResourceRequest request(m_url); |
| 839 request.setHTTPMethod(m_method); | 839 request.setHTTPMethod(m_method); |
| 840 request.setTargetType(ResourceRequest::TargetIsXHR); | 840 request.setRequestContext(ResourceRequest::ConnectContext); |
| 841 | 841 |
| 842 InspectorInstrumentation::willLoadXHR(&executionContext, this, this, m_metho
d, m_url, m_async, httpBody ? httpBody->deepCopy() : nullptr, m_requestHeaders,
m_includeCredentials); | 842 InspectorInstrumentation::willLoadXHR(&executionContext, this, this, m_metho
d, m_url, m_async, httpBody ? httpBody->deepCopy() : nullptr, m_requestHeaders,
m_includeCredentials); |
| 843 | 843 |
| 844 if (httpBody) { | 844 if (httpBody) { |
| 845 ASSERT(m_method != "GET"); | 845 ASSERT(m_method != "GET"); |
| 846 ASSERT(m_method != "HEAD"); | 846 ASSERT(m_method != "HEAD"); |
| 847 request.setHTTPBody(httpBody); | 847 request.setHTTPBody(httpBody); |
| 848 } | 848 } |
| 849 | 849 |
| 850 if (m_requestHeaders.size() > 0) | 850 if (m_requestHeaders.size() > 0) |
| (...skipping 611 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1462 { | 1462 { |
| 1463 visitor->trace(m_responseBlob); | 1463 visitor->trace(m_responseBlob); |
| 1464 visitor->trace(m_responseStream); | 1464 visitor->trace(m_responseStream); |
| 1465 visitor->trace(m_responseDocument); | 1465 visitor->trace(m_responseDocument); |
| 1466 visitor->trace(m_progressEventThrottle); | 1466 visitor->trace(m_progressEventThrottle); |
| 1467 visitor->trace(m_upload); | 1467 visitor->trace(m_upload); |
| 1468 XMLHttpRequestEventTarget::trace(visitor); | 1468 XMLHttpRequestEventTarget::trace(visitor); |
| 1469 } | 1469 } |
| 1470 | 1470 |
| 1471 } // namespace WebCore | 1471 } // namespace WebCore |
| OLD | NEW |