diff options
| author | danakj <danakj@chromium.org> | 2016-03-10 11:13:17 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-10 19:14:51 +0000 |
| commit | dea2efb645e7ac6bae644658f963b096c2800652 (patch) | |
| tree | cec680955c50f7b7be9082a6f29a90db25320474 /extensions/renderer | |
| parent | 89e5e9707432b52b19046f8aedee9021aae97e31 (diff) | |
| download | chromium_src-dea2efb645e7ac6bae644658f963b096c2800652.zip chromium_src-dea2efb645e7ac6bae644658f963b096c2800652.tar.gz chromium_src-dea2efb645e7ac6bae644658f963b096c2800652.tar.bz2 | |
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}
Diffstat (limited to 'extensions/renderer')
| -rw-r--r-- | extensions/renderer/extension_helper.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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<DraggableRegion> 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); |