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 2940 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2951 // be offscreen, in which case bottom-align the caret. | 2951 // be offscreen, in which case bottom-align the caret. |
| 2952 newScroll.setY(std::max<int>(textboxRectInDocument.y(), caretInDocument. y() + caretInDocument.height() + caretPadding - targetViewportSize.height())); | 2952 newScroll.setY(std::max<int>(textboxRectInDocument.y(), caretInDocument. y() + caretInDocument.height() + caretPadding - targetViewportSize.height())); |
| 2953 } | 2953 } |
| 2954 } | 2954 } |
| 2955 | 2955 |
| 2956 void WebViewImpl::advanceFocus(bool reverse) | 2956 void WebViewImpl::advanceFocus(bool reverse) |
| 2957 { | 2957 { |
| 2958 page()->focusController().advanceFocus(reverse ? WebFocusTypeBackward : WebF ocusTypeForward); | 2958 page()->focusController().advanceFocus(reverse ? WebFocusTypeBackward : WebF ocusTypeForward); |
| 2959 } | 2959 } |
| 2960 | 2960 |
| 2961 void WebViewImpl::advanceFocusAcrossFrames(WebFocusType type, WebRemoteFrame* fr om, WebLocalFrame* to) | |
| 2962 { | |
| 2963 // TODO(alexmos): Pass in proper with sourceCapabilities. | |
| 2964 page()->focusController().advanceFocusAcrossFrames( | |
| 2965 type, toWebRemoteFrameImpl(from)->frame(), toWebLocalFrameImpl(to)->fram e()); | |
| 2966 } | |
|
dcheng
2015/12/04 23:16:37
Also, another thought (this can wait until a futur
alexmos
2015/12/05 00:07:45
Agreed. I'll move it in a future patch.
| |
| 2967 | |
| 2961 double WebViewImpl::zoomLevel() | 2968 double WebViewImpl::zoomLevel() |
| 2962 { | 2969 { |
| 2963 return m_zoomLevel; | 2970 return m_zoomLevel; |
| 2964 } | 2971 } |
| 2965 | 2972 |
| 2966 double WebViewImpl::setZoomLevel(double zoomLevel) | 2973 double WebViewImpl::setZoomLevel(double zoomLevel) |
| 2967 { | 2974 { |
| 2968 if (zoomLevel < m_minimumZoomLevel) | 2975 if (zoomLevel < m_minimumZoomLevel) |
| 2969 m_zoomLevel = m_minimumZoomLevel; | 2976 m_zoomLevel = m_minimumZoomLevel; |
| 2970 else if (zoomLevel > m_maximumZoomLevel) | 2977 else if (zoomLevel > m_maximumZoomLevel) |
| (...skipping 1481 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4452 if (m_pageColorOverlay) | 4459 if (m_pageColorOverlay) |
| 4453 m_pageColorOverlay->update(); | 4460 m_pageColorOverlay->update(); |
| 4454 if (InspectorOverlay* overlay = inspectorOverlay()) { | 4461 if (InspectorOverlay* overlay = inspectorOverlay()) { |
| 4455 PageOverlay* inspectorPageOverlay = overlay->pageOverlay(); | 4462 PageOverlay* inspectorPageOverlay = overlay->pageOverlay(); |
| 4456 if (inspectorPageOverlay) | 4463 if (inspectorPageOverlay) |
| 4457 inspectorPageOverlay->update(); | 4464 inspectorPageOverlay->update(); |
| 4458 } | 4465 } |
| 4459 } | 4466 } |
| 4460 | 4467 |
| 4461 } // namespace blink | 4468 } // namespace blink |
| OLD | NEW |