| 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 586 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 597 { | 597 { |
| 598 m_webFrame->createFrameView(); | 598 m_webFrame->createFrameView(); |
| 599 } | 599 } |
| 600 | 600 |
| 601 PassRefPtr<LocalFrame> FrameLoaderClientImpl::createFrame( | 601 PassRefPtr<LocalFrame> FrameLoaderClientImpl::createFrame( |
| 602 const KURL& url, | 602 const KURL& url, |
| 603 const AtomicString& name, | 603 const AtomicString& name, |
| 604 const Referrer& referrer, | 604 const Referrer& referrer, |
| 605 HTMLFrameOwnerElement* ownerElement) | 605 HTMLFrameOwnerElement* ownerElement) |
| 606 { | 606 { |
| 607 FrameLoadRequest frameRequest(m_webFrame->frame()->document(), | 607 ResourceRequest request = ResourceRequest::createMainResourceRequest(url, fa
lse, referrer); |
| 608 ResourceRequest(url, referrer), name); | 608 FrameLoadRequest frameRequest(m_webFrame->frame()->document(), request, name
); |
| 609 return m_webFrame->createChildFrame(frameRequest, ownerElement); | 609 return m_webFrame->createChildFrame(frameRequest, ownerElement); |
| 610 } | 610 } |
| 611 | 611 |
| 612 bool FrameLoaderClientImpl::canCreatePluginWithoutRenderer(const String& mimeTyp
e) const | 612 bool FrameLoaderClientImpl::canCreatePluginWithoutRenderer(const String& mimeTyp
e) const |
| 613 { | 613 { |
| 614 if (!m_webFrame->client()) | 614 if (!m_webFrame->client()) |
| 615 return false; | 615 return false; |
| 616 | 616 |
| 617 return m_webFrame->client()->canCreatePluginWithoutRenderer(mimeType); | 617 return m_webFrame->client()->canCreatePluginWithoutRenderer(mimeType); |
| 618 } | 618 } |
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 807 m_webFrame->client()->didAbortLoading(m_webFrame); | 807 m_webFrame->client()->didAbortLoading(m_webFrame); |
| 808 } | 808 } |
| 809 | 809 |
| 810 void FrameLoaderClientImpl::dispatchDidChangeManifest() | 810 void FrameLoaderClientImpl::dispatchDidChangeManifest() |
| 811 { | 811 { |
| 812 if (m_webFrame->client()) | 812 if (m_webFrame->client()) |
| 813 m_webFrame->client()->didChangeManifest(m_webFrame); | 813 m_webFrame->client()->didChangeManifest(m_webFrame); |
| 814 } | 814 } |
| 815 | 815 |
| 816 } // namespace blink | 816 } // namespace blink |
| OLD | NEW |