Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix nsJARURI::Equals so anchor scrolling creates history entries in files

Browse Source 
loaded from a jar.  Bug 244137, r+sr=darin


git-svn-id: svn://10.0.0.236/trunk@156669 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu
2004-05-20 23:29:52 +00:00
parent 3633c2dfc9
commit fecee10929
4 changed files with 62 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
mozilla/modules/libjar/nsJARURI.cpp
View File

@@ -46,6 +46,9 @@
#include "nsReadableUtils.h"
#include "nsURLHelper.h"
#include "nsStandardURL.h"
#include "nsAutoPtr.h"
static NS_DEFINE_CID(kThisImplCID, NS_THIS_JARURI_IMPL_CID);
////////////////////////////////////////////////////////////////////////////////
@@ -57,7 +60,19 @@ nsJARURI::~nsJARURI()
{
}
NS_IMPL_THREADSAFE_ISUPPORTS4(nsJARURI, nsIJARURI, nsIURL, nsIURI, nsISerializable)
NS_IMPL_THREADSAFE_ADDREF(nsJARURI)
NS_IMPL_THREADSAFE_RELEASE(nsJARURI)
NS_INTERFACE_MAP_BEGIN(nsJARURI)
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIJARURI)
NS_INTERFACE_MAP_ENTRY(nsIURI)
NS_INTERFACE_MAP_ENTRY(nsIURL)
NS_INTERFACE_MAP_ENTRY(nsIJARURI)
NS_INTERFACE_MAP_ENTRY(nsISerializable)
// see nsJARURI::Equals
if (aIID.Equals(kThisImplCID))
foundInterface = NS_STATIC_CAST(nsIJARURI *, this);
else
NS_INTERFACE_MAP_END
nsresult
nsJARURI::Init(const char *charsetHint)
@@ -319,34 +334,23 @@ nsJARURI::GetOriginCharset(nsACString &aOriginCharset)
NS_IMETHODIMP
nsJARURI::Equals(nsIURI *other, PRBool *result)
{
nsresult rv;
*result = PR_FALSE;
if (other == nsnull)
return NS_OK; // not equal
nsCOMPtr<nsIJARURI> otherJAR(do_QueryInterface(other, &rv));
nsRefPtr<nsJARURI> otherJAR;
nsresult rv = other->QueryInterface(kThisImplCID, getter_AddRefs(otherJAR));
if (NS_FAILED(rv))
return NS_OK; // not equal
nsCOMPtr<nsIURI> otherJARFile;
rv = otherJAR->GetJARFile(getter_AddRefs(otherJARFile));
if (NS_FAILED(rv)) return rv;
PRBool equal;
rv = mJARFile->Equals(otherJARFile, &equal);
if (NS_FAILED(rv)) return rv;
if (!equal)
return NS_OK; // not equal
rv = mJARFile->Equals(otherJAR->mJARFile, &equal);
if (NS_FAILED(rv) || !equal) {
return rv; // not equal
}
nsCAutoString otherJAREntry;
rv = otherJAR->GetJAREntry(otherJAREntry);
if (NS_FAILED(rv)) return rv;
nsCAutoString ourJAREntry;
rv = GetJAREntry(ourJAREntry);
if (NS_SUCCEEDED(rv))
*result = (strcmp(ourJAREntry.get(), otherJAREntry.get()) == 0);
rv = mJAREntry->Equals(otherJAR->mJAREntry, result);
return rv;
}

8
mozilla/modules/libjar/nsJARURI.h
View File

@@ -44,6 +44,14 @@
#include "nsCOMPtr.h"
#include "nsString.h"
#define NS_THIS_JARURI_IMPL_CID \
{ /* 9a55f629-730b-4d08-b75b-fa7d9570a691 */ \
0x9a55f629, \
0x730b, \
0x4d08, \
{0xb7, 0x5b, 0xfa, 0x7d, 0x95, 0x70, 0xa6, 0x91} \
}
class nsJARURI : public nsIJARURI, nsISerializable
{
public: