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 2146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2157 if (!sourceLocation.url.isNull()) { | 2157 if (!sourceLocation.url.isNull()) { |
2158 source = | 2158 source = |
2159 SourceLocation::create(sourceLocation.url, sourceLocation.lineNumber, | 2159 SourceLocation::create(sourceLocation.url, sourceLocation.lineNumber, |
2160 sourceLocation.columnNumber, nullptr); | 2160 sourceLocation.columnNumber, nullptr); |
2161 } | 2161 } |
2162 MixedContentChecker::mixedContentFound( | 2162 MixedContentChecker::mixedContentFound( |
2163 frame(), mainResourceUrl, mixedContentUrl, requestContext, wasAllowed, | 2163 frame(), mainResourceUrl, mixedContentUrl, requestContext, wasAllowed, |
2164 hadRedirect, std::move(source)); | 2164 hadRedirect, std::move(source)); |
2165 } | 2165 } |
2166 | 2166 |
| 2167 void WebLocalFrameImpl::clientDroppedNavigation() { |
| 2168 if (frame()) |
| 2169 frame()->loader().clientDroppedNavigation(); |
| 2170 } |
| 2171 |
2167 void WebLocalFrameImpl::sendOrientationChangeEvent() { | 2172 void WebLocalFrameImpl::sendOrientationChangeEvent() { |
2168 if (!frame()) | 2173 if (!frame()) |
2169 return; | 2174 return; |
2170 | 2175 |
2171 // Screen Orientation API | 2176 // Screen Orientation API |
2172 if (ScreenOrientationControllerImpl::from(*frame())) | 2177 if (ScreenOrientationControllerImpl::from(*frame())) |
2173 ScreenOrientationControllerImpl::from(*frame())->notifyOrientationChanged(); | 2178 ScreenOrientationControllerImpl::from(*frame())->notifyOrientationChanged(); |
2174 | 2179 |
2175 // Legacy window.orientation API | 2180 // Legacy window.orientation API |
2176 if (RuntimeEnabledFeatures::orientationEventEnabled() && frame()->domWindow()) | 2181 if (RuntimeEnabledFeatures::orientationEventEnabled() && frame()->domWindow()) |
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2505 createMarkup(startPosition, endPosition, AnnotateForInterchange, | 2510 createMarkup(startPosition, endPosition, AnnotateForInterchange, |
2506 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); | 2511 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); |
2507 } else { | 2512 } else { |
2508 clipHtml = | 2513 clipHtml = |
2509 createMarkup(endPosition, startPosition, AnnotateForInterchange, | 2514 createMarkup(endPosition, startPosition, AnnotateForInterchange, |
2510 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); | 2515 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); |
2511 } | 2516 } |
2512 } | 2517 } |
2513 | 2518 |
2514 } // namespace blink | 2519 } // namespace blink |
OLD | NEW |