Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(16)

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 1924043002: Switch the inheritance of WebViewClient from WebWidgetClient to protected. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase, fix new test Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <memory> 9 #include <memory>
10 10
(...skipping 2052 matching lines...) Expand 10 before | Expand all | Expand 10 after
2063 render_thread ? render_thread->input_handler_manager() : NULL; 2063 render_thread ? render_thread->input_handler_manager() : NULL;
2064 if (input_handler_manager) { 2064 if (input_handler_manager) {
2065 input_handler_manager->AddInputHandler( 2065 input_handler_manager->AddInputHandler(
2066 GetRoutingID(), rwc->GetInputHandler(), AsWeakPtr(), 2066 GetRoutingID(), rwc->GetInputHandler(), AsWeakPtr(),
2067 webkit_preferences_.enable_scroll_animator, 2067 webkit_preferences_.enable_scroll_animator,
2068 UseGestureBasedWheelScrolling()); 2068 UseGestureBasedWheelScrolling());
2069 } 2069 }
2070 } 2070 }
2071 } 2071 }
2072 2072
2073 bool RenderViewImpl::allowsBrokenNullLayerTreeView() const {
2074 return RenderWidget::allowsBrokenNullLayerTreeView();
2075 }
2076
2077 void RenderViewImpl::closeWidgetSoon() {
2078 RenderWidget::closeWidgetSoon();
2079 }
2080
2081 void RenderViewImpl::convertViewportToWindow(blink::WebRect* rect) {
2082 RenderWidget::convertViewportToWindow(rect);
2083 }
2084
2085 void RenderViewImpl::convertWindowToViewport(blink::WebFloatRect* rect) {
2086 RenderWidget::convertWindowToViewport(rect);
2087 }
2088
2089 void RenderViewImpl::didAutoResize(const blink::WebSize& newSize) {
2090 RenderWidget::didAutoResize(newSize);
2091 }
2092
2093 void RenderViewImpl::didChangeCursor(const blink::WebCursorInfo& info) {
2094 RenderWidget::didChangeCursor(info);
2095 }
2096
2097 void RenderViewImpl::didInvalidateRect(const blink::WebRect& rect) {
2098 RenderWidget::didInvalidateRect(rect);
2099 }
2100
2101 void RenderViewImpl::didMeaningfulLayout(
2102 blink::WebMeaningfulLayout layout_type) {
2103 RenderWidget::didMeaningfulLayout(layout_type);
2104 }
2105
2106 void RenderViewImpl::didOverscroll(
2107 const blink::WebFloatSize& overscrollDelta,
2108 const blink::WebFloatSize& accumulatedOverscroll,
2109 const blink::WebFloatPoint& positionInViewport,
2110 const blink::WebFloatSize& velocityInViewport) {
2111 RenderWidget::didOverscroll(overscrollDelta, accumulatedOverscroll,
2112 positionInViewport, velocityInViewport);
2113 }
2114
2115 void RenderViewImpl::didUpdateTextOfFocusedElementByNonUserInput() {
2116 RenderWidget::didUpdateTextOfFocusedElementByNonUserInput();
2117 }
2118
2119 void RenderViewImpl::hasTouchEventHandlers(bool has_handlers) {
2120 RenderWidget::hasTouchEventHandlers(has_handlers);
2121 }
2122
2123 blink::WebLayerTreeView* RenderViewImpl::layerTreeView() {
2124 return RenderWidget::layerTreeView();
2125 }
2126
2127 void RenderViewImpl::resetInputMethod() {
2128 RenderWidget::resetInputMethod();
2129 }
2130
2131 blink::WebRect RenderViewImpl::rootWindowRect() {
2132 return RenderWidget::rootWindowRect();
2133 }
2134
2135 void RenderViewImpl::scheduleAnimation() {
2136 RenderWidget::scheduleAnimation();
2137 }
2138
2139 blink::WebScreenInfo RenderViewImpl::screenInfo() {
2140 return RenderWidget::screenInfo();
2141 }
2142
2143 void RenderViewImpl::setToolTipText(const blink::WebString& text,
2144 blink::WebTextDirection hint) {
2145 RenderWidget::setToolTipText(text, hint);
2146 }
2147
2148 void RenderViewImpl::setTouchAction(blink::WebTouchAction touchAction) {
2149 RenderWidget::setTouchAction(touchAction);
2150 }
2151
2152 void RenderViewImpl::setWindowRect(const blink::WebRect& rect) {
2153 RenderWidget::setWindowRect(rect);
2154 }
2155
2156 void RenderViewImpl::showImeIfNeeded() {
2157 RenderWidget::showImeIfNeeded();
2158 }
2159
2160 void RenderViewImpl::showUnhandledTapUIIfNeeded(
2161 const blink::WebPoint& tappedPosition,
2162 const blink::WebNode& tappedNode,
2163 bool pageChanged) {
2164 RenderWidget::showUnhandledTapUIIfNeeded(tappedPosition, tappedNode,
2165 pageChanged);
2166 }
2167
2168 blink::WebRect RenderViewImpl::windowRect() {
2169 return RenderWidget::windowRect();
2170 }
2171
2172 blink::WebRect RenderViewImpl::windowResizerRect() {
2173 return RenderWidget::windowResizerRect();
2174 }
2175
2073 // blink::WebFrameClient ----------------------------------------------------- 2176 // blink::WebFrameClient -----------------------------------------------------
2074 2177
2075 void RenderViewImpl::Repaint(const gfx::Size& size) { 2178 void RenderViewImpl::Repaint(const gfx::Size& size) {
2076 OnRepaint(size); 2179 OnRepaint(size);
2077 } 2180 }
2078 2181
2079 void RenderViewImpl::SetEditCommandForNextKeyEvent(const std::string& name, 2182 void RenderViewImpl::SetEditCommandForNextKeyEvent(const std::string& name,
2080 const std::string& value) { 2183 const std::string& value) {
2081 EditCommands edit_commands; 2184 EditCommands edit_commands;
2082 edit_commands.push_back(EditCommand(name, value)); 2185 edit_commands.push_back(EditCommand(name, value));
(...skipping 1226 matching lines...) Expand 10 before | Expand all | Expand 10 after
3309 if (IsUseZoomForDSFEnabled()) { 3412 if (IsUseZoomForDSFEnabled()) {
3310 webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_); 3413 webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_);
3311 } else { 3414 } else {
3312 webview()->setDeviceScaleFactor(device_scale_factor_); 3415 webview()->setDeviceScaleFactor(device_scale_factor_);
3313 } 3416 }
3314 webview()->settings()->setPreferCompositingToLCDTextEnabled( 3417 webview()->settings()->setPreferCompositingToLCDTextEnabled(
3315 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); 3418 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_));
3316 } 3419 }
3317 3420
3318 } // namespace content 3421 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698