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 2104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 DCHECK(frame()); | 2119 DCHECK(frame()); |
2120 MixedContentChecker::mixedContentFound(frame(), mainResourceUrl, | 2120 MixedContentChecker::mixedContentFound(frame(), mainResourceUrl, |
2121 mixedContentUrl, requestContext, | 2121 mixedContentUrl, requestContext, |
2122 wasAllowed, hadRedirect); | 2122 wasAllowed, hadRedirect); |
2123 } | 2123 } |
2124 | 2124 |
| 2125 void WebLocalFrameImpl::clientDroppedNavigation() { |
| 2126 if (frame()) |
| 2127 frame()->loader().clientDroppedNavigation(); |
| 2128 } |
| 2129 |
2125 void WebLocalFrameImpl::sendOrientationChangeEvent() { | 2130 void WebLocalFrameImpl::sendOrientationChangeEvent() { |
2126 if (!frame()) | 2131 if (!frame()) |
2127 return; | 2132 return; |
2128 | 2133 |
2129 // Screen Orientation API | 2134 // Screen Orientation API |
2130 if (ScreenOrientationControllerImpl::from(*frame())) | 2135 if (ScreenOrientationControllerImpl::from(*frame())) |
2131 ScreenOrientationControllerImpl::from(*frame())->notifyOrientationChanged(); | 2136 ScreenOrientationControllerImpl::from(*frame())->notifyOrientationChanged(); |
2132 | 2137 |
2133 // Legacy window.orientation API | 2138 // Legacy window.orientation API |
2134 if (RuntimeEnabledFeatures::orientationEventEnabled() && frame()->domWindow()) | 2139 if (RuntimeEnabledFeatures::orientationEventEnabled() && frame()->domWindow()) |
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2463 createMarkup(startPosition, endPosition, AnnotateForInterchange, | 2468 createMarkup(startPosition, endPosition, AnnotateForInterchange, |
2464 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); | 2469 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); |
2465 } else { | 2470 } else { |
2466 clipHtml = | 2471 clipHtml = |
2467 createMarkup(endPosition, startPosition, AnnotateForInterchange, | 2472 createMarkup(endPosition, startPosition, AnnotateForInterchange, |
2468 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); | 2473 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); |
2469 } | 2474 } |
2470 } | 2475 } |
2471 | 2476 |
2472 } // namespace blink | 2477 } // namespace blink |
OLD | NEW |