| 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 741 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 752 RefPtrWillBeRawPtr<WebPluginContainerImpl> container = | 752 RefPtrWillBeRawPtr<WebPluginContainerImpl> container = |
| 753 WebPluginContainerImpl::create(element, webPlugin); | 753 WebPluginContainerImpl::create(element, webPlugin); |
| 754 | 754 |
| 755 if (!webPlugin->initialize(container.get())) { | 755 if (!webPlugin->initialize(container.get())) { |
| 756 #if ENABLE(OILPAN) | 756 #if ENABLE(OILPAN) |
| 757 container->dispose(); | 757 container->dispose(); |
| 758 #endif | 758 #endif |
| 759 return nullptr; | 759 return nullptr; |
| 760 } | 760 } |
| 761 | 761 |
| 762 if (policy != AllowDetachedPlugin && !element->renderer()) { | 762 if (policy != AllowDetachedPlugin && !element->layoutObject()) { |
| 763 #if ENABLE(OILPAN) | 763 #if ENABLE(OILPAN) |
| 764 container->dispose(); | 764 container->dispose(); |
| 765 #endif | 765 #endif |
| 766 return nullptr; | 766 return nullptr; |
| 767 } | 767 } |
| 768 | 768 |
| 769 return container; | 769 return container; |
| 770 } | 770 } |
| 771 | 771 |
| 772 PassRefPtrWillBeRawPtr<Widget> FrameLoaderClientImpl::createJavaAppletWidget( | 772 PassRefPtrWillBeRawPtr<Widget> FrameLoaderClientImpl::createJavaAppletWidget( |
| (...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 949 | 949 |
| 950 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde
nTerminationDisablerType type) | 950 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde
nTerminationDisablerType type) |
| 951 { | 951 { |
| 952 if (m_webFrame->client()) { | 952 if (m_webFrame->client()) { |
| 953 m_webFrame->client()->suddenTerminationDisablerChanged( | 953 m_webFrame->client()->suddenTerminationDisablerChanged( |
| 954 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>(
type)); | 954 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>(
type)); |
| 955 } | 955 } |
| 956 } | 956 } |
| 957 | 957 |
| 958 } // namespace blink | 958 } // namespace blink |
| OLD | NEW |