| 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 1695 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1706 { | 1706 { |
| 1707 if (mainFrameImpl() && mainFrameImpl()->frameView()) | 1707 if (mainFrameImpl() && mainFrameImpl()->frameView()) |
| 1708 mainFrameImpl()->frameView()->willEndLiveResize(); | 1708 mainFrameImpl()->frameView()->willEndLiveResize(); |
| 1709 | 1709 |
| 1710 LocalFrame* frame = mainFrameImpl()->frame(); | 1710 LocalFrame* frame = mainFrameImpl()->frame(); |
| 1711 WebPluginContainerImpl* pluginContainer = WebLocalFrameImpl::pluginContainer
FromFrame(frame); | 1711 WebPluginContainerImpl* pluginContainer = WebLocalFrameImpl::pluginContainer
FromFrame(frame); |
| 1712 if (pluginContainer) | 1712 if (pluginContainer) |
| 1713 pluginContainer->willEndLiveResize(); | 1713 pluginContainer->willEndLiveResize(); |
| 1714 } | 1714 } |
| 1715 | 1715 |
| 1716 void WebViewImpl::willEnterFullScreen() | |
| 1717 { | |
| 1718 m_fullscreenController->willEnterFullScreen(); | |
| 1719 } | |
| 1720 | |
| 1721 void WebViewImpl::didEnterFullScreen() | 1716 void WebViewImpl::didEnterFullScreen() |
| 1722 { | 1717 { |
| 1723 m_fullscreenController->didEnterFullScreen(); | 1718 m_fullscreenController->didEnterFullScreen(); |
| 1724 } | 1719 } |
| 1725 | 1720 |
| 1726 void WebViewImpl::willExitFullScreen() | |
| 1727 { | |
| 1728 m_fullscreenController->willExitFullScreen(); | |
| 1729 } | |
| 1730 | |
| 1731 void WebViewImpl::didExitFullScreen() | 1721 void WebViewImpl::didExitFullScreen() |
| 1732 { | 1722 { |
| 1733 m_fullscreenController->didExitFullScreen(); | 1723 m_fullscreenController->didExitFullScreen(); |
| 1734 } | 1724 } |
| 1735 | 1725 |
| 1736 void WebViewImpl::beginFrame(const WebBeginFrameArgs& frameTime) | 1726 void WebViewImpl::beginFrame(const WebBeginFrameArgs& frameTime) |
| 1737 { | 1727 { |
| 1738 TRACE_EVENT0("blink", "WebViewImpl::beginFrame"); | 1728 TRACE_EVENT0("blink", "WebViewImpl::beginFrame"); |
| 1739 | 1729 |
| 1740 double monotonicFrameBeginTime = frameTime.lastFrameTimeMonotonic; | 1730 double monotonicFrameBeginTime = frameTime.lastFrameTimeMonotonic; |
| (...skipping 2532 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4273 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); | 4263 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); |
| 4274 | 4264 |
| 4275 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) | 4265 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) |
| 4276 return false; | 4266 return false; |
| 4277 | 4267 |
| 4278 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 4268 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
| 4279 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); | 4269 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); |
| 4280 } | 4270 } |
| 4281 | 4271 |
| 4282 } // namespace blink | 4272 } // namespace blink |
| OLD | NEW |