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

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

Issue 2439903003: PlzNavigate: Allow frames to fallback to alternative content. (Closed)
Patch Set: Nit (+rebase) Created 4 years, 1 month 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 2048 matching lines...) Expand 10 before | Expand all | Expand 10 after
2059 frameRequest.setReplacesCurrentItem(replace); 2059 frameRequest.setReplacesCurrentItem(replace);
2060 if (isClientRedirect) 2060 if (isClientRedirect)
2061 frameRequest.setClientRedirect(ClientRedirectPolicy::ClientRedirect); 2061 frameRequest.setClientRedirect(ClientRedirectPolicy::ClientRedirect);
2062 2062
2063 HistoryItem* historyItem = item; 2063 HistoryItem* historyItem = item;
2064 frame()->loader().load( 2064 frame()->loader().load(
2065 frameRequest, static_cast<FrameLoadType>(webFrameLoadType), historyItem, 2065 frameRequest, static_cast<FrameLoadType>(webFrameLoadType), historyItem,
2066 static_cast<HistoryLoadType>(webHistoryLoadType)); 2066 static_cast<HistoryLoadType>(webHistoryLoadType));
2067 } 2067 }
2068 2068
2069 bool WebLocalFrameImpl::maybeRenderFallbackContent(
2070 const WebURLError& error) const {
2071 DCHECK(frame());
2072
2073 if (!frame()->owner() || !frame()->owner()->canRenderFallbackContent())
2074 return false;
2075
2076 FrameLoader& frameloader = frame()->loader();
2077 frameloader.loadFailed(frameloader.documentLoader(), error);
2078 return true;
2079 }
2080
2069 bool WebLocalFrameImpl::isLoading() const { 2081 bool WebLocalFrameImpl::isLoading() const {
2070 if (!frame() || !frame()->document()) 2082 if (!frame() || !frame()->document())
2071 return false; 2083 return false;
2072 return frame()->loader().stateMachine()->isDisplayingInitialEmptyDocument() || 2084 return frame()->loader().stateMachine()->isDisplayingInitialEmptyDocument() ||
2073 frame()->loader().provisionalDocumentLoader() || 2085 frame()->loader().provisionalDocumentLoader() ||
2074 !frame()->document()->loadEventFinished(); 2086 !frame()->document()->loadEventFinished();
2075 } 2087 }
2076 2088
2077 bool WebLocalFrameImpl:: 2089 bool WebLocalFrameImpl::
2078 isFrameDetachedForSpecialOneOffStopTheCrashingHackBug561873() const { 2090 isFrameDetachedForSpecialOneOffStopTheCrashingHackBug561873() const {
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
2388 feature = UseCounter::ChromeLoadTimesNpnNegotiatedProtocol; 2400 feature = UseCounter::ChromeLoadTimesNpnNegotiatedProtocol;
2389 } else if (metric == "wasAlternateProtocolAvailable") { 2401 } else if (metric == "wasAlternateProtocolAvailable") {
2390 feature = UseCounter::ChromeLoadTimesWasAlternateProtocolAvailable; 2402 feature = UseCounter::ChromeLoadTimesWasAlternateProtocolAvailable;
2391 } else if (metric == "connectionInfo") { 2403 } else if (metric == "connectionInfo") {
2392 feature = UseCounter::ChromeLoadTimesConnectionInfo; 2404 feature = UseCounter::ChromeLoadTimesConnectionInfo;
2393 } 2405 }
2394 UseCounter::count(frame(), feature); 2406 UseCounter::count(frame(), feature);
2395 } 2407 }
2396 2408
2397 } // namespace blink 2409 } // 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