| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2008, 2009 Anthony Ricaud <rik@webkit.org> | 3 * Copyright (C) 2008, 2009 Anthony Ricaud <rik@webkit.org> |
| 4 * Copyright (C) 2011 Google Inc. All rights reserved. | 4 * Copyright (C) 2011 Google Inc. All rights reserved. |
| 5 * | 5 * |
| 6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
| 7 * modification, are permitted provided that the following conditions | 7 * modification, are permitted provided that the following conditions |
| 8 * are met: | 8 * are met: |
| 9 * | 9 * |
| 10 * 1. Redistributions of source code must retain the above copyright | 10 * 1. Redistributions of source code must retain the above copyright |
| (...skipping 1084 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1095 | 1095 |
| 1096 if (request.mixedContentType !== "none") { | 1096 if (request.mixedContentType !== "none") { |
| 1097 this._suggestionBuilder.addItem(WebInspector.NetworkLogView.FilterTy
pe.MixedContent, "all"); | 1097 this._suggestionBuilder.addItem(WebInspector.NetworkLogView.FilterTy
pe.MixedContent, "all"); |
| 1098 } | 1098 } |
| 1099 | 1099 |
| 1100 if (request.mixedContentType === "optionally-blockable") { | 1100 if (request.mixedContentType === "optionally-blockable") { |
| 1101 this._suggestionBuilder.addItem(WebInspector.NetworkLogView.FilterTy
pe.MixedContent, "displayed"); | 1101 this._suggestionBuilder.addItem(WebInspector.NetworkLogView.FilterTy
pe.MixedContent, "displayed"); |
| 1102 } | 1102 } |
| 1103 | 1103 |
| 1104 if (request.mixedContentType === "blockable") { | 1104 if (request.mixedContentType === "blockable") { |
| 1105 var suggestion = request.blocked ? "blocked" : "block-overridden"; | 1105 var suggestion = request.wasBlocked() ? "blocked" : "block-overridde
n"; |
| 1106 this._suggestionBuilder.addItem(WebInspector.NetworkLogView.FilterTy
pe.MixedContent, suggestion); | 1106 this._suggestionBuilder.addItem(WebInspector.NetworkLogView.FilterTy
pe.MixedContent, suggestion); |
| 1107 } | 1107 } |
| 1108 | 1108 |
| 1109 var responseHeaders = request.responseHeaders; | 1109 var responseHeaders = request.responseHeaders; |
| 1110 for (var i = 0, l = responseHeaders.length; i < l; ++i) | 1110 for (var i = 0, l = responseHeaders.length; i < l; ++i) |
| 1111 this._suggestionBuilder.addItem(WebInspector.NetworkLogView.FilterTy
pe.HasResponseHeader, responseHeaders[i].name); | 1111 this._suggestionBuilder.addItem(WebInspector.NetworkLogView.FilterTy
pe.HasResponseHeader, responseHeaders[i].name); |
| 1112 var cookies = request.responseCookies; | 1112 var cookies = request.responseCookies; |
| 1113 for (var i = 0, l = cookies ? cookies.length : 0; i < l; ++i) { | 1113 for (var i = 0, l = cookies ? cookies.length : 0; i < l; ++i) { |
| 1114 var cookie = cookies[i]; | 1114 var cookie = cookies[i]; |
| 1115 this._suggestionBuilder.addItem(WebInspector.NetworkLogView.FilterTy
pe.SetCookieDomain, cookie.domain()); | 1115 this._suggestionBuilder.addItem(WebInspector.NetworkLogView.FilterTy
pe.SetCookieDomain, cookie.domain()); |
| (...skipping 907 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2023 /** | 2023 /** |
| 2024 * @param {string} value | 2024 * @param {string} value |
| 2025 * @param {!WebInspector.NetworkRequest} request | 2025 * @param {!WebInspector.NetworkRequest} request |
| 2026 * @return {boolean} | 2026 * @return {boolean} |
| 2027 */ | 2027 */ |
| 2028 WebInspector.NetworkLogView._requestMixedContentFilter = function(value, request
) | 2028 WebInspector.NetworkLogView._requestMixedContentFilter = function(value, request
) |
| 2029 { | 2029 { |
| 2030 if (value === "displayed") { | 2030 if (value === "displayed") { |
| 2031 return request.mixedContentType === "optionally-blockable"; | 2031 return request.mixedContentType === "optionally-blockable"; |
| 2032 } else if (value === "blocked") { | 2032 } else if (value === "blocked") { |
| 2033 return request.mixedContentType === "blockable" && request.blocked; | 2033 return request.mixedContentType === "blockable" && request.wasBlocked(); |
| 2034 } else if (value === "block-overridden") { | 2034 } else if (value === "block-overridden") { |
| 2035 return request.mixedContentType === "blockable" && !request.blocked; | 2035 return request.mixedContentType === "blockable" && !request.wasBlocked()
; |
| 2036 } else if (value === "all") { | 2036 } else if (value === "all") { |
| 2037 return request.mixedContentType !== "none"; | 2037 return request.mixedContentType !== "none"; |
| 2038 } | 2038 } |
| 2039 return false; | 2039 return false; |
| 2040 } | 2040 } |
| 2041 | 2041 |
| 2042 /** | 2042 /** |
| 2043 * @param {string} value | 2043 * @param {string} value |
| 2044 * @param {!WebInspector.NetworkRequest} request | 2044 * @param {!WebInspector.NetworkRequest} request |
| 2045 * @return {boolean} | 2045 * @return {boolean} |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2146 return false; | 2146 return false; |
| 2147 return true; | 2147 return true; |
| 2148 } | 2148 } |
| 2149 | 2149 |
| 2150 WebInspector.NetworkLogView.EventTypes = { | 2150 WebInspector.NetworkLogView.EventTypes = { |
| 2151 RequestSelected: "RequestSelected", | 2151 RequestSelected: "RequestSelected", |
| 2152 SearchCountUpdated: "SearchCountUpdated", | 2152 SearchCountUpdated: "SearchCountUpdated", |
| 2153 SearchIndexUpdated: "SearchIndexUpdated", | 2153 SearchIndexUpdated: "SearchIndexUpdated", |
| 2154 UpdateRequest: "UpdateRequest" | 2154 UpdateRequest: "UpdateRequest" |
| 2155 }; | 2155 }; |
| OLD | NEW |