Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1064439, part 1c - Get rid of if ( foo ) in nsDocShellTreeOwner. r=jst

Browse Source
This commit is contained in:
Andrew McCreight 2014-12-16 09:18:01 -08:00
parent f7c0e804ba
commit d91383288a
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
embedding/browser/nsDocShellTreeOwner.cpp
View File

@ -741,7 +741,7 @@ nsDocShellTreeOwner::OnSecurityChange(nsIWebProgress *aWebProgress,
void void
nsDocShellTreeOwner::WebBrowser(nsWebBrowser* aWebBrowser) nsDocShellTreeOwner::WebBrowser(nsWebBrowser* aWebBrowser)
{ {
if ( !aWebBrowser ) if (!aWebBrowser)
RemoveChromeListeners(); RemoveChromeListeners();
if (aWebBrowser != mWebBrowser) { if (aWebBrowser != mWebBrowser) {
mPrompter = 0; mPrompter = 0;
@ -819,13 +819,13 @@ nsDocShellTreeOwner::AddChromeListeners()
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
// install tooltips // install tooltips
if ( !mChromeTooltipListener ) { if (!mChromeTooltipListener) {
nsCOMPtr<nsITooltipListener> nsCOMPtr<nsITooltipListener>
tooltipListener(do_QueryInterface(webBrowserChrome)); tooltipListener(do_QueryInterface(webBrowserChrome));
if ( tooltipListener ) { if (tooltipListener) {
mChromeTooltipListener = new ChromeTooltipListener(mWebBrowser, mChromeTooltipListener = new ChromeTooltipListener(mWebBrowser,
webBrowserChrome); webBrowserChrome);
if ( mChromeTooltipListener ) { if (mChromeTooltipListener) {
NS_ADDREF(mChromeTooltipListener); NS_ADDREF(mChromeTooltipListener);
rv = mChromeTooltipListener->AddChromeListeners(); rv = mChromeTooltipListener->AddChromeListeners();
} }
@ -835,15 +835,15 @@ nsDocShellTreeOwner::AddChromeListeners()
} }
// install context menus // install context menus
if ( !mChromeContextMenuListener ) { if (!mChromeContextMenuListener) {
nsCOMPtr<nsIContextMenuListener2> nsCOMPtr<nsIContextMenuListener2>
contextListener2(do_QueryInterface(webBrowserChrome)); contextListener2(do_QueryInterface(webBrowserChrome));
nsCOMPtr<nsIContextMenuListener> nsCOMPtr<nsIContextMenuListener>
contextListener(do_QueryInterface(webBrowserChrome)); contextListener(do_QueryInterface(webBrowserChrome));
if ( contextListener2 || contextListener ) { if (contextListener2 || contextListener) {
mChromeContextMenuListener = mChromeContextMenuListener =
new ChromeContextMenuListener(mWebBrowser, webBrowserChrome); new ChromeContextMenuListener(mWebBrowser, webBrowserChrome);
if ( mChromeContextMenuListener ) { if (mChromeContextMenuListener) {
NS_ADDREF(mChromeContextMenuListener); NS_ADDREF(mChromeContextMenuListener);
rv = mChromeContextMenuListener->AddChromeListeners(); rv = mChromeContextMenuListener->AddChromeListeners();
} }
@ -872,11 +872,11 @@ nsDocShellTreeOwner::AddChromeListeners()
NS_IMETHODIMP NS_IMETHODIMP
nsDocShellTreeOwner::RemoveChromeListeners() nsDocShellTreeOwner::RemoveChromeListeners()
{ {
if ( mChromeTooltipListener ) { if (mChromeTooltipListener) {
mChromeTooltipListener->RemoveChromeListeners(); mChromeTooltipListener->RemoveChromeListeners();
NS_RELEASE(mChromeTooltipListener); NS_RELEASE(mChromeTooltipListener);
} }
if ( mChromeContextMenuListener ) { if (mChromeContextMenuListener) {
mChromeContextMenuListener->RemoveChromeListeners(); mChromeContextMenuListener->RemoveChromeListeners();
NS_RELEASE(mChromeContextMenuListener); NS_RELEASE(mChromeContextMenuListener);
} }
@ -1063,7 +1063,7 @@ DefaultTooltipTextProvider::GetNodeText(nsIDOMNode *aNode, char16_t **aText,
while ( !found && current ) { while ( !found && current ) {
nsCOMPtr<nsIDOMElement> currElement ( do_QueryInterface(current) ); nsCOMPtr<nsIDOMElement> currElement ( do_QueryInterface(current) );
if ( currElement ) { if (currElement) {
nsCOMPtr<nsIContent> content(do_QueryInterface(currElement)); nsCOMPtr<nsIContent> content(do_QueryInterface(currElement));
if (content) { if (content) {
nsIAtom *tagAtom = content->Tag(); nsIAtom *tagAtom = content->Tag();
@ -1072,7 +1072,7 @@ DefaultTooltipTextProvider::GetNodeText(nsIDOMNode *aNode, char16_t **aText,
tagAtom != mTag_window) { tagAtom != mTag_window) {
// first try the normal title attribute... // first try the normal title attribute...
currElement->GetAttribute(NS_LITERAL_STRING("title"), outText); currElement->GetAttribute(NS_LITERAL_STRING("title"), outText);
if ( outText.Length() ) if (outText.Length())
found = true; found = true;
else { else {
// ...ok, that didn't work, try it in the XLink namespace // ...ok, that didn't work, try it in the XLink namespace
@ -1082,7 +1082,7 @@ DefaultTooltipTextProvider::GetNodeText(nsIDOMNode *aNode, char16_t **aText,
nsCOMPtr<nsIURI> uri(linkContent->GetURIExternal()); nsCOMPtr<nsIURI> uri(linkContent->GetURIExternal());
if (uri) { if (uri) {
currElement->GetAttributeNS(NS_LITERAL_STRING("http://www.w3.org/1999/xlink"), NS_LITERAL_STRING("title"), outText); currElement->GetAttributeNS(NS_LITERAL_STRING("http://www.w3.org/1999/xlink"), NS_LITERAL_STRING("title"), outText);
if ( outText.Length() ) if (outText.Length())
found = true; found = true;
} }
} }
@ -1097,7 +1097,7 @@ DefaultTooltipTextProvider::GetNodeText(nsIDOMNode *aNode, char16_t **aText,
nsIContent* child = childNodes->Item(i); nsIContent* child = childNodes->Item(i);
if (child->IsSVG(nsGkAtoms::title)) { if (child->IsSVG(nsGkAtoms::title)) {
static_cast<dom::SVGTitleElement*>(child)->GetTextContent(outText); static_cast<dom::SVGTitleElement*>(child)->GetTextContent(outText);
if ( outText.Length() ) if (outText.Length())
found = true; found = true;
break; break;
} }
@ -1110,7 +1110,7 @@ DefaultTooltipTextProvider::GetNodeText(nsIDOMNode *aNode, char16_t **aText,
} }
// not found here, walk up to the parent and keep trying // not found here, walk up to the parent and keep trying
if ( !found ) { if (!found) {
nsCOMPtr<nsIDOMNode> temp ( current ); nsCOMPtr<nsIDOMNode> temp ( current );
temp->GetParentNode(getter_AddRefs(current)); temp->GetParentNode(getter_AddRefs(current));
} }
@ -1170,9 +1170,9 @@ ChromeTooltipListener::AddChromeListeners()
// the embedding chrome cares. // the embedding chrome cares.
nsresult rv = NS_OK; nsresult rv = NS_OK;
nsCOMPtr<nsITooltipListener> tooltipListener ( do_QueryInterface(mWebBrowserChrome) ); nsCOMPtr<nsITooltipListener> tooltipListener ( do_QueryInterface(mWebBrowserChrome) );
if ( tooltipListener && !mTooltipListenerInstalled ) { if (tooltipListener && !mTooltipListenerInstalled) {
rv = AddTooltipListener(); rv = AddTooltipListener();
if ( NS_FAILED(rv) ) if (NS_FAILED(rv))
return rv; return rv;
} }
@ -1222,7 +1222,7 @@ ChromeTooltipListener::RemoveChromeListeners ( )
{ {
HideTooltip(); HideTooltip();
if ( mTooltipListenerInstalled ) if (mTooltipListenerInstalled)
RemoveTooltipListener(); RemoveTooltipListener();
mEventTarget = nullptr; mEventTarget = nullptr;
@ -1306,7 +1306,7 @@ ChromeTooltipListener::MouseMove(nsIDOMEvent* aMouseEvent)
int32_t newMouseX, newMouseY; int32_t newMouseX, newMouseY;
mouseEvent->GetClientX(&newMouseX); mouseEvent->GetClientX(&newMouseX);
mouseEvent->GetClientY(&newMouseY); mouseEvent->GetClientY(&newMouseY);
if ( mMouseClientX == newMouseX && mMouseClientY == newMouseY ) if (mMouseClientX == newMouseX && mMouseClientY == newMouseY)
return NS_OK; return NS_OK;
// Filter out minor mouse movements. // Filter out minor mouse movements.
@ -1319,17 +1319,17 @@ ChromeTooltipListener::MouseMove(nsIDOMEvent* aMouseEvent)
mouseEvent->GetScreenX(&mMouseScreenX); mouseEvent->GetScreenX(&mMouseScreenX);
mouseEvent->GetScreenY(&mMouseScreenY); mouseEvent->GetScreenY(&mMouseScreenY);
if ( mTooltipTimer ) { if (mTooltipTimer) {
mTooltipTimer->Cancel(); mTooltipTimer->Cancel();
} }
if (!mShowingTooltip && !mTooltipShownOnce) { if (!mShowingTooltip && !mTooltipShownOnce) {
mTooltipTimer = do_CreateInstance("@mozilla.org/timer;1"); mTooltipTimer = do_CreateInstance("@mozilla.org/timer;1");
if ( mTooltipTimer ) { if (mTooltipTimer) {
nsCOMPtr<EventTarget> eventTarget = aMouseEvent->InternalDOMEvent()->GetTarget(); nsCOMPtr<EventTarget> eventTarget = aMouseEvent->InternalDOMEvent()->GetTarget();
if ( eventTarget ) if (eventTarget)
mPossibleTooltipNode = do_QueryInterface(eventTarget); mPossibleTooltipNode = do_QueryInterface(eventTarget);
if ( mPossibleTooltipNode ) { if (mPossibleTooltipNode) {
nsresult rv = nsresult rv =
mTooltipTimer->InitWithFuncCallback(sTooltipCallback, this, mTooltipTimer->InitWithFuncCallback(sTooltipCallback, this,
LookAndFeel::GetInt(LookAndFeel::eIntID_TooltipDelay, 500), LookAndFeel::GetInt(LookAndFeel::eIntID_TooltipDelay, 500),
@ -1364,9 +1364,9 @@ ChromeTooltipListener::ShowTooltip(int32_t inXCoords, int32_t inYCoords,
// do the work to call the client // do the work to call the client
nsCOMPtr<nsITooltipListener> tooltipListener ( do_QueryInterface(mWebBrowserChrome) ); nsCOMPtr<nsITooltipListener> tooltipListener ( do_QueryInterface(mWebBrowserChrome) );
if ( tooltipListener ) { if (tooltipListener) {
rv = tooltipListener->OnShowTooltip ( inXCoords, inYCoords, PromiseFlatString(inTipText).get() ); rv = tooltipListener->OnShowTooltip ( inXCoords, inYCoords, PromiseFlatString(inTipText).get() );
if ( NS_SUCCEEDED(rv) ) if (NS_SUCCEEDED(rv))
mShowingTooltip = true; mShowingTooltip = true;
} }
@ -1387,7 +1387,7 @@ ChromeTooltipListener::HideTooltip()
nsresult rv = NS_OK; nsresult rv = NS_OK;
// shut down the relevant timers // shut down the relevant timers
if ( mTooltipTimer ) { if (mTooltipTimer) {
mTooltipTimer->Cancel(); mTooltipTimer->Cancel();
mTooltipTimer = nullptr; mTooltipTimer = nullptr;
// release tooltip target // release tooltip target
@ -1395,11 +1395,11 @@ ChromeTooltipListener::HideTooltip()
} }
// if we're showing the tip, tell the chrome to hide it // if we're showing the tip, tell the chrome to hide it
if ( mShowingTooltip ) { if (mShowingTooltip) {
nsCOMPtr<nsITooltipListener> tooltipListener ( do_QueryInterface(mWebBrowserChrome) ); nsCOMPtr<nsITooltipListener> tooltipListener ( do_QueryInterface(mWebBrowserChrome) );
if ( tooltipListener ) { if (tooltipListener) {
rv = tooltipListener->OnHideTooltip ( ); rv = tooltipListener->OnHideTooltip ( );
if ( NS_SUCCEEDED(rv) ) if (NS_SUCCEEDED(rv))
mShowingTooltip = false; mShowingTooltip = false;
} }
} }
@ -1427,7 +1427,7 @@ ChromeTooltipListener::sTooltipCallback(nsITimer *aTimer,
{ {
ChromeTooltipListener* self = static_cast<ChromeTooltipListener*> ChromeTooltipListener* self = static_cast<ChromeTooltipListener*>
(aChromeTooltipListener); (aChromeTooltipListener);
if ( self && self->mPossibleTooltipNode ){ if (self && self->mPossibleTooltipNode) {
// The actual coordinates we want to put the tooltip at are relative to the // The actual coordinates we want to put the tooltip at are relative to the
// toplevel docshell of our mWebBrowser. We know what the screen // toplevel docshell of our mWebBrowser. We know what the screen
// coordinates of the mouse event were, which means we just need the screen // coordinates of the mouse event were, which means we just need the screen
@ -1568,7 +1568,7 @@ ChromeContextMenuListener::AddChromeListeners()
nsCOMPtr<nsIContextMenuListener2> contextListener2 ( do_QueryInterface(mWebBrowserChrome) ); nsCOMPtr<nsIContextMenuListener2> contextListener2 ( do_QueryInterface(mWebBrowserChrome) );
nsCOMPtr<nsIContextMenuListener> contextListener ( do_QueryInterface(mWebBrowserChrome) ); nsCOMPtr<nsIContextMenuListener> contextListener ( do_QueryInterface(mWebBrowserChrome) );
if ( (contextListener || contextListener2) && !mContextMenuListenerInstalled ) if ((contextListener || contextListener2) && !mContextMenuListenerInstalled)
rv = AddContextMenuListener(); rv = AddContextMenuListener();
return rv; return rv;
@ -1584,7 +1584,7 @@ ChromeContextMenuListener::AddChromeListeners()
NS_IMETHODIMP NS_IMETHODIMP
ChromeContextMenuListener::RemoveChromeListeners() ChromeContextMenuListener::RemoveChromeListeners()
{ {
if ( mContextMenuListenerInstalled ) if (mContextMenuListenerInstalled)
RemoveContextMenuListener(); RemoveContextMenuListener();
mEventTarget = nullptr; mEventTarget = nullptr;
@ -1769,14 +1769,14 @@ ChromeContextMenuListener::HandleEvent(nsIDOMEvent* aMouseEvent)
} }
// Tell the listener all about the event // Tell the listener all about the event
if ( menuListener2 ) { if (menuListener2) {
menuInfoImpl->SetMouseEvent(aMouseEvent); menuInfoImpl->SetMouseEvent(aMouseEvent);
menuInfoImpl->SetDOMNode(targetDOMnode); menuInfoImpl->SetDOMNode(targetDOMnode);
menuListener2->OnShowContextMenu(flags2, menuInfo); menuListener2->OnShowContextMenu(flags2, menuInfo);
} }
else { else {
nsCOMPtr<nsIContextMenuListener> menuListener(do_QueryInterface(mWebBrowserChrome)); nsCOMPtr<nsIContextMenuListener> menuListener(do_QueryInterface(mWebBrowserChrome));
if ( menuListener ) if (menuListener)
menuListener->OnShowContextMenu(flags, aMouseEvent, targetDOMnode); menuListener->OnShowContextMenu(flags, aMouseEvent, targetDOMnode);
} }