diff --git a/mozilla/layout/generic/nsHTMLFrame.cpp b/mozilla/layout/generic/nsHTMLFrame.cpp
index 08604da00a8..e78dde6365c 100644
--- a/mozilla/layout/generic/nsHTMLFrame.cpp
+++ b/mozilla/layout/generic/nsHTMLFrame.cpp
@@ -55,8 +55,6 @@
#include "nsIScrollableView.h"
#include "nsIDocShell.h"
#include "nsICanvasFrame.h"
-#include "nsIPref.h"
-static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID);
#ifdef DEBUG_rods
//#define DEBUG_CANVAS_FOCUS
@@ -157,17 +155,12 @@ protected:
PRPackedBool mDoPaintFocus;
nsCOMPtr mPresContext;
- // static members
- static PRBool mShowFocusPrefOn;
-
private:
NS_IMETHOD_(nsrefcnt) AddRef() { return NS_OK; }
NS_IMETHOD_(nsrefcnt) Release() { return NS_OK; }
};
-PRBool CanvasFrame::mShowFocusPrefOn = PR_TRUE;
-
//----------------------------------------------------------------------
@@ -233,13 +226,6 @@ CanvasFrame::Init(nsIPresContext* aPresContext,
scrollingView->AddScrollPositionListener((nsIScrollPositionListener *)this);
}
- // Get the prefs service
- nsresult result;
- nsCOMPtr prefs(do_GetService(kPrefServiceCID, &result));
- if (NS_SUCCEEDED(result)) {
- prefs->GetBoolPref("layout.reflow.showframecounts", &mShowFocusPrefOn);
- }
-
return rv;
}
diff --git a/mozilla/layout/html/base/src/nsHTMLFrame.cpp b/mozilla/layout/html/base/src/nsHTMLFrame.cpp
index 08604da00a8..e78dde6365c 100644
--- a/mozilla/layout/html/base/src/nsHTMLFrame.cpp
+++ b/mozilla/layout/html/base/src/nsHTMLFrame.cpp
@@ -55,8 +55,6 @@
#include "nsIScrollableView.h"
#include "nsIDocShell.h"
#include "nsICanvasFrame.h"
-#include "nsIPref.h"
-static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID);
#ifdef DEBUG_rods
//#define DEBUG_CANVAS_FOCUS
@@ -157,17 +155,12 @@ protected:
PRPackedBool mDoPaintFocus;
nsCOMPtr mPresContext;
- // static members
- static PRBool mShowFocusPrefOn;
-
private:
NS_IMETHOD_(nsrefcnt) AddRef() { return NS_OK; }
NS_IMETHOD_(nsrefcnt) Release() { return NS_OK; }
};
-PRBool CanvasFrame::mShowFocusPrefOn = PR_TRUE;
-
//----------------------------------------------------------------------
@@ -233,13 +226,6 @@ CanvasFrame::Init(nsIPresContext* aPresContext,
scrollingView->AddScrollPositionListener((nsIScrollPositionListener *)this);
}
- // Get the prefs service
- nsresult result;
- nsCOMPtr prefs(do_GetService(kPrefServiceCID, &result));
- if (NS_SUCCEEDED(result)) {
- prefs->GetBoolPref("layout.reflow.showframecounts", &mShowFocusPrefOn);
- }
-
return rv;
}