зеркало из https://github.com/mozilla/gecko-dev.git
Remove nsObserverBase. Bug 726950, r=emk
This commit is contained in:
Simon Montagu
Родитель
986c3c419f
Коммит
cdae24e9d0
|
|
@ -52,7 +52,6 @@ LIBXUL_LIBRARY = 1
|
|||
|
||||
|
||||
CPPSRCS = \
|
||||
nsObserverBase.cpp \
|
||||
nsCyrillicDetector.cpp \
|
||||
nsChardetModule.cpp \
|
||||
$(NULL)
|
||||
|
|
|
|||
|
|
@ -1,85 +0,0 @@
|
|||
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* ***** 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
|
||||
* Netscape Communications Corporation.
|
||||
* Portions created by the Initial Developer are Copyright (C) 1999
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
*
|
||||
* 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 "nsIWebShellServices.h"
|
||||
#include "nsObserverBase.h"
|
||||
#include "nsString.h"
|
||||
#include "nsIHttpChannel.h"
|
||||
|
||||
|
||||
|
||||
//-------------------------------------------------------------------------
|
||||
NS_IMETHODIMP nsObserverBase::NotifyDocShell(nsISupports* aDocShell,
|
||||
nsISupports* aChannel,
|
||||
const char* charset,
|
||||
PRInt32 source)
|
||||
{
|
||||
|
||||
nsresult rv = NS_OK;
|
||||
nsresult res = NS_OK;
|
||||
|
||||
nsCOMPtr<nsIHttpChannel> httpChannel(do_QueryInterface(aChannel,&res));
|
||||
if (NS_SUCCEEDED(res)) {
|
||||
nsCAutoString method;
|
||||
httpChannel->GetRequestMethod(method);
|
||||
if (method.EqualsLiteral("POST")) { // XXX What about PUT, etc?
|
||||
return NS_OK;
|
||||
}
|
||||
}
|
||||
|
||||
nsCOMPtr<nsIWebShellServices> wss;
|
||||
wss = do_QueryInterface(aDocShell,&res);
|
||||
if (NS_SUCCEEDED(res)) {
|
||||
// ask the webshellservice to load the URL
|
||||
if (NS_FAILED(wss->StopDocumentLoad())){
|
||||
// do nothing and fall through
|
||||
}
|
||||
else if (NS_FAILED(wss->ReloadDocument(charset, source))) {
|
||||
// do nothing and fall through
|
||||
}
|
||||
else {
|
||||
rv = NS_ERROR_HTMLPARSER_STOPPARSING; // We're reloading a new document...stop loading the current.
|
||||
}
|
||||
}
|
||||
|
||||
//if our reload request is not accepted, we should tell parser to go on
|
||||
if (rv != NS_ERROR_HTMLPARSER_STOPPARSING)
|
||||
rv = NS_ERROR_HTMLPARSER_CONTINUE;
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
|
@ -1,69 +0,0 @@
|
|||
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* ***** 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
|
||||
* Netscape Communications Corporation.
|
||||
* Portions created by the Initial Developer are Copyright (C) 1999
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
*
|
||||
* 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 ***** */
|
||||
|
||||
|
||||
#ifndef nsObserverBase_h__
|
||||
#define nsObserverBase_h__
|
||||
|
||||
//==========================================================================
|
||||
//
|
||||
// Class declaration for the class
|
||||
//
|
||||
//==========================================================================
|
||||
class nsObserverBase {
|
||||
|
||||
public:
|
||||
|
||||
nsObserverBase() {}
|
||||
virtual ~nsObserverBase() {}
|
||||
|
||||
/*
|
||||
* Subject call observer when the parser hit the tag
|
||||
* @param aDocumentID- ID of the document
|
||||
* @param aTag- the tag
|
||||
* @param valueArray - array of value
|
||||
*/
|
||||
protected:
|
||||
|
||||
NS_IMETHOD NotifyDocShell(nsISupports* aDocShell,
|
||||
nsISupports* aChannel,
|
||||
const char* charset,
|
||||
PRInt32 source);
|
||||
|
||||
};
|
||||
|
||||
#endif /* nsObserverBase_h__ */
|
||||
Загрузка…
Ссылка в новой задаче