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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
126 #include "public/web/WebAutofillClient.h" | 126 #include "public/web/WebAutofillClient.h" |
127 #include "public/web/WebBeginFrameArgs.h" | 127 #include "public/web/WebBeginFrameArgs.h" |
128 #include "public/web/WebFrameClient.h" | 128 #include "public/web/WebFrameClient.h" |
129 #include "public/web/WebHitTestResult.h" | 129 #include "public/web/WebHitTestResult.h" |
130 #include "public/web/WebInputElement.h" | 130 #include "public/web/WebInputElement.h" |
131 #include "public/web/WebMediaPlayerAction.h" | 131 #include "public/web/WebMediaPlayerAction.h" |
132 #include "public/web/WebNode.h" | 132 #include "public/web/WebNode.h" |
133 #include "public/web/WebPlugin.h" | 133 #include "public/web/WebPlugin.h" |
134 #include "public/web/WebPluginAction.h" | 134 #include "public/web/WebPluginAction.h" |
135 #include "public/web/WebRange.h" | 135 #include "public/web/WebRange.h" |
| 136 #include "public/web/WebSelection.h" |
136 #include "public/web/WebTextInputInfo.h" | 137 #include "public/web/WebTextInputInfo.h" |
137 #include "public/web/WebViewClient.h" | 138 #include "public/web/WebViewClient.h" |
138 #include "public/web/WebWindowFeatures.h" | 139 #include "public/web/WebWindowFeatures.h" |
139 #include "web/CompositionUnderlineVectorBuilder.h" | 140 #include "web/CompositionUnderlineVectorBuilder.h" |
140 #include "web/ContextFeaturesClientImpl.h" | 141 #include "web/ContextFeaturesClientImpl.h" |
141 #include "web/DatabaseClientImpl.h" | 142 #include "web/DatabaseClientImpl.h" |
142 #include "web/DevToolsEmulator.h" | 143 #include "web/DevToolsEmulator.h" |
143 #include "web/FullscreenController.h" | 144 #include "web/FullscreenController.h" |
144 #include "web/GraphicsLayerFactoryChromium.h" | 145 #include "web/GraphicsLayerFactoryChromium.h" |
145 #include "web/InspectorOverlayImpl.h" | 146 #include "web/InspectorOverlayImpl.h" |
(...skipping 1852 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1998 void WebViewImpl::enterFullScreenForElement(Element* element) | 1999 void WebViewImpl::enterFullScreenForElement(Element* element) |
1999 { | 2000 { |
2000 m_fullscreenController->enterFullScreenForElement(element); | 2001 m_fullscreenController->enterFullScreenForElement(element); |
2001 } | 2002 } |
2002 | 2003 |
2003 void WebViewImpl::exitFullScreenForElement(Element* element) | 2004 void WebViewImpl::exitFullScreenForElement(Element* element) |
2004 { | 2005 { |
2005 m_fullscreenController->exitFullScreenForElement(element); | 2006 m_fullscreenController->exitFullScreenForElement(element); |
2006 } | 2007 } |
2007 | 2008 |
2008 void WebViewImpl::clearCompositedSelectionBounds() | 2009 void WebViewImpl::clearCompositedSelection() |
2009 { | 2010 { |
2010 if (m_layerTreeView) | 2011 if (m_layerTreeView) |
2011 m_layerTreeView->clearSelection(); | 2012 m_layerTreeView->clearSelection(); |
2012 } | 2013 } |
2013 | 2014 |
2014 void WebViewImpl::updateCompositedSelectionBounds(const WebSelectionBound& ancho
r, const WebSelectionBound& focus) | 2015 void WebViewImpl::updateCompositedSelection(const WebSelection& selection) |
2015 { | 2016 { |
2016 if (m_layerTreeView) | 2017 if (m_layerTreeView) { |
2017 m_layerTreeView->registerSelection(anchor, focus); | 2018 m_layerTreeView->registerSelection(selection); |
| 2019 // TODO(jdduke): Remove this overload when downstream consumers have bee
n updated, crbug.com/466672. |
| 2020 m_layerTreeView->registerSelection(selection.start(), selection.end()); |
| 2021 } |
2018 } | 2022 } |
2019 | 2023 |
2020 bool WebViewImpl::hasHorizontalScrollbar() | 2024 bool WebViewImpl::hasHorizontalScrollbar() |
2021 { | 2025 { |
2022 return mainFrameImpl()->frameView()->horizontalScrollbar(); | 2026 return mainFrameImpl()->frameView()->horizontalScrollbar(); |
2023 } | 2027 } |
2024 | 2028 |
2025 bool WebViewImpl::hasVerticalScrollbar() | 2029 bool WebViewImpl::hasVerticalScrollbar() |
2026 { | 2030 { |
2027 return mainFrameImpl()->frameView()->verticalScrollbar(); | 2031 return mainFrameImpl()->frameView()->verticalScrollbar(); |
(...skipping 2480 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4508 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 4512 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
4509 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); | 4513 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); |
4510 } | 4514 } |
4511 | 4515 |
4512 void WebViewImpl::forceNextWebGLContextCreationToFail() | 4516 void WebViewImpl::forceNextWebGLContextCreationToFail() |
4513 { | 4517 { |
4514 WebGLRenderingContext::forceNextWebGLContextCreationToFail(); | 4518 WebGLRenderingContext::forceNextWebGLContextCreationToFail(); |
4515 } | 4519 } |
4516 | 4520 |
4517 } // namespace blink | 4521 } // namespace blink |
OLD | NEW |