From dea2efb645e7ac6bae644658f963b096c2800652 Mon Sep 17 00:00:00 2001 From: danakj Date: Thu, 10 Mar 2016 11:13:17 -0800 Subject: content: Rename virtual method on RenderView to not (ab)use blink style The RenderView::convertViewportToWindow method uses blink style to create a horrorshow inheritance hierarchy problem, where the same named method in RenderViewImpl inherits this method from two places (one in blink one in content) from RenderView and from RenderWidget. Fix this by renaming the method on RenderView to not use the same name as the blink method (even after blink uses chromium style). R=avi@chromium.org,jochen@chromium.org BUG=593446 Review URL: https://codereview.chromium.org/1781873002 Cr-Commit-Position: refs/heads/master@{#380441} --- extensions/renderer/extension_helper.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'extensions/renderer') diff --git a/extensions/renderer/extension_helper.cc b/extensions/renderer/extension_helper.cc index 728ea13..4d3bd27 100644 --- a/extensions/renderer/extension_helper.cc +++ b/extensions/renderer/extension_helper.cc @@ -47,7 +47,7 @@ void ExtensionHelper::DraggableRegionsChanged(blink::WebFrame* frame) { std::vector regions; for (size_t i = 0; i < webregions.size(); ++i) { DraggableRegion region; - render_view()->convertViewportToWindow(&webregions[i].bounds); + render_view()->ConvertViewportToWindowViaWidget(&webregions[i].bounds); region.bounds = webregions[i].bounds; region.draggable = webregions[i].draggable; regions.push_back(region); -- cgit v1.1