| 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 2097 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2108 for (int feature : features) { | 2108 for (int feature : features) { |
| 2109 UseCounter::count(frame(), static_cast<UseCounter::Feature>(feature)); | 2109 UseCounter::count(frame(), static_cast<UseCounter::Feature>(feature)); |
| 2110 } | 2110 } |
| 2111 } | 2111 } |
| 2112 | 2112 |
| 2113 void WebLocalFrameImpl::mixedContentFound( | 2113 void WebLocalFrameImpl::mixedContentFound( |
| 2114 const WebURL& mainResourceUrl, | 2114 const WebURL& mainResourceUrl, |
| 2115 const WebURL& mixedContentUrl, | 2115 const WebURL& mixedContentUrl, |
| 2116 WebURLRequest::RequestContext requestContext, | 2116 WebURLRequest::RequestContext requestContext, |
| 2117 bool wasAllowed, | 2117 bool wasAllowed, |
| 2118 bool hadRedirect) { | 2118 bool hadRedirect, |
| 2119 const WebSourceLocation& sourceLocation) { |
| 2119 DCHECK(frame()); | 2120 DCHECK(frame()); |
| 2120 MixedContentChecker::mixedContentFound(frame(), mainResourceUrl, | 2121 std::unique_ptr<SourceLocation> source; |
| 2121 mixedContentUrl, requestContext, | 2122 if (!sourceLocation.url.isNull()) { |
| 2122 wasAllowed, hadRedirect); | 2123 source = |
| 2124 SourceLocation::create(sourceLocation.url, sourceLocation.lineNumber, |
| 2125 sourceLocation.columnNumber, nullptr); |
| 2126 } |
| 2127 MixedContentChecker::mixedContentFound( |
| 2128 frame(), mainResourceUrl, mixedContentUrl, requestContext, wasAllowed, |
| 2129 hadRedirect, std::move(source)); |
| 2123 } | 2130 } |
| 2124 | 2131 |
| 2125 void WebLocalFrameImpl::sendOrientationChangeEvent() { | 2132 void WebLocalFrameImpl::sendOrientationChangeEvent() { |
| 2126 if (!frame()) | 2133 if (!frame()) |
| 2127 return; | 2134 return; |
| 2128 | 2135 |
| 2129 // Screen Orientation API | 2136 // Screen Orientation API |
| 2130 if (ScreenOrientationControllerImpl::from(*frame())) | 2137 if (ScreenOrientationControllerImpl::from(*frame())) |
| 2131 ScreenOrientationControllerImpl::from(*frame())->notifyOrientationChanged(); | 2138 ScreenOrientationControllerImpl::from(*frame())->notifyOrientationChanged(); |
| 2132 | 2139 |
| (...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2463 createMarkup(startPosition, endPosition, AnnotateForInterchange, | 2470 createMarkup(startPosition, endPosition, AnnotateForInterchange, |
| 2464 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); | 2471 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); |
| 2465 } else { | 2472 } else { |
| 2466 clipHtml = | 2473 clipHtml = |
| 2467 createMarkup(endPosition, startPosition, AnnotateForInterchange, | 2474 createMarkup(endPosition, startPosition, AnnotateForInterchange, |
| 2468 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); | 2475 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); |
| 2469 } | 2476 } |
| 2470 } | 2477 } |
| 2471 | 2478 |
| 2472 } // namespace blink | 2479 } // namespace blink |
| OLD | NEW |