Bug 690892 - Replace PR_TRUE/PR_FALSE with true/false on mozilla-central; rs=dbaron
Landing on a CLOSED TREE
This commit is contained in:
@@ -236,7 +236,7 @@ ImageListener::OnStartRequest(nsIRequest* request, nsISupports *ctxt)
|
||||
NS_ENSURE_TRUE(imageLoader, NS_ERROR_UNEXPECTED);
|
||||
|
||||
imageLoader->AddObserver(imgDoc);
|
||||
imgDoc->mObservingImageLoader = PR_TRUE;
|
||||
imgDoc->mObservingImageLoader = true;
|
||||
imageLoader->LoadImageWithChannel(channel, getter_AddRefs(mNextStream));
|
||||
|
||||
return MediaDocumentStreamListener::OnStartRequest(request, ctxt);
|
||||
@@ -289,7 +289,7 @@ ImageDocument::Init()
|
||||
mResizeImageByDefault = Preferences::GetBool(AUTOMATIC_IMAGE_RESIZING_PREF);
|
||||
mClickResizingEnabled = Preferences::GetBool(CLICK_IMAGE_RESIZING_PREF);
|
||||
mShouldResize = mResizeImageByDefault;
|
||||
mFirstResize = PR_TRUE;
|
||||
mFirstResize = true;
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
@@ -326,7 +326,7 @@ ImageDocument::Destroy()
|
||||
if (mImageContent) {
|
||||
// Remove our event listener from the image content.
|
||||
nsCOMPtr<nsIDOMEventTarget> target = do_QueryInterface(mImageContent);
|
||||
target->RemoveEventListener(NS_LITERAL_STRING("click"), this, PR_FALSE);
|
||||
target->RemoveEventListener(NS_LITERAL_STRING("click"), this, false);
|
||||
|
||||
// Break reference cycle with mImageContent, if we have one
|
||||
if (mObservingImageLoader) {
|
||||
@@ -356,9 +356,9 @@ ImageDocument::SetScriptGlobalObject(nsIScriptGlobalObject* aScriptGlobalObject)
|
||||
if (mScriptGlobalObject &&
|
||||
aScriptGlobalObject != mScriptGlobalObject) {
|
||||
target = do_QueryInterface(mScriptGlobalObject);
|
||||
target->RemoveEventListener(NS_LITERAL_STRING("resize"), this, PR_FALSE);
|
||||
target->RemoveEventListener(NS_LITERAL_STRING("resize"), this, false);
|
||||
target->RemoveEventListener(NS_LITERAL_STRING("keypress"), this,
|
||||
PR_FALSE);
|
||||
false);
|
||||
}
|
||||
|
||||
// Set the script global object on the superclass before doing
|
||||
@@ -375,12 +375,12 @@ ImageDocument::SetScriptGlobalObject(nsIScriptGlobalObject* aScriptGlobalObject)
|
||||
NS_ASSERTION(NS_SUCCEEDED(rv), "failed to create synthetic document");
|
||||
|
||||
target = do_QueryInterface(mImageContent);
|
||||
target->AddEventListener(NS_LITERAL_STRING("click"), this, PR_FALSE);
|
||||
target->AddEventListener(NS_LITERAL_STRING("click"), this, false);
|
||||
}
|
||||
|
||||
target = do_QueryInterface(aScriptGlobalObject);
|
||||
target->AddEventListener(NS_LITERAL_STRING("resize"), this, PR_FALSE);
|
||||
target->AddEventListener(NS_LITERAL_STRING("keypress"), this, PR_FALSE);
|
||||
target->AddEventListener(NS_LITERAL_STRING("resize"), this, false);
|
||||
target->AddEventListener(NS_LITERAL_STRING("keypress"), this, false);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -398,7 +398,7 @@ ImageDocument::OnPageShow(bool aPersisted,
|
||||
NS_IMETHODIMP
|
||||
ImageDocument::GetImageResizingEnabled(bool* aImageResizingEnabled)
|
||||
{
|
||||
*aImageResizingEnabled = PR_TRUE;
|
||||
*aImageResizingEnabled = true;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
@@ -448,12 +448,12 @@ ImageDocument::ShrinkToFit()
|
||||
|
||||
// The view might have been scrolled when zooming in, scroll back to the
|
||||
// origin now that we're showing a shrunk-to-window version.
|
||||
(void) ScrollImageTo(0, 0, PR_FALSE);
|
||||
(void) ScrollImageTo(0, 0, false);
|
||||
|
||||
imageContent->SetAttr(kNameSpaceID_None, nsGkAtoms::style,
|
||||
NS_LITERAL_STRING("cursor: -moz-zoom-in"), PR_TRUE);
|
||||
NS_LITERAL_STRING("cursor: -moz-zoom-in"), true);
|
||||
|
||||
mImageIsResized = PR_TRUE;
|
||||
mImageIsResized = true;
|
||||
|
||||
UpdateTitleAndCharset();
|
||||
|
||||
@@ -463,7 +463,7 @@ ImageDocument::ShrinkToFit()
|
||||
NS_IMETHODIMP
|
||||
ImageDocument::RestoreImageTo(PRInt32 aX, PRInt32 aY)
|
||||
{
|
||||
return ScrollImageTo(aX, aY, PR_TRUE);
|
||||
return ScrollImageTo(aX, aY, true);
|
||||
}
|
||||
|
||||
nsresult
|
||||
@@ -499,18 +499,18 @@ ImageDocument::RestoreImage()
|
||||
}
|
||||
// Keep image content alive while changing the attributes.
|
||||
nsCOMPtr<nsIContent> imageContent = mImageContent;
|
||||
imageContent->UnsetAttr(kNameSpaceID_None, nsGkAtoms::width, PR_TRUE);
|
||||
imageContent->UnsetAttr(kNameSpaceID_None, nsGkAtoms::height, PR_TRUE);
|
||||
imageContent->UnsetAttr(kNameSpaceID_None, nsGkAtoms::width, true);
|
||||
imageContent->UnsetAttr(kNameSpaceID_None, nsGkAtoms::height, true);
|
||||
|
||||
if (mImageIsOverflowing) {
|
||||
imageContent->SetAttr(kNameSpaceID_None, nsGkAtoms::style,
|
||||
NS_LITERAL_STRING("cursor: -moz-zoom-out"), PR_TRUE);
|
||||
NS_LITERAL_STRING("cursor: -moz-zoom-out"), true);
|
||||
}
|
||||
else {
|
||||
imageContent->UnsetAttr(kNameSpaceID_None, nsGkAtoms::style, PR_TRUE);
|
||||
imageContent->UnsetAttr(kNameSpaceID_None, nsGkAtoms::style, true);
|
||||
}
|
||||
|
||||
mImageIsResized = PR_FALSE;
|
||||
mImageIsResized = false;
|
||||
|
||||
UpdateTitleAndCharset();
|
||||
|
||||
@@ -520,9 +520,9 @@ ImageDocument::RestoreImage()
|
||||
NS_IMETHODIMP
|
||||
ImageDocument::ToggleImageSize()
|
||||
{
|
||||
mShouldResize = PR_TRUE;
|
||||
mShouldResize = true;
|
||||
if (mImageIsResized) {
|
||||
mShouldResize = PR_FALSE;
|
||||
mShouldResize = false;
|
||||
ResetZoomLevel();
|
||||
RestoreImage();
|
||||
}
|
||||
@@ -556,7 +556,7 @@ ImageDocument::OnStopDecode(imgIRequest *aRequest,
|
||||
|
||||
nsCOMPtr<nsIImageLoadingContent> imageLoader = do_QueryInterface(mImageContent);
|
||||
if (imageLoader) {
|
||||
mObservingImageLoader = PR_FALSE;
|
||||
mObservingImageLoader = false;
|
||||
imageLoader->RemoveObserver(this);
|
||||
}
|
||||
|
||||
@@ -571,7 +571,7 @@ ImageDocument::OnStopDecode(imgIRequest *aRequest,
|
||||
mStringBundle->FormatStringFromName(str.get(), formatString, 1,
|
||||
getter_Copies(errorMsg));
|
||||
|
||||
mImageContent->SetAttr(kNameSpaceID_None, nsGkAtoms::alt, errorMsg, PR_FALSE);
|
||||
mImageContent->SetAttr(kNameSpaceID_None, nsGkAtoms::alt, errorMsg, false);
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
@@ -583,11 +583,11 @@ ImageDocument::HandleEvent(nsIDOMEvent* aEvent)
|
||||
nsAutoString eventType;
|
||||
aEvent->GetType(eventType);
|
||||
if (eventType.EqualsLiteral("resize")) {
|
||||
CheckOverflowing(PR_FALSE);
|
||||
CheckOverflowing(false);
|
||||
}
|
||||
else if (eventType.EqualsLiteral("click") && mClickResizingEnabled) {
|
||||
ResetZoomLevel();
|
||||
mShouldResize = PR_TRUE;
|
||||
mShouldResize = true;
|
||||
if (mImageIsResized) {
|
||||
PRInt32 x = 0, y = 0;
|
||||
nsCOMPtr<nsIDOMMouseEvent> event(do_QueryInterface(aEvent));
|
||||
@@ -601,7 +601,7 @@ ImageDocument::HandleEvent(nsIDOMEvent* aEvent)
|
||||
x -= left;
|
||||
y -= top;
|
||||
}
|
||||
mShouldResize = PR_FALSE;
|
||||
mShouldResize = false;
|
||||
RestoreImageTo(x, y);
|
||||
}
|
||||
else if (mImageIsOverflowing) {
|
||||
@@ -618,7 +618,7 @@ ImageDocument::HandleEvent(nsIDOMEvent* aEvent)
|
||||
keyEvent->GetAltKey(&altKey);
|
||||
// plus key
|
||||
if (charCode == 0x2B && !ctrlKey && !metaKey && !altKey) {
|
||||
mShouldResize = PR_FALSE;
|
||||
mShouldResize = false;
|
||||
if (mImageIsResized) {
|
||||
ResetZoomLevel();
|
||||
RestoreImage();
|
||||
@@ -626,7 +626,7 @@ ImageDocument::HandleEvent(nsIDOMEvent* aEvent)
|
||||
}
|
||||
// minus key
|
||||
else if (charCode == 0x2D && !ctrlKey && !metaKey && !altKey) {
|
||||
mShouldResize = PR_TRUE;
|
||||
mShouldResize = true;
|
||||
if (mImageIsOverflowing) {
|
||||
ResetZoomLevel();
|
||||
ShrinkToFit();
|
||||
@@ -667,7 +667,7 @@ ImageDocument::CreateSyntheticDocument()
|
||||
}
|
||||
|
||||
styleContent->SetTextContent(NS_LITERAL_STRING("img { display: block; }"));
|
||||
head->AppendChildTo(styleContent, PR_FALSE);
|
||||
head->AppendChildTo(styleContent, false);
|
||||
|
||||
// Add the image element
|
||||
Element* body = GetBodyElement();
|
||||
@@ -699,12 +699,12 @@ ImageDocument::CreateSyntheticDocument()
|
||||
|
||||
NS_ConvertUTF8toUTF16 srcString(src);
|
||||
// Make sure not to start the image load from here...
|
||||
imageLoader->SetLoadingEnabled(PR_FALSE);
|
||||
mImageContent->SetAttr(kNameSpaceID_None, nsGkAtoms::src, srcString, PR_FALSE);
|
||||
mImageContent->SetAttr(kNameSpaceID_None, nsGkAtoms::alt, srcString, PR_FALSE);
|
||||
imageLoader->SetLoadingEnabled(false);
|
||||
mImageContent->SetAttr(kNameSpaceID_None, nsGkAtoms::src, srcString, false);
|
||||
mImageContent->SetAttr(kNameSpaceID_None, nsGkAtoms::alt, srcString, false);
|
||||
|
||||
body->AppendChildTo(mImageContent, PR_FALSE);
|
||||
imageLoader->SetLoadingEnabled(PR_TRUE);
|
||||
body->AppendChildTo(mImageContent, false);
|
||||
imageLoader->SetLoadingEnabled(true);
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
@@ -760,7 +760,7 @@ ImageDocument::CheckOverflowing(bool changeState)
|
||||
RestoreImage();
|
||||
}
|
||||
}
|
||||
mFirstResize = PR_FALSE;
|
||||
mFirstResize = false;
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user