| 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 1839 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1850 { | 1850 { |
| 1851 m_fullscreenController->exitFullScreenForElement(element); | 1851 m_fullscreenController->exitFullScreenForElement(element); |
| 1852 } | 1852 } |
| 1853 | 1853 |
| 1854 void WebViewImpl::clearCompositedSelectionBounds() | 1854 void WebViewImpl::clearCompositedSelectionBounds() |
| 1855 { | 1855 { |
| 1856 if (m_layerTreeView) | 1856 if (m_layerTreeView) |
| 1857 m_layerTreeView->clearSelection(); | 1857 m_layerTreeView->clearSelection(); |
| 1858 } | 1858 } |
| 1859 | 1859 |
| 1860 void WebViewImpl::updateCompositedSelectionBounds(const WebSelectionBound& ancho
r, const WebSelectionBound& focus) |
| 1861 { |
| 1862 if (m_layerTreeView) |
| 1863 m_layerTreeView->registerSelection(anchor, focus); |
| 1864 } |
| 1865 |
| 1860 bool WebViewImpl::hasHorizontalScrollbar() | 1866 bool WebViewImpl::hasHorizontalScrollbar() |
| 1861 { | 1867 { |
| 1862 return mainFrameImpl()->frameView()->horizontalScrollbar(); | 1868 return mainFrameImpl()->frameView()->horizontalScrollbar(); |
| 1863 } | 1869 } |
| 1864 | 1870 |
| 1865 bool WebViewImpl::hasVerticalScrollbar() | 1871 bool WebViewImpl::hasVerticalScrollbar() |
| 1866 { | 1872 { |
| 1867 return mainFrameImpl()->frameView()->verticalScrollbar(); | 1873 return mainFrameImpl()->frameView()->verticalScrollbar(); |
| 1868 } | 1874 } |
| 1869 | 1875 |
| (...skipping 2395 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4265 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); | 4271 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); |
| 4266 | 4272 |
| 4267 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) | 4273 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) |
| 4268 return false; | 4274 return false; |
| 4269 | 4275 |
| 4270 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 4276 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
| 4271 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); | 4277 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); |
| 4272 } | 4278 } |
| 4273 | 4279 |
| 4274 } // namespace blink | 4280 } // namespace blink |
| OLD | NEW |