| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 2142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2153 for (int feature : features) { | 2153 for (int feature : features) { |
| 2154 UseCounter::count(frame(), static_cast<UseCounter::Feature>(feature)); | 2154 UseCounter::count(frame(), static_cast<UseCounter::Feature>(feature)); |
| 2155 } | 2155 } |
| 2156 } | 2156 } |
| 2157 | 2157 |
| 2158 void WebLocalFrameImpl::mixedContentFound( | 2158 void WebLocalFrameImpl::mixedContentFound( |
| 2159 const WebURL& mainResourceUrl, | 2159 const WebURL& mainResourceUrl, |
| 2160 const WebURL& mixedContentUrl, | 2160 const WebURL& mixedContentUrl, |
| 2161 WebURLRequest::RequestContext requestContext, | 2161 WebURLRequest::RequestContext requestContext, |
| 2162 bool wasAllowed, | 2162 bool wasAllowed, |
| 2163 bool hadRedirect) { | 2163 bool hadRedirect, |
| 2164 const WebSourceLocation& sourceLocation) { |
| 2164 DCHECK(frame()); | 2165 DCHECK(frame()); |
| 2165 MixedContentChecker::mixedContentFound(frame(), mainResourceUrl, | 2166 std::unique_ptr<SourceLocation> source; |
| 2166 mixedContentUrl, requestContext, | 2167 if (!sourceLocation.url.isNull()) { |
| 2167 wasAllowed, hadRedirect); | 2168 source = |
| 2169 SourceLocation::create(sourceLocation.url, sourceLocation.lineNumber, |
| 2170 sourceLocation.columnNumber, nullptr); |
| 2171 } |
| 2172 MixedContentChecker::mixedContentFound( |
| 2173 frame(), mainResourceUrl, mixedContentUrl, requestContext, wasAllowed, |
| 2174 hadRedirect, std::move(source)); |
| 2168 } | 2175 } |
| 2169 | 2176 |
| 2170 void WebLocalFrameImpl::sendOrientationChangeEvent() { | 2177 void WebLocalFrameImpl::sendOrientationChangeEvent() { |
| 2171 if (!frame()) | 2178 if (!frame()) |
| 2172 return; | 2179 return; |
| 2173 | 2180 |
| 2174 // Screen Orientation API | 2181 // Screen Orientation API |
| 2175 if (ScreenOrientationControllerImpl::from(*frame())) | 2182 if (ScreenOrientationControllerImpl::from(*frame())) |
| 2176 ScreenOrientationControllerImpl::from(*frame())->notifyOrientationChanged(); | 2183 ScreenOrientationControllerImpl::from(*frame())->notifyOrientationChanged(); |
| 2177 | 2184 |
| (...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2508 createMarkup(startPosition, endPosition, AnnotateForInterchange, | 2515 createMarkup(startPosition, endPosition, AnnotateForInterchange, |
| 2509 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); | 2516 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); |
| 2510 } else { | 2517 } else { |
| 2511 clipHtml = | 2518 clipHtml = |
| 2512 createMarkup(endPosition, startPosition, AnnotateForInterchange, | 2519 createMarkup(endPosition, startPosition, AnnotateForInterchange, |
| 2513 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); | 2520 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); |
| 2514 } | 2521 } |
| 2515 } | 2522 } |
| 2516 | 2523 |
| 2517 } // namespace blink | 2524 } // namespace blink |
| OLD | NEW |