| 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 1998 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2009 } | 2009 } |
| 2010 | 2010 |
| 2011 bool WebLocalFrameImpl::maybeRenderFallbackContent( | 2011 bool WebLocalFrameImpl::maybeRenderFallbackContent( |
| 2012 const WebURLError& error) const { | 2012 const WebURLError& error) const { |
| 2013 DCHECK(frame()); | 2013 DCHECK(frame()); |
| 2014 | 2014 |
| 2015 if (!frame()->owner() || !frame()->owner()->canRenderFallbackContent()) | 2015 if (!frame()->owner() || !frame()->owner()->canRenderFallbackContent()) |
| 2016 return false; | 2016 return false; |
| 2017 | 2017 |
| 2018 FrameLoader& frameloader = frame()->loader(); | 2018 FrameLoader& frameloader = frame()->loader(); |
| 2019 frameloader.clearNavigationHandledByClient(); |
| 2019 frameloader.loadFailed(frameloader.documentLoader(), error); | 2020 frameloader.loadFailed(frameloader.documentLoader(), error); |
| 2020 return true; | 2021 return true; |
| 2021 } | 2022 } |
| 2022 | 2023 |
| 2023 bool WebLocalFrameImpl::isLoading() const { | 2024 bool WebLocalFrameImpl::isLoading() const { |
| 2024 if (!frame() || !frame()->document()) | 2025 if (!frame() || !frame()->document()) |
| 2025 return false; | 2026 return false; |
| 2026 return frame()->loader().stateMachine()->isDisplayingInitialEmptyDocument() || | 2027 return frame()->loader().stateMachine()->isDisplayingInitialEmptyDocument() || |
| 2027 frame()->loader().hasProvisionalNavigation() || | 2028 frame()->loader().hasProvisionalNavigation() || |
| 2028 !frame()->document()->loadEventFinished(); | 2029 !frame()->document()->loadEventFinished(); |
| (...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2354 ->frameScheduler() | 2355 ->frameScheduler() |
| 2355 ->unthrottledTaskRunner() | 2356 ->unthrottledTaskRunner() |
| 2356 ->toSingleThreadTaskRunner(); | 2357 ->toSingleThreadTaskRunner(); |
| 2357 } | 2358 } |
| 2358 | 2359 |
| 2359 WebInputMethodControllerImpl* WebLocalFrameImpl::inputMethodController() const { | 2360 WebInputMethodControllerImpl* WebLocalFrameImpl::inputMethodController() const { |
| 2360 return m_inputMethodController.get(); | 2361 return m_inputMethodController.get(); |
| 2361 } | 2362 } |
| 2362 | 2363 |
| 2363 } // namespace blink | 2364 } // namespace blink |
| OLD | NEW |