Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compile errors and warnings with -DDEBUG_DOCSHELL_FOCUS. b=373985 r+sr=jst

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@222313 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mats.palmgren%bredband.net
2007-03-24 10:51:44 +00:00
parent 4c5fb88739
commit f48b9434d2
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mozilla/docshell/base/nsDocShell.cpp
View File

@@ -2103,14 +2103,13 @@ PrintDocTree(nsIDocShellTreeNode * aParentNode, int aLevel)
if (vm) {
vm->GetWidget(getter_AddRefs(widget));
}
nsCOMPtr<nsIContent> rootContent;
doc->GetRootContent(getter_AddRefs(rootContent));
nsIContent* rootContent = doc->GetRootContent();
printf("DS %p Ty %s Doc %p DW %p EM %p CN %p\n",
parentAsDocShell.get(),
(void*)parentAsDocShell.get(),
type==nsIDocShellTreeItem::typeChrome?"Chr":"Con",
doc.get(), domwin.get(),
presContext->EventStateManager(), rootContent.get());
(void*)doc, (void*)domwin.get(),
(void*)presContext->EventStateManager(), (void*)rootContent);
if (childWebshellCount > 0) {
for (PRInt32 i=0;i<childWebshellCount;i++) {
@@ -3797,7 +3796,7 @@ NS_IMETHODIMP
nsDocShell::SetFocus()
{
#ifdef DEBUG_DOCSHELL_FOCUS
printf("nsDocShell::SetFocus %p\n", (nsIDocShell*)this);
printf("nsDocShell::SetFocus %p\n", (void*)this);
#endif
// Tell itself (and the DocShellFocusController) who has focus
@@ -8574,7 +8573,8 @@ NS_IMETHODIMP
nsDocShell::SetHasFocus(PRBool aHasFocus)
{
#ifdef DEBUG_DOCSHELL_FOCUS
printf(">>>>>>>>>> nsDocShell::SetHasFocus: %p %s\n", this, aHasFocus?"Yes":"No");
printf(">>>>>>>>>> nsDocShell::SetHasFocus: %p %s\n", (void*)this,
aHasFocus?"Yes":"No");
#endif
mHasFocus = aHasFocus;
@@ -8748,7 +8748,8 @@ void
nsDocShellFocusController::Focus(nsIDocShell* aDocShell)
{
#ifdef DEBUG_DOCSHELL_FOCUS
printf("****** nsDocShellFocusController Focus To: %p Blur To: %p\n", aDocShell, mFocusedDocShell);
printf("****** nsDocShellFocusController Focus To: %p Blur To: %p\n",
(void*)aDocShell, (void*)mFocusedDocShell);
#endif
if (aDocShell != mFocusedDocShell) {