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 2045 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2056 } | 2056 } |
2057 | 2057 |
2058 bool WebLocalFrameImpl::maybeRenderFallbackContent( | 2058 bool WebLocalFrameImpl::maybeRenderFallbackContent( |
2059 const WebURLError& error) const { | 2059 const WebURLError& error) const { |
2060 DCHECK(frame()); | 2060 DCHECK(frame()); |
2061 | 2061 |
2062 if (!frame()->owner() || !frame()->owner()->canRenderFallbackContent()) | 2062 if (!frame()->owner() || !frame()->owner()->canRenderFallbackContent()) |
2063 return false; | 2063 return false; |
2064 | 2064 |
2065 FrameLoader& frameloader = frame()->loader(); | 2065 FrameLoader& frameloader = frame()->loader(); |
2066 frameloader.clearNavigationHandledByClient(); | 2066 DCHECK(frameloader.provisionalDocumentLoader()); |
2067 frameloader.loadFailed(frameloader.documentLoader(), error); | 2067 frameloader.loadFailed(frameloader.provisionalDocumentLoader(), error); |
2068 return true; | 2068 return true; |
2069 } | 2069 } |
2070 | 2070 |
2071 bool WebLocalFrameImpl::isLoading() const { | 2071 bool WebLocalFrameImpl::isLoading() const { |
2072 if (!frame() || !frame()->document()) | 2072 if (!frame() || !frame()->document()) |
2073 return false; | 2073 return false; |
2074 return frame()->loader().stateMachine()->isDisplayingInitialEmptyDocument() || | 2074 return frame()->loader().stateMachine()->isDisplayingInitialEmptyDocument() || |
2075 frame()->loader().hasProvisionalNavigation() || | 2075 frame()->loader().hasProvisionalNavigation() || |
2076 !frame()->document()->loadEventFinished(); | 2076 !frame()->document()->loadEventFinished(); |
2077 } | 2077 } |
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2454 createMarkup(startPosition, endPosition, AnnotateForInterchange, | 2454 createMarkup(startPosition, endPosition, AnnotateForInterchange, |
2455 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); | 2455 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); |
2456 } else { | 2456 } else { |
2457 clipHtml = | 2457 clipHtml = |
2458 createMarkup(endPosition, startPosition, AnnotateForInterchange, | 2458 createMarkup(endPosition, startPosition, AnnotateForInterchange, |
2459 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); | 2459 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); |
2460 } | 2460 } |
2461 } | 2461 } |
2462 | 2462 |
2463 } // namespace blink | 2463 } // namespace blink |
OLD | NEW |