| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2011 Apple Inc. All rights reserved. | 3 * Copyright (C) 2011 Apple Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 631 | 631 |
| 632 void FrameLoaderClientImpl::progressEstimateChanged(double progressEstimate) | 632 void FrameLoaderClientImpl::progressEstimateChanged(double progressEstimate) |
| 633 { | 633 { |
| 634 if (m_webFrame->client()) | 634 if (m_webFrame->client()) |
| 635 m_webFrame->client()->didChangeLoadProgress(progressEstimate); | 635 m_webFrame->client()->didChangeLoadProgress(progressEstimate); |
| 636 } | 636 } |
| 637 | 637 |
| 638 void FrameLoaderClientImpl::didStopLoading() | 638 void FrameLoaderClientImpl::didStopLoading() |
| 639 { | 639 { |
| 640 if (m_webFrame->client()) | 640 if (m_webFrame->client()) |
| 641 m_webFrame->client()->didStopLoading(); | 641 m_webFrame->client()->didStopLoading(m_webFrame); |
| 642 } | 642 } |
| 643 | 643 |
| 644 void FrameLoaderClientImpl::loadURLExternally(const ResourceRequest& request, Na
vigationPolicy policy, const String& suggestedName, bool shouldReplaceCurrentEnt
ry) | 644 void FrameLoaderClientImpl::loadURLExternally(const ResourceRequest& request, Na
vigationPolicy policy, const String& suggestedName, bool shouldReplaceCurrentEnt
ry) |
| 645 { | 645 { |
| 646 if (!m_webFrame->client()) | 646 if (!m_webFrame->client()) |
| 647 return; | 647 return; |
| 648 ASSERT(m_webFrame->frame()->document()); | 648 ASSERT(m_webFrame->frame()->document()); |
| 649 Fullscreen::fullyExitFullscreen(*m_webFrame->frame()->document()); | 649 Fullscreen::fullyExitFullscreen(*m_webFrame->frame()->document()); |
| 650 m_webFrame->client()->loadURLExternally( | 650 m_webFrame->client()->loadURLExternally( |
| 651 WrappedResourceRequest(request), static_cast<WebNavigationPolicy>(policy
), suggestedName, shouldReplaceCurrentEntry); | 651 WrappedResourceRequest(request), static_cast<WebNavigationPolicy>(policy
), suggestedName, shouldReplaceCurrentEntry); |
| (...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1023 | 1023 |
| 1024 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde
nTerminationDisablerType type) | 1024 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde
nTerminationDisablerType type) |
| 1025 { | 1025 { |
| 1026 if (m_webFrame->client()) { | 1026 if (m_webFrame->client()) { |
| 1027 m_webFrame->client()->suddenTerminationDisablerChanged( | 1027 m_webFrame->client()->suddenTerminationDisablerChanged( |
| 1028 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>(
type)); | 1028 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>(
type)); |
| 1029 } | 1029 } |
| 1030 } | 1030 } |
| 1031 | 1031 |
| 1032 } // namespace blink | 1032 } // namespace blink |
| OLD | NEW |