Backed out changeset ba41917b2182 (bug 1151890) for android reftest failures
authorWes Kocher <wkocher@mozilla.com>
Tue, 07 Apr 2015 17:42:41 -0700
changeset 238076 46297000a83f99a0aa7b3b93d6b9de4a02561e45
parent 238075 dfb9e2a7ea9cc355a778473aa1f492fc49b5a284
child 238077 a3a9ad0ee98cc0c4150e121c9f438326b2ca806c
push id58102
push userkwierso@gmail.com
push dateWed, 08 Apr 2015 00:43:00 +0000
treeherdermozilla-inbound@46297000a83f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1151890
milestone40.0a1
backs outba41917b21822a3642e2b3f48bf754b3edbe9dcf
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 ba41917b2182 (bug 1151890) for android reftest failures
widget/cocoa/nsChildView.h
widget/cocoa/nsChildView.mm
--- a/widget/cocoa/nsChildView.h
+++ b/widget/cocoa/nsChildView.h
@@ -555,17 +555,16 @@ protected:
   AllocateChildPopupWidget() override
   {
     static NS_DEFINE_IID(kCPopUpCID, NS_POPUP_CID);
     nsCOMPtr<nsIWidget> widget = do_CreateInstance(kCPopUpCID);
     return widget.forget();
   }
 
   void ConfigureAPZCTreeManager() override;
-  void ConfigureAPZControllerThread() override;
 
   void DoRemoteComposition(const nsIntRect& aRenderRect);
 
   // Overlay drawing functions for OpenGL drawing
   void DrawWindowOverlay(mozilla::layers::GLManager* aManager, nsIntRect aRect);
   void MaybeDrawResizeIndicator(mozilla::layers::GLManager* aManager, const nsIntRect& aRect);
   void MaybeDrawRoundedCorners(mozilla::layers::GLManager* aManager, const nsIntRect& aRect);
   void MaybeDrawTitlebar(mozilla::layers::GLManager* aManager, const nsIntRect& aRect);
--- a/widget/cocoa/nsChildView.mm
+++ b/widget/cocoa/nsChildView.mm
@@ -55,17 +55,16 @@
 #include "mozilla/layers/LayerManagerComposite.h"
 #include "GLTextureImage.h"
 #include "GLContextProvider.h"
 #include "GLContextCGL.h"
 #include "GLUploadHelpers.h"
 #include "ScopedGLHelpers.h"
 #include "HeapCopyOfStackArray.h"
 #include "mozilla/layers/APZCTreeManager.h"
-#include "mozilla/layers/APZThreadUtils.h"
 #include "mozilla/layers/GLManager.h"
 #include "mozilla/layers/CompositorOGL.h"
 #include "mozilla/layers/CompositorParent.h"
 #include "mozilla/layers/BasicCompositor.h"
 #include "gfxUtils.h"
 #include "gfxPrefs.h"
 #include "mozilla/gfx/2D.h"
 #include "mozilla/gfx/BorrowedContext.h"
@@ -1886,24 +1885,16 @@ nsChildView::ConfigureAPZCTreeManager()
   nsBaseWidget::ConfigureAPZCTreeManager();
 
   if (gNumberOfWidgetsNeedingEventThread == 0) {
     [EventThreadRunner start];
   }
   gNumberOfWidgetsNeedingEventThread++;
 }
 
-void
-nsChildView::ConfigureAPZControllerThread()
-{
-  // On OS X the EventThreadRunner is the controller thread, but it doesn't
-  // have a MessageLoop.
-  APZThreadUtils::SetControllerThread(nullptr);
-}
-
 nsIntRect
 nsChildView::RectContainingTitlebarControls()
 {
   // Start with a thin strip at the top of the window for the highlight line.
   NSRect rect = NSMakeRect(0, 0, [mView bounds].size.width,
                            [(ChildView*)mView cornerRadius]);
 
   // Add the rects of the titlebar controls.