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

Unified Diff: Source/core/frame/FrameView.cpp

Issue 26936002: Remove Widget's dependency upon its own inheritor aka ScrollView. This was nasty from an OO design… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink@master
Patch Set: Fix for clang compile error Created 7 years, 2 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
« no previous file with comments | « no previous file | Source/core/platform/ScrollView.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/FrameView.cpp
diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp
index 54f061d373455b45f334ac84a9e3ecc822b79fea..5b9a860851764df9bc27c40e1d2a5c17b2daec1d 100644
--- a/Source/core/frame/FrameView.cpp
+++ b/Source/core/frame/FrameView.cpp
@@ -3198,7 +3198,7 @@ IntPoint FrameView::convertToRenderer(const RenderObject* renderer, const IntPoi
IntRect FrameView::convertToContainingView(const IntRect& localRect) const
{
- if (const ScrollView* parentScrollView = parent()) {
+ if (const ScrollView* parentScrollView = toScrollView(parent())) {
if (parentScrollView->isFrameView()) {
const FrameView* parentView = toFrameView(parentScrollView);
// Get our renderer in the parent view
@@ -3221,7 +3221,7 @@ IntRect FrameView::convertToContainingView(const IntRect& localRect) const
IntRect FrameView::convertFromContainingView(const IntRect& parentRect) const
{
- if (const ScrollView* parentScrollView = parent()) {
+ if (const ScrollView* parentScrollView = toScrollView(parent())) {
if (parentScrollView->isFrameView()) {
const FrameView* parentView = toFrameView(parentScrollView);
@@ -3245,7 +3245,7 @@ IntRect FrameView::convertFromContainingView(const IntRect& parentRect) const
IntPoint FrameView::convertToContainingView(const IntPoint& localPoint) const
{
- if (const ScrollView* parentScrollView = parent()) {
+ if (const ScrollView* parentScrollView = toScrollView(parent())) {
if (parentScrollView->isFrameView()) {
const FrameView* parentView = toFrameView(parentScrollView);
@@ -3270,7 +3270,7 @@ IntPoint FrameView::convertToContainingView(const IntPoint& localPoint) const
IntPoint FrameView::convertFromContainingView(const IntPoint& parentPoint) const
{
- if (const ScrollView* parentScrollView = parent()) {
+ if (const ScrollView* parentScrollView = toScrollView(parent())) {
if (parentScrollView->isFrameView()) {
const FrameView* parentView = toFrameView(parentScrollView);
« no previous file with comments | « no previous file | Source/core/platform/ScrollView.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698