Chromium Code Reviews| 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 3908 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3919 } | 3919 } |
| 3920 | 3920 |
| 3921 void WebViewImpl::setVisibilityState(WebPageVisibilityState visibilityState, | 3921 void WebViewImpl::setVisibilityState(WebPageVisibilityState visibilityState, |
| 3922 bool isInitialState) { | 3922 bool isInitialState) { |
| 3923 if (!page()) | 3923 if (!page()) |
| 3924 return; | 3924 return; |
| 3925 | 3925 |
| 3926 ASSERT(visibilityState == WebPageVisibilityStateVisible || visibilityState = = WebPageVisibilityStateHidden || visibilityState == WebPageVisibilityStatePrere nder); | 3926 ASSERT(visibilityState == WebPageVisibilityStateVisible || visibilityState = = WebPageVisibilityStateHidden || visibilityState == WebPageVisibilityStatePrere nder); |
| 3927 m_page->setVisibilityState(static_cast<PageVisibilityState>(static_cast<int> (visibilityState)), isInitialState); | 3927 m_page->setVisibilityState(static_cast<PageVisibilityState>(static_cast<int> (visibilityState)), isInitialState); |
| 3928 | 3928 |
| 3929 bool visible = visibilityState == WebPageVisibilityStateVisible; | |
|
Stephen White
2014/01/24 18:52:35
Don't see the need for this change; maybe a remnan
| |
| 3929 if (m_layerTreeView) { | 3930 if (m_layerTreeView) { |
| 3930 bool visible = visibilityState == WebPageVisibilityStateVisible; | |
| 3931 m_layerTreeView->setVisible(visible); | 3931 m_layerTreeView->setVisible(visible); |
| 3932 } | 3932 } |
| 3933 } | 3933 } |
| 3934 | 3934 |
| 3935 bool WebViewImpl::requestPointerLock() | 3935 bool WebViewImpl::requestPointerLock() |
| 3936 { | 3936 { |
| 3937 return m_client && m_client->requestPointerLock(); | 3937 return m_client && m_client->requestPointerLock(); |
| 3938 } | 3938 } |
| 3939 | 3939 |
| 3940 void WebViewImpl::requestPointerUnlock() | 3940 void WebViewImpl::requestPointerUnlock() |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3986 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints(); | 3986 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints(); |
| 3987 | 3987 |
| 3988 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) | 3988 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) |
| 3989 return false; | 3989 return false; |
| 3990 | 3990 |
| 3991 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 3991 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
| 3992 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); | 3992 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); |
| 3993 } | 3993 } |
| 3994 | 3994 |
| 3995 } // namespace blink | 3995 } // namespace blink |
| OLD | NEW |