| 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 559 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 570 | 570 |
| 571 // Called when the FrameLoader goes into a state in which a new page load | 571 // Called when the FrameLoader goes into a state in which a new page load |
| 572 // will occur. | 572 // will occur. |
| 573 void FrameLoaderClientImpl::transitionToCommittedForNewPage() | 573 void FrameLoaderClientImpl::transitionToCommittedForNewPage() |
| 574 { | 574 { |
| 575 m_webFrame->createFrameView(); | 575 m_webFrame->createFrameView(); |
| 576 } | 576 } |
| 577 | 577 |
| 578 PassRefPtr<Frame> FrameLoaderClientImpl::createFrame( | 578 PassRefPtr<Frame> FrameLoaderClientImpl::createFrame( |
| 579 const KURL& url, | 579 const KURL& url, |
| 580 const String& name, | 580 const AtomicString& name, |
| 581 const String& referrer, | 581 const String& referrer, |
| 582 HTMLFrameOwnerElement* ownerElement) | 582 HTMLFrameOwnerElement* ownerElement) |
| 583 { | 583 { |
| 584 FrameLoadRequest frameRequest(m_webFrame->frame()->document(), | 584 FrameLoadRequest frameRequest(m_webFrame->frame()->document(), |
| 585 ResourceRequest(url, referrer), name); | 585 ResourceRequest(url, AtomicString(referrer)), name); |
| 586 return m_webFrame->createChildFrame(frameRequest, ownerElement); | 586 return m_webFrame->createChildFrame(frameRequest, ownerElement); |
| 587 } | 587 } |
| 588 | 588 |
| 589 PassRefPtr<Widget> FrameLoaderClientImpl::createPlugin( | 589 PassRefPtr<Widget> FrameLoaderClientImpl::createPlugin( |
| 590 const IntSize& size, // FIXME: how do we use this? | 590 const IntSize& size, // FIXME: how do we use this? |
| 591 HTMLPlugInElement* element, | 591 HTMLPlugInElement* element, |
| 592 const KURL& url, | 592 const KURL& url, |
| 593 const Vector<String>& paramNames, | 593 const Vector<String>& paramNames, |
| 594 const Vector<String>& paramValues, | 594 const Vector<String>& paramValues, |
| 595 const String& mimeType, | 595 const String& mimeType, |
| (...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 772 return m_webFrame->sharedWorkerRepositoryClient(); | 772 return m_webFrame->sharedWorkerRepositoryClient(); |
| 773 } | 773 } |
| 774 | 774 |
| 775 void FrameLoaderClientImpl::didStopAllLoaders() | 775 void FrameLoaderClientImpl::didStopAllLoaders() |
| 776 { | 776 { |
| 777 if (m_webFrame->client()) | 777 if (m_webFrame->client()) |
| 778 m_webFrame->client()->didAbortLoading(m_webFrame); | 778 m_webFrame->client()->didAbortLoading(m_webFrame); |
| 779 } | 779 } |
| 780 | 780 |
| 781 } // namespace blink | 781 } // namespace blink |
| OLD | NEW |