From 0f9dcd84d201313f3a44521953b41706edddf2a2 Mon Sep 17 00:00:00 2001 From: "dbaron%dbaron.org" Date: Thu, 22 Apr 2004 20:58:32 +0000 Subject: [PATCH] Fix windows bustage. b=241304 git-svn-id: svn://10.0.0.236/trunk@155350 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsGfxScrollFrame.cpp | 3 ++- mozilla/layout/html/base/src/nsGfxScrollFrame.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) 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;