wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge backout.

Browse Source
This commit is contained in:
Jeff Walden 2010-10-29 22:39:44 -07:00
commit 737b66b063
5 changed files with 1 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/src/xpconnect/src/xpc.msg
View File

@ -215,7 +215,6 @@ XPC_MSG_DEF(NS_ERROR_CACHE_IN_USE , "Cache is currently in use
XPC_MSG_DEF(NS_ERROR_DOCUMENT_NOT_CACHED , "Document does not exist in cache")
XPC_MSG_DEF(NS_ERROR_INSUFFICIENT_DOMAIN_LEVELS , "The requested number of domain levels exceeds those present in the host string")
XPC_MSG_DEF(NS_ERROR_HOST_IS_IP_ADDRESS , "The host string is an IP address")
XPC_MSG_DEF(NS_ERROR_NOT_SAME_THREAD , "Can't access a wrapped JS object from a different thread")
/* storage related codes (from mozStorage.h) */
XPC_MSG_DEF(NS_ERROR_STORAGE_BUSY , "SQLite database connection is busy")

1
js/src/xpconnect/src/xpcprivate.h
View File

@ -3071,7 +3071,6 @@ private:
nsXPCWrappedJS* mRoot;
nsXPCWrappedJS* mNext;
nsISupports* mOuter; // only set in root
nsCOMPtr<nsIThread> mThread;
};
/***************************************************************************/

7
js/src/xpconnect/src/xpcwrappedjs.cpp
View File

@ -43,7 +43,6 @@
#include "xpcprivate.h"
#include "nsAtomicRefcnt.h"
#include "nsThreadUtils.h"
// NOTE: much of the fancy footwork is done in xpcstubs.cpp
@ -291,7 +290,6 @@ nsXPCWrappedJS::GetJSObject(JSObject** aJSObj)
{
NS_PRECONDITION(aJSObj, "bad param");
NS_PRECONDITION(mJSObj, "bad wrapper");
if(!(*aJSObj = mJSObj))
return NS_ERROR_OUT_OF_MEMORY;
return NS_OK;
@ -435,8 +433,7 @@ nsXPCWrappedJS::nsXPCWrappedJS(XPCCallContext& ccx,
mClass(aClass),
mRoot(root ? root : this),
mNext(nsnull),
mOuter(root ? nsnull : aOuter),
mThread(do_GetCurrentThread())
mOuter(root ? nsnull : aOuter)
{
#ifdef DEBUG_stats_jband
static int count = 0;
@ -571,8 +568,6 @@ nsXPCWrappedJS::CallMethod(PRUint16 methodIndex,
{
if(!IsValid())
return NS_ERROR_UNEXPECTED;
if (NS_GetCurrentThread() != mThread)
return NS_ERROR_NOT_SAME_THREAD;
return GetClass()->CallMethod(this, methodIndex, info, params);
}

51
js/src/xpconnect/tests/unit/test_bug608142.js
View File

@ -1,51 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: sw=4 ts=4 sts=4 et
* ***** 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 Necko Test Code.
*
* The Initial Developer of the Original Code is the Mozilla Foundation.
* Portions created by the Initial Developer are Copyright (C) 2009
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Andreas Gal <gal@uci.edu>
*
* 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 ***** */
function run_test() {
var tm = Components.classes["@mozilla.org/thread-manager;1"].getService();
var thr = tm.newThread(0);
thr.dispatch({
run: function() {
do_check_true(false);
}
}, Components.interfaces.nsIThread.DISPATCH_NORMAL);
thr.shutdown();
}

4
xpcom/base/nsError.h
View File

@ -307,10 +307,6 @@ inline int NS_SUCCEEDED(nsresult _nsresult) {
#define NS_SUCCESS_LOSS_OF_INSIGNIFICANT_DATA NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_XPCOM, 1)
/* Result codes used by nsIThreadManager */
#define NS_ERROR_NOT_SAME_THREAD NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XPCOM, 4)
/**
* Various operations are not permitted during XPCOM shutdown and will fail
* with this exception.