Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 03b936cdbf73 (bug 933260) for crashtest assertions

Browse Source
This commit is contained in:
Wes Kocher 2013-11-01 17:06:21 -07:00
parent ecc35ec24a
commit cdb0604ef0
9 changed files with 13 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
layout/reftests/forms/input/checkbox/gtk-theme-width-height-ref.html
View File

@ -1,31 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>Testcase for bug 932506</title>
<style>
input { outline:1px solid black; }
</style>
</head>
<body>
<div style="overflow:hidden; width:160px;">
<div style="float:left; width:799px; border:1px solid blue;">
<input type="checkbox" checked style="width:400px; visibility:hidden;">
<input type="checkbox" checked style="width:400px; height:100px; visibility:hidden;">
</div>
</div>
<input type="checkbox" checked style="width:400px;"><br>
<input type="checkbox" checked style="height:100px;"><br>
<input type="checkbox" checked style=""><br>
<input type="checkbox" checked style="width:400px;"><br>
<input type="checkbox" checked style="height:100px;"><br>
<input type="checkbox" checked style=""><br>
</body>
</html>

30
layout/reftests/forms/input/checkbox/gtk-theme-width-height.html
View File

@ -1,30 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>Testcase for bug 932506</title>
<style>
input { outline:1px solid black; }
</style>
</head>
<body>
<div style="overflow:hidden; width:160px;">
<div style="float:left; width:799px; border:1px solid blue;">
<input type="checkbox" checked style="width:400px; outline:none;">
<input type="checkbox" checked style="width:400px; height:100px; outline:none;">
</div>
</div>
<input type="checkbox" checked style="width:400px; height:1px;"><br>
<input type="checkbox" checked style="width:1px; height:100px;"><br>
<input type="checkbox" checked style="width:1px; height:1px;"><br>
<input type="checkbox" checked style="width:400px; height:0;"><br>
<input type="checkbox" checked style="width:0; height:100px;"><br>
<input type="checkbox" checked style="width:0; height:0;"><br>
</body>
</html>

1
layout/reftests/forms/input/checkbox/reftest.list
View File

@ -11,4 +11,3 @@ skip-if(B2G) fails-if(Android) == radio-stretched.html radio-stretched-ref.html
!= indeterminate-native-checked.html indeterminate-native-checked-notref.html
!= indeterminate-native-unchecked.html indeterminate-native-unchecked-notref.html
== indeterminate-selector.html indeterminate-selector-ref.html
skip-if(!gtk2Widget) == gtk-theme-width-height.html gtk-theme-width-height-ref.html

31
layout/reftests/forms/input/radio/gtk-theme-width-height-ref.html
View File

@ -1,31 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>Testcase for bug 932506</title>
<style>
input { outline:1px solid black; }
</style>
</head>
<body>
<div style="overflow:hidden; width:160px;">
<div style="float:left; width:799px; border:1px solid blue;">
<input type="radio" checked style="width:400px; visibility:hidden;">
<input type="radio" checked style="width:400px; height:100px; visibility:hidden;">
</div>
</div>
<input type="radio" checked style="width:400px;"><br>
<input type="radio" checked style="height:100px;"><br>
<input type="radio" checked style=""><br>
<input type="radio" checked style="width:400px;"><br>
<input type="radio" checked style="height:100px;"><br>
<input type="radio" checked style=""><br>
</body>
</html>

30
layout/reftests/forms/input/radio/gtk-theme-width-height.html
View File

@ -1,30 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>Testcase for bug 932506</title>
<style>
input { outline:1px solid black; }
</style>
</head>
<body>
<div style="overflow:hidden; width:160px;">
<div style="float:left; width:799px; border:1px solid blue;">
<input type="radio" checked style="width:400px; outline:none;">
<input type="radio" checked style="width:400px; height:100px; outline:none;">
</div>
</div>
<input type="radio" checked style="width:400px; height:1px;"><br>
<input type="radio" checked style="width:1px; height:100px;"><br>
<input type="radio" checked style="width:1px; height:1px;"><br>
<input type="radio" checked style="width:400px; height:0;"><br>
<input type="radio" checked style="width:0; height:100px;"><br>
<input type="radio" checked style="width:0; height:0;"><br>
</body>
</html>

1
layout/reftests/forms/input/radio/reftest.list
View File

@ -5,4 +5,3 @@
!= checked-notref.html about:blank
!= checked-native.html about:blank
!= checked-native-notref.html about:blank
skip-if(!gtk2Widget) == gtk-theme-width-height.html gtk-theme-width-height-ref.html

11
widget/gtk/gtk2drawing.c
View File

@ -1046,12 +1046,13 @@ moz_gtk_toggle_paint(GdkDrawable* drawable, GdkRectangle* rect,
w = gCheckboxWidget;
}
NS_ASSERTION(rect->width >= indicator_size &&
rect->height >= indicator_size,
NS_ASSERTION(rect->width == indicator_size,
"GetMinimumWidgetSize was ignored");
// Paint it center aligned in the rect.
x = rect->x + (rect->width - indicator_size) / 2;
/*
* vertically center in the box, since XUL sometimes ignores our
* GetMinimumWidgetSize in the vertical dimension
*/
x = rect->x;
y = rect->y + (rect->height - indicator_size) / 2;
width = indicator_size;
height = indicator_size;

11
widget/gtk/gtk3drawing.c
View File

@ -958,12 +958,13 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRectangle* rect,
w = gCheckboxWidget;
}
NS_ASSERTION(rect->width >= indicator_size &&
rect->height >= indicator_size,
NS_ASSERTION(rect->width == indicator_size,
"GetMinimumWidgetSize was ignored");
// Paint it center aligned in the rect.
x = rect->x + (rect->width - indicator_size) / 2;
/*
* vertically center in the box, since XUL sometimes ignores our
* GetMinimumWidgetSize in the vertical dimension
*/
x = rect->x;
y = rect->y + (rect->height - indicator_size) / 2;
width = indicator_size;
height = indicator_size;

1
widget/gtk/nsNativeThemeGTK.cpp
View File

@ -1186,6 +1186,7 @@ nsNativeThemeGTK::GetMinimumWidgetSize(nsRenderingContext* aContext,
// Include space for the indicator and the padding around it.
aResult->width = indicator_size;
aResult->height = indicator_size;
*aIsOverridable = false;
}
break;
case NS_THEME_TOOLBAR_BUTTON_DROPDOWN: