Backed out changeset b8372d58243b (bug 1264365) for android test bustage on a CLOSED TREE
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Thu, 21 Apr 2016 14:06:56 +0200
changeset 332155 1c10754af667cdacd699d7e547bc502a2e2fb24a
parent 332154 99ee6347b17310da4d035261e3167e7ae906843c
child 332156 220a41ef6ffa6801ad923650d182234a2d956588
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1264365
milestone48.0a1
backs outb8372d58243bfe6773766f3ae7ba9070cfef6695
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset b8372d58243b (bug 1264365) for android test bustage on a CLOSED TREE
widget/nsBaseWidget.cpp
widget/nsBaseWidget.h
--- a/widget/nsBaseWidget.cpp
+++ b/widget/nsBaseWidget.cpp
@@ -917,26 +917,20 @@ nsBaseWidget::AutoLayerManagerSetup::~Au
   if (mLayerManager) {
     NS_ASSERTION(mLayerManager->GetBackendType() == LayersBackend::LAYERS_BASIC,
       "AutoLayerManagerSetup instantiated for non-basic layer backend!");
     mLayerManager->SetDefaultTarget(nullptr);
     mLayerManager->SetDefaultTargetConfiguration(mozilla::layers::BufferMode::BUFFER_NONE, ROTATION_0);
   }
 }
 
-bool nsBaseWidget::IsSmallPopup() const
-{
-  return mWindowType == eWindowType_popup || mPopupType == ePopupTypePanel;
-}
-
 bool
 nsBaseWidget::ComputeShouldAccelerate()
 {
-  return !IsSmallPopup() &&
-         gfxPlatform::GetPlatform()->ShouldUseLayersAcceleration();
+  return gfxPlatform::GetPlatform()->ShouldUseLayersAcceleration();
 }
 
 CompositorBridgeParent* nsBaseWidget::NewCompositorBridgeParent(int aSurfaceWidth,
                                                     int aSurfaceHeight)
 {
   return new CompositorBridgeParent(this, false, aSurfaceWidth, aSurfaceHeight);
 }
 
--- a/widget/nsBaseWidget.h
+++ b/widget/nsBaseWidget.h
@@ -294,20 +294,16 @@ public:
   void NotifyUIStateChanged(UIStateChangeType aShowAccelerators,
                             UIStateChangeType aShowFocusRings);
 
 #ifdef ACCESSIBILITY
   // Get the accessible for the window.
   mozilla::a11y::Accessible* GetRootAccessible();
 #endif
 
-  // Return true if this is a simple widget (that is typically not worth
-  // accelerating)
-  bool IsSmallPopup() const;
-
   nsPopupLevel PopupLevel() { return mPopupLevel; }
 
   virtual LayoutDeviceIntSize
   ClientToWindowSize(const LayoutDeviceIntSize& aClientSize) override
   {
     return aClientSize;
   }