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 460 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
471 navigationInfo.extraData = ds->extraData(); | 471 navigationInfo.extraData = ds->extraData(); |
472 navigationInfo.navigationType = ds->navigationType(); | 472 navigationInfo.navigationType = ds->navigationType(); |
473 navigationInfo.defaultPolicy = static_cast<WebNavigationPolicy>(policy); | 473 navigationInfo.defaultPolicy = static_cast<WebNavigationPolicy>(policy); |
474 navigationInfo.isRedirect = ds->isRedirect(); | 474 navigationInfo.isRedirect = ds->isRedirect(); |
475 navigationInfo.isTransitionNavigation = isTransitionNavigation; | 475 navigationInfo.isTransitionNavigation = isTransitionNavigation; |
476 | 476 |
477 WebNavigationPolicy webPolicy = m_webFrame->client()->decidePolicyForNavigat ion(navigationInfo); | 477 WebNavigationPolicy webPolicy = m_webFrame->client()->decidePolicyForNavigat ion(navigationInfo); |
478 return static_cast<NavigationPolicy>(webPolicy); | 478 return static_cast<NavigationPolicy>(webPolicy); |
479 } | 479 } |
480 | 480 |
481 void FrameLoaderClientImpl::dispatchAddNavigationTransitionData(const String& al lowedDestinationOrigin, const String& selector, const String& markup) | 481 void FrameLoaderClientImpl::dispatchAddNavigationTransitionData( |
482 const String& allowedDestinationOrigin, const String& selector, | |
483 const String& markup, const Vector<String>& names, | |
sof
2014/10/24 15:17:14
Ditto
Zhen Wang
2014/10/27 14:14:45
Using struct now.
| |
484 const Vector<IntRect>& rects) | |
482 { | 485 { |
483 if (m_webFrame->client()) | 486 if (m_webFrame->client()) { |
484 m_webFrame->client()->addNavigationTransitionData(allowedDestinationOrig in, selector, markup); | 487 m_webFrame->client()->addNavigationTransitionData( |
488 allowedDestinationOrigin, selector, markup, names, rects); | |
sof
2014/10/24 15:17:14
Keep line length style as-was?
Zhen Wang
2014/10/27 14:14:45
This will be changed into using struct in later CL
| |
489 } | |
485 } | 490 } |
486 | 491 |
487 void FrameLoaderClientImpl::dispatchWillRequestResource(FetchRequest* request) | 492 void FrameLoaderClientImpl::dispatchWillRequestResource(FetchRequest* request) |
488 { | 493 { |
489 if (m_webFrame->client()) { | 494 if (m_webFrame->client()) { |
490 WebCachedURLRequest urlRequest(request); | 495 WebCachedURLRequest urlRequest(request); |
491 m_webFrame->client()->willRequestResource(m_webFrame, urlRequest); | 496 m_webFrame->client()->willRequestResource(m_webFrame, urlRequest); |
492 } | 497 } |
493 } | 498 } |
494 | 499 |
(...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
853 m_webFrame->client()->didAbortLoading(m_webFrame); | 858 m_webFrame->client()->didAbortLoading(m_webFrame); |
854 } | 859 } |
855 | 860 |
856 void FrameLoaderClientImpl::dispatchDidChangeManifest() | 861 void FrameLoaderClientImpl::dispatchDidChangeManifest() |
857 { | 862 { |
858 if (m_webFrame->client()) | 863 if (m_webFrame->client()) |
859 m_webFrame->client()->didChangeManifest(m_webFrame); | 864 m_webFrame->client()->didChangeManifest(m_webFrame); |
860 } | 865 } |
861 | 866 |
862 } // namespace blink | 867 } // namespace blink |
OLD | NEW |