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 1956 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1967 } | 1967 } |
1968 | 1968 |
1969 void WebViewImpl::clearCompositedSelection() | 1969 void WebViewImpl::clearCompositedSelection() |
1970 { | 1970 { |
1971 if (m_layerTreeView) | 1971 if (m_layerTreeView) |
1972 m_layerTreeView->clearSelection(); | 1972 m_layerTreeView->clearSelection(); |
1973 } | 1973 } |
1974 | 1974 |
1975 void WebViewImpl::updateCompositedSelection(const WebSelection& selection) | 1975 void WebViewImpl::updateCompositedSelection(const WebSelection& selection) |
1976 { | 1976 { |
1977 if (m_layerTreeView) { | 1977 if (m_layerTreeView) |
1978 m_layerTreeView->registerSelection(selection); | 1978 m_layerTreeView->registerSelection(selection); |
1979 // TODO(jdduke): Remove this overload when downstream consumers have bee
n updated, crbug.com/466672. | |
1980 m_layerTreeView->registerSelection(selection.start(), selection.end()); | |
1981 } | |
1982 } | 1979 } |
1983 | 1980 |
1984 bool WebViewImpl::hasHorizontalScrollbar() | 1981 bool WebViewImpl::hasHorizontalScrollbar() |
1985 { | 1982 { |
1986 return mainFrameImpl()->frameView()->horizontalScrollbar(); | 1983 return mainFrameImpl()->frameView()->horizontalScrollbar(); |
1987 } | 1984 } |
1988 | 1985 |
1989 bool WebViewImpl::hasVerticalScrollbar() | 1986 bool WebViewImpl::hasVerticalScrollbar() |
1990 { | 1987 { |
1991 return mainFrameImpl()->frameView()->verticalScrollbar(); | 1988 return mainFrameImpl()->frameView()->verticalScrollbar(); |
(...skipping 2420 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4412 if (m_pageColorOverlay) | 4409 if (m_pageColorOverlay) |
4413 m_pageColorOverlay->update(); | 4410 m_pageColorOverlay->update(); |
4414 if (InspectorOverlayImpl* overlay = inspectorOverlay()) { | 4411 if (InspectorOverlayImpl* overlay = inspectorOverlay()) { |
4415 PageOverlay* inspectorPageOverlay = overlay->pageOverlay(); | 4412 PageOverlay* inspectorPageOverlay = overlay->pageOverlay(); |
4416 if (inspectorPageOverlay) | 4413 if (inspectorPageOverlay) |
4417 inspectorPageOverlay->update(); | 4414 inspectorPageOverlay->update(); |
4418 } | 4415 } |
4419 } | 4416 } |
4420 | 4417 |
4421 } // namespace blink | 4418 } // namespace blink |
OLD | NEW |