| 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 1723 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1734 // deleted. | 1734 // deleted. |
| 1735 m_client = nullptr; | 1735 m_client = nullptr; |
| 1736 | 1736 |
| 1737 deref(); // Balances ref() acquired in WebView::create | 1737 deref(); // Balances ref() acquired in WebView::create |
| 1738 } | 1738 } |
| 1739 | 1739 |
| 1740 void WebViewImpl::willStartLiveResize() | 1740 void WebViewImpl::willStartLiveResize() |
| 1741 { | 1741 { |
| 1742 if (mainFrameImpl() && mainFrameImpl()->frameView()) | 1742 if (mainFrameImpl() && mainFrameImpl()->frameView()) |
| 1743 mainFrameImpl()->frameView()->willStartLiveResize(); | 1743 mainFrameImpl()->frameView()->willStartLiveResize(); |
| 1744 | |
| 1745 LocalFrame* frame = mainFrameImpl()->frame(); | |
| 1746 WebPluginContainerImpl* pluginContainer = WebLocalFrameImpl::pluginContainer
FromFrame(frame); | |
| 1747 if (pluginContainer) | |
| 1748 pluginContainer->willStartLiveResize(); | |
| 1749 } | 1744 } |
| 1750 | 1745 |
| 1751 WebSize WebViewImpl::size() | 1746 WebSize WebViewImpl::size() |
| 1752 { | 1747 { |
| 1753 return m_size; | 1748 return m_size; |
| 1754 } | 1749 } |
| 1755 | 1750 |
| 1756 void WebViewImpl::resizePinchViewport(const WebSize& newSize) | 1751 void WebViewImpl::resizePinchViewport(const WebSize& newSize) |
| 1757 { | 1752 { |
| 1758 page()->frameHost().pinchViewport().setSize(newSize); | 1753 page()->frameHost().pinchViewport().setSize(newSize); |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1883 ResizeViewportAnchor anchor(*view, pinchViewport); | 1878 ResizeViewportAnchor anchor(*view, pinchViewport); |
| 1884 resizeViewWhileAnchored(view); | 1879 resizeViewWhileAnchored(view); |
| 1885 } | 1880 } |
| 1886 sendResizeEventAndRepaint(); | 1881 sendResizeEventAndRepaint(); |
| 1887 } | 1882 } |
| 1888 | 1883 |
| 1889 void WebViewImpl::willEndLiveResize() | 1884 void WebViewImpl::willEndLiveResize() |
| 1890 { | 1885 { |
| 1891 if (mainFrameImpl() && mainFrameImpl()->frameView()) | 1886 if (mainFrameImpl() && mainFrameImpl()->frameView()) |
| 1892 mainFrameImpl()->frameView()->willEndLiveResize(); | 1887 mainFrameImpl()->frameView()->willEndLiveResize(); |
| 1893 | |
| 1894 LocalFrame* frame = mainFrameImpl()->frame(); | |
| 1895 WebPluginContainerImpl* pluginContainer = WebLocalFrameImpl::pluginContainer
FromFrame(frame); | |
| 1896 if (pluginContainer) | |
| 1897 pluginContainer->willEndLiveResize(); | |
| 1898 } | 1888 } |
| 1899 | 1889 |
| 1900 void WebViewImpl::didEnterFullScreen() | 1890 void WebViewImpl::didEnterFullScreen() |
| 1901 { | 1891 { |
| 1902 m_fullscreenController->didEnterFullScreen(); | 1892 m_fullscreenController->didEnterFullScreen(); |
| 1903 } | 1893 } |
| 1904 | 1894 |
| 1905 void WebViewImpl::didExitFullScreen() | 1895 void WebViewImpl::didExitFullScreen() |
| 1906 { | 1896 { |
| 1907 m_fullscreenController->didExitFullScreen(); | 1897 m_fullscreenController->didExitFullScreen(); |
| (...skipping 2621 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4529 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 4519 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
| 4530 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); | 4520 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); |
| 4531 } | 4521 } |
| 4532 | 4522 |
| 4533 void WebViewImpl::forceNextWebGLContextCreationToFail() | 4523 void WebViewImpl::forceNextWebGLContextCreationToFail() |
| 4534 { | 4524 { |
| 4535 WebGLRenderingContext::forceNextWebGLContextCreationToFail(); | 4525 WebGLRenderingContext::forceNextWebGLContextCreationToFail(); |
| 4536 } | 4526 } |
| 4537 | 4527 |
| 4538 } // namespace blink | 4528 } // namespace blink |
| OLD | NEW |