| 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 438 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 449 if (m_webFrame->client()) | 449 if (m_webFrame->client()) |
| 450 m_webFrame->client()->didHandleOnloadEvents(m_webFrame); | 450 m_webFrame->client()->didHandleOnloadEvents(m_webFrame); |
| 451 } | 451 } |
| 452 | 452 |
| 453 void FrameLoaderClientImpl::dispatchDidReceiveServerRedirectForProvisionalLoad() | 453 void FrameLoaderClientImpl::dispatchDidReceiveServerRedirectForProvisionalLoad() |
| 454 { | 454 { |
| 455 if (m_webFrame->client()) | 455 if (m_webFrame->client()) |
| 456 m_webFrame->client()->didReceiveServerRedirectForProvisionalLoad(m_webFr
ame); | 456 m_webFrame->client()->didReceiveServerRedirectForProvisionalLoad(m_webFr
ame); |
| 457 } | 457 } |
| 458 | 458 |
| 459 void FrameLoaderClientImpl::dispatchDidNavigateWithinPage(HistoryItem* item, His
toryCommitType commitType) | 459 void FrameLoaderClientImpl::dispatchDidNavigateWithinPage(HistoryItem* item, His
toryCommitType commitType, bool contentInitiated) |
| 460 { | 460 { |
| 461 bool shouldCreateHistoryEntry = commitType == StandardCommit; | 461 bool shouldCreateHistoryEntry = commitType == StandardCommit; |
| 462 // TODO(dglazkov): Does this need to be called for subframes? | 462 // TODO(dglazkov): Does this need to be called for subframes? |
| 463 m_webFrame->viewImpl()->didCommitLoad(shouldCreateHistoryEntry, true); | 463 m_webFrame->viewImpl()->didCommitLoad(shouldCreateHistoryEntry, true); |
| 464 if (m_webFrame->client()) | 464 if (m_webFrame->client()) |
| 465 m_webFrame->client()->didNavigateWithinPage(m_webFrame, WebHistoryItem(i
tem), static_cast<WebHistoryCommitType>(commitType)); | 465 m_webFrame->client()->didNavigateWithinPage(m_webFrame, WebHistoryItem(i
tem), static_cast<WebHistoryCommitType>(commitType), contentInitiated); |
| 466 } | 466 } |
| 467 | 467 |
| 468 void FrameLoaderClientImpl::dispatchWillClose() | 468 void FrameLoaderClientImpl::dispatchWillClose() |
| 469 { | 469 { |
| 470 if (m_webFrame->client()) | 470 if (m_webFrame->client()) |
| 471 m_webFrame->client()->willClose(m_webFrame); | 471 m_webFrame->client()->willClose(m_webFrame); |
| 472 } | 472 } |
| 473 | 473 |
| 474 void FrameLoaderClientImpl::dispatchDidStartProvisionalLoad(double triggeringEve
ntTime) | 474 void FrameLoaderClientImpl::dispatchDidStartProvisionalLoad(double triggeringEve
ntTime) |
| 475 { | 475 { |
| (...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1034 } | 1034 } |
| 1035 | 1035 |
| 1036 WebEffectiveConnectionType FrameLoaderClientImpl::getEffectiveConnectionType() | 1036 WebEffectiveConnectionType FrameLoaderClientImpl::getEffectiveConnectionType() |
| 1037 { | 1037 { |
| 1038 if (m_webFrame->client()) | 1038 if (m_webFrame->client()) |
| 1039 return m_webFrame->client()->getEffectiveConnectionType(); | 1039 return m_webFrame->client()->getEffectiveConnectionType(); |
| 1040 return WebEffectiveConnectionType::TypeUnknown; | 1040 return WebEffectiveConnectionType::TypeUnknown; |
| 1041 } | 1041 } |
| 1042 | 1042 |
| 1043 } // namespace blink | 1043 } // namespace blink |
| OLD | NEW |