| 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 417 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 428 | 428 |
| 429 void FrameLoaderClientImpl::dispatchDidNavigateWithinPage(HistoryItem* item, His
toryCommitType commitType, bool contentInitiated) | 429 void FrameLoaderClientImpl::dispatchDidNavigateWithinPage(HistoryItem* item, His
toryCommitType commitType, bool contentInitiated) |
| 430 { | 430 { |
| 431 bool shouldCreateHistoryEntry = commitType == StandardCommit; | 431 bool shouldCreateHistoryEntry = commitType == StandardCommit; |
| 432 // TODO(dglazkov): Does this need to be called for subframes? | 432 // TODO(dglazkov): Does this need to be called for subframes? |
| 433 m_webFrame->viewImpl()->didCommitLoad(shouldCreateHistoryEntry, true); | 433 m_webFrame->viewImpl()->didCommitLoad(shouldCreateHistoryEntry, true); |
| 434 if (m_webFrame->client()) | 434 if (m_webFrame->client()) |
| 435 m_webFrame->client()->didNavigateWithinPage(m_webFrame, WebHistoryItem(i
tem), static_cast<WebHistoryCommitType>(commitType), contentInitiated); | 435 m_webFrame->client()->didNavigateWithinPage(m_webFrame, WebHistoryItem(i
tem), static_cast<WebHistoryCommitType>(commitType), contentInitiated); |
| 436 } | 436 } |
| 437 | 437 |
| 438 void FrameLoaderClientImpl::dispatchWillCommitProvisionalLoad() | 438 void FrameLoaderClientImpl::dispatchWillClose() |
| 439 { | 439 { |
| 440 if (m_webFrame->client()) | 440 if (m_webFrame->client()) |
| 441 m_webFrame->client()->willCommitProvisionalLoad(m_webFrame); | 441 m_webFrame->client()->willClose(m_webFrame); |
| 442 } | 442 } |
| 443 | 443 |
| 444 void FrameLoaderClientImpl::dispatchDidStartProvisionalLoad(double triggeringEve
ntTime) | 444 void FrameLoaderClientImpl::dispatchDidStartProvisionalLoad(double triggeringEve
ntTime) |
| 445 { | 445 { |
| 446 if (m_webFrame->client()) | 446 if (m_webFrame->client()) |
| 447 m_webFrame->client()->didStartProvisionalLoad(m_webFrame, triggeringEven
tTime); | 447 m_webFrame->client()->didStartProvisionalLoad(m_webFrame, triggeringEven
tTime); |
| 448 if (WebDevToolsAgentImpl* devTools = devToolsAgent()) | 448 if (WebDevToolsAgentImpl* devTools = devToolsAgent()) |
| 449 devTools->didStartProvisionalLoad(m_webFrame->frame()); | 449 devTools->didStartProvisionalLoad(m_webFrame->frame()); |
| 450 } | 450 } |
| 451 | 451 |
| (...skipping 545 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 997 { | 997 { |
| 998 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot())->
devToolsAgentImpl(); | 998 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot())->
devToolsAgentImpl(); |
| 999 } | 999 } |
| 1000 | 1000 |
| 1001 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) | 1001 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) |
| 1002 { | 1002 { |
| 1003 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url)); | 1003 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url)); |
| 1004 } | 1004 } |
| 1005 | 1005 |
| 1006 } // namespace blink | 1006 } // namespace blink |
| OLD | NEW |