diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp
index 8bfa865ed553..80842e9588bf 100644
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -1208,11 +1208,6 @@ nsObjectFrame::ComputeWidgetGeometry(const nsRegion& aRegion,
nsRect bounds = GetContentRect() + GetParent()->GetOffsetTo(rootFrame);
configuration->mBounds = bounds.ToNearestPixels(appUnitsPerDevPixel);
- // This should produce basically the same rectangle (but not relative
- // to the root frame). We only call this here for the side-effect of
- // setting mViewToWidgetOffset on the view.
- mInnerView->CalcWidgetBounds(eWindowType_plugin);
-
nsRegionRectIterator iter(aRegion);
nsIntPoint pluginOrigin = aPluginOrigin.ToNearestPixels(appUnitsPerDevPixel);
for (const nsRect* r = iter.Next(); r; r = iter.Next()) {
diff --git a/layout/reftests/bugs/546071-1-ref.html b/layout/reftests/bugs/546071-1-ref.html
deleted file mode 100644
index 07607872c0cf..000000000000
--- a/layout/reftests/bugs/546071-1-ref.html
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/layout/reftests/bugs/546071-1.html b/layout/reftests/bugs/546071-1.html
deleted file mode 100644
index d996613e2faa..000000000000
--- a/layout/reftests/bugs/546071-1.html
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list
index 72b897fc002c..246fa112d6c0 100644
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -1393,4 +1393,3 @@ fails HTTP(..) == 518172-2b.html 518172-b-ref.html # bug 518172
== 541382-1.html 541382-1-ref.html
== 541406-1.html 541406-1-ref.html
== 546033-1.html 546033-1-ref.html
-== 546071-1.html 546071-1-ref.html
diff --git a/view/public/nsIView.h b/view/public/nsIView.h
index ff091c4c3e79..a84f030b62ed 100644
--- a/view/public/nsIView.h
+++ b/view/public/nsIView.h
@@ -63,8 +63,8 @@ enum nsViewVisibility {
// IID for the nsIView interface
#define NS_IVIEW_IID \
- { 0xe981334b, 0x756e, 0x417a, \
- { 0xbf, 0x18, 0x47, 0x4a, 0x2d, 0xfe, 0xc3, 0x87 } }
+ { 0x4435167c, 0xb627, 0x4073, \
+ { 0x9c, 0x92, 0xbc, 0x34, 0x39, 0xd9, 0xf8, 0xd2 } }
// Public view flags are defined in this file
#define NS_VIEW_FLAGS_PUBLIC 0x00FF
@@ -334,11 +334,6 @@ public:
virtual PRBool ExternalIsRoot() const;
void SetDeletionObserver(nsWeakView* aDeletionObserver);
-
- nsIntRect CalcWidgetBounds(nsWindowType aType);
-
- PRBool IsEffectivelyVisible();
-
protected:
friend class nsWeakView;
nsViewManager *mViewManager;
@@ -351,7 +346,6 @@ protected:
nsViewVisibility mVis;
nscoord mPosX, mPosY;
nsRect mDimBounds; // relative to parent
- nsPoint mViewToWidgetOffset;
float mOpacity;
PRUint32 mVFlags;
nsWeakView* mDeletionObserver;
diff --git a/view/src/nsView.cpp b/view/src/nsView.cpp
index f1566e3e17a5..501408a10553 100644
--- a/view/src/nsView.cpp
+++ b/view/src/nsView.cpp
@@ -328,16 +328,16 @@ void nsView::ResetWidgetBounds(PRBool aRecurse, PRBool aMoveOnly,
}
}
-PRBool nsIView::IsEffectivelyVisible()
+PRBool nsView::IsEffectivelyVisible()
{
- for (nsIView* v = this; v; v = v->mParent) {
+ for (nsView* v = this; v; v = v->mParent) {
if (v->GetVisibility() == nsViewVisibility_kHide)
return PR_FALSE;
}
return PR_TRUE;
}
-nsIntRect nsIView::CalcWidgetBounds(nsWindowType aType)
+nsIntRect nsView::CalcWidgetBounds(nsWindowType aType)
{
nsCOMPtr dx;
mViewManager->GetDeviceContext(*getter_AddRefs(dx));
diff --git a/view/src/nsView.h b/view/src/nsView.h
index 31c053656e25..bc162d0c8dea 100644
--- a/view/src/nsView.h
+++ b/view/src/nsView.h
@@ -195,12 +195,17 @@ public:
return mViewToWidgetOffset;
}
+ nsIntRect CalcWidgetBounds(nsWindowType aType);
+
+ PRBool IsEffectivelyVisible();
+
protected:
// Do the actual work of ResetWidgetBounds, unconditionally. Don't
// call this method if we have no widget.
void DoResetWidgetBounds(PRBool aMoveOnly, PRBool aInvalidateChangedSize);
nsRegion* mDirtyRegion;
+ nsPoint mViewToWidgetOffset;
};
#endif