diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 07e5548e2cc9..6d6bd900201c 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -1013,6 +1013,12 @@ pref("devtools.inspector.htmlHeight", 112); // Enable the style inspector pref("devtools.styleinspector.enabled", true); +// Enable the Tilt inspector +pref("devtools.tilt.enabled", true); + +// Enable the Tilt inspector even if WebGL capabilities are not detected +pref("devtools.tilt.force-enabled", false); + // Enable the rules view pref("devtools.ruleview.enabled", true); diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc index 10df1b09b182..ecc75e92ca2a 100644 --- a/browser/base/content/browser-sets.inc +++ b/browser/base/content/browser-sets.inc @@ -148,6 +148,8 @@ oncommand="InspectorUI.toggleInspection();"/> + diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index e9769d60cef1..514e9f1f3c88 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -55,6 +55,7 @@ # David Dahl # Patrick Walton # Mihai Sucan +# Victor Porof # # Alternatively, the contents of this file may be used under the terms of # either the GNU General Public License Version 2 or later (the "GPL"), or @@ -179,6 +180,12 @@ XPCOMUtils.defineLazyGetter(this, "InspectorUI", function() { return new tmp.InspectorUI(window); }); +XPCOMUtils.defineLazyGetter(this, "Tilt", function() { + let tmp = {}; + Cu.import("resource:///modules/devtools/Tilt.jsm", tmp); + return new tmp.Tilt(window); +}); + let gInitialPages = [ "about:blank", "about:privatebrowsing", diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul index cc77ab1e8716..d96ef8d894ab 100644 --- a/browser/base/content/browser.xul +++ b/browser/base/content/browser.xul @@ -37,6 +37,7 @@ # Patrick Walton # David Dahl # Frank Yan +# Victor Porof # # Alternatively, the contents of this file may be used under the terms of # either the GNU General Public License Version 2 or later (the "GPL"), or @@ -1007,6 +1008,11 @@ flex="1" orient="horizontal" clicktoscroll="true"/> +