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 2149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 DCHECK(frame()); | 2164 DCHECK(frame()); |
2165 MixedContentChecker::mixedContentFound(frame(), mainResourceUrl, | 2165 MixedContentChecker::mixedContentFound(frame(), mainResourceUrl, |
2166 mixedContentUrl, requestContext, | 2166 mixedContentUrl, requestContext, |
2167 wasAllowed, hadRedirect); | 2167 wasAllowed, hadRedirect); |
2168 } | 2168 } |
2169 | 2169 |
| 2170 void WebLocalFrameImpl::clientDroppedNavigation() { |
| 2171 if (frame()) |
| 2172 frame()->loader().clientDroppedNavigation(); |
| 2173 } |
| 2174 |
2170 void WebLocalFrameImpl::sendOrientationChangeEvent() { | 2175 void WebLocalFrameImpl::sendOrientationChangeEvent() { |
2171 if (!frame()) | 2176 if (!frame()) |
2172 return; | 2177 return; |
2173 | 2178 |
2174 // Screen Orientation API | 2179 // Screen Orientation API |
2175 if (ScreenOrientationControllerImpl::from(*frame())) | 2180 if (ScreenOrientationControllerImpl::from(*frame())) |
2176 ScreenOrientationControllerImpl::from(*frame())->notifyOrientationChanged(); | 2181 ScreenOrientationControllerImpl::from(*frame())->notifyOrientationChanged(); |
2177 | 2182 |
2178 // Legacy window.orientation API | 2183 // Legacy window.orientation API |
2179 if (RuntimeEnabledFeatures::orientationEventEnabled() && frame()->domWindow()) | 2184 if (RuntimeEnabledFeatures::orientationEventEnabled() && frame()->domWindow()) |
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2508 createMarkup(startPosition, endPosition, AnnotateForInterchange, | 2513 createMarkup(startPosition, endPosition, AnnotateForInterchange, |
2509 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); | 2514 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); |
2510 } else { | 2515 } else { |
2511 clipHtml = | 2516 clipHtml = |
2512 createMarkup(endPosition, startPosition, AnnotateForInterchange, | 2517 createMarkup(endPosition, startPosition, AnnotateForInterchange, |
2513 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); | 2518 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); |
2514 } | 2519 } |
2515 } | 2520 } |
2516 | 2521 |
2517 } // namespace blink | 2522 } // namespace blink |
OLD | NEW |