OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2003, 2006 Apple Computer, Inc. All rights reserved. | 2 * Copyright (C) 2003, 2006 Apple Computer, Inc. All rights reserved. |
3 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. | 3 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
7 * are met: | 7 * are met: |
8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 request->setFetchRequestMode(data->m_fetchRequestMode); | 62 request->setFetchRequestMode(data->m_fetchRequestMode); |
63 request->setFetchCredentialsMode(data->m_fetchCredentialsMode); | 63 request->setFetchCredentialsMode(data->m_fetchCredentialsMode); |
64 request->setFetchRedirectMode(data->m_fetchRedirectMode); | 64 request->setFetchRedirectMode(data->m_fetchRedirectMode); |
65 request->m_referrerPolicy = data->m_referrerPolicy; | 65 request->m_referrerPolicy = data->m_referrerPolicy; |
66 request->m_didSetHTTPReferrer = data->m_didSetHTTPReferrer; | 66 request->m_didSetHTTPReferrer = data->m_didSetHTTPReferrer; |
67 request->m_checkForBrowserSideNavigation = data->m_checkForBrowserSideNaviga
tion; | 67 request->m_checkForBrowserSideNavigation = data->m_checkForBrowserSideNaviga
tion; |
68 request->m_uiStartTime = data->m_uiStartTime; | 68 request->m_uiStartTime = data->m_uiStartTime; |
69 request->m_originatesFromReservedIPRange = data->m_originatesFromReservedIPR
ange; | 69 request->m_originatesFromReservedIPRange = data->m_originatesFromReservedIPR
ange; |
70 request->m_inputPerfMetricReportPolicy = data->m_inputPerfMetricReportPolicy
; | 70 request->m_inputPerfMetricReportPolicy = data->m_inputPerfMetricReportPolicy
; |
71 request->m_followedRedirect = data->m_followedRedirect; | 71 request->m_followedRedirect = data->m_followedRedirect; |
| 72 request->m_mixedContentStatus = data->m_mixedContentStatus; |
72 return request.release(); | 73 return request.release(); |
73 } | 74 } |
74 | 75 |
75 PassOwnPtr<CrossThreadResourceRequestData> ResourceRequest::copyData() const | 76 PassOwnPtr<CrossThreadResourceRequestData> ResourceRequest::copyData() const |
76 { | 77 { |
77 OwnPtr<CrossThreadResourceRequestData> data = adoptPtr(new CrossThreadResour
ceRequestData()); | 78 OwnPtr<CrossThreadResourceRequestData> data = adoptPtr(new CrossThreadResour
ceRequestData()); |
78 data->m_url = url().copy(); | 79 data->m_url = url().copy(); |
79 data->m_cachePolicy = cachePolicy(); | 80 data->m_cachePolicy = cachePolicy(); |
80 data->m_timeoutInterval = timeoutInterval(); | 81 data->m_timeoutInterval = timeoutInterval(); |
81 data->m_firstPartyForCookies = firstPartyForCookies().copy(); | 82 data->m_firstPartyForCookies = firstPartyForCookies().copy(); |
(...skipping 20 matching lines...) Expand all Loading... |
102 data->m_fetchRequestMode = m_fetchRequestMode; | 103 data->m_fetchRequestMode = m_fetchRequestMode; |
103 data->m_fetchCredentialsMode = m_fetchCredentialsMode; | 104 data->m_fetchCredentialsMode = m_fetchCredentialsMode; |
104 data->m_fetchRedirectMode = m_fetchRedirectMode; | 105 data->m_fetchRedirectMode = m_fetchRedirectMode; |
105 data->m_referrerPolicy = m_referrerPolicy; | 106 data->m_referrerPolicy = m_referrerPolicy; |
106 data->m_didSetHTTPReferrer = m_didSetHTTPReferrer; | 107 data->m_didSetHTTPReferrer = m_didSetHTTPReferrer; |
107 data->m_checkForBrowserSideNavigation = m_checkForBrowserSideNavigation; | 108 data->m_checkForBrowserSideNavigation = m_checkForBrowserSideNavigation; |
108 data->m_uiStartTime = m_uiStartTime; | 109 data->m_uiStartTime = m_uiStartTime; |
109 data->m_originatesFromReservedIPRange = m_originatesFromReservedIPRange; | 110 data->m_originatesFromReservedIPRange = m_originatesFromReservedIPRange; |
110 data->m_inputPerfMetricReportPolicy = m_inputPerfMetricReportPolicy; | 111 data->m_inputPerfMetricReportPolicy = m_inputPerfMetricReportPolicy; |
111 data->m_followedRedirect = m_followedRedirect; | 112 data->m_followedRedirect = m_followedRedirect; |
| 113 data->m_mixedContentStatus = m_mixedContentStatus; |
112 return data.release(); | 114 return data.release(); |
113 } | 115 } |
114 | 116 |
115 bool ResourceRequest::isEmpty() const | 117 bool ResourceRequest::isEmpty() const |
116 { | 118 { |
117 return m_url.isEmpty(); | 119 return m_url.isEmpty(); |
118 } | 120 } |
119 | 121 |
120 bool ResourceRequest::isNull() const | 122 bool ResourceRequest::isNull() const |
121 { | 123 { |
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
448 m_fetchCredentialsMode = WebURLRequest::FetchCredentialsModeSameOrigin; | 450 m_fetchCredentialsMode = WebURLRequest::FetchCredentialsModeSameOrigin; |
449 m_fetchRedirectMode = WebURLRequest::FetchRedirectModeFollow; | 451 m_fetchRedirectMode = WebURLRequest::FetchRedirectModeFollow; |
450 m_referrerPolicy = ReferrerPolicyDefault; | 452 m_referrerPolicy = ReferrerPolicyDefault; |
451 m_didSetHTTPReferrer = false; | 453 m_didSetHTTPReferrer = false; |
452 m_checkForBrowserSideNavigation = true; | 454 m_checkForBrowserSideNavigation = true; |
453 m_uiStartTime = 0; | 455 m_uiStartTime = 0; |
454 m_originatesFromReservedIPRange = false; | 456 m_originatesFromReservedIPRange = false; |
455 m_inputPerfMetricReportPolicy = InputToLoadPerfMetricReportPolicy::NoReport; | 457 m_inputPerfMetricReportPolicy = InputToLoadPerfMetricReportPolicy::NoReport; |
456 m_followedRedirect = false; | 458 m_followedRedirect = false; |
457 m_requestorOrigin = SecurityOrigin::createUnique(); | 459 m_requestorOrigin = SecurityOrigin::createUnique(); |
| 460 m_mixedContentStatus = NotMixedContent; |
458 } | 461 } |
459 | 462 |
460 } // namespace blink | 463 } // namespace blink |
OLD | NEW |