wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge m-i to m-c

Browse Source
This commit is contained in:
Phil Ringnalda 2013-10-27 19:22:36 -07:00
commit bfde5fc447
10 changed files with 62 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/devtools/shared/widgets/SideMenuWidget.jsm
View File

@ -487,7 +487,6 @@ function SideMenuGroup(aWidget, aName, aOptions={}) {
if (aOptions.showCheckbox) {
let checkbox = this._checkbox = makeCheckbox(title, { description: aName });
checkbox.className = "side-menu-widget-group-checkbox";
checkbox.setAttribute("align", "start");
}
title.appendChild(name);
@ -592,7 +591,6 @@ function SideMenuItem(aGroup, aContents, aTooltip, aAttachment={}, aOptions={})
if (aOptions.showCheckbox) {
let checkbox = this._checkbox = makeCheckbox(container, aAttachment);
checkbox.className = "side-menu-widget-item-checkbox";
checkbox.setAttribute("align", "start");
}
container.appendChild(target);

5
browser/devtools/shared/widgets/widgets.css
View File

@ -24,6 +24,11 @@
-moz-user-focus: normal;
}
.side-menu-widget-group-checkbox .checkbox-label-box,
.side-menu-widget-item-checkbox .checkbox-label-box {
display: none; /* See bug 669507 */
}
/* VariablesView */
.variables-view-container {

4
browser/themes/linux/devtools/shadereditor.css
View File

@ -3,3 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
%include ../../shared/devtools/shadereditor.inc.css
.side-menu-widget-item-checkbox > .checkbox-spacer-box {
-moz-appearance: none;
}

29
browser/themes/linux/devtools/widgets.css
View File

@ -317,11 +317,6 @@
background-image: linear-gradient(#fff, #eee);
}
.side-menu-widget-group-checkbox {
margin: 0;
padding: 0;
}
/* SideMenuWidget items */
.side-menu-widget-item[theme="dark"] {
@ -379,11 +374,6 @@
width: 8px;
}
.side-menu-widget-item-checkbox {
-moz-margin-start: 4px;
-moz-margin-end: -6px;
}
.side-menu-widget-item-other {
background: url(background-noise-toolbar.png), hsla(208,11%,27%, 0.65);
}
@ -403,6 +393,25 @@
text-shadow: 0 1px 1px #111;
}
/* SideMenuWidget checkboxes */
.side-menu-widget-group-checkbox {
margin: 0;
-moz-margin-end: 4px;
}
.side-menu-widget-item-checkbox {
margin: 0;
-moz-margin-start: 4px;
-moz-margin-end: -4px;
}
.side-menu-widget-group-checkbox .checkbox-spacer-box,
.side-menu-widget-item-checkbox .checkbox-spacer-box {
margin: 0;
border: none;
}
/* SideMenuWidget misc */
.side-menu-widget-empty-notice-container {

23
browser/themes/osx/devtools/widgets.css
View File

@ -317,11 +317,6 @@
background-image: linear-gradient(#fff, #eee);
}
.side-menu-widget-group-checkbox {
margin: 0;
padding: 0;
}
/* SideMenuWidget items */
.side-menu-widget-item[theme="dark"] {
@ -379,11 +374,6 @@
width: 8px;
}
.side-menu-widget-item-checkbox {
-moz-margin-start: 4px;
-moz-margin-end: -6px;
}
.side-menu-widget-item-other {
background: url(background-noise-toolbar.png), hsla(208,11%,27%, 0.65);
}
@ -403,6 +393,19 @@
text-shadow: 0 1px 1px #111;
}
/* SideMenuWidget checkboxes */
.side-menu-widget-group-checkbox {
margin: 0;
-moz-margin-end: 4px;
}
.side-menu-widget-item-checkbox {
margin: 0;
-moz-margin-start: 4px;
-moz-margin-end: -4px;
}
/* SideMenuWidget misc */
.side-menu-widget-empty-notice-container {

8
browser/themes/shared/devtools/shadereditor.inc.css
View File

@ -51,8 +51,6 @@
.side-menu-widget-item-checkbox {
-moz-appearance: none;
-moz-margin-end: -6px;
padding: 0;
opacity: 0;
transition: opacity .15s ease-out 0s;
}
@ -66,10 +64,10 @@
transition: opacity .15s ease-out 0s;
}
.side-menu-widget-item-checkbox > .checkbox-check {
.side-menu-widget-item-checkbox .checkbox-check {
-moz-appearance: none;
background: none;
background-image: url("chrome://browser/skin/devtools/itemToggle.png");
background-image: url(itemToggle.png);
background-repeat: no-repeat;
background-clip: content-box;
background-size: 32px 16px;
@ -79,7 +77,7 @@
border: 0;
}
.side-menu-widget-item-checkbox[checked] > .checkbox-check {
.side-menu-widget-item-checkbox[checked] .checkbox-check {
background-position: 0 0;
}

23
browser/themes/windows/devtools/widgets.css
View File

@ -321,11 +321,6 @@
background-image: linear-gradient(#fff, #eee);
}
.side-menu-widget-group-checkbox {
margin: 0;
padding: 0;
}
/* SideMenuWidget items */
.side-menu-widget-item[theme="dark"] {
@ -383,11 +378,6 @@
width: 8px;
}
.side-menu-widget-item-checkbox {
-moz-margin-start: 4px;
-moz-margin-end: -6px;
}
.side-menu-widget-item-other {
background: url(background-noise-toolbar.png), hsla(208,11%,27%, 0.65);
}
@ -406,6 +396,19 @@
color: #f5f7fa;
}
/* SideMenuWidget checkboxes */
.side-menu-widget-group-checkbox {
margin: 0;
-moz-margin-end: 4px;
}
.side-menu-widget-item-checkbox {
margin: 0;
-moz-margin-start: 4px;
-moz-margin-end: -4px;
}
/* SideMenuWidget misc */
.side-menu-widget-empty-notice-container {

7
toolkit/devtools/client/dbg-client.jsm
View File

@ -971,7 +971,7 @@ TabClient.prototype = {
}, {
after: function (aResponse) {
if (this.activeTab === this._client._tabClients[this.actor]) {
delete this.activeTab;
this.activeTab = undefined;
}
delete this._client._tabClients[this.actor];
return aResponse;
@ -1123,9 +1123,6 @@ ThreadClient.prototype = {
// further requests that should only be sent in the paused state.
this._state = "resuming";
if (!aPacket.resumeLimit) {
delete aPacket.resumeLimit;
}
if (this._pauseOnExceptions) {
aPacket.pauseOnExceptions = this._pauseOnExceptions;
}
@ -1302,7 +1299,7 @@ ThreadClient.prototype = {
}, {
after: function (aResponse) {
if (this.activeThread === this._client._threadClients[this.actor]) {
delete this.activeThread;
this.activeThread = null;
}
delete this._client._threadClients[this.actor];
return aResponse;

4
toolkit/devtools/server/main.js
View File

@ -292,7 +292,7 @@ var DebuggerServer = {
this.closeListener();
this.globalActorFactories = {};
this.tabActorFactories = {};
delete this._allowConnection;
this._allowConnection = null;
this._transportInitialized = false;
this._initialized = false;
@ -1023,7 +1023,7 @@ DebuggerServerConnection.prototype = {
"error occurred while processing '" + aPacket.type,
e));
} finally {
delete this.currentPacket;
this.currentPacket = undefined;
}
} else {
ret = { error: "unrecognizedPacketType",

2
toolkit/devtools/server/transport.js
View File

@ -269,7 +269,7 @@ LocalDebuggerTransport.prototype = {
// Remove the reference to the other endpoint before calling close(), to
// avoid infinite recursion.
let other = this.other;
delete this.other;
this.other = null;
other.close();
}
if (this.hooks) {