| 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 387 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 398 m_webFrame->client()->didNavigateWithinPage( | 398 m_webFrame->client()->didNavigateWithinPage( |
| 399 m_webFrame, WebHistoryItem(item), | 399 m_webFrame, WebHistoryItem(item), |
| 400 static_cast<WebHistoryCommitType>(commitType), contentInitiated); | 400 static_cast<WebHistoryCommitType>(commitType), contentInitiated); |
| 401 } | 401 } |
| 402 | 402 |
| 403 void FrameLoaderClientImpl::dispatchWillCommitProvisionalLoad() { | 403 void FrameLoaderClientImpl::dispatchWillCommitProvisionalLoad() { |
| 404 if (m_webFrame->client()) | 404 if (m_webFrame->client()) |
| 405 m_webFrame->client()->willCommitProvisionalLoad(m_webFrame); | 405 m_webFrame->client()->willCommitProvisionalLoad(m_webFrame); |
| 406 } | 406 } |
| 407 | 407 |
| 408 void FrameLoaderClientImpl::dispatchDidStartProvisionalLoad() { | 408 void FrameLoaderClientImpl::dispatchDidStartProvisionalLoad( |
| 409 if (m_webFrame->client()) | 409 DocumentLoader* loader) { |
| 410 m_webFrame->client()->didStartProvisionalLoad(m_webFrame); | 410 if (m_webFrame->client()) { |
| 411 m_webFrame->client()->didStartProvisionalLoad( |
| 412 m_webFrame, WebDataSourceImpl::fromDocumentLoader(loader)); |
| 413 } |
| 411 if (WebDevToolsAgentImpl* devTools = devToolsAgent()) | 414 if (WebDevToolsAgentImpl* devTools = devToolsAgent()) |
| 412 devTools->didStartProvisionalLoad(m_webFrame->frame()); | 415 devTools->didStartProvisionalLoad(m_webFrame->frame()); |
| 413 } | 416 } |
| 414 | 417 |
| 415 void FrameLoaderClientImpl::dispatchDidReceiveTitle(const String& title) { | 418 void FrameLoaderClientImpl::dispatchDidReceiveTitle(const String& title) { |
| 416 if (m_webFrame->client()) | 419 if (m_webFrame->client()) |
| 417 m_webFrame->client()->didReceiveTitle(m_webFrame, title, | 420 m_webFrame->client()->didReceiveTitle(m_webFrame, title, |
| 418 WebTextDirectionLeftToRight); | 421 WebTextDirectionLeftToRight); |
| 419 } | 422 } |
| 420 | 423 |
| (...skipping 578 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 999 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) { | 1002 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) { |
| 1000 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url)); | 1003 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url)); |
| 1001 } | 1004 } |
| 1002 | 1005 |
| 1003 void FrameLoaderClientImpl::setHasReceivedUserGesture() { | 1006 void FrameLoaderClientImpl::setHasReceivedUserGesture() { |
| 1004 if (m_webFrame->client()) | 1007 if (m_webFrame->client()) |
| 1005 m_webFrame->client()->setHasReceivedUserGesture(); | 1008 m_webFrame->client()->setHasReceivedUserGesture(); |
| 1006 } | 1009 } |
| 1007 | 1010 |
| 1008 } // namespace blink | 1011 } // namespace blink |
| OLD | NEW |