mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Backed out changeset f3fee3ded743 (bug 1550804) for many devtools failures e.g. browser_markup_accessibility_focus_blur.js on a CLOSED TREE.

This commit is contained in:
Gurzau Raul 2019-10-24 21:39:31 +03:00
Родитель 4f50b617db
Коммит 4e686f7962
15 изменённых файлов: 17 добавлений и 266 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
browser/app/profile/firefox.js
Просмотреть файл

@ -2019,8 +2019,6 @@ pref("devtools.inspector.new-rulesview.enabled", false);
pref("devtools.inspector.compatibility.enabled", false);
// Enable the new Box Model Highlighter with renderer in parent process
pref("devtools.inspector.use-new-box-model-highlighter", false);
// Enable color scheme simulation in the inspector.
pref("devtools.inspector.color-scheme-simulation.enabled", false);
// Grid highlighter preferences
pref("devtools.gridinspector.gridOutlineMaxColumns", 50);

1
devtools/client/inspector/index.xhtml
Просмотреть файл

@ -101,7 +101,6 @@
<button id="pseudo-class-panel-toggle" data-localization="title=inspector.togglePseudo.tooltip" class="devtools-button"></button>
<button id="class-panel-toggle" data-localization="title=inspector.classPanel.toggleClass.tooltip" class="devtools-button"></button>
<button id="ruleview-add-rule-button" data-localization="title=inspector.addRule.tooltip" class="devtools-button"></button>
<button id="color-scheme-simulation-toggle" data-localization="title=inspector.colorSchemeSimulation.tooltip" class="devtools-button" hidden="true"></button>
<button id="print-simulation-toggle" data-localization="title=inspector.printSimulation.tooltip" class="devtools-button" hidden="true"></button>
</div>
</div>

3
devtools/client/inspector/rules/actions/index.js
Просмотреть файл

@ -28,9 +28,6 @@ createEnum(
// Updates whether or not the class list panel is expanded.
"UPDATE_CLASS_PANEL_EXPANDED",
// Updates whether or not the color scheme simulation button is hidden.
"UPDATE_COLOR_SCHEME_SIMULATION_HIDDEN",
// Updates the highlighted selector.
"UPDATE_HIGHLIGHTED_SELECTOR",

14
devtools/client/inspector/rules/actions/rules.js
Просмотреть файл

@ -6,7 +6,6 @@
const {
UPDATE_ADD_RULE_ENABLED,
UPDATE_COLOR_SCHEME_SIMULATION_HIDDEN,
UPDATE_HIGHLIGHTED_SELECTOR,
UPDATE_PRINT_SIMULATION_HIDDEN,
UPDATE_RULES,
@ -28,19 +27,6 @@ module.exports = {
};
},
/**
* Updates whether or not the color scheme simulation button is hidden.
*
* @param {Boolean} hidden
* Whether or not the color scheme simulation button is hidden.
*/
updateColorSchemeSimulationHidden(hidden) {
return {
type: UPDATE_COLOR_SCHEME_SIMULATION_HIDDEN,
hidden,
};
},
/**
* Updates the highlighted selector.
*

2
devtools/client/inspector/rules/components/RulesApp.js
Просмотреть файл

@ -37,7 +37,6 @@ class RulesApp extends PureComponent {
onToggleClassPanelExpanded: PropTypes.func.isRequired,
onToggleDeclaration: PropTypes.func.isRequired,
onTogglePrintSimulation: PropTypes.func.isRequired,
onToggleColorSchemeSimulation: PropTypes.func.isRequired,
onTogglePseudoClass: PropTypes.func.isRequired,
onToggleSelectorHighlighter: PropTypes.func.isRequired,
rules: PropTypes.arrayOf(PropTypes.shape(Types.rule)).isRequired,
@ -194,7 +193,6 @@ class RulesApp extends PureComponent {
onSetClassState: this.props.onSetClassState,
onToggleClassPanelExpanded: this.props.onToggleClassPanelExpanded,
onTogglePrintSimulation: this.props.onTogglePrintSimulation,
onToggleColorSchemeSimulation: this.props.onToggleColorSchemeSimulation,
onTogglePseudoClass: this.props.onTogglePseudoClass,
}),
dom.div(

29
devtools/client/inspector/rules/components/Toolbar.js
Просмотреть файл

@ -11,7 +11,6 @@ const {
const dom = require("devtools/client/shared/vendor/react-dom-factories");
const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
const { connect } = require("devtools/client/shared/vendor/react-redux");
const { COLOR_SCHEMES } = require("devtools/client/inspector/rules/constants");
const SearchBox = createFactory(require("./SearchBox"));
@ -29,13 +28,11 @@ class Toolbar extends PureComponent {
return {
isAddRuleEnabled: PropTypes.bool.isRequired,
isClassPanelExpanded: PropTypes.bool.isRequired,
isColorSchemeSimulationHidden: PropTypes.bool.isRequired,
isPrintSimulationHidden: PropTypes.bool.isRequired,
onAddClass: PropTypes.func.isRequired,
onAddRule: PropTypes.func.isRequired,
onSetClassState: PropTypes.func.isRequired,
onToggleClassPanelExpanded: PropTypes.func.isRequired,
onToggleColorSchemeSimulation: PropTypes.func.isRequired,
onTogglePrintSimulation: PropTypes.func.isRequired,
onTogglePseudoClass: PropTypes.func.isRequired,
};
@ -45,8 +42,6 @@ class Toolbar extends PureComponent {
super(props);
this.state = {
// Which of the color schemes is simulated, if any.
currentColorScheme: 0,
// Whether or not the print simulation button is enabled.
isPrintSimulationEnabled: false,
// Whether or not the pseudo class panel is expanded.
@ -55,9 +50,6 @@ class Toolbar extends PureComponent {
this.onAddRuleClick = this.onAddRuleClick.bind(this);
this.onClassPanelToggle = this.onClassPanelToggle.bind(this);
this.onColorSchemeSimulationClick = this.onColorSchemeSimulationClick.bind(
this
);
this.onPrintSimulationToggle = this.onPrintSimulationToggle.bind(this);
this.onPseudoClassPanelToggle = this.onPseudoClassPanelToggle.bind(this);
}
@ -81,16 +73,6 @@ class Toolbar extends PureComponent {
});
}
onColorSchemeSimulationClick(event) {
event.stopPropagation();
this.props.onToggleColorSchemeSimulation();
this.setState(prevState => ({
currentColorScheme:
(prevState.currentColorScheme + 1) % COLOR_SCHEMES.length,
}));
}
onPrintSimulationToggle(event) {
event.stopPropagation();
this.props.onTogglePrintSimulation();
@ -115,7 +97,6 @@ class Toolbar extends PureComponent {
const {
isAddRuleEnabled,
isClassPanelExpanded,
isColorSchemeSimulationHidden,
isPrintSimulationHidden,
} = this.props;
const { isPrintSimulationEnabled, isPseudoClassPanelExpanded } = this.state;
@ -155,15 +136,6 @@ class Toolbar extends PureComponent {
onClick: this.onAddRuleClick,
title: getStr("rule.addRule.tooltip"),
}),
isColorSchemeSimulationHidden
? dom.button({
id: "color-scheme-simulation-toggle",
className: "devtools-button",
onClick: this.onColorSchemeSimulationClick,
state: COLOR_SCHEMES[this.state.currentColorScheme],
title: getStr("rule.colorSchemeSimulation.tooltip"),
})
: null,
!isPrintSimulationHidden
? dom.button({
id: "print-simulation-toggle",
@ -195,7 +167,6 @@ const mapStateToProps = state => {
return {
isAddRuleEnabled: state.rules.isAddRuleEnabled,
isClassPanelExpanded: state.classList.isClassPanelExpanded,
isColorSchemeSimulationHidden: state.rules.isColorSchemeSimulationHidden,
isPrintSimulationHidden: state.rules.isPrintSimulationHidden,
};
};

3
devtools/client/inspector/rules/constants.js
Просмотреть файл

@ -8,6 +8,3 @@
// Rules and their Styles into one actor. For elements (which have a style
// but no associated rule) we fake a rule with the following style id.
exports.ELEMENT_STYLE = 100;
// An array of the possible color schemes that can be emulated.
exports.COLOR_SCHEMES = [null, "dark", "light", "no-preference"];

66
devtools/client/inspector/rules/new-rules.js
Просмотреть файл

@ -24,7 +24,6 @@ const {
} = require("./actions/pseudo-classes");
const {
updateAddRuleEnabled,
updateColorSchemeSimulationHidden,
updateHighlightedSelector,
updatePrintSimulationHidden,
updateRules,
@ -67,12 +66,6 @@ loader.lazyRequireGetter(
"devtools/client/shared/inplace-editor",
true
);
loader.lazyRequireGetter(
this,
"COLOR_SCHEMES",
"devtools/client/inspector/rules/constants",
true
);
const PREF_UA_STYLES = "devtools.inspector.showUserAgentStyles";
@ -100,9 +93,6 @@ class RulesView {
);
this.onToggleDeclaration = this.onToggleDeclaration.bind(this);
this.onTogglePrintSimulation = this.onTogglePrintSimulation.bind(this);
this.onToggleColorSchemeSimulation = this.onToggleColorSchemeSimulation.bind(
this
);
this.onTogglePseudoClass = this.onTogglePseudoClass.bind(this);
this.onToolChanged = this.onToolChanged.bind(this);
this.onToggleSelectorHighlighter = this.onToggleSelectorHighlighter.bind(
@ -139,7 +129,6 @@ class RulesView {
onOpenSourceLink: this.onOpenSourceLink,
onSetClassState: this.onSetClassState,
onToggleClassPanelExpanded: this.onToggleClassPanelExpanded,
onToggleColorSchemeSimulation: this.onToggleColorSchemeSimulation,
onToggleDeclaration: this.onToggleDeclaration,
onTogglePrintSimulation: this.onTogglePrintSimulation,
onTogglePseudoClass: this.onTogglePseudoClass,
@ -150,7 +139,7 @@ class RulesView {
showSelectorEditor: this.showSelectorEditor,
});
this.initSimulationFeatures();
this.initPrintSimulation();
const provider = createElement(
Provider,
@ -167,34 +156,19 @@ class RulesView {
this.provider = provider;
}
async initSimulationFeatures() {
async initPrintSimulation() {
const target = this.inspector.currentTarget;
// In order to query if the emulation actor's print simulation methods are supported,
// we have to call the emulation front so that the actor is lazily loaded. This allows
// us to use `actorHasMethod`. Please see `getActorDescription` for more information.
this.emulationFront = await this.currentTarget.getFront("emulation");
this.emulationFront = await target.getFront("emulation");
if (!this.currentTarget.chrome) {
if (!target.chrome) {
this.store.dispatch(updatePrintSimulationHidden(false));
} else {
this.store.dispatch(updatePrintSimulationHidden(true));
}
// Show the color scheme simulation toggle button if:
// - The feature pref is enabled.
// - Color scheme simulation is supported for the current target.
if (
Services.prefs.getBoolPref(
"devtools.inspector.color-scheme-simulation.enabled"
) &&
(await this.currentTarget.actorHasMethod(
"emulation",
"getEmulatedColorScheme"
))
) {
this.store.dispatch(updateColorSchemeSimulationHidden(false));
} else {
this.store.dispatch(updateColorSchemeSimulationHidden(true));
}
}
destroy() {
@ -271,16 +245,6 @@ class RulesView {
return this._classList;
}
/**
* Get the current target the toolbox is debugging.
*
* @return {Target}
*/
get currentTarget() {
return this.inspector.currentTarget;
}
/**
* Creates a dummy element in the document that helps get the computed style in
* TextProperty.
@ -406,12 +370,15 @@ class RulesView {
*/
async onOpenSourceLink(ruleId) {
const rule = this.elementStyle.getRule(ruleId);
if (!rule || !Tools.styleEditor.isTargetSupported(this.currentTarget)) {
if (
!rule ||
!Tools.styleEditor.isTargetSupported(this.inspector.currentTarget)
) {
return;
}
const toolbox = await gDevTools.showToolbox(
this.currentTarget,
this.inspector.currentTarget,
"styleeditor"
);
const styleEditor = toolbox.getCurrentPanel();
@ -486,17 +453,6 @@ class RulesView {
});
}
/**
* Handler for toggling color scheme simulation.
*/
async onToggleColorSchemeSimulation() {
const currentState = await this.emulationFront.getEmulatedColorScheme();
const index = COLOR_SCHEMES.indexOf(currentState);
const nextState = COLOR_SCHEMES[(index + 1) % COLOR_SCHEMES.length];
await this.emulationFront.setEmulatedColorScheme(nextState);
await this.updateElementStyle();
}
/**
* Handler for toggling print media simulation.
*/

10
devtools/client/inspector/rules/reducers/rules.js
Просмотреть файл

@ -8,7 +8,6 @@ const Services = require("Services");
const {
UPDATE_ADD_RULE_ENABLED,
UPDATE_COLOR_SCHEME_SIMULATION_HIDDEN,
UPDATE_HIGHLIGHTED_SELECTOR,
UPDATE_PRINT_SIMULATION_HIDDEN,
UPDATE_RULES,
@ -21,8 +20,6 @@ const INITIAL_RULES = {
highlightedSelector: "",
// Whether or not the add new rule button should be enabled.
isAddRuleEnabled: false,
// Whether or not the color scheme simulation button is hidden.
isColorSchemeSimulationHidden: false,
// Whether or not the print simulation button is hidden.
isPrintSimulationHidden: false,
// Whether or not the source links are enabled. This is determined by
@ -119,13 +116,6 @@ const reducers = {
};
},
[UPDATE_COLOR_SCHEME_SIMULATION_HIDDEN](rules, { hidden }) {
return {
...rules,
isColorSchemeSimulationHidden: hidden,
};
},
[UPDATE_HIGHLIGHTED_SELECTOR](rules, { highlightedSelector }) {
return {
...rules,

64
devtools/client/inspector/rules/rules.js
Просмотреть файл

@ -51,12 +51,6 @@ loader.lazyRequireGetter(
"ClassListPreviewer",
"devtools/client/inspector/rules/views/class-list-previewer"
);
loader.lazyRequireGetter(
this,
"COLOR_SCHEMES",
"devtools/client/inspector/rules/constants",
true
);
loader.lazyRequireGetter(
this,
"StyleInspectorMenu",
@ -162,9 +156,6 @@ function CssRuleView(inspector, document, store) {
this._onTogglePseudoClassPanel = this._onTogglePseudoClassPanel.bind(this);
this._onTogglePseudoClass = this._onTogglePseudoClass.bind(this);
this._onToggleClassPanel = this._onToggleClassPanel.bind(this);
this._onToggleColorSchemeSimulation = this._onToggleColorSchemeSimulation.bind(
this
);
this._onTogglePrintSimulation = this._onTogglePrintSimulation.bind(this);
this.highlightElementRule = this.highlightElementRule.bind(this);
this.highlightProperty = this.highlightProperty.bind(this);
@ -179,12 +170,9 @@ function CssRuleView(inspector, document, store) {
this.pseudoClassToggle = doc.getElementById("pseudo-class-panel-toggle");
this.classPanel = doc.getElementById("ruleview-class-panel");
this.classToggle = doc.getElementById("class-panel-toggle");
this.colorSchemeSimulationButton = doc.getElementById(
"color-scheme-simulation-toggle"
);
this.printSimulationButton = doc.getElementById("print-simulation-toggle");
this._initSimulationFeatures();
this._initPrintSimulation();
this.searchClearButton.hidden = true;
@ -405,14 +393,13 @@ CssRuleView.prototype = {
},
/**
* Initializes the emulation front and enable the print and color scheme simulation
* if they are supported in the current target.
* Check the print emulation actor's backwards-compatibility via the target actor's
* actorHasMethod.
*/
async _initPrintSimulation() {
// In order to query if the emulation actor's print and color simulation methods are
// supported, we have to call the emulation front so that the actor is lazily loaded.
// This allows us to use `actorHasMethod`. Please see `getActorDescription` for more
// information.
// In order to query if the emulation actor's print simulation methods are supported,
// we have to call the emulation front so that the actor is lazily loaded. This allows
// us to use `actorHasMethod`. Please see `getActorDescription` for more information.
this._emulationFront = await this.currentTarget.getFront("emulation");
if (!this.currentTarget.chrome) {
@ -422,25 +409,6 @@ CssRuleView.prototype = {
this._onTogglePrintSimulation
);
}
// Show the color scheme simulation toggle button if:
// - The feature pref is enabled.
// - Color scheme simulation is supported for the current target.
if (
Services.prefs.getBoolPref(
"devtools.inspector.color-scheme-simulation.enabled"
) &&
(await this.currentTarget.actorHasMethod(
"emulation",
"getEmulatedColorScheme"
))
) {
this.colorSchemeSimulationButton.removeAttribute("hidden");
this.colorSchemeSimulationButton.addEventListener(
"click",
this._onToggleColorSchemeSimulation
);
}
},
/**
@ -849,10 +817,6 @@ CssRuleView.prototype = {
// Clean-up for print simulation.
if (this._emulationFront) {
this.colorSchemeSimulationButton.removeEventListener(
"click",
this._onToggleColorSchemeSimulation
);
this.printSimulationButton.removeEventListener(
"click",
this._onTogglePrintSimulation
@ -860,7 +824,6 @@ CssRuleView.prototype = {
this._emulationFront.destroy();
this.colorSchemeSimulationButton = null;
this.printSimulationButton = null;
this._emulationFront = null;
}
@ -1740,21 +1703,6 @@ CssRuleView.prototype = {
}
},
async _onToggleColorSchemeSimulation() {
const currentState = await this.emulationFront.getEmulatedColorScheme();
const index = COLOR_SCHEMES.indexOf(currentState);
const nextState = COLOR_SCHEMES[(index + 1) % COLOR_SCHEMES.length];
if (nextState) {
this.colorSchemeSimulationButton.setAttribute("state", nextState);
} else {
this.colorSchemeSimulationButton.removeAttribute("state");
}
await this.emulationFront.setEmulatedColorScheme(nextState);
this.refreshPanel();
},
async _onTogglePrintSimulation() {
const enabled = await this.emulationFront.getIsPrintSimulationEnabled();

5
devtools/client/locales/en-US/inspector.properties
Просмотреть файл

@ -490,11 +490,6 @@ inspector.noProperties=No CSS properties found.
# that toggles print simulation.
inspector.printSimulation.tooltip = Toggle print media simulation for the page
# LOCALIZATION NOTE (inspector.colorSchemeSimulation.tooltip):
# This is the tooltip of the color scheme simulation button in the Rule View
# toolbar that toggles color scheme simulation.
inspector.colorSchemeSimulation.tooltip=Toggle color scheme simulation for the page
# LOCALIZATION NOTE (markupView.scrollableBadge.label): This is the text displayed inside a
# badge, in the inspector, next to nodes that are scrollable in the page.
markupView.scrollableBadge.label=scroll

22
devtools/client/themes/rules.css
Просмотреть файл

@ -692,28 +692,6 @@
background-image: url("chrome://devtools/skin/images/rules-view-print-simulation.svg");
}
#color-scheme-simulation-toggle::before {
-moz-context-properties: fill, fill-opacity;
background-image: url("chrome://mozapps/skin/extensions/category-themes.svg");
background-size: 12px;
}
#color-scheme-simulation-toggle[state="dark"] {
background-color: #333;
}
#color-scheme-simulation-toggle[state="dark"]::before {
fill: white;
}
#color-scheme-simulation-toggle[state="light"]::before {
fill-color: #bbb;
}
#color-scheme-simulation-toggle[state="no-preference"]::before {
fill-opacity: 0.5;
}
.flash-out {
transition: background 1s;
}

43
devtools/server/actors/emulation.js
Просмотреть файл

@ -52,7 +52,6 @@ const EmulationActor = protocol.ActorClassWithSpec(emulationSpec, {
this.stopPrintMediaSimulation();
}
this.setEmulatedColorScheme();
this.clearDPPXOverride();
this.clearNetworkThrottling();
this.clearTouchEventsOverride();
@ -155,48 +154,6 @@ const EmulationActor = protocol.ActorClassWithSpec(emulationSpec, {
return false;
},
/* Color scheme simulation */
/**
* Returns the currently emulated color scheme.
*/
getEmulatedColorScheme() {
return this._emulatedColorScheme;
},
/**
* Sets the currently emulated color scheme or if an invalid value is given,
* the override is cleared.
*/
setEmulatedColorScheme(scheme = null) {
if (this._emulatedColorScheme === scheme) {
return;
}
let internalColorScheme;
switch (scheme) {
case "light":
internalColorScheme = Ci.nsIContentViewer.PREFERS_COLOR_SCHEME_LIGHT;
break;
case "dark":
internalColorScheme = Ci.nsIContentViewer.PREFERS_COLOR_SCHEME_DARK;
break;
case "no-preference":
internalColorScheme =
Ci.nsIContentViewer.PREFERS_COLOR_SCHEME_NO_PREFERENCE;
break;
default:
internalColorScheme = Ci.nsIContentViewer.PREFERS_COLOR_SCHEME_NONE;
}
this._emulatedColorScheme = scheme;
this.docShell.contentViewer.emulatePrefersColorScheme(internalColorScheme);
},
// The current emulated color scheme value. It's possible values are listed in the
// COLOR_SCHEMES constant in devtools/client/inspector/rules/constants.
_emulatedColorScheme: null,
/* Network Throttling */
_previousNetworkThrottling: undefined,

5
devtools/shared/locales/en-US/styleinspector.properties
Просмотреть файл

@ -140,11 +140,6 @@ rule.classPanel.noClasses=No classes on this element
# that toggles print simulation.
rule.printSimulation.tooltip=Toggle print media simulation for the page
# LOCALIZATION NOTE (rule.colorSchemeSimulation.tooltip):
# This is the tooltip of the color scheme simulation button in the Rule View
# toolbar that toggles color-scheme simulation.
rule.colorSchemeSimulation.tooltip=Toggle color-scheme simulation for the page
# LOCALIZATION NOTE (styleinspector.contextmenu.copyColor): Text displayed in the rule
# and computed view context menu when a color value was clicked.
styleinspector.contextmenu.copyColor=Copy Color

14
devtools/shared/specs/emulation.js
Просмотреть файл

@ -131,20 +131,6 @@ const emulationSpec = generateActorSpec({
response: {},
},
getEmulatedColorScheme: {
request: {},
response: {
emulated: RetVal("nullable:string"),
},
},
setEmulatedColorScheme: {
request: {
scheme: Arg(0, "nullable:string"),
},
response: {},
},
getIsPrintSimulationEnabled: {
request: {},
response: {