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

1) "Not in the build" is the biggest cop-out of checkin rules imaginable.

Browse Source 
2) If the file is compiled without setting a special flag, it's PART OF THE BUILD!
3) WTF IS UP WITH THESE EXTRA ^Ms?!?!?!


git-svn-id: svn://10.0.0.236/trunk@89567 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cls%seawood.org
2001-03-14 02:05:21 +00:00
parent 0e1b596a03
commit 93551f54df
2 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
View File

@@ -51,10 +51,10 @@
#include "nsNetUtil.h"
#include "nsIProgressEventSink.h"
#include "nsIDocument.h"
#if MOZ_NEW_CACHE
#include "nsICachingChannel.h"
#if MOZ_NEW_CACHE
#include "nsICachingChannel.h"
#endif
// Friggin' X11 has to "#define None". Lame!
#ifdef None
@@ -1285,18 +1285,18 @@ nsPluginStreamListenerPeer::OnStartRequest(nsIRequest *request, nsISupports* aCo
if (!channel)
return NS_ERROR_FAILURE;
#if MOZ_NEW_CACHE
nsCOMPtr<nsICachingChannel> cacheChannel = do_QueryInterface(channel);
if (cacheChannel) {
rv = cacheChannel->SetCacheAsFile(PR_TRUE);
if (NS_FAILED(rv)) {
// FIX: Cache must be disabled. We should try to stream this file
// to disk ourselves otherwise OnFileAvailable will never be fired.
NS_ASSERTION(PR_FALSE, "No Disk Cache Aval. Some plugins wont work.");
}
}
#endif
#if MOZ_NEW_CACHE
nsCOMPtr<nsICachingChannel> cacheChannel = do_QueryInterface(channel);
if (cacheChannel) {
rv = cacheChannel->SetCacheAsFile(PR_TRUE);
if (NS_FAILED(rv)) {
// FIX: Cache must be disabled. We should try to stream this file
// to disk ourselves otherwise OnFileAvailable will never be fired.
NS_ASSERTION(PR_FALSE, "No Disk Cache Aval. Some plugins wont work.");
}
}
#endif
char* aContentType = nsnull;
rv = channel->GetContentType(&aContentType);
@@ -1455,15 +1455,15 @@ NS_IMETHODIMP nsPluginStreamListenerPeer::OnStopRequest(nsIRequest *request,
{
char* urlString;
nsCOMPtr<nsIFile> localFile;
#if MOZ_NEW_CACHE
nsCOMPtr<nsICachingChannel> cacheChannel = do_QueryInterface(channel);
if (cacheChannel)
rv = cacheChannel->GetCacheFile(getter_AddRefs(localFile));
#else
#if MOZ_NEW_CACHE
nsCOMPtr<nsICachingChannel> cacheChannel = do_QueryInterface(channel);
if (cacheChannel)
rv = cacheChannel->GetCacheFile(getter_AddRefs(localFile));
#else
nsCOMPtr<nsIStreamAsFile> streamAsFile = do_QueryInterface(channel);
if (streamAsFile)
rv = streamAsFile->GetFile(getter_AddRefs(localFile));
rv = streamAsFile->GetFile(getter_AddRefs(localFile));
#endif
if (NS_SUCCEEDED(rv) && localFile)
{

46
mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp
View File

@@ -51,10 +51,10 @@
#include "nsNetUtil.h"
#include "nsIProgressEventSink.h"
#include "nsIDocument.h"
#if MOZ_NEW_CACHE
#include "nsICachingChannel.h"
#if MOZ_NEW_CACHE
#include "nsICachingChannel.h"
#endif
// Friggin' X11 has to "#define None". Lame!
#ifdef None
@@ -1285,18 +1285,18 @@ nsPluginStreamListenerPeer::OnStartRequest(nsIRequest *request, nsISupports* aCo
if (!channel)
return NS_ERROR_FAILURE;
#if MOZ_NEW_CACHE
nsCOMPtr<nsICachingChannel> cacheChannel = do_QueryInterface(channel);
if (cacheChannel) {
rv = cacheChannel->SetCacheAsFile(PR_TRUE);
if (NS_FAILED(rv)) {
// FIX: Cache must be disabled. We should try to stream this file
// to disk ourselves otherwise OnFileAvailable will never be fired.
NS_ASSERTION(PR_FALSE, "No Disk Cache Aval. Some plugins wont work.");
}
}
#endif
#if MOZ_NEW_CACHE
nsCOMPtr<nsICachingChannel> cacheChannel = do_QueryInterface(channel);
if (cacheChannel) {
rv = cacheChannel->SetCacheAsFile(PR_TRUE);
if (NS_FAILED(rv)) {
// FIX: Cache must be disabled. We should try to stream this file
// to disk ourselves otherwise OnFileAvailable will never be fired.
NS_ASSERTION(PR_FALSE, "No Disk Cache Aval. Some plugins wont work.");
}
}
#endif
char* aContentType = nsnull;
rv = channel->GetContentType(&aContentType);
@@ -1455,15 +1455,15 @@ NS_IMETHODIMP nsPluginStreamListenerPeer::OnStopRequest(nsIRequest *request,
{
char* urlString;
nsCOMPtr<nsIFile> localFile;
#if MOZ_NEW_CACHE
nsCOMPtr<nsICachingChannel> cacheChannel = do_QueryInterface(channel);
if (cacheChannel)
rv = cacheChannel->GetCacheFile(getter_AddRefs(localFile));
#else
#if MOZ_NEW_CACHE
nsCOMPtr<nsICachingChannel> cacheChannel = do_QueryInterface(channel);
if (cacheChannel)
rv = cacheChannel->GetCacheFile(getter_AddRefs(localFile));
#else
nsCOMPtr<nsIStreamAsFile> streamAsFile = do_QueryInterface(channel);
if (streamAsFile)
rv = streamAsFile->GetFile(getter_AddRefs(localFile));
rv = streamAsFile->GetFile(getter_AddRefs(localFile));
#endif
if (NS_SUCCEEDED(rv) && localFile)
{