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

Unified Diff: content/renderer/render_view_impl.cc

Issue 1781873002: content: Rename virtual method on RenderView to not (ab)use blink style (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: renderwidget-overrides Created 4 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 807be3129ada9415b933e0f9f17b387f993db824..00db538ea70590d12f6648937746e1600a5ca5d3 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -1958,7 +1958,7 @@ void RenderViewImpl::startDragging(WebLocalFrame* frame,
const WebImage& image,
const WebPoint& webImageOffset) {
blink::WebRect offset_in_window(webImageOffset.x, webImageOffset.y, 0, 0);
- convertViewportToWindow(&offset_in_window);
+ ConvertViewportToWindowViaWidget(&offset_in_window);
DropData drop_data(DropDataBuilder::Build(data));
drop_data.referrer_policy = frame->document().referrerPolicy();
gfx::Vector2d imageOffset(offset_in_window.x, offset_in_window.y);
@@ -1989,7 +1989,7 @@ void RenderViewImpl::focusedNodeChanged(const WebNode& fromNode,
if (!toNode.isNull() && toNode.isElementNode()) {
WebElement element = const_cast<WebNode&>(toNode).to<WebElement>();
blink::WebRect rect = element.boundsInViewport();
- convertViewportToWindow(&rect);
+ ConvertViewportToWindowViaWidget(&rect);
node_bounds = gfx::Rect(rect);
is_editable = element.isEditable();
}
@@ -2187,14 +2187,14 @@ const std::string& RenderViewImpl::GetAcceptLanguages() const {
return renderer_preferences_.accept_languages;
}
-void RenderViewImpl::convertViewportToWindow(blink::WebRect* rect) {
- RenderWidget::convertViewportToWindow(rect);
+void RenderViewImpl::ConvertViewportToWindowViaWidget(blink::WebRect* rect) {
+ convertViewportToWindow(rect);
danakj 2016/03/09 23:17:24 In future, this could be GetWidget()->convert...()
}
gfx::RectF RenderViewImpl::ElementBoundsInWindow(
const blink::WebElement& element) {
blink::WebRect bounding_box_in_window = element.boundsInViewport();
- convertViewportToWindow(&bounding_box_in_window);
+ ConvertViewportToWindowViaWidget(&bounding_box_in_window);
return gfx::RectF(bounding_box_in_window);
}
@@ -3076,7 +3076,7 @@ void RenderViewImpl::GetSelectionBounds(gfx::Rect* start, gfx::Rect* end) {
// use the caret position as an empty range for now. It will be updated
// after Pepper API equips features related to surrounding text retrieval.
blink::WebRect caret(focused_pepper_plugin_->GetCaretBounds());
- convertViewportToWindow(&caret);
+ ConvertViewportToWindowViaWidget(&caret);
*start = caret;
*end = caret;
return;
@@ -3117,7 +3117,7 @@ void RenderViewImpl::GetCompositionCharacterBounds(
bounds_in_window->clear();
return;
}
- convertViewportToWindow(&webrect);
+ ConvertViewportToWindowViaWidget(&webrect);
bounds_in_window->push_back(webrect);
}
}

Powered by Google App Engine
This is Rietveld 408576698