| 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 722 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 733 } | 733 } |
| 734 | 734 |
| 735 m_sameOriginRequest = securityOrigin()->canRequest(m_url); | 735 m_sameOriginRequest = securityOrigin()->canRequest(m_url); |
| 736 | 736 |
| 737 // We also remember whether upload events should be allowed for this request
in case the upload listeners are | 737 // We also remember whether upload events should be allowed for this request
in case the upload listeners are |
| 738 // added after the request is started. | 738 // added after the request is started. |
| 739 m_uploadEventsAllowed = m_sameOriginRequest || uploadEvents || !isSimpleCros
sOriginAccessRequest(m_method, m_requestHeaders); | 739 m_uploadEventsAllowed = m_sameOriginRequest || uploadEvents || !isSimpleCros
sOriginAccessRequest(m_method, m_requestHeaders); |
| 740 | 740 |
| 741 ResourceRequest request(m_url); | 741 ResourceRequest request(m_url); |
| 742 request.setHTTPMethod(m_method); | 742 request.setHTTPMethod(m_method); |
| 743 #if PLATFORM(CHROMIUM) || PLATFORM(BLACKBERRY) | 743 #if PLATFORM(CHROMIUM) |
| 744 request.setTargetType(ResourceRequest::TargetIsXHR); | 744 request.setTargetType(ResourceRequest::TargetIsXHR); |
| 745 #endif | 745 #endif |
| 746 | 746 |
| 747 InspectorInstrumentation::willLoadXHR(scriptExecutionContext(), this, m_meth
od, m_url, m_async, m_requestEntityBody ? m_requestEntityBody->deepCopy() : 0, m
_requestHeaders, m_includeCredentials); | 747 InspectorInstrumentation::willLoadXHR(scriptExecutionContext(), this, m_meth
od, m_url, m_async, m_requestEntityBody ? m_requestEntityBody->deepCopy() : 0, m
_requestHeaders, m_includeCredentials); |
| 748 | 748 |
| 749 if (m_requestEntityBody) { | 749 if (m_requestEntityBody) { |
| 750 ASSERT(m_method != "GET"); | 750 ASSERT(m_method != "GET"); |
| 751 ASSERT(m_method != "HEAD"); | 751 ASSERT(m_method != "HEAD"); |
| 752 request.setHTTPBody(m_requestEntityBody.release()); | 752 request.setHTTPBody(m_requestEntityBody.release()); |
| 753 } | 753 } |
| (...skipping 544 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1298 info.addMember(m_responseDocument, "responseDocument"); | 1298 info.addMember(m_responseDocument, "responseDocument"); |
| 1299 info.addMember(m_binaryResponseBuilder, "binaryResponseBuilder"); | 1299 info.addMember(m_binaryResponseBuilder, "binaryResponseBuilder"); |
| 1300 info.addMember(m_responseArrayBuffer, "responseArrayBuffer"); | 1300 info.addMember(m_responseArrayBuffer, "responseArrayBuffer"); |
| 1301 info.addMember(m_lastSendURL, "lastSendURL"); | 1301 info.addMember(m_lastSendURL, "lastSendURL"); |
| 1302 info.addMember(m_eventTargetData, "eventTargetData"); | 1302 info.addMember(m_eventTargetData, "eventTargetData"); |
| 1303 info.addMember(m_progressEventThrottle, "progressEventThrottle"); | 1303 info.addMember(m_progressEventThrottle, "progressEventThrottle"); |
| 1304 info.addMember(m_securityOrigin, "securityOrigin"); | 1304 info.addMember(m_securityOrigin, "securityOrigin"); |
| 1305 } | 1305 } |
| 1306 | 1306 |
| 1307 } // namespace WebCore | 1307 } // namespace WebCore |
| OLD | NEW |