mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 11:25:00 +00:00
Backed out changeset 5a0227d048e8 (bug 1305777) for failing devtools' devtools/client/styleeditor/test/browser_styleeditor_media_sidebar_links.js on Windows 7 debug without e10s. r=backout
--HG-- rename : devtools/client/responsive.html/browser/content.js => devtools/client/responsivedesign/responsivedesign-child.js
This commit is contained in:
parent
58cfe586be
commit
5d940bbf9d
@ -5,7 +5,6 @@
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
DevToolsModules(
|
||||
'content.js',
|
||||
'swap.js',
|
||||
'tunnel.js',
|
||||
'web-navigation.js',
|
||||
|
@ -15,8 +15,6 @@ const { DOM: dom, createClass, addons, PropTypes } =
|
||||
const e10s = require("../utils/e10s");
|
||||
const message = require("../utils/message");
|
||||
|
||||
const FRAME_SCRIPT = "resource://devtools/client/responsive.html/browser/content.js";
|
||||
|
||||
module.exports = createClass({
|
||||
|
||||
/**
|
||||
@ -85,7 +83,8 @@ module.exports = createClass({
|
||||
e10s.on(mm, "OnContentResize", onContentResize);
|
||||
|
||||
let ready = e10s.once(mm, "ChildScriptReady");
|
||||
mm.loadFrameScript(FRAME_SCRIPT, true);
|
||||
mm.loadFrameScript("resource://devtools/client/responsivedesign/" +
|
||||
"responsivedesign-child.js", true);
|
||||
yield ready;
|
||||
|
||||
let browserWindow = getToplevelWindow(window);
|
||||
|
@ -5,7 +5,7 @@
|
||||
"use strict";
|
||||
|
||||
// The prefix used for RDM messages in content.
|
||||
// see: devtools/client/responsive.html/browser/content.js
|
||||
// see: devtools/client/responsivedesign/responsivedesign-child.js
|
||||
const MESSAGE_PREFIX = "ResponsiveMode:";
|
||||
const REQUEST_DONE_SUFFIX = ":Done";
|
||||
|
||||
|
@ -6,9 +6,10 @@ BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
|
||||
|
||||
DevToolsModules(
|
||||
'resize-commands.js',
|
||||
'responsivedesign-child.js',
|
||||
'responsivedesign-old.js',
|
||||
'responsivedesign.js',
|
||||
)
|
||||
|
||||
with Files('**'):
|
||||
BUG_COMPONENT = ('Firefox', 'Developer Tools: Responsive Design Mode')
|
||||
with Files('**'):
|
||||
BUG_COMPONENT = ('Firefox', 'Developer Tools: Responsive Design Mode')
|
||||
|
@ -209,7 +209,7 @@ ResponsiveUI.prototype = {
|
||||
init: Task.async(function* () {
|
||||
debug("INIT BEGINS");
|
||||
let ready = this.waitForMessage("ResponsiveMode:ChildScriptReady");
|
||||
this.mm.loadFrameScript("resource://devtools/client/responsive.html/browser/content.js", true);
|
||||
this.mm.loadFrameScript("resource://devtools/client/responsivedesign/responsivedesign-child.js", true);
|
||||
yield ready;
|
||||
|
||||
yield gDevToolsBrowser.loadBrowserStyleSheet(this.mainWindow);
|
||||
|
Loading…
Reference in New Issue
Block a user