Chromium Code Reviews| 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 656 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 667 // will occur. | 667 // will occur. |
| 668 void FrameLoaderClientImpl::transitionToCommittedForNewPage() | 668 void FrameLoaderClientImpl::transitionToCommittedForNewPage() |
| 669 { | 669 { |
| 670 m_webFrame->createFrameView(); | 670 m_webFrame->createFrameView(); |
| 671 } | 671 } |
| 672 | 672 |
| 673 PassRefPtrWillBeRawPtr<LocalFrame> FrameLoaderClientImpl::createFrame( | 673 PassRefPtrWillBeRawPtr<LocalFrame> FrameLoaderClientImpl::createFrame( |
| 674 const KURL& url, | 674 const KURL& url, |
| 675 const AtomicString& name, | 675 const AtomicString& name, |
| 676 HTMLFrameOwnerElement* ownerElement, | 676 HTMLFrameOwnerElement* ownerElement, |
| 677 ContentSecurityPolicyDisposition shouldCheckContentSecurityPolicy) | 677 ContentSecurityPolicyDisposition shouldCheckContentSecurityPolicy, |
| 678 SandboxFlags sandboxFlags) | |
| 678 { | 679 { |
| 679 FrameLoadRequest frameRequest(m_webFrame->frame()->document(), url, name, sh ouldCheckContentSecurityPolicy); | 680 FrameLoadRequest frameRequest(m_webFrame->frame()->document(), url, name, sh ouldCheckContentSecurityPolicy, sandboxFlags); |
|
alexmos
2015/01/16 18:31:40
Instead of plumbing sandboxFlags through createFra
dcheng
2015/01/16 19:11:19
I haven't really thought about this. +japhet
Nate Chapin
2015/01/21 18:27:30
I have mixed feelings about making all of the Fram
| |
| 680 return m_webFrame->createChildFrame(frameRequest, ownerElement); | 681 return m_webFrame->createChildFrame(frameRequest, ownerElement); |
| 681 } | 682 } |
| 682 | 683 |
| 683 bool FrameLoaderClientImpl::canCreatePluginWithoutRenderer(const String& mimeTyp e) const | 684 bool FrameLoaderClientImpl::canCreatePluginWithoutRenderer(const String& mimeTyp e) const |
| 684 { | 685 { |
| 685 if (!m_webFrame->client()) | 686 if (!m_webFrame->client()) |
| 686 return false; | 687 return false; |
| 687 | 688 |
| 688 return m_webFrame->client()->canCreatePluginWithoutRenderer(mimeType); | 689 return m_webFrame->client()->canCreatePluginWithoutRenderer(mimeType); |
| 689 } | 690 } |
| (...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 923 | 924 |
| 924 unsigned FrameLoaderClientImpl::backForwardLength() | 925 unsigned FrameLoaderClientImpl::backForwardLength() |
| 925 { | 926 { |
| 926 WebViewImpl* webview = m_webFrame->viewImpl(); | 927 WebViewImpl* webview = m_webFrame->viewImpl(); |
| 927 if (!webview || !webview->client()) | 928 if (!webview || !webview->client()) |
| 928 return 0; | 929 return 0; |
| 929 return webview->client()->historyBackListCount() + 1 + webview->client()->hi storyForwardListCount(); | 930 return webview->client()->historyBackListCount() + 1 + webview->client()->hi storyForwardListCount(); |
| 930 } | 931 } |
| 931 | 932 |
| 932 } // namespace blink | 933 } // namespace blink |
| OLD | NEW |