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 399 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
410 static_cast<WebHistoryCommitType>(commitType), contentInitiated); | 410 static_cast<WebHistoryCommitType>(commitType), contentInitiated); |
411 } | 411 } |
412 } | 412 } |
413 | 413 |
414 void LocalFrameClientImpl::dispatchWillCommitProvisionalLoad() { | 414 void LocalFrameClientImpl::dispatchWillCommitProvisionalLoad() { |
415 if (m_webFrame->client()) | 415 if (m_webFrame->client()) |
416 m_webFrame->client()->willCommitProvisionalLoad(m_webFrame); | 416 m_webFrame->client()->willCommitProvisionalLoad(m_webFrame); |
417 } | 417 } |
418 | 418 |
419 void LocalFrameClientImpl::dispatchDidStartProvisionalLoad( | 419 void LocalFrameClientImpl::dispatchDidStartProvisionalLoad( |
420 DocumentLoader* loader) { | 420 DocumentLoader* loader, |
| 421 ResourceRequest& request) { |
421 if (m_webFrame->client()) { | 422 if (m_webFrame->client()) { |
| 423 WrappedResourceRequest wrappedRequest(request); |
422 m_webFrame->client()->didStartProvisionalLoad( | 424 m_webFrame->client()->didStartProvisionalLoad( |
423 WebDataSourceImpl::fromDocumentLoader(loader)); | 425 WebDataSourceImpl::fromDocumentLoader(loader), |
| 426 wrappedRequest); |
424 } | 427 } |
425 if (WebDevToolsAgentImpl* devTools = devToolsAgent()) | 428 if (WebDevToolsAgentImpl* devTools = devToolsAgent()) |
426 devTools->didStartProvisionalLoad(m_webFrame->frame()); | 429 devTools->didStartProvisionalLoad(m_webFrame->frame()); |
427 } | 430 } |
428 | 431 |
429 void LocalFrameClientImpl::dispatchDidReceiveTitle(const String& title) { | 432 void LocalFrameClientImpl::dispatchDidReceiveTitle(const String& title) { |
430 if (m_webFrame->client()) { | 433 if (m_webFrame->client()) { |
431 m_webFrame->client()->didReceiveTitle(m_webFrame, title, | 434 m_webFrame->client()->didReceiveTitle(m_webFrame, title, |
432 WebTextDirectionLeftToRight); | 435 WebTextDirectionLeftToRight); |
433 } | 436 } |
(...skipping 587 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1021 KURL LocalFrameClientImpl::overrideFlashEmbedWithHTML(const KURL& url) { | 1024 KURL LocalFrameClientImpl::overrideFlashEmbedWithHTML(const KURL& url) { |
1022 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url)); | 1025 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url)); |
1023 } | 1026 } |
1024 | 1027 |
1025 void LocalFrameClientImpl::setHasReceivedUserGesture() { | 1028 void LocalFrameClientImpl::setHasReceivedUserGesture() { |
1026 if (m_webFrame->client()) | 1029 if (m_webFrame->client()) |
1027 m_webFrame->client()->setHasReceivedUserGesture(); | 1030 m_webFrame->client()->setHasReceivedUserGesture(); |
1028 } | 1031 } |
1029 | 1032 |
1030 } // namespace blink | 1033 } // namespace blink |
OLD | NEW |