зеркало из https://github.com/mozilla/gecko-dev.git
Backed out 4 changesets (bug 1341102, bug 1383492) for windows build bustage and crashtest assertions a=backout CLOSED TREE
Backed out changeset 1c4310082e35 (bug 1341102) Backed out changeset 849c109d96b4 (bug 1341102) Backed out changeset 11cadad891a4 (bug 1383492) Backed out changeset b4dfcf4f795e (bug 1383492) MozReview-Commit-ID: 4bDAPgiaepG
This commit is contained in:
Wes Kocher
Родитель
210c009a85
Коммит
18f09001d3
|
|
@ -46,7 +46,7 @@ typedef float nscoord;
|
|||
#define nscoord_MAX NS_IEEEPositiveInfinity()
|
||||
#else
|
||||
typedef int32_t nscoord;
|
||||
#define nscoord_MAX nscoord((1 << 30) - 1)
|
||||
#define nscoord_MAX nscoord(1 << 30)
|
||||
#endif
|
||||
|
||||
#define nscoord_MIN (-nscoord_MAX)
|
||||
|
|
@ -132,8 +132,8 @@ inline nscoord _nscoordSaturatingMultiply(nscoord aCoord, float aScale,
|
|||
#else
|
||||
float product = aCoord * aScale;
|
||||
if (requireNotNegative ? aCoord > 0 : (aCoord > 0) == (aScale > 0))
|
||||
return NSToCoordRoundWithClamp(std::min<float>((float)nscoord_MAX, product));
|
||||
return NSToCoordRoundWithClamp(std::max<float>((float)nscoord_MIN, product));
|
||||
return NSToCoordRoundWithClamp(std::min<float>(nscoord_MAX, product));
|
||||
return NSToCoordRoundWithClamp(std::max<float>(nscoord_MIN, product));
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ load 265736-1.html
|
|||
load 265736-2.html
|
||||
load 265899-1.html
|
||||
load 265973-1.html
|
||||
asserts-if(!stylo,6-12) load 265986-1.html # Bug 512405 , bug 718883
|
||||
asserts(6-12) load 265986-1.html # Bug 512405
|
||||
load 265999-1.html
|
||||
load 266222-1.html
|
||||
asserts(1-7) load 266360-1.html # bug 576358
|
||||
|
|
|
|||
|
|
@ -141,7 +141,7 @@ load 387215-1.xhtml
|
|||
load 387219-1.xhtml
|
||||
load 387233-1.html
|
||||
load 387233-2.html
|
||||
asserts-if(stylo,2) load 387282-1.html
|
||||
load 387282-1.html
|
||||
load 388175-1.html
|
||||
load 388367-1.html
|
||||
load 388709-1.html
|
||||
|
|
@ -399,8 +399,8 @@ load 536692-1.xhtml
|
|||
load 537645.xhtml
|
||||
load 541277-1.html
|
||||
load 541277-2.html
|
||||
asserts-if(stylo,2) load 541714-1.html # bug 634161
|
||||
asserts-if(stylo,3) load 541714-2.html # bug 634161
|
||||
load 541714-1.html
|
||||
load 541714-2.html
|
||||
load 542136-1.html
|
||||
load 545571-1.html
|
||||
load 547338.xul
|
||||
|
|
@ -558,7 +558,7 @@ load 914891.html
|
|||
load 915475.xhtml
|
||||
load 927558.html
|
||||
load 943509-1.html
|
||||
asserts-if(stylo,2-8) load 944909-1.html
|
||||
asserts(2-8) load 944909-1.html
|
||||
load 946167-1.html
|
||||
load 947158.html
|
||||
load 949932.html
|
||||
|
|
@ -631,7 +631,7 @@ load text-overflow-bug671796.xhtml
|
|||
load text-overflow-bug713610.html
|
||||
load text-overflow-form-elements.html
|
||||
load text-overflow-iframe.html
|
||||
asserts-if(Android,2-4) load 1225005.html # bug 682647 and bug 448083
|
||||
asserts-if(Android,2-4) asserts-if(!Android,4) load 1225005.html # bug 682647 and bug 448083
|
||||
load 1233191.html
|
||||
asserts-if(stylo,0-15) load 1271765.html # bug 1324684
|
||||
asserts(2) load 1272983-1.html # bug 586628
|
||||
|
|
|
|||
|
|
@ -1580,7 +1580,7 @@ fails-if(Android) random-if(layersGPUAccelerated) fuzzy-if(skiaContent,1,6436) =
|
|||
== 582037-1b.html 582037-1-ref.html
|
||||
fuzzy-if(Android,3,256) == 582037-2a.html 582037-2-ref.html
|
||||
fuzzy-if(Android,3,256) == 582037-2b.html 582037-2-ref.html
|
||||
asserts(1-2) asserts-if(styloVsGecko,3) == 582146-1.html about:blank
|
||||
asserts(1-2) asserts-if(styloVsGecko,4) == 582146-1.html about:blank
|
||||
== 582476-1.svg 582476-1-ref.svg
|
||||
== 584400-dash-length.svg 584400-dash-length-ref.svg
|
||||
== 584699-1.html 584699-1-ref.html
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ load 587336-1.html
|
|||
load 590291-1.svg
|
||||
load 601999-1.html
|
||||
load 605626-1.svg
|
||||
asserts-if(!stylo,2) load 606914.xhtml # bug 606914, bug 718883
|
||||
asserts(2) load 606914.xhtml # bug 606914
|
||||
load 610594-1.html
|
||||
load 610954-1.html
|
||||
load 612662-1.svg
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ load 434458-1.xul
|
|||
load 452185.html
|
||||
load 460900-1.xul
|
||||
load 464149-1.xul
|
||||
asserts-if(winWidget,1) asserts-if(Android,0-1) asserts-if(stylo,0-1) load 464407-1.xhtml # Bug 450974 on win, Bug 1267054 on Android, bug 718883 for stylo
|
||||
asserts-if(winWidget,1) asserts-if(Android,0-1) load 464407-1.xhtml # Bug 450974 on win, Bug 1267054 on Android
|
||||
load 467080.xul
|
||||
load 467481-1.xul
|
||||
load 470063-1.html
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
|
||||
[[package]]
|
||||
name = "app_units"
|
||||
version = "0.5.1"
|
||||
version = "0.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"heapsize 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -923,7 +923,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
name = "style"
|
||||
version = "0.0.1"
|
||||
dependencies = [
|
||||
"app_units 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"app_units 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"arraydeque 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"arrayvec 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -976,7 +976,7 @@ dependencies = [
|
|||
name = "style_traits"
|
||||
version = "0.0.1"
|
||||
dependencies = [
|
||||
"app_units 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"app_units 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"cssparser 0.18.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"euclid 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -1184,7 +1184,7 @@ dependencies = [
|
|||
name = "webrender"
|
||||
version = "0.48.0"
|
||||
dependencies = [
|
||||
"app_units 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"app_units 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"bit-set 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -1211,7 +1211,7 @@ dependencies = [
|
|||
name = "webrender_api"
|
||||
version = "0.48.0"
|
||||
dependencies = [
|
||||
"app_units 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"app_units 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"core-foundation 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -1228,7 +1228,7 @@ dependencies = [
|
|||
name = "webrender_bindings"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"app_units 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"app_units 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"euclid 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rayon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -1258,7 +1258,7 @@ dependencies = [
|
|||
[metadata]
|
||||
"checksum aho-corasick 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0638fd549427caa90c499814196d1b9e3725eb4d15d7339d6de073a680ed0ca2"
|
||||
"checksum ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "23ac7c30002a5accbf7e8987d0632fa6de155b7c3d39d0067317a391e00a2ef6"
|
||||
"checksum app_units 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b502f30531df49d388ac6efbc8fb25652d54df5cc2bca653361f683c6dd2f075"
|
||||
"checksum app_units 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "99f3af85d0c7c054d95da6405117b523284a97484494b44a6dec58b9617eabf6"
|
||||
"checksum arraydeque 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "96e774cadb24c2245225280c6799793f9802b918a58a79615e9490607489a717"
|
||||
"checksum arrayvec 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)" = "699e63a93b79d717e8c3b5eb1b28b7780d0d6d9e59a72eb769291c83b0c8dc67"
|
||||
"checksum aster 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ccfdf7355d9db158df68f976ed030ab0f6578af811f5a7bb6dcf221ec24e0e0"
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
|
||||
[[package]]
|
||||
name = "app_units"
|
||||
version = "0.5.1"
|
||||
version = "0.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"heapsize 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -910,7 +910,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
name = "style"
|
||||
version = "0.0.1"
|
||||
dependencies = [
|
||||
"app_units 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"app_units 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"arraydeque 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"arrayvec 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -963,7 +963,7 @@ dependencies = [
|
|||
name = "style_traits"
|
||||
version = "0.0.1"
|
||||
dependencies = [
|
||||
"app_units 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"app_units 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"cssparser 0.18.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"euclid 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -1171,7 +1171,7 @@ dependencies = [
|
|||
name = "webrender"
|
||||
version = "0.48.0"
|
||||
dependencies = [
|
||||
"app_units 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"app_units 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"bit-set 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -1198,7 +1198,7 @@ dependencies = [
|
|||
name = "webrender_api"
|
||||
version = "0.48.0"
|
||||
dependencies = [
|
||||
"app_units 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"app_units 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"core-foundation 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -1215,7 +1215,7 @@ dependencies = [
|
|||
name = "webrender_bindings"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"app_units 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"app_units 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"euclid 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"gleam 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rayon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -1245,7 +1245,7 @@ dependencies = [
|
|||
[metadata]
|
||||
"checksum aho-corasick 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0638fd549427caa90c499814196d1b9e3725eb4d15d7339d6de073a680ed0ca2"
|
||||
"checksum ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "23ac7c30002a5accbf7e8987d0632fa6de155b7c3d39d0067317a391e00a2ef6"
|
||||
"checksum app_units 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b502f30531df49d388ac6efbc8fb25652d54df5cc2bca653361f683c6dd2f075"
|
||||
"checksum app_units 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "99f3af85d0c7c054d95da6405117b523284a97484494b44a6dec58b9617eabf6"
|
||||
"checksum arraydeque 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "96e774cadb24c2245225280c6799793f9802b918a58a79615e9490607489a717"
|
||||
"checksum arrayvec 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)" = "699e63a93b79d717e8c3b5eb1b28b7780d0d6d9e59a72eb769291c83b0c8dc67"
|
||||
"checksum aster 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ccfdf7355d9db158df68f976ed030ab0f6578af811f5a7bb6dcf221ec24e0e0"
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче