| 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 669 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 680 | 680 |
| 681 if (MIMETypeRegistry::isSupportedNonImageMIMEType(mimeType)) | 681 if (MIMETypeRegistry::isSupportedNonImageMIMEType(mimeType)) |
| 682 return ObjectContentFrame; | 682 return ObjectContentFrame; |
| 683 | 683 |
| 684 return ObjectContentNone; | 684 return ObjectContentNone; |
| 685 } | 685 } |
| 686 | 686 |
| 687 PassOwnPtr<WebPluginLoadObserver> FrameLoaderClientImpl::pluginLoadObserver() | 687 PassOwnPtr<WebPluginLoadObserver> FrameLoaderClientImpl::pluginLoadObserver() |
| 688 { | 688 { |
| 689 WebDataSourceImpl* ds = WebDataSourceImpl::fromDocumentLoader( | 689 WebDataSourceImpl* ds = WebDataSourceImpl::fromDocumentLoader( |
| 690 m_webFrame->frame()->loader()->activeDocumentLoader()); | 690 m_webFrame->frame()->loader().activeDocumentLoader()); |
| 691 if (!ds) { | 691 if (!ds) { |
| 692 // We can arrive here if a popstate event handler detaches this frame. | 692 // We can arrive here if a popstate event handler detaches this frame. |
| 693 // FIXME: Remove this code once http://webkit.org/b/36202 is fixed. | 693 // FIXME: Remove this code once http://webkit.org/b/36202 is fixed. |
| 694 ASSERT(!m_webFrame->frame()->page()); | 694 ASSERT(!m_webFrame->frame()->page()); |
| 695 return nullptr; | 695 return nullptr; |
| 696 } | 696 } |
| 697 return ds->releasePluginLoadObserver(); | 697 return ds->releasePluginLoadObserver(); |
| 698 } | 698 } |
| 699 | 699 |
| 700 WebCookieJar* FrameLoaderClientImpl::cookieJar() const | 700 WebCookieJar* FrameLoaderClientImpl::cookieJar() const |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 767 return adoptPtr(m_webFrame->client()->createServiceWorkerProvider(m_webFrame
, client.leakPtr())); | 767 return adoptPtr(m_webFrame->client()->createServiceWorkerProvider(m_webFrame
, client.leakPtr())); |
| 768 } | 768 } |
| 769 | 769 |
| 770 void FrameLoaderClientImpl::didStopAllLoaders() | 770 void FrameLoaderClientImpl::didStopAllLoaders() |
| 771 { | 771 { |
| 772 if (m_webFrame->client()) | 772 if (m_webFrame->client()) |
| 773 m_webFrame->client()->didAbortLoading(m_webFrame); | 773 m_webFrame->client()->didAbortLoading(m_webFrame); |
| 774 } | 774 } |
| 775 | 775 |
| 776 } // namespace WebKit | 776 } // namespace WebKit |
| OLD | NEW |