diff --git a/mozilla/layout/generic/nsGfxScrollFrame.cpp b/mozilla/layout/generic/nsGfxScrollFrame.cpp index 1a218d712c1..2ff37f9d783 100644 --- a/mozilla/layout/generic/nsGfxScrollFrame.cpp +++ b/mozilla/layout/generic/nsGfxScrollFrame.cpp @@ -657,7 +657,8 @@ nsGfxScrollFrame::GetScrollbarStyles() const PRUint8 overflow; if (GetParent() && GetParent()->GetType() == nsLayoutAtoms::viewportFrame && // Make sure we're actually the root scrollframe - GetParent()->GetFirstChild(nsnull) == this) { + GetParent()->GetFirstChild(nsnull) == + NS_STATIC_CAST(const nsIFrame*, this)) { overflow = GetPresContext()->GetViewportOverflowOverride(); } else { overflow = GetStyleDisplay()->mOverflow; diff --git a/mozilla/layout/html/base/src/nsGfxScrollFrame.cpp b/mozilla/layout/html/base/src/nsGfxScrollFrame.cpp index 1a218d712c1..2ff37f9d783 100644 --- a/mozilla/layout/html/base/src/nsGfxScrollFrame.cpp +++ b/mozilla/layout/html/base/src/nsGfxScrollFrame.cpp @@ -657,7 +657,8 @@ nsGfxScrollFrame::GetScrollbarStyles() const PRUint8 overflow; if (GetParent() && GetParent()->GetType() == nsLayoutAtoms::viewportFrame && // Make sure we're actually the root scrollframe - GetParent()->GetFirstChild(nsnull) == this) { + GetParent()->GetFirstChild(nsnull) == + NS_STATIC_CAST(const nsIFrame*, this)) { overflow = GetPresContext()->GetViewportOverflowOverride(); } else { overflow = GetStyleDisplay()->mOverflow;