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

Bug 579517 follow-up: Remove NSPR types that crept in

Browse Source
This commit is contained in:
Ehsan Akhgari 2012-10-01 16:04:09 -04:00
parent 86b407c027
commit 4b71a98ab2
9 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
content/base/src/nsDocument.cpp
View File

@ -2458,7 +2458,7 @@ nsDocument::InitCSP(nsIChannel* aChannel)
// ----- Figure out if we need to apply an app default CSP
bool applyAppDefaultCSP = false;
nsIPrincipal* principal = NodePrincipal();
PRUint16 appStatus = nsIPrincipal::APP_STATUS_NOT_INSTALLED;
uint16_t appStatus = nsIPrincipal::APP_STATUS_NOT_INSTALLED;
bool unknownAppId;
if (NS_SUCCEEDED(principal->GetUnknownAppId(&unknownAppId)) &&
!unknownAppId &&

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

@ -76,14 +76,14 @@ nsMixedContentBlocker::~nsMixedContentBlocker()
NS_IMPL_ISUPPORTS1(nsMixedContentBlocker, nsIContentPolicy)
NS_IMETHODIMP
nsMixedContentBlocker::ShouldLoad(PRUint32 aContentType,
nsMixedContentBlocker::ShouldLoad(uint32_t aContentType,
nsIURI* aContentLocation,
nsIURI* aRequestingLocation,
nsISupports* aRequestingContext,
const nsACString& aMimeGuess,
nsISupports* aExtra,
nsIPrincipal* aRequestPrincipal,
PRInt16* aDecision)
int16_t* aDecision)
{
// Default policy: allow the load if we find no reason to block it.
*aDecision = nsIContentPolicy::ACCEPT;
@ -186,14 +186,14 @@ nsMixedContentBlocker::ShouldLoad(PRUint32 aContentType,
}
NS_IMETHODIMP
nsMixedContentBlocker::ShouldProcess(PRUint32 aContentType,
nsMixedContentBlocker::ShouldProcess(uint32_t aContentType,
nsIURI* aContentLocation,
nsIURI* aRequestingLocation,
nsISupports* aRequestingContext,
const nsACString& aMimeGuess,
nsISupports* aExtra,
nsIPrincipal* aRequestPrincipal,
PRInt16* aDecision)
int16_t* aDecision)
{
if(!aContentLocation) {
// aContentLocation may be null when a plugin is loading without an associated URI resource

10
dom/bluetooth/BluetoothRilListener.cpp
View File

@ -25,8 +25,8 @@ public:
NS_IMPL_ISUPPORTS1(BluetoothRILTelephonyCallback, nsIRILTelephonyCallback)
NS_IMETHODIMP
BluetoothRILTelephonyCallback::CallStateChanged(PRUint32 aCallIndex,
PRUint16 aCallState,
BluetoothRILTelephonyCallback::CallStateChanged(uint32_t aCallIndex,
uint16_t aCallState,
const nsAString& aNumber,
bool aIsActive)
{
@ -38,8 +38,8 @@ BluetoothRILTelephonyCallback::CallStateChanged(PRUint32 aCallIndex,
}
NS_IMETHODIMP
BluetoothRILTelephonyCallback::EnumerateCallState(PRUint32 aCallIndex,
PRUint16 aCallState,
BluetoothRILTelephonyCallback::EnumerateCallState(uint32_t aCallIndex,
uint16_t aCallState,
const nsAString_internal& aNumber,
bool aIsActive,
bool* aResult)
@ -49,7 +49,7 @@ BluetoothRILTelephonyCallback::EnumerateCallState(PRUint32 aCallIndex,
}
NS_IMETHODIMP
BluetoothRILTelephonyCallback::NotifyError(PRInt32 aCallIndex,
BluetoothRILTelephonyCallback::NotifyError(int32_t aCallIndex,
const nsAString& aError)
{
return NS_OK;

4
dom/camera/DOMCameraManager.cpp
View File

@ -158,8 +158,8 @@ nsDOMCameraManager::Shutdown(uint64_t aWindowId)
return;
}
PRUint32 length = controls->Length();
for (PRUint32 i = 0; i < length; i++) {
uint32_t length = controls->Length();
for (uint32_t i = 0; i < length; i++) {
nsRefPtr<nsDOMCameraControl> cameraControl = controls->ElementAt(i);
cameraControl->Shutdown();
}

6
dom/camera/GonkCameraControl.h
View File

@ -93,9 +93,9 @@ protected:
android::MediaProfiles* mMediaProfiles;
android::GonkRecorder* mRecorder;
PRUint32 mVideoRotation;
PRUint32 mVideoWidth;
PRUint32 mVideoHeight;
uint32_t mVideoRotation;
uint32_t mVideoWidth;
uint32_t mVideoHeight;
nsString mVideoFile;
// camcorder profile settings for the desired quality level

4
dom/ipc/TabChild.cpp
View File

@ -410,12 +410,12 @@ TabChild::HandlePossibleMetaViewportChange()
nsCOMPtr<nsIDOMElement> htmlDOMElement = do_QueryInterface(document->GetHtmlElement());
nsCOMPtr<nsIDOMElement> bodyDOMElement = do_QueryInterface(document->GetBodyElement());
PRInt32 htmlWidth = 0, htmlHeight = 0;
int32_t htmlWidth = 0, htmlHeight = 0;
if (htmlDOMElement) {
htmlDOMElement->GetScrollWidth(&htmlWidth);
htmlDOMElement->GetScrollHeight(&htmlHeight);
}
PRInt32 bodyWidth = 0, bodyHeight = 0;
int32_t bodyWidth = 0, bodyHeight = 0;
if (bodyDOMElement) {
bodyDOMElement->GetScrollWidth(&bodyWidth);
bodyDOMElement->GetScrollHeight(&bodyHeight);

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

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

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

@ -288,13 +288,13 @@ nsHttp::ParseInt64(const char *input, const char **next, int64_t *r)
}
bool
nsHttp::IsPermanentRedirect(PRUint32 httpStatus)
nsHttp::IsPermanentRedirect(uint32_t httpStatus)
{
return httpStatus == 301 || httpStatus == 308;
}
bool
nsHttp::ShouldRewriteRedirectToGET(PRUint32 httpStatus, nsHttpAtom method)
nsHttp::ShouldRewriteRedirectToGET(uint32_t httpStatus, nsHttpAtom method)
{
// for 301 and 302, only rewrite POST
if (httpStatus == 301 || httpStatus == 302)

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

@ -181,11 +181,11 @@ struct nsHttp
}
// Return whether the HTTP status code represents a permanent redirect
static bool IsPermanentRedirect(PRUint32 httpStatus);
static bool IsPermanentRedirect(uint32_t httpStatus);
// Return whether upon a redirect code of httpStatus for method, the
// request method should be rewritten to GET.
static bool ShouldRewriteRedirectToGET(PRUint32 httpStatus, nsHttpAtom method);
static bool ShouldRewriteRedirectToGET(uint32_t httpStatus, nsHttpAtom method);
// Return whether the specified method is safe as per RFC 2616,
// Section 9.1.1.