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

Back out 8bd13443d0bc (bug 579517) to get a clean backout

Browse Source 
--HG--
extra : rebase_source : 63c8087f0a6de5adeddb8762ff9e410b2b818e22
This commit is contained in:
Phil Ringnalda 2012-09-24 21:21:10 -07:00
parent 37fc3e77dc
commit 59da0af0b1
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
content/base/src/nsMixedContentBlocker.cpp
View File

@ -76,14 +76,14 @@ nsMixedContentBlocker::~nsMixedContentBlocker()
NS_IMPL_ISUPPORTS1(nsMixedContentBlocker, nsIContentPolicy)
NS_IMETHODIMP
nsMixedContentBlocker::ShouldLoad(uint32_t aContentType,
nsMixedContentBlocker::ShouldLoad(PRUint32 aContentType,
nsIURI* aContentLocation,
nsIURI* aRequestingLocation,
nsISupports* aRequestingContext,
const nsACString& aMimeGuess,
nsISupports* aExtra,
nsIPrincipal* aRequestPrincipal,
int16_t* aDecision)
PRInt16* aDecision)
{
// Default policy: allow the load if we find no reason to block it.
*aDecision = nsIContentPolicy::ACCEPT;
@ -186,14 +186,14 @@ nsMixedContentBlocker::ShouldLoad(uint32_t aContentType,
}
NS_IMETHODIMP
nsMixedContentBlocker::ShouldProcess(uint32_t aContentType,
nsMixedContentBlocker::ShouldProcess(PRUint32 aContentType,
nsIURI* aContentLocation,
nsIURI* aRequestingLocation,
nsISupports* aRequestingContext,
const nsACString& aMimeGuess,
nsISupports* aExtra,
nsIPrincipal* aRequestPrincipal,
int16_t* aDecision)
PRInt16* aDecision)
{
return ShouldLoad(aContentType, aContentLocation, aRequestingLocation,
aRequestingContext, aMimeGuess, aExtra, aRequestPrincipal,

4
layout/base/FrameLayerBuilder.cpp
View File

@ -725,7 +725,7 @@ FrameLayerBuilder::DidBeginRetainedLayerTransaction(LayerManager* aManager)
}
void
FrameLayerBuilder::StoreOptimizedLayerForFrame(nsIFrame* aFrame, uint32_t aDisplayItemKey, Layer* aImage)
FrameLayerBuilder::StoreOptimizedLayerForFrame(nsIFrame* aFrame, PRUint32 aDisplayItemKey, Layer* aImage)
{
DisplayItemDataEntry *entry = mNewDisplayItemData.GetEntry(aFrame);
if (!entry)
@ -735,7 +735,7 @@ FrameLayerBuilder::StoreOptimizedLayerForFrame(nsIFrame* aFrame, uint32_t aDispl
if (!array)
return;
for (uint32_t i = 0; i < array->Length(); ++i) {
for (PRUint32 i = 0; i < array->Length(); ++i) {
if (array->ElementAt(i).mDisplayItemKey == aDisplayItemKey) {
array->ElementAt(i).mOptLayer = aImage;
return;

2
layout/base/FrameLayerBuilder.h
View File

@ -388,7 +388,7 @@ public:
* Used when we optimize a ThebesLayer into an ImageLayer and want to retroactively update the
* DisplayItemData so we can retrieve the layer from within layout.
*/
void StoreOptimizedLayerForFrame(nsIFrame* aFrame, uint32_t aDisplayItemKey, Layer* aImage);
void StoreOptimizedLayerForFrame(nsIFrame* aFrame, PRUint32 aDisplayItemKey, Layer* aImage);
/**
* Clip represents the intersection of an optional rectangle with a

10
layout/xul/base/src/nsImageBoxFrame.cpp
View File

@ -343,8 +343,8 @@ void nsDisplayXULImage::Paint(nsDisplayListBuilder* aBuilder,
static_cast<nsImageBoxFrame*>(mFrame)->
PaintImage(*aCtx, mVisibleRect, ToReferenceFrame(),
aBuilder->ShouldSyncDecodeImages()
? (uint32_t) imgIContainer::FLAG_SYNC_DECODE
: (uint32_t) imgIContainer::FLAG_NONE);
? (PRUint32) imgIContainer::FLAG_SYNC_DECODE
: (PRUint32) imgIContainer::FLAG_NONE);
}
void
@ -352,7 +352,7 @@ nsDisplayXULImage::ConfigureLayer(ImageLayer* aLayer, const nsIntPoint& aOffset)
{
aLayer->SetFilter(nsLayoutUtils::GetGraphicsFilterForFrame(mFrame));
int32_t factor = mFrame->PresContext()->AppUnitsPerDevPixel();
PRInt32 factor = mFrame->PresContext()->AppUnitsPerDevPixel();
nsImageBoxFrame* imageFrame = static_cast<nsImageBoxFrame*>(mFrame);
nsRect dest;
@ -363,8 +363,8 @@ nsDisplayXULImage::ConfigureLayer(ImageLayer* aLayer, const nsIntPoint& aOffset)
nsCOMPtr<imgIContainer> imgCon;
imageFrame->mImageRequest->GetImage(getter_AddRefs(imgCon));
int32_t imageWidth;
int32_t imageHeight;
PRInt32 imageWidth;
PRInt32 imageHeight;
imgCon->GetWidth(&imageWidth);
imgCon->GetHeight(&imageHeight);

2
netwerk/protocol/about/nsAboutCacheEntry.cpp
View File

@ -463,7 +463,7 @@ nsAboutCacheEntry::OnCacheEntryAvailable(nsICacheEntryDescriptor *entry,
rv = WriteCacheEntryUnavailable();
if (NS_FAILED(rv)) return rv;
uint32_t n;
PRUint32 n;
NS_NAMED_LITERAL_CSTRING(buffer, "</body>\n</html>\n");
mOutputStream->Write(buffer.get(), buffer.Length(), &n);
mOutputStream->Close();

2
netwerk/protocol/http/nsHttp.cpp
View File

@ -288,7 +288,7 @@ nsHttp::ParseInt64(const char *input, const char **next, int64_t *r)
}
bool
nsHttp::IsPermanentRedirect(uint32_t httpStatus)
nsHttp::IsPermanentRedirect(PRUint32 httpStatus)
{
return httpStatus == 301 || httpStatus == 308;
}

2
netwerk/protocol/http/nsHttp.h
View File

@ -181,7 +181,7 @@ struct nsHttp
}
// Return whether the HTTP status code represents a permanent redirect
static bool IsPermanentRedirect(uint32_t httpStatus);
static bool IsPermanentRedirect(PRUint32 httpStatus);
// Declare all atoms
//