Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1064439, part 1e - Get rid of more space around parens in nsDocShellTreeOwner. r=jst

Browse Source
This commit is contained in:
Andrew McCreight 2014-12-16 09:18:01 -08:00
parent 78f3159e8a
commit 669aa09977
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
embedding/browser/nsDocShellTreeOwner.cpp
View File

@ -1021,7 +1021,7 @@ UseSVGTitle(nsIDOMElement *currElement)
return element->GetParentNode()->NodeType() != nsIDOMNode::DOCUMENT_NODE;
}
/* void getNodeText (in nsIDOMNode aNode, out wstring aText); */
/* void getNodeText(in nsIDOMNode aNode, out wstring aText); */
NS_IMETHODIMP
DefaultTooltipTextProvider::GetNodeText(nsIDOMNode *aNode, char16_t **aText,
bool *_retval)
@ -1035,7 +1035,7 @@ DefaultTooltipTextProvider::GetNodeText(nsIDOMNode *aNode, char16_t **aText,
bool lookingForSVGTitle = true;
bool found = false;
nsCOMPtr<nsIDOMNode> current ( aNode );
nsCOMPtr<nsIDOMNode> current(aNode);
// If the element implement the constraint validation API and has no title,
// show the validation message, if any.
@ -1059,8 +1059,8 @@ DefaultTooltipTextProvider::GetNodeText(nsIDOMNode *aNode, char16_t **aText,
}
}
while ( !found && current ) {
nsCOMPtr<nsIDOMElement> currElement ( do_QueryInterface(current) );
while (!found && current) {
nsCOMPtr<nsIDOMElement> currElement(do_QueryInterface(current));
if (currElement) {
nsCOMPtr<nsIContent> content(do_QueryInterface(currElement));
if (content) {
@ -1108,7 +1108,7 @@ DefaultTooltipTextProvider::GetNodeText(nsIDOMNode *aNode, char16_t **aText,
// not found here, walk up to the parent and keep trying
if (!found) {
nsCOMPtr<nsIDOMNode> temp ( current );
nsCOMPtr<nsIDOMNode> temp(current);
temp->GetParentNode(getter_AddRefs(current));
}
} // while not found
@ -1166,7 +1166,7 @@ ChromeTooltipListener::AddChromeListeners()
// Register the appropriate events for tooltips, but only if
// the embedding chrome cares.
nsresult rv = NS_OK;
nsCOMPtr<nsITooltipListener> tooltipListener ( do_QueryInterface(mWebBrowserChrome) );
nsCOMPtr<nsITooltipListener> tooltipListener(do_QueryInterface(mWebBrowserChrome));
if (tooltipListener && !mTooltipListenerInstalled) {
rv = AddTooltipListener();
if (NS_FAILED(rv))
@ -1215,7 +1215,7 @@ ChromeTooltipListener::AddTooltipListener()
// Unsubscribe from the various things we've hooked up to the window root.
//
NS_IMETHODIMP
ChromeTooltipListener::RemoveChromeListeners ( )
ChromeTooltipListener::RemoveChromeListeners()
{
HideTooltip();
@ -1290,7 +1290,7 @@ ChromeTooltipListener::HandleEvent(nsIDOMEvent* aEvent)
nsresult
ChromeTooltipListener::MouseMove(nsIDOMEvent* aMouseEvent)
{
nsCOMPtr<nsIDOMMouseEvent> mouseEvent ( do_QueryInterface(aMouseEvent) );
nsCOMPtr<nsIDOMMouseEvent> mouseEvent(do_QueryInterface(aMouseEvent));
if (!mouseEvent)
return NS_OK;
@ -1334,7 +1334,7 @@ ChromeTooltipListener::MouseMove(nsIDOMEvent* aMouseEvent)
}
}
else {
NS_WARNING ( "Could not create a timer for tooltip tracking" );
NS_WARNING("Could not create a timer for tooltip tracking");
}
} else {
mTooltipShownOnce = true;
@ -1358,9 +1358,9 @@ ChromeTooltipListener::ShowTooltip(int32_t inXCoords, int32_t inYCoords,
nsresult rv = NS_OK;
// do the work to call the client
nsCOMPtr<nsITooltipListener> tooltipListener ( do_QueryInterface(mWebBrowserChrome) );
nsCOMPtr<nsITooltipListener> tooltipListener(do_QueryInterface(mWebBrowserChrome));
if (tooltipListener) {
rv = tooltipListener->OnShowTooltip ( inXCoords, inYCoords, PromiseFlatString(inTipText).get() );
rv = tooltipListener->OnShowTooltip(inXCoords, inYCoords, PromiseFlatString(inTipText).get());
if (NS_SUCCEEDED(rv))
mShowingTooltip = true;
}
@ -1391,9 +1391,9 @@ ChromeTooltipListener::HideTooltip()
// if we're showing the tip, tell the chrome to hide it
if (mShowingTooltip) {
nsCOMPtr<nsITooltipListener> tooltipListener ( do_QueryInterface(mWebBrowserChrome) );
nsCOMPtr<nsITooltipListener> tooltipListener(do_QueryInterface(mWebBrowserChrome));
if (tooltipListener) {
rv = tooltipListener->OnHideTooltip ( );
rv = tooltipListener->OnHideTooltip();
if (NS_SUCCEEDED(rv))
mShowingTooltip = false;
}
@ -1467,9 +1467,9 @@ ChromeTooltipListener::sTooltipCallback(nsITimer *aTimer,
if (textFound) {
nsString tipText(tooltipText);
nsIntPoint screenDot = widget->WidgetToScreenOffset();
self->ShowTooltip (self->mMouseScreenX - screenDot.x,
self->mMouseScreenY - screenDot.y,
tipText);
self->ShowTooltip(self->mMouseScreenX - screenDot.x,
self->mMouseScreenY - screenDot.y,
tipText);
}
}
@ -1486,7 +1486,7 @@ NS_IMPL_ISUPPORTS(ChromeContextMenuListener, nsIDOMEventListener)
//
// ChromeTooltipListener ctor
//
ChromeContextMenuListener::ChromeContextMenuListener(nsWebBrowser* inBrowser, nsIWebBrowserChrome* inChrome )
ChromeContextMenuListener::ChromeContextMenuListener(nsWebBrowser* inBrowser, nsIWebBrowserChrome* inChrome)
: mContextMenuListenerInstalled(false),
mWebBrowser(inBrowser),
mWebBrowserChrome(inChrome)
@ -1561,8 +1561,8 @@ ChromeContextMenuListener::AddChromeListeners()
// the embedding chrome cares.
nsresult rv = NS_OK;
nsCOMPtr<nsIContextMenuListener2> contextListener2 ( do_QueryInterface(mWebBrowserChrome) );
nsCOMPtr<nsIContextMenuListener> contextListener ( do_QueryInterface(mWebBrowserChrome) );
nsCOMPtr<nsIContextMenuListener2> contextListener2(do_QueryInterface(mWebBrowserChrome));
nsCOMPtr<nsIContextMenuListener> contextListener(do_QueryInterface(mWebBrowserChrome));
if ((contextListener || contextListener2) && !mContextMenuListenerInstalled)
rv = AddContextMenuListener();

14
embedding/browser/nsDocShellTreeOwner.h
View File

@ -147,12 +147,12 @@ protected:
class ChromeTooltipListener MOZ_FINAL : public nsIDOMEventListener
{
protected:
virtual ~ChromeTooltipListener ( ) ;
virtual ~ChromeTooltipListener();
public:
NS_DECL_ISUPPORTS
ChromeTooltipListener ( nsWebBrowser* inBrowser, nsIWebBrowserChrome* inChrome ) ;
ChromeTooltipListener(nsWebBrowser* inBrowser, nsIWebBrowserChrome* inChrome);
NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent);
NS_IMETHOD MouseMove(nsIDOMEvent* aMouseEvent);
@ -173,8 +173,8 @@ private:
NS_IMETHOD AddTooltipListener();
NS_IMETHOD RemoveTooltipListener();
NS_IMETHOD ShowTooltip ( int32_t inXCoords, int32_t inYCoords, const nsAString & inTipText ) ;
NS_IMETHOD HideTooltip ( ) ;
NS_IMETHOD ShowTooltip(int32_t inXCoords, int32_t inYCoords, const nsAString & inTipText);
NS_IMETHOD HideTooltip();
nsWebBrowser* mWebBrowser;
nsCOMPtr<mozilla::dom::EventTarget> mEventTarget;
@ -189,7 +189,7 @@ private:
bool mTooltipListenerInstalled;
nsCOMPtr<nsITimer> mTooltipTimer;
static void sTooltipCallback ( nsITimer* aTimer, void* aListener ) ;
static void sTooltipCallback(nsITimer* aTimer, void* aListener);
int32_t mMouseClientX, mMouseClientY; // mouse coordinates for last mousemove event we saw
int32_t mMouseScreenX, mMouseScreenY; // mouse coordinates for tooltip event
bool mShowingTooltip;
@ -218,12 +218,12 @@ private:
class ChromeContextMenuListener : public nsIDOMEventListener
{
protected:
virtual ~ChromeContextMenuListener ( ) ;
virtual ~ChromeContextMenuListener();
public:
NS_DECL_ISUPPORTS
ChromeContextMenuListener ( nsWebBrowser* inBrowser, nsIWebBrowserChrome* inChrome ) ;
ChromeContextMenuListener(nsWebBrowser* inBrowser, nsIWebBrowserChrome* inChrome);
// nsIDOMContextMenuListener
NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent);