| 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 1674 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1685 { | 1685 { |
| 1686 if (mainFrameImpl() && mainFrameImpl()->frameView()) | 1686 if (mainFrameImpl() && mainFrameImpl()->frameView()) |
| 1687 mainFrameImpl()->frameView()->willEndLiveResize(); | 1687 mainFrameImpl()->frameView()->willEndLiveResize(); |
| 1688 | 1688 |
| 1689 LocalFrame* frame = mainFrameImpl()->frame(); | 1689 LocalFrame* frame = mainFrameImpl()->frame(); |
| 1690 WebPluginContainerImpl* pluginContainer = WebLocalFrameImpl::pluginContainer
FromFrame(frame); | 1690 WebPluginContainerImpl* pluginContainer = WebLocalFrameImpl::pluginContainer
FromFrame(frame); |
| 1691 if (pluginContainer) | 1691 if (pluginContainer) |
| 1692 pluginContainer->willEndLiveResize(); | 1692 pluginContainer->willEndLiveResize(); |
| 1693 } | 1693 } |
| 1694 | 1694 |
| 1695 bool WebViewImpl::fullscreenEnabled(blink::Element* element) |
| 1696 { |
| 1697 return m_fullscreenController->fullscreenEnabled(element); |
| 1698 } |
| 1699 |
| 1695 void WebViewImpl::willEnterFullScreen() | 1700 void WebViewImpl::willEnterFullScreen() |
| 1696 { | 1701 { |
| 1697 m_fullscreenController->willEnterFullScreen(); | 1702 m_fullscreenController->willEnterFullScreen(); |
| 1698 } | 1703 } |
| 1699 | 1704 |
| 1700 void WebViewImpl::didEnterFullScreen() | 1705 void WebViewImpl::didEnterFullScreen() |
| 1701 { | 1706 { |
| 1702 m_fullscreenController->didEnterFullScreen(); | 1707 m_fullscreenController->didEnterFullScreen(); |
| 1703 } | 1708 } |
| 1704 | 1709 |
| (...skipping 2535 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4240 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); | 4245 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); |
| 4241 | 4246 |
| 4242 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) | 4247 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) |
| 4243 return false; | 4248 return false; |
| 4244 | 4249 |
| 4245 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 4250 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
| 4246 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); | 4251 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); |
| 4247 } | 4252 } |
| 4248 | 4253 |
| 4249 } // namespace blink | 4254 } // namespace blink |
| OLD | NEW |