diff --git a/widget/xpwidgets/nsBaseWidget.cpp b/widget/xpwidgets/nsBaseWidget.cpp index e95e9431b92..2431113ce70 100644 --- a/widget/xpwidgets/nsBaseWidget.cpp +++ b/widget/xpwidgets/nsBaseWidget.cpp @@ -851,7 +851,7 @@ nsBaseWidget::ComputeShouldAccelerate(bool aDefault) #endif // we should use AddBoolPrefVarCache - bool disableAcceleration = IsSmallPopup() || gfxPlatform::GetPrefLayersAccelerationDisabled(); + bool disableAcceleration = gfxPlatform::GetPrefLayersAccelerationDisabled(); mForceLayersAcceleration = gfxPlatform::GetPrefLayersAccelerationForceEnabled(); const char *acceleratedEnv = PR_GetEnv("MOZ_ACCELERATED"); @@ -992,15 +992,9 @@ void nsBaseWidget::CreateCompositor(int aWidth, int aHeight) // deallocated it when being freed. } -bool nsBaseWidget::IsSmallPopup() -{ - return mWindowType == eWindowType_popup && - mPopupType != ePopupTypePanel; -} - bool nsBaseWidget::ShouldUseOffMainThreadCompositing() { - return CompositorParent::CompositorLoop() && !IsSmallPopup(); + return CompositorParent::CompositorLoop(); } LayerManager* nsBaseWidget::GetLayerManager(PLayerTransactionChild* aShadowManager, diff --git a/widget/xpwidgets/nsBaseWidget.h b/widget/xpwidgets/nsBaseWidget.h index 52ccba791bd..7e66bc3a073 100644 --- a/widget/xpwidgets/nsBaseWidget.h +++ b/widget/xpwidgets/nsBaseWidget.h @@ -324,11 +324,6 @@ protected: // if the new rectangles are different from the old rectangles. bool StoreWindowClipRegion(const nsTArray& aRects); - // We don't want to accelerate small popup windows like menu, but we still - // want to accelerate xul panels that may contain arbitrarily complex content. - bool IsSmallPopup(); - - virtual already_AddRefed AllocateChildPopupWidget() {