From 5e0a0fc51d3d94e88bee0cf4ca62f6176fd6c40e Mon Sep 17 00:00:00 2001 From: asac Date: Wed, 21 Feb 2007 03:34:16 +0100 Subject: [PATCH] ubuntu-prevent-distributor-user-agent-part-reset + remove cpu cycle wasting nsContentHTTPStartup component from build --- layout/build/Makefile.in | 1 - layout/build/nsContentHTTPStartup.cpp | 113 --------------------------------- layout/build/nsContentHTTPStartup.h | 78 ----------------------- layout/build/nsLayoutModule.cpp | 9 --- 4 files changed, 0 insertions(+), 201 deletions(-) diff --git a/layout/build/Makefile.in b/layout/build/Makefile.in index af9c744..e543c97 100644 --- a/layout/build/Makefile.in +++ b/layout/build/Makefile.in @@ -107,7 +107,6 @@ REQUIRES = xpcom \ CPPSRCS = \ nsLayoutModule.cpp \ - nsContentHTTPStartup.cpp \ nsContentDLF.cpp \ nsLayoutStatics.cpp \ $(NULL) diff --git a/layout/build/nsContentHTTPStartup.cpp b/layout/build/nsContentHTTPStartup.cpp deleted file mode 100644 index 9455532..0000000 --- a/layout/build/nsContentHTTPStartup.cpp +++ /dev/null @@ -1,113 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 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 Communicator client code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Alec Flett - * - * Alternatively, the contents of this file may be used under the terms of - * either of 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 "nsIServiceManager.h" -#include "nsICategoryManager.h" - -#include "nsCOMPtr.h" -#include "nsString.h" -#include "nsXPIDLString.h" -#include "nsCRT.h" - -#include "nsContentHTTPStartup.h" -#include "nsIHttpProtocolHandler.h" -#include "gbdate.h" - -#define PRODUCT_NAME "Gecko" - -NS_IMPL_ISUPPORTS1(nsContentHTTPStartup,nsIObserver) - -nsresult -nsContentHTTPStartup::Observe( nsISupports *aSubject, - const char *aTopic, - const PRUnichar *aData) -{ - if (nsCRT::strcmp(aTopic, NS_HTTP_STARTUP_TOPIC) != 0) - return NS_OK; - - nsresult rv = nsnull; - - nsCOMPtr http(do_QueryInterface(aSubject)); - if (NS_FAILED(rv)) return rv; - - rv = http->SetProduct(NS_LITERAL_CSTRING(PRODUCT_NAME)); - if (NS_FAILED(rv)) return rv; - - rv = http->SetProductSub(NS_LITERAL_CSTRING(PRODUCT_VERSION)); - if (NS_FAILED(rv)) return rv; - - return NS_OK; -} - -nsresult -nsContentHTTPStartup::RegisterHTTPStartup(nsIComponentManager* aCompMgr, - nsIFile* aPath, - const char* aRegistryLocation, - const char* aComponentType, - const nsModuleComponentInfo* aInfo) -{ - nsresult rv; - nsCOMPtr - catMan(do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv)); - - if (NS_FAILED(rv)) return rv; - - nsXPIDLCString previousEntry; - rv = catMan->AddCategoryEntry(NS_HTTP_STARTUP_CATEGORY, - "Content UserAgent Setter", - NS_CONTENTHTTPSTARTUP_CONTRACTID, - PR_TRUE, PR_TRUE, - getter_Copies(previousEntry)); - return rv; -} - -nsresult -nsContentHTTPStartup::UnregisterHTTPStartup(nsIComponentManager* aCompMgr, - nsIFile* aPath, - const char* aRegistryLocation, - const nsModuleComponentInfo* aInfo) -{ - nsresult rv; - nsCOMPtr - catMan(do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv)); - - if (NS_FAILED(rv)) return rv; - - - return NS_OK; -} diff --git a/layout/build/nsContentHTTPStartup.h b/layout/build/nsContentHTTPStartup.h deleted file mode 100644 index aab45d0..0000000 --- a/layout/build/nsContentHTTPStartup.h +++ /dev/null @@ -1,78 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 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 Communicator client code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Alec Flett - * - * Alternatively, the contents of this file may be used under the terms of - * either of 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 "nsIObserver.h" - -#define NS_CONTENTHTTPSTARTUP_CONTRACTID \ - "@mozilla.org/content/http-startup;1" - -/* c2f6ef7e-afd5-4be4-a1f5-c824efa4231b */ -#define NS_CONTENTHTTPSTARTUP_CID \ -{ 0xc2f6ef7e, 0xafd5, 0x4be4, \ - {0xa1, 0xf5, 0xc8, 0x24, 0xef, 0xa4, 0x23, 0x1b} } - -struct nsModuleComponentInfo; -class nsIFile; - -class nsContentHTTPStartup : public nsIObserver -{ -public: - nsContentHTTPStartup() { } - virtual ~nsContentHTTPStartup() {} - - NS_DECL_ISUPPORTS - NS_DECL_NSIOBSERVER - -public: - static NS_IMETHODIMP - RegisterHTTPStartup(nsIComponentManager* aCompMgr, - nsIFile* aPath, - const char* aRegistryLocation, - const char* aComponentType, - const nsModuleComponentInfo* aInfo); - - static NS_IMETHODIMP - UnregisterHTTPStartup(nsIComponentManager* aCompMgr, - nsIFile* aPath, - const char* aRegistryLocation, - const nsModuleComponentInfo* aInfo); - -private: - nsresult setUserAgent(); - -}; diff --git a/layout/build/nsLayoutModule.cpp b/layout/build/nsLayoutModule.cpp index a52ce38..0516445 100644 --- a/layout/build/nsLayoutModule.cpp +++ b/layout/build/nsLayoutModule.cpp @@ -38,7 +38,6 @@ #include "nsLayoutStatics.h" #include "nsContentCID.h" -#include "nsContentHTTPStartup.h" #include "nsContentDLF.h" #include "nsContentPolicyUtils.h" #include "nsDataDocumentContentPolicy.h" @@ -447,7 +446,6 @@ MAKE_CTOR(CreateXMLContentBuilder, nsIXMLContentBuilder, NS_NewXML #ifdef MOZ_SVG MAKE_CTOR(CreateSVGRect, nsIDOMSVGRect, NS_NewSVGRect) #endif -NS_GENERIC_FACTORY_CONSTRUCTOR(nsContentHTTPStartup) MAKE_CTOR(CreateContentDLF, nsIDocumentLoaderFactory, NS_NewContentDocumentLoaderFactory) NS_GENERIC_FACTORY_CONSTRUCTOR(nsCSSOMFactory) NS_GENERIC_FACTORY_CONSTRUCTOR(nsInspectorCSSUtils) @@ -1211,13 +1209,6 @@ static const nsModuleComponentInfo gComponents[] = { CreateSVGRect }, #endif - { "Content HTTP Startup Listener", - NS_CONTENTHTTPSTARTUP_CID, - NS_CONTENTHTTPSTARTUP_CONTRACTID, - nsContentHTTPStartupConstructor, - nsContentHTTPStartup::RegisterHTTPStartup, - nsContentHTTPStartup::UnregisterHTTPStartup }, - { "Document Loader Factory", NS_CONTENT_DOCUMENT_LOADER_FACTORY_CID, "@mozilla.org/content/document-loader-factory;1", -- 1.4.4.4