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