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

Unified Diff: third_party/WebKit/Source/platform/FrameViewBase.cpp

Issue 2730773003: Rename FrameViewBase fields and methods *Widget* to ...FrameViewBase... (Closed)
Patch Set: Created 3 years, 10 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: third_party/WebKit/Source/platform/FrameViewBase.cpp
diff --git a/third_party/WebKit/Source/platform/FrameViewBase.cpp b/third_party/WebKit/Source/platform/FrameViewBase.cpp
index b48054ff4dca207c6f30030d29fe154e30c6122d..b1c934775199ac0860ad4ed6502af187ccee0959 100644
--- a/third_party/WebKit/Source/platform/FrameViewBase.cpp
+++ b/third_party/WebKit/Source/platform/FrameViewBase.cpp
@@ -62,14 +62,14 @@ IntRect FrameViewBase::convertFromRootFrame(
if (const FrameViewBase* parentFrameViewBase = parent()) {
IntRect parentRect =
parentFrameViewBase->convertFromRootFrame(rectInRootFrame);
- return convertFromContainingWidget(parentRect);
+ return convertFromContainingFrameViewBase(parentRect);
}
return rectInRootFrame;
}
IntRect FrameViewBase::convertToRootFrame(const IntRect& localRect) const {
if (const FrameViewBase* parentFrameViewBase = parent()) {
- IntRect parentRect = convertToContainingWidget(localRect);
+ IntRect parentRect = convertToContainingFrameViewBase(localRect);
return parentFrameViewBase->convertToRootFrame(parentRect);
}
return localRect;
@@ -80,7 +80,7 @@ IntPoint FrameViewBase::convertFromRootFrame(
if (const FrameViewBase* parentFrameViewBase = parent()) {
IntPoint parentPoint =
parentFrameViewBase->convertFromRootFrame(pointInRootFrame);
- return convertFromContainingWidget(parentPoint);
+ return convertFromContainingFrameViewBase(parentPoint);
}
return pointInRootFrame;
}
@@ -108,13 +108,13 @@ FloatPoint FrameViewBase::convertFromRootFrame(
IntPoint FrameViewBase::convertToRootFrame(const IntPoint& localPoint) const {
if (const FrameViewBase* parentFrameViewBase = parent()) {
- IntPoint parentPoint = convertToContainingWidget(localPoint);
+ IntPoint parentPoint = convertToContainingFrameViewBase(localPoint);
return parentFrameViewBase->convertToRootFrame(parentPoint);
}
return localPoint;
}
-IntRect FrameViewBase::convertToContainingWidget(
+IntRect FrameViewBase::convertToContainingFrameViewBase(
const IntRect& localRect) const {
if (const FrameViewBase* parentFrameViewBase = parent()) {
IntRect parentRect(localRect);
@@ -125,7 +125,7 @@ IntRect FrameViewBase::convertToContainingWidget(
return localRect;
}
-IntRect FrameViewBase::convertFromContainingWidget(
+IntRect FrameViewBase::convertFromContainingFrameViewBase(
const IntRect& parentRect) const {
if (const FrameViewBase* parentFrameViewBase = parent()) {
IntRect localRect = parentRect;
@@ -137,7 +137,7 @@ IntRect FrameViewBase::convertFromContainingWidget(
return parentRect;
}
-IntPoint FrameViewBase::convertToContainingWidget(
+IntPoint FrameViewBase::convertToContainingFrameViewBase(
const IntPoint& localPoint) const {
if (const FrameViewBase* parentFrameViewBase = parent())
return parentFrameViewBase->convertChildToSelf(this, localPoint);
@@ -145,7 +145,7 @@ IntPoint FrameViewBase::convertToContainingWidget(
return localPoint;
}
-IntPoint FrameViewBase::convertFromContainingWidget(
+IntPoint FrameViewBase::convertFromContainingFrameViewBase(
const IntPoint& parentPoint) const {
if (const FrameViewBase* parentFrameViewBase = parent())
return parentFrameViewBase->convertSelfToChild(this, parentPoint);
« no previous file with comments | « third_party/WebKit/Source/platform/FrameViewBase.h ('k') | third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698