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

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

Issue 2121373002: Move allowsBrokenNullLayerTreeView calls from WebViewClient to WebWidgetClient. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: adds override in RenderViewImpl to make sure we use the correct client Created 4 years, 5 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 1986 matching lines...) Expand 10 before | Expand all | Expand 10 after
1997 InputHandlerManager* input_handler_manager = 1997 InputHandlerManager* input_handler_manager =
1998 render_thread ? render_thread->input_handler_manager() : NULL; 1998 render_thread ? render_thread->input_handler_manager() : NULL;
1999 if (input_handler_manager) { 1999 if (input_handler_manager) {
2000 input_handler_manager->AddInputHandler( 2000 input_handler_manager->AddInputHandler(
2001 GetRoutingID(), rwc->GetInputHandler(), AsWeakPtr(), 2001 GetRoutingID(), rwc->GetInputHandler(), AsWeakPtr(),
2002 webkit_preferences_.enable_scroll_animator); 2002 webkit_preferences_.enable_scroll_animator);
2003 has_added_input_handler_ = true; 2003 has_added_input_handler_ = true;
2004 } 2004 }
2005 } 2005 }
2006 2006
2007 bool RenderViewImpl::allowsBrokenNullLayerTreeView() const {
2008 return RenderWidget::allowsBrokenNullLayerTreeView();
2009 }
2010
2011 void RenderViewImpl::closeWidgetSoon() { 2007 void RenderViewImpl::closeWidgetSoon() {
2012 RenderWidget::closeWidgetSoon(); 2008 RenderWidget::closeWidgetSoon();
2013 } 2009 }
2014 2010
2015 void RenderViewImpl::convertViewportToWindow(blink::WebRect* rect) { 2011 void RenderViewImpl::convertViewportToWindow(blink::WebRect* rect) {
2016 RenderWidget::convertViewportToWindow(rect); 2012 RenderWidget::convertViewportToWindow(rect);
2017 } 2013 }
2018 2014
2019 void RenderViewImpl::convertWindowToViewport(blink::WebFloatRect* rect) { 2015 void RenderViewImpl::convertWindowToViewport(blink::WebFloatRect* rect) {
2020 RenderWidget::convertWindowToViewport(rect); 2016 RenderWidget::convertWindowToViewport(rect);
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
2100 } 2096 }
2101 2097
2102 blink::WebRect RenderViewImpl::windowRect() { 2098 blink::WebRect RenderViewImpl::windowRect() {
2103 return RenderWidget::windowRect(); 2099 return RenderWidget::windowRect();
2104 } 2100 }
2105 2101
2106 blink::WebRect RenderViewImpl::windowResizerRect() { 2102 blink::WebRect RenderViewImpl::windowResizerRect() {
2107 return RenderWidget::windowResizerRect(); 2103 return RenderWidget::windowResizerRect();
2108 } 2104 }
2109 2105
2106 blink::WebWidgetClient* RenderViewImpl::widgetClient() {
2107 return static_cast<RenderWidget*>(this);
2108 }
2109
2110 // blink::WebFrameClient ----------------------------------------------------- 2110 // blink::WebFrameClient -----------------------------------------------------
2111 2111
2112 void RenderViewImpl::Repaint(const gfx::Size& size) { 2112 void RenderViewImpl::Repaint(const gfx::Size& size) {
2113 OnRepaint(size); 2113 OnRepaint(size);
2114 } 2114 }
2115 2115
2116 void RenderViewImpl::SetEditCommandForNextKeyEvent(const std::string& name, 2116 void RenderViewImpl::SetEditCommandForNextKeyEvent(const std::string& name,
2117 const std::string& value) { 2117 const std::string& value) {
2118 EditCommands edit_commands; 2118 EditCommands edit_commands;
2119 edit_commands.push_back(EditCommand(name, value)); 2119 edit_commands.push_back(EditCommand(name, value));
(...skipping 1141 matching lines...) Expand 10 before | Expand all | Expand 10 after
3261 return render_frame->focused_pepper_plugin(); 3261 return render_frame->focused_pepper_plugin();
3262 } 3262 }
3263 frame = frame->traverseNext(false); 3263 frame = frame->traverseNext(false);
3264 } 3264 }
3265 3265
3266 return nullptr; 3266 return nullptr;
3267 } 3267 }
3268 #endif 3268 #endif
3269 3269
3270 } // namespace content 3270 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698