diff --git a/mozilla/layout/inspector/src/inFlasher.cpp b/mozilla/layout/inspector/src/inFlasher.cpp index 8864caf0f13..e1469e9ec86 100644 --- a/mozilla/layout/inspector/src/inFlasher.cpp +++ b/mozilla/layout/inspector/src/inFlasher.cpp @@ -167,7 +167,7 @@ inFlasher::DrawElementOutline(nsIDOMElement* aElement) if (!window) return NS_OK; nsCOMPtr presShell = inLayoutUtils::GetPresShellFor(window); - nsCOMPtr presContext; + nsCOMPtr presContext; presShell->GetPresContext(getter_AddRefs(presContext)); float p2t; diff --git a/mozilla/layout/inspector/src/inLayoutUtils.cpp b/mozilla/layout/inspector/src/inLayoutUtils.cpp index 2b67f393250..c88b25e59fc 100644 --- a/mozilla/layout/inspector/src/inLayoutUtils.cpp +++ b/mozilla/layout/inspector/src/inLayoutUtils.cpp @@ -50,7 +50,7 @@ #include "nsIPresShell.h" #include "nsIViewManager.h" #include "nsIWidget.h" -#include "nsIPresContext.h" +#include "nsPresContext.h" #include "nsXULAtoms.h" #include "nsHTMLAtoms.h" @@ -125,7 +125,7 @@ inLayoutUtils::GetEventStateManagerFor(nsIDOMElement *aElement) nsIPresShell *shell = doc->GetShellAt(0); NS_ASSERTION(shell, "No pres shell"); - nsCOMPtr presContext; + nsCOMPtr presContext; shell->GetPresContext(getter_AddRefs(presContext)); NS_ASSERTION(presContext, "No pres context"); @@ -133,7 +133,7 @@ inLayoutUtils::GetEventStateManagerFor(nsIDOMElement *aElement) } nsPoint -inLayoutUtils::GetClientOrigin(nsIPresContext* aPresContext, +inLayoutUtils::GetClientOrigin(nsPresContext* aPresContext, nsIFrame* aFrame) { nsPoint result(0,0); @@ -171,7 +171,7 @@ inLayoutUtils::GetScreenOrigin(nsIDOMElement* aElement) // Flush all pending notifications so that our frames are uptodate doc->FlushPendingNotifications(Flush_Layout); - nsCOMPtr presContext; + nsCOMPtr presContext; presShell->GetPresContext(getter_AddRefs(presContext)); if (presContext) { diff --git a/mozilla/layout/inspector/src/inLayoutUtils.h b/mozilla/layout/inspector/src/inLayoutUtils.h index 76bce35ba0a..74d513dc4b4 100644 --- a/mozilla/layout/inspector/src/inLayoutUtils.h +++ b/mozilla/layout/inspector/src/inLayoutUtils.h @@ -69,7 +69,7 @@ public: * @param aPresContext the presentation context * @return the offset */ - static nsPoint GetClientOrigin(nsIPresContext* aPresContext, + static nsPoint GetClientOrigin(nsPresContext* aPresContext, nsIFrame* aFrame); static nsRect& GetScreenOrigin(nsIDOMElement* aElement);