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

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

Issue 2694013005: Cleanup blink-side PlzNavigate logic (Closed)
Patch Set: Rebase Created 3 years, 9 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 } 2062 }
2063 2063
2064 bool WebLocalFrameImpl::maybeRenderFallbackContent( 2064 bool WebLocalFrameImpl::maybeRenderFallbackContent(
2065 const WebURLError& error) const { 2065 const WebURLError& error) const {
2066 DCHECK(frame()); 2066 DCHECK(frame());
2067 2067
2068 if (!frame()->owner() || !frame()->owner()->canRenderFallbackContent()) 2068 if (!frame()->owner() || !frame()->owner()->canRenderFallbackContent())
2069 return false; 2069 return false;
2070 2070
2071 FrameLoader& frameloader = frame()->loader(); 2071 FrameLoader& frameloader = frame()->loader();
2072 frameloader.clearNavigationHandledByClient(); 2072 DCHECK(frameloader.provisionalDocumentLoader());
2073 frameloader.loadFailed(frameloader.documentLoader(), error); 2073 frameloader.loadFailed(frameloader.provisionalDocumentLoader(), error);
2074 return true; 2074 return true;
2075 } 2075 }
2076 2076
2077 bool WebLocalFrameImpl::isLoading() const { 2077 bool WebLocalFrameImpl::isLoading() const {
2078 if (!frame() || !frame()->document()) 2078 if (!frame() || !frame()->document())
2079 return false; 2079 return false;
2080 return frame()->loader().stateMachine()->isDisplayingInitialEmptyDocument() || 2080 return frame()->loader().stateMachine()->isDisplayingInitialEmptyDocument() ||
2081 frame()->loader().hasProvisionalNavigation() || 2081 frame()->loader().hasProvisionalNavigation() ||
2082 !frame()->document()->loadEventFinished(); 2082 !frame()->document()->loadEventFinished();
2083 } 2083 }
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
2460 createMarkup(startPosition, endPosition, AnnotateForInterchange, 2460 createMarkup(startPosition, endPosition, AnnotateForInterchange,
2461 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); 2461 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs);
2462 } else { 2462 } else {
2463 clipHtml = 2463 clipHtml =
2464 createMarkup(endPosition, startPosition, AnnotateForInterchange, 2464 createMarkup(endPosition, startPosition, AnnotateForInterchange,
2465 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); 2465 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs);
2466 } 2466 }
2467 } 2467 }
2468 2468
2469 } // namespace blink 2469 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/loader/ProgressTracker.cpp ('k') | third_party/WebKit/public/web/WebNavigationPolicy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698