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