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 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
127 #include "public/web/WebAutofillClient.h" | 127 #include "public/web/WebAutofillClient.h" |
128 #include "public/web/WebBeginFrameArgs.h" | 128 #include "public/web/WebBeginFrameArgs.h" |
129 #include "public/web/WebFrameClient.h" | 129 #include "public/web/WebFrameClient.h" |
130 #include "public/web/WebHitTestResult.h" | 130 #include "public/web/WebHitTestResult.h" |
131 #include "public/web/WebInputElement.h" | 131 #include "public/web/WebInputElement.h" |
132 #include "public/web/WebMediaPlayerAction.h" | 132 #include "public/web/WebMediaPlayerAction.h" |
133 #include "public/web/WebNode.h" | 133 #include "public/web/WebNode.h" |
134 #include "public/web/WebPlugin.h" | 134 #include "public/web/WebPlugin.h" |
135 #include "public/web/WebPluginAction.h" | 135 #include "public/web/WebPluginAction.h" |
136 #include "public/web/WebRange.h" | 136 #include "public/web/WebRange.h" |
137 #include "public/web/WebSelection.h" | |
137 #include "public/web/WebTextInputInfo.h" | 138 #include "public/web/WebTextInputInfo.h" |
138 #include "public/web/WebViewClient.h" | 139 #include "public/web/WebViewClient.h" |
139 #include "public/web/WebWindowFeatures.h" | 140 #include "public/web/WebWindowFeatures.h" |
140 #include "web/CompositionUnderlineVectorBuilder.h" | 141 #include "web/CompositionUnderlineVectorBuilder.h" |
141 #include "web/ContextFeaturesClientImpl.h" | 142 #include "web/ContextFeaturesClientImpl.h" |
142 #include "web/DatabaseClientImpl.h" | 143 #include "web/DatabaseClientImpl.h" |
143 #include "web/DevToolsEmulator.h" | 144 #include "web/DevToolsEmulator.h" |
144 #include "web/FullscreenController.h" | 145 #include "web/FullscreenController.h" |
145 #include "web/GraphicsLayerFactoryChromium.h" | 146 #include "web/GraphicsLayerFactoryChromium.h" |
146 #include "web/InspectorEmulationAgent.h" | 147 #include "web/InspectorEmulationAgent.h" |
(...skipping 1866 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2013 void WebViewImpl::enterFullScreenForElement(Element* element) | 2014 void WebViewImpl::enterFullScreenForElement(Element* element) |
2014 { | 2015 { |
2015 m_fullscreenController->enterFullScreenForElement(element); | 2016 m_fullscreenController->enterFullScreenForElement(element); |
2016 } | 2017 } |
2017 | 2018 |
2018 void WebViewImpl::exitFullScreenForElement(Element* element) | 2019 void WebViewImpl::exitFullScreenForElement(Element* element) |
2019 { | 2020 { |
2020 m_fullscreenController->exitFullScreenForElement(element); | 2021 m_fullscreenController->exitFullScreenForElement(element); |
2021 } | 2022 } |
2022 | 2023 |
2023 void WebViewImpl::clearCompositedSelectionBounds() | 2024 void WebViewImpl::clearCompositedSelection() |
2024 { | 2025 { |
2025 if (m_layerTreeView) | 2026 if (m_layerTreeView) |
2026 m_layerTreeView->clearSelection(); | 2027 m_layerTreeView->clearSelection(); |
2027 } | 2028 } |
2028 | 2029 |
2029 void WebViewImpl::updateCompositedSelectionBounds(const WebSelectionBound& ancho r, const WebSelectionBound& focus) | 2030 void WebViewImpl::updateCompositedSelection(const WebSelection& selection) |
2030 { | 2031 { |
2031 if (m_layerTreeView) | 2032 if (m_layerTreeView) { |
2032 m_layerTreeView->registerSelection(anchor, focus); | 2033 m_layerTreeView->registerSelection(selection); |
2034 // FIXME: Remove this overload when downstream consumers have been updat ed, crbug.com/466672. | |
yoichio
2015/03/30 05:07:38
Use "TODO(jdduke)" as this comment style was chang
jdduke (slow)
2015/03/30 15:24:44
Yay! Done.
| |
2035 m_layerTreeView->registerSelection(selection.start(), selection.end()); | |
2036 } | |
2033 } | 2037 } |
2034 | 2038 |
2035 bool WebViewImpl::hasHorizontalScrollbar() | 2039 bool WebViewImpl::hasHorizontalScrollbar() |
2036 { | 2040 { |
2037 return mainFrameImpl()->frameView()->horizontalScrollbar(); | 2041 return mainFrameImpl()->frameView()->horizontalScrollbar(); |
2038 } | 2042 } |
2039 | 2043 |
2040 bool WebViewImpl::hasVerticalScrollbar() | 2044 bool WebViewImpl::hasVerticalScrollbar() |
2041 { | 2045 { |
2042 return mainFrameImpl()->frameView()->verticalScrollbar(); | 2046 return mainFrameImpl()->frameView()->verticalScrollbar(); |
(...skipping 2642 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
4685 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 4689 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
4686 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); | 4690 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); |
4687 } | 4691 } |
4688 | 4692 |
4689 void WebViewImpl::forceNextWebGLContextCreationToFail() | 4693 void WebViewImpl::forceNextWebGLContextCreationToFail() |
4690 { | 4694 { |
4691 WebGLRenderingContext::forceNextWebGLContextCreationToFail(); | 4695 WebGLRenderingContext::forceNextWebGLContextCreationToFail(); |
4692 } | 4696 } |
4693 | 4697 |
4694 } // namespace blink | 4698 } // namespace blink |
OLD | NEW |