| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 1658 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1669 m_devToolsAgent->willBeDestroyed(); | 1669 m_devToolsAgent->willBeDestroyed(); |
| 1670 | 1670 |
| 1671 if (m_page) { | 1671 if (m_page) { |
| 1672 // Initiate shutdown for the entire frameset. This will cause a lot of | 1672 // Initiate shutdown for the entire frameset. This will cause a lot of |
| 1673 // notifications to be sent. | 1673 // notifications to be sent. |
| 1674 m_page->willBeDestroyed(); | 1674 m_page->willBeDestroyed(); |
| 1675 m_page.clear(); | 1675 m_page.clear(); |
| 1676 } | 1676 } |
| 1677 | 1677 |
| 1678 // Should happen after m_page.clear(). | 1678 // Should happen after m_page.clear(). |
| 1679 if (m_devToolsAgent) | 1679 if (m_devToolsAgent) { |
| 1680 m_devToolsAgent->dispose(); |
| 1680 m_devToolsAgent.clear(); | 1681 m_devToolsAgent.clear(); |
| 1682 } |
| 1681 | 1683 |
| 1682 // Reset the delegate to prevent notifications being sent as we're being | 1684 // Reset the delegate to prevent notifications being sent as we're being |
| 1683 // deleted. | 1685 // deleted. |
| 1684 m_client = nullptr; | 1686 m_client = nullptr; |
| 1685 | 1687 |
| 1686 deref(); // Balances ref() acquired in WebView::create | 1688 deref(); // Balances ref() acquired in WebView::create |
| 1687 } | 1689 } |
| 1688 | 1690 |
| 1689 void WebViewImpl::willStartLiveResize() | 1691 void WebViewImpl::willStartLiveResize() |
| 1690 { | 1692 { |
| (...skipping 2961 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4652 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 4654 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
| 4653 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); | 4655 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); |
| 4654 } | 4656 } |
| 4655 | 4657 |
| 4656 void WebViewImpl::forceNextWebGLContextCreationToFail() | 4658 void WebViewImpl::forceNextWebGLContextCreationToFail() |
| 4657 { | 4659 { |
| 4658 WebGLRenderingContext::forceNextWebGLContextCreationToFail(); | 4660 WebGLRenderingContext::forceNextWebGLContextCreationToFail(); |
| 4659 } | 4661 } |
| 4660 | 4662 |
| 4661 } // namespace blink | 4663 } // namespace blink |
| OLD | NEW |