Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(296)

Side by Side Diff: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

Issue 1905033002: PlzNavigate: Move navigation-level mixed content checks to the browser. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@console-security-message
Patch Set: Minor changes from nasko@'s comments Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 2051 matching lines...) Expand 10 before | Expand all | Expand 10 after
2062 void WebLocalFrameImpl::setCommittedFirstRealLoad() { 2062 void WebLocalFrameImpl::setCommittedFirstRealLoad() {
2063 DCHECK(frame()); 2063 DCHECK(frame());
2064 ensureFrameLoaderHasCommitted(frame()->loader()); 2064 ensureFrameLoaderHasCommitted(frame()->loader());
2065 } 2065 }
2066 2066
2067 void WebLocalFrameImpl::setHasReceivedUserGesture() { 2067 void WebLocalFrameImpl::setHasReceivedUserGesture() {
2068 if (frame()) 2068 if (frame())
2069 frame()->setDocumentHasReceivedUserGesture(); 2069 frame()->setDocumentHasReceivedUserGesture();
2070 } 2070 }
2071 2071
2072 void WebLocalFrameImpl::blinkFeatureUsageReport(const std::set<int>& features) {
2073 DCHECK(!features.empty());
2074 // Assimilate all features used/performed by the browser into UseCounter.
2075 for (int feature : features) {
2076 UseCounter::count(frame(), static_cast<UseCounter::Feature>(feature));
2077 }
2078 }
2079
2080 void WebLocalFrameImpl::mixedContentFound(
2081 const WebURL& mainResourceUrl,
2082 const WebURL& mixedContentUrl,
2083 WebURLRequest::RequestContext requestContext,
2084 bool wasAllowed,
2085 bool hadRedirect) {
2086 DCHECK(frame());
2087 MixedContentChecker::mixedContentFound(frame(), mainResourceUrl,
2088 mixedContentUrl, requestContext,
2089 wasAllowed, hadRedirect);
2090 }
2091
2072 void WebLocalFrameImpl::sendOrientationChangeEvent() { 2092 void WebLocalFrameImpl::sendOrientationChangeEvent() {
2073 if (!frame()) 2093 if (!frame())
2074 return; 2094 return;
2075 2095
2076 // Screen Orientation API 2096 // Screen Orientation API
2077 if (ScreenOrientationControllerImpl::from(*frame())) 2097 if (ScreenOrientationControllerImpl::from(*frame()))
2078 ScreenOrientationControllerImpl::from(*frame())->notifyOrientationChanged(); 2098 ScreenOrientationControllerImpl::from(*frame())->notifyOrientationChanged();
2079 2099
2080 // Legacy window.orientation API 2100 // Legacy window.orientation API
2081 if (RuntimeEnabledFeatures::orientationEventEnabled() && frame()->domWindow()) 2101 if (RuntimeEnabledFeatures::orientationEventEnabled() && frame()->domWindow())
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
2410 createMarkup(startPosition, endPosition, AnnotateForInterchange, 2430 createMarkup(startPosition, endPosition, AnnotateForInterchange,
2411 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); 2431 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs);
2412 } else { 2432 } else {
2413 clipHtml = 2433 clipHtml =
2414 createMarkup(endPosition, startPosition, AnnotateForInterchange, 2434 createMarkup(endPosition, startPosition, AnnotateForInterchange,
2415 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); 2435 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs);
2416 } 2436 }
2417 } 2437 }
2418 2438
2419 } // namespace blink 2439 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebLocalFrameImpl.h ('k') | third_party/WebKit/public/web/WebLocalFrame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698