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);