Merge layout-debugger bustage fix
authorBenjamin Smedberg <benjamin@smedbergs.us>
Mon, 12 Jan 2009 19:32:28 -0500
changeset 23570 48b12c9bb824ce04b0d366ce85622e88afd74117
parent 23568 034f60a2969e335a606feaafd04669803a4331b2 (current diff)
parent 23569 52be68be1534d061f0f4c50d5134e9940b419174 (diff)
child 23571 62e0965bc0e49bb9db5f82116c10a95ff8cdaba4
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone1.9.2a1pre
Merge layout-debugger bustage fix
--- a/extensions/layout-debug/src/nsLayoutDebuggingTools.cpp
+++ b/extensions/layout-debug/src/nsLayoutDebuggingTools.cpp
@@ -422,18 +422,18 @@ static void
 DumpFramesRecur(nsIDocShell* aDocShell, FILE* out)
 {
     if (nsnull != aDocShell) {
         fprintf(out, "webshell=%p \n", static_cast<void*>(aDocShell));
         nsCOMPtr<nsIPresShell> shell(pres_shell(aDocShell));
         if (shell) {
             nsIFrame* root = shell->GetRootFrame();
             if (root) {
-                nsIFrameDebug* fdbg;
-                if (NS_SUCCEEDED(CallQueryInterface(root, &fdbg))) {
+                nsIFrameDebug* fdbg = do_QueryFrame(root);
+                if (fdbg) {
                     fdbg->List(out, 0);
                 }
             }
         }
         else {
             fputs("null pres shell\n", out);
         }
 
--- a/extensions/layout-debug/src/nsRegressionTester.cpp
+++ b/extensions/layout-debug/src/nsRegressionTester.cpp
@@ -106,18 +106,17 @@ nsRegressionTester::DumpFrameModel(nsIDO
     return NS_OK;
   }
   
   nsCOMPtr<nsIPresShell> presShell;
   docShell->GetPresShell(getter_AddRefs(presShell));
 
   nsIFrame* root = presShell->GetRootFrame();
 
-  nsIFrameDebug*  fdbg;
-  rv = CallQueryInterface(root, &fdbg);
+  nsIFrameDebug*  fdbg = do_QueryFrame(root);
   if (NS_FAILED(rv)) return rv;
 
   PRBool  dumpStyle = (aFlagsMask & DUMP_FLAGS_MASK_DUMP_STYLE) != 0;
 
   FILE* fp = stdout;
   if (aDestFile)
   {
     rv = aDestFile->OpenANSIFileDesc("w", &fp);