Skip to content

Commit 67ef499

Browse files
authored
Merge pull request #1552 from nmuthu973/wpe-2.46-port-rwi-chromium-fixes
[wpe-2.46][RWI] fixes for RWI with chromium browser
2 parents 8eadcfb + 4a57ee1 commit 67ef499

8 files changed

Lines changed: 12 additions & 14 deletions

File tree

Source/WebInspectorUI/Tools/Images/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ async function parseSVG(path) {
7676

7777
let imgs = [];
7878
if (!path.includes("#")) {
79-
let variants = dom.querySelectorAll(":root > :matches(svg, g)[id]");
79+
let variants = dom.querySelectorAll(":root > :is(svg, g)[id]");
8080
if (variants.length) {
8181
for (let variant of variants) {
8282
let target = variant.getAttribute("id");

Source/WebInspectorUI/UserInterface/Views/ButtonNavigationItem.css

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,6 @@
9191
color: var(--glyph-color-disabled);
9292
}
9393

94-
.navigation-bar .item.button > img {
95-
width: 100%;
96-
height: 100%;
97-
}
98-
9994
.navigation-bar .item.button.disabled > img {
10095
opacity: 0.3;
10196
}

Source/WebInspectorUI/UserInterface/Views/ButtonNavigationItem.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,11 @@ WI.ButtonNavigationItem = class ButtonNavigationItem extends WI.NavigationItem
229229

230230
case WI.ButtonNavigationItem.ImageType.IMG: {
231231
let img = this.element.appendChild(document.createElement("img"));
232-
if (this._image)
232+
if (this._image) {
233+
img.style.width = this._imageWidth + "px";
234+
img.style.height = this._imageHeight + "px";
233235
img.src = this._image;
236+
}
234237
break;
235238
}
236239
}

Source/WebInspectorUI/UserInterface/Views/GradientSlider.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
width: 20px;
6363
height: 26px;
6464

65-
background-image: image-set(url(../Images/GradientStop.png) 1x, url(../Images/GradientStop@2x.png) 2x);
65+
background-image: url(../Images/GradientStop.png);
6666

6767
transition: opacity 350ms;
6868
}
@@ -73,7 +73,7 @@
7373
}
7474

7575
.gradient-slider-knob.selected {
76-
background-image: image-set(url(../Images/GradientStopSelected.png) 1x, url(../Images/GradientStopSelected@2x.png) 2x);
76+
background-image: url(../Images/GradientStopSelected.png);
7777
}
7878

7979
.gradient-slider-knob.detaching {

Source/WebInspectorUI/UserInterface/Views/HoverMenu.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
width: 15px;
5959
height: 13px;
6060

61-
content: image-set(url(../Images/HoverMenuButton.png) 1x, url(../Images/HoverMenuButton@2x.png) 2x);
61+
content: url(../Images/HoverMenuButton.png);
6262
transform: translateY(-1px);
6363
}
6464

Source/WebInspectorUI/UserInterface/Views/Slider.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
top: -5px;
3535
width: 14px;
3636
height: 17px;
37-
content: image-set(url(../Images/SliderThumb.png) 1x, url(../Images/SliderThumb@2x.png) 2x);
37+
content: url(../Images/SliderThumb.png);
3838
}
3939

4040
body[dir=ltr] .slider > img {
@@ -48,7 +48,7 @@ body[dir=rtl] .slider > img {
4848
}
4949

5050
.slider > img.dragging {
51-
content: image-set(url(../Images/SliderThumbPressed.png) 1x, url(../Images/SliderThumbPressed@2x.png) 2x);
51+
content: url(../Images/SliderThumbPressed.png);
5252
}
5353

5454
.slider:focus {

Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@
183183
.hover-menu.color > img {
184184
width: 16px;
185185
height: 16px;
186-
content: image-set(url(../Images/ColorIcon.png) 1x, url(../Images/ColorIcon@2x.png) 2x);
186+
content: url(../Images/ColorIcon.png);
187187
transform: translateY(0.5px);
188188
}
189189

Source/WebInspectorUI/UserInterface/Views/TextEditor.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104

105105
z-index: -1;
106106

107-
background-image: image-set(url(../Images/InstructionPointer.png) 1x, url(../Images/InstructionPointer@2x.png) 2x);
107+
background-image: url(../Images/InstructionPointer.png);
108108
background-size: 9px 100%;
109109
background-repeat: no-repeat;
110110
}

0 commit comments

Comments
 (0)