From 3d0e577f40cb0ce764802af5755f87f485ba4313 Mon Sep 17 00:00:00 2001
From: "dbaron%dbaron.org"
 <dbaron%dbaron.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 21 Sep 2004 05:04:01 +0000
Subject: [PATCH] Fix bustage.  b=259615 (and 258521)

git-svn-id: svn://10.0.0.236/trunk@162581 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/layout/base/nsLayoutUtils.cpp     | 5 ++---
 mozilla/layout/base/src/nsLayoutUtils.cpp | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/mozilla/layout/base/nsLayoutUtils.cpp b/mozilla/layout/base/nsLayoutUtils.cpp
index 6989da12f5d..899d25e8c5c 100644
--- a/mozilla/layout/base/nsLayoutUtils.cpp
+++ b/mozilla/layout/base/nsLayoutUtils.cpp
@@ -353,9 +353,8 @@ nsLayoutUtils::FindSiblingViewFor(nsIView* aParentView, nsIFrame* aFrame) {
 nsPresContext::ScrollbarStyles
 nsLayoutUtils::ScrollbarStylesOfView(nsIScrollableView *aScrollableView)
 {
-  nsIView *view;
-  CallQueryInterface(aScrollableView, &view);
-  nsIFrame *frame = NS_STATIC_CAST(nsIFrame*, view->GetClientData());
+  nsIFrame *frame =
+    NS_STATIC_CAST(nsIFrame*, aScrollableView->View()->GetClientData());
   if (frame && ((frame = frame->GetParent()))) {
     nsIScrollableFrame *sf;
     CallQueryInterface(frame, &sf);
diff --git a/mozilla/layout/base/src/nsLayoutUtils.cpp b/mozilla/layout/base/src/nsLayoutUtils.cpp
index 6989da12f5d..899d25e8c5c 100644
--- a/mozilla/layout/base/src/nsLayoutUtils.cpp
+++ b/mozilla/layout/base/src/nsLayoutUtils.cpp
@@ -353,9 +353,8 @@ nsLayoutUtils::FindSiblingViewFor(nsIView* aParentView, nsIFrame* aFrame) {
 nsPresContext::ScrollbarStyles
 nsLayoutUtils::ScrollbarStylesOfView(nsIScrollableView *aScrollableView)
 {
-  nsIView *view;
-  CallQueryInterface(aScrollableView, &view);
-  nsIFrame *frame = NS_STATIC_CAST(nsIFrame*, view->GetClientData());
+  nsIFrame *frame =
+    NS_STATIC_CAST(nsIFrame*, aScrollableView->View()->GetClientData());
   if (frame && ((frame = frame->GetParent()))) {
     nsIScrollableFrame *sf;
     CallQueryInterface(frame, &sf);