| 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 1821 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1832 { | 1832 { |
| 1833 m_fullscreenController->exitFullScreenForElement(element); | 1833 m_fullscreenController->exitFullScreenForElement(element); |
| 1834 } | 1834 } |
| 1835 | 1835 |
| 1836 void WebViewImpl::clearCompositedSelectionBounds() | 1836 void WebViewImpl::clearCompositedSelectionBounds() |
| 1837 { | 1837 { |
| 1838 if (m_layerTreeView) | 1838 if (m_layerTreeView) |
| 1839 m_layerTreeView->clearSelection(); | 1839 m_layerTreeView->clearSelection(); |
| 1840 } | 1840 } |
| 1841 | 1841 |
| 1842 void WebViewImpl::updateCompositedSelectionBounds(const WebSelectionBound& ancho
r, const WebSelectionBound& focus) |
| 1843 { |
| 1844 if (m_layerTreeView) |
| 1845 m_layerTreeView->registerSelection(anchor, focus); |
| 1846 } |
| 1847 |
| 1842 bool WebViewImpl::hasHorizontalScrollbar() | 1848 bool WebViewImpl::hasHorizontalScrollbar() |
| 1843 { | 1849 { |
| 1844 return mainFrameImpl()->frameView()->horizontalScrollbar(); | 1850 return mainFrameImpl()->frameView()->horizontalScrollbar(); |
| 1845 } | 1851 } |
| 1846 | 1852 |
| 1847 bool WebViewImpl::hasVerticalScrollbar() | 1853 bool WebViewImpl::hasVerticalScrollbar() |
| 1848 { | 1854 { |
| 1849 return mainFrameImpl()->frameView()->verticalScrollbar(); | 1855 return mainFrameImpl()->frameView()->verticalScrollbar(); |
| 1850 } | 1856 } |
| 1851 | 1857 |
| (...skipping 2388 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4240 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); | 4246 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); |
| 4241 | 4247 |
| 4242 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) | 4248 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) |
| 4243 return false; | 4249 return false; |
| 4244 | 4250 |
| 4245 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 4251 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
| 4246 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); | 4252 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); |
| 4247 } | 4253 } |
| 4248 | 4254 |
| 4249 } // namespace blink | 4255 } // namespace blink |
| OLD | NEW |