Backout 4c84b021a3c8 & d16206820082 (bug 714694) to correct patch author
authorEd Morley <bmo@edmorley.co.uk>
Wed, 11 Jan 2012 02:06:28 +0000
changeset 85426 3710dc1826ca8e0499902287b924a57c5c3d4573
parent 85425 208cbee3b3a0f75a3f53d52f26ece07074f9bb4f
child 85427 7c5ecb76b94c1a85cb0e051f5e841bf6dad3f311
push id805
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 18:17:35 +0000
treeherdermozilla-aurora@6fb3bf232436 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs714694
milestone12.0a1
backs out4c84b021a3c8a91a74fc4495351043df5e24dd83
Backout 4c84b021a3c8 & d16206820082 (bug 714694) to correct patch author
widget/gonk/Makefile.in
widget/gonk/nsIdleServiceGonk.cpp
widget/gonk/nsIdleServiceGonk.h
widget/gonk/nsWidgetFactory.cpp
widget/gonk/nsWindow.cpp
widget/gonk/nsWindow.h
--- a/widget/gonk/Makefile.in
+++ b/widget/gonk/Makefile.in
@@ -53,17 +53,16 @@ LIBXUL_LIBRARY  = 1
 
 CPPSRCS	= \
 	Framebuffer.cpp \
 	nsAppShell.cpp \
 	nsWidgetFactory.cpp \
 	nsWindow.cpp \
 	nsLookAndFeel.cpp \
 	nsScreenManagerGonk.cpp \
-	nsIdleServiceGonk.cpp \
 	$(NULL)
 
 SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -D_IMPL_NS_WIDGET
 
deleted file mode 100644
--- a/widget/gonk/nsIdleServiceGonk.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* vim:expandtab:shiftwidth=4:tabstop=4:
- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Gijs Kruitbosch <gijskruitbosch@gmail.com>.
- * Portions created by the Initial Developer are Copyright (C) 2007
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Michael Wu <mwu@mozilla.com>
- *   Kan-Ru Chen <kchen@mozilla.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsIdleServiceGonk.h"
-#include "nsIServiceManager.h"
-
-NS_IMPL_ISUPPORTS2(nsIdleServiceGonk, nsIIdleService, nsIdleService)
-
-bool
-nsIdleServiceGonk::PollIdleTime(PRUint32 *aIdleTime)
-{
-    return false;
-}
-
-bool
-nsIdleServiceGonk::UsePollMode()
-{
-    return false;
-}
deleted file mode 100644
--- a/widget/gonk/nsIdleServiceGonk.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* vim:expandtab:shiftwidth=4:tabstop=4:
- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Gijs Kruitbosch <gijskruitbosch@gmail.com>.
- * Portions created by the Initial Developer are Copyright (C) 2007
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Michael Wu <mwu@mozilla.com>
- *   Kan-Ru Chen <kchen@mozilla.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nsIdleServiceGonk_h__
-#define nsIdleServiceGonk_h__
-
-#include "nsIdleService.h"
-
-class nsIdleServiceGonk : public nsIdleService
-{
-public:
-    NS_DECL_ISUPPORTS
-
-    bool PollIdleTime(PRUint32* aIdleTime);
-protected:
-    bool UsePollMode();
-};
-
-#endif // nsIdleServiceGonk_h__
--- a/widget/gonk/nsWidgetFactory.cpp
+++ b/widget/gonk/nsWidgetFactory.cpp
@@ -41,50 +41,45 @@
 #include "nsCOMPtr.h"
 #include "nsWidgetsCID.h"
 #include "nsAppShell.h"
 
 #include "nsWindow.h"
 #include "nsLookAndFeel.h"
 #include "nsAppShellSingleton.h"
 #include "nsScreenManagerGonk.h"
-#include "nsIdleServiceGonk.h"
 
 #include "nsHTMLFormatConverter.h"
 #include "nsXULAppAPI.h"
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindow)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsScreenManagerGonk)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsHTMLFormatConverter)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsIdleServiceGonk)
 
 NS_DEFINE_NAMED_CID(NS_APPSHELL_CID);
 NS_DEFINE_NAMED_CID(NS_WINDOW_CID);
 NS_DEFINE_NAMED_CID(NS_CHILD_CID);
 NS_DEFINE_NAMED_CID(NS_SCREENMANAGER_CID);
 NS_DEFINE_NAMED_CID(NS_HTMLFORMATCONVERTER_CID);
-NS_DEFINE_NAMED_CID(NS_IDLE_SERVICE_CID);
 
 static const mozilla::Module::CIDEntry kWidgetCIDs[] = {
     { &kNS_WINDOW_CID, false, NULL, nsWindowConstructor },
     { &kNS_CHILD_CID, false, NULL, nsWindowConstructor },
     { &kNS_APPSHELL_CID, false, NULL, nsAppShellConstructor },
     { &kNS_SCREENMANAGER_CID, false, NULL, nsScreenManagerGonkConstructor },
     { &kNS_HTMLFORMATCONVERTER_CID, false, NULL, nsHTMLFormatConverterConstructor },
-    { &kNS_IDLE_SERVICE_CID, false, NULL, nsIdleServiceGonkConstructor },
     { NULL }
 };
 
 static const mozilla::Module::ContractIDEntry kWidgetContracts[] = {
     { "@mozilla.org/widgets/window/gonk;1", &kNS_WINDOW_CID },
     { "@mozilla.org/widgets/child_window/gonk;1", &kNS_CHILD_CID },
     { "@mozilla.org/widget/appshell/gonk;1", &kNS_APPSHELL_CID },
     { "@mozilla.org/gfx/screenmanager;1", &kNS_SCREENMANAGER_CID },
     { "@mozilla.org/widget/htmlformatconverter;1", &kNS_HTMLFORMATCONVERTER_CID },
-    { "@mozilla.org/widget/idleservice;1", &kNS_IDLE_SERVICE_CID },
     { NULL }
 };
 
 static void
 nsWidgetGonkModuleDtor()
 {
     nsLookAndFeel::Shutdown();
     nsAppShellShutdown();
--- a/widget/gonk/nsWindow.cpp
+++ b/widget/gonk/nsWindow.cpp
@@ -44,17 +44,16 @@
 #include "Framebuffer.h"
 #include "gfxContext.h"
 #include "gfxUtils.h"
 #include "GLContextProvider.h"
 #include "LayerManagerOGL.h"
 #include "nsAutoPtr.h"
 #include "nsAppShell.h"
 #include "nsTArray.h"
-#include "nsIdleService.h"
 #include "nsWindow.h"
 
 #define LOG(args...)  __android_log_print(ANDROID_LOG_INFO, "Gonk" , ## args)
 
 #define IS_TOPLEVEL() (mWindowType == eWindowType_toplevel || mWindowType == eWindowType_dialog)
 
 using namespace mozilla;
 using namespace mozilla::gl;
@@ -137,17 +136,16 @@ nsWindow::DoDraw(void)
 }
 
 nsEventStatus
 nsWindow::DispatchInputEvent(nsGUIEvent &aEvent)
 {
     if (!gFocusedWindow)
         return nsEventStatus_eIgnore;
 
-    gFocusedWindow->UserActivity();
     aEvent.widget = gFocusedWindow;
     return gFocusedWindow->mEventCallback(&aEvent);
 }
 
 NS_IMETHODIMP
 nsWindow::Create(nsIWidget *aParent,
                  void *aNativeParent,
                  const nsIntRect &aRect,
@@ -440,19 +438,8 @@ nsWindow::BringToTop()
     sTopWindows.RemoveElement(this);
     sTopWindows.InsertElementAt(0, this);
 
     nsGUIEvent event(true, NS_ACTIVATE, this);
     (*mEventCallback)(&event);
     Update();
 }
 
-void
-nsWindow::UserActivity()
-{
-    if (!mIdleService) {
-        mIdleService = do_GetService("@mozilla.org/widget/idleservice;1");
-    }
-
-    if (mIdleService) {
-        mIdleService->ResetIdleTimeOut();
-    }
-}
--- a/widget/gonk/nsWindow.h
+++ b/widget/gonk/nsWindow.h
@@ -37,18 +37,16 @@
 
 #ifndef nsWindow_h
 #define nsWindow_h
 
 #include "nsBaseWidget.h"
 
 extern nsIntRect gScreenBounds;
 
-class nsIdleService;
-
 namespace mozilla {
 namespace gl {
 class GLContext;
 }
 namespace layers {
 class LayersManager;
 }
 }
@@ -128,18 +126,13 @@ public:
                                       const InputContextAction& aAction);
     NS_IMETHOD_(InputContext) GetInputContext();
 
 protected:
     nsWindow* mParent;
     bool mVisible;
     nsIntRegion mDirtyRegion;
     InputContext mInputContext;
-    nsCOMPtr<nsIdleService> mIdleService;
 
     void BringToTop();
-
-    // Call this function when the users activity is the direct cause of an
-    // event (like a keypress or mouse click).
-    void UserActivity();
 };
 
 #endif /* nsWindow_h */