131781 2014-04-16 19:39:16 -0700 Uninline blend(Color, Color) to get AnimationUtilities out of Color.h 2014-04-17 00:33:54 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton commit-queue simon.fraser oldest_to_newest 1001456 0 thorton 2014-04-16 19:39:16 -0700 yep 1001457 1 229513 thorton 2014-04-16 19:39:58 -0700 Created attachment 229513 patch 1001459 2 commit-queue 2014-04-16 19:42:18 -0700 Attachment 229513 did not pass style-queue: ERROR: Source/WebCore/platform/graphics/Color.cpp:470: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Source/WebCore/platform/graphics/Color.cpp:471: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Source/WebCore/platform/graphics/Color.cpp:472: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Source/WebCore/platform/graphics/Color.cpp:478: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Source/WebCore/platform/graphics/Color.cpp:479: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Source/WebCore/platform/graphics/Color.cpp:480: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Source/WebCore/ChangeLog:1: ChangeLog entry has no bug number [changelog/bugnumber] [5] Total errors found: 7 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1001462 3 229513 simon.fraser 2014-04-16 19:52:10 -0700 Comment on attachment 229513 patch r=me if it builds. 1001463 4 229513 thorton 2014-04-16 19:52:40 -0700 Comment on attachment 229513 patch View in context: https://bugs.webkit.org/attachment.cgi?id=229513&action=review > Source/WebCore/ChangeLog:10 > + These can be static now. Or not, other platforms use them elsewhere. 1001468 5 229515 thorton 2014-04-16 19:58:44 -0700 Created attachment 229515 patch 1001510 6 229515 commit-queue 2014-04-17 00:33:51 -0700 Comment on attachment 229515 patch Clearing flags on attachment: 229515 Committed r167423: <http://trac.webkit.org/changeset/167423> 1001511 7 commit-queue 2014-04-17 00:33:54 -0700 All reviewed patches have been landed. Closing bug. 229513 2014-04-16 19:39:58 -0700 2014-04-16 19:58:44 -0700 patch color.diff text/plain 5292 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAyNzdjMDhkLi41NzQ1N2E4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTQtMDQtMTYgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgVW5pbmxpbmUgYmxlbmQoQ29sb3IsIENvbG9yKSB0byBnZXQgQW5pbWF0aW9uVXRp bGl0aWVzIG91dCBvZiBDb2xvci5oCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9Db2xvci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpjb2xvckZyb21QcmVtdWx0aXBsaWVkQVJHQik6CisgICAgICAgIChXZWJDb3JlOjpw cmVtdWx0aXBsaWVkQVJHQkZyb21Db2xvcik6CisgICAgICAgIFRoZXNlIGNhbiBiZSBzdGF0aWMg bm93LgorCisgICAgICAgIChXZWJDb3JlOjpibGVuZCk6CisgICAgICAgIFVuLWlubGluZS4KKwor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0NvbG9yLmg6CisgICAgICAgIE5vIG1vcmUgQW5p bWF0aW9uVXRpbGl0aWVzLgorCiAyMDE0LTA0LTE2ICBEZWFuIEphY2tzb24gIDxkaW5vQGFwcGxl LmNvbT4KIAogICAgICAgICBNZWRpYURvY3VtZW50IG9uIGlPUyBzaG91bGQgYmUgZnVsbCBwYWdl CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Db2xvci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Db2xvci5jcHAKaW5kZXggOGJjNzE0 Ni4uNjE4NTkxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Q29sb3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0NvbG9yLmNw cApAQCAtMjYsNiArMjYsNyBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIkNvbG9y LmgiCiAKKyNpbmNsdWRlICJBbmltYXRpb25VdGlsaXRpZXMuaCIKICNpbmNsdWRlICJIYXNoVG9v bHMuaCIKICNpbmNsdWRlIDx3dGYvQXNzZXJ0aW9ucy5oPgogI2luY2x1ZGUgPHd0Zi9EZWNpbWFs TnVtYmVyLmg+CkBAIC00MjMsNyArNDI0LDcgQEAgdm9pZCBDb2xvcjo6Z2V0SFNMKGRvdWJsZSYg aHVlLCBkb3VibGUmIHNhdHVyYXRpb24sIGRvdWJsZSYgbGlnaHRuZXNzKSBjb25zdAogICAgICAg ICBzYXR1cmF0aW9uID0gKChtYXggLSBtaW4pIC8gKDIuMCAtIChtYXggKyBtaW4pKSk7CiB9CiAK LUNvbG9yIGNvbG9yRnJvbVByZW11bHRpcGxpZWRBUkdCKFJHQkEzMiBwaXhlbENvbG9yKQorc3Rh dGljIENvbG9yIGNvbG9yRnJvbVByZW11bHRpcGxpZWRBUkdCKFJHQkEzMiBwaXhlbENvbG9yKQog ewogICAgIGludCBhbHBoYSA9IGFscGhhQ2hhbm5lbChwaXhlbENvbG9yKTsKICAgICBpZiAoYWxw aGEgJiYgYWxwaGEgPCAyNTUpIHsKQEAgLTQzNiw3ICs0MzcsNyBAQCBDb2xvciBjb2xvckZyb21Q cmVtdWx0aXBsaWVkQVJHQihSR0JBMzIgcGl4ZWxDb2xvcikKICAgICAgICAgcmV0dXJuIENvbG9y KHBpeGVsQ29sb3IpOwogfQogCi1SR0JBMzIgcHJlbXVsdGlwbGllZEFSR0JGcm9tQ29sb3IoY29u c3QgQ29sb3ImIGNvbG9yKQorc3RhdGljIFJHQkEzMiBwcmVtdWx0aXBsaWVkQVJHQkZyb21Db2xv cihjb25zdCBDb2xvciYgY29sb3IpCiB7CiAgICAgdW5zaWduZWQgcGl4ZWxDb2xvcjsKIApAQCAt NDUzLDQgKzQ1NCwzMSBAQCBSR0JBMzIgcHJlbXVsdGlwbGllZEFSR0JGcm9tQ29sb3IoY29uc3Qg Q29sb3ImIGNvbG9yKQogICAgIHJldHVybiBwaXhlbENvbG9yOwogfQogCitDb2xvciBibGVuZChj b25zdCBDb2xvciYgZnJvbSwgY29uc3QgQ29sb3ImIHRvLCBkb3VibGUgcHJvZ3Jlc3MsIGJvb2wg YmxlbmRQcmVtdWx0aXBsaWVkKQoreworICAgIC8vIFdlIG5lZWQgdG8gcHJlc2VydmUgdGhlIHN0 YXRlIG9mIHRoZSB2YWxpZCBmbGFnIGF0IHRoZSBlbmQgb2YgdGhlIGFuaW1hdGlvbgorICAgIGlm IChwcm9ncmVzcyA9PSAxICYmICF0by5pc1ZhbGlkKCkpCisgICAgICAgIHJldHVybiBDb2xvcigp OworCisgICAgaWYgKGJsZW5kUHJlbXVsdGlwbGllZCkgeworICAgICAgICAvLyBDb250cmFyeSB0 byB0aGUgbmFtZSwgUkdCQTMyIGFjdHVhbGx5IHN0b3JlcyBBUkdCLCBzbyB3ZSBjYW4gaW5pdGlh bGl6ZSBDb2xvciBkaXJlY3RseSBmcm9tIHByZW11bHRpcGxpZWRBUkdCRnJvbUNvbG9yKCkuCisg ICAgICAgIC8vIEFsc28sIHByZW11bHRpcGxpZWRBUkdCRnJvbUNvbG9yKCkgYmFpbHMgb24gemVy byBhbHBoYSwgc28gc3BlY2lhbC1jYXNlIHRoYXQuCisgICAgICAgIENvbG9yIHByZW11bHRGcm9t ID0gZnJvbS5hbHBoYSgpID8gcHJlbXVsdGlwbGllZEFSR0JGcm9tQ29sb3IoZnJvbSkgOiAwOwor ICAgICAgICBDb2xvciBwcmVtdWx0VG8gPSB0by5hbHBoYSgpID8gcHJlbXVsdGlwbGllZEFSR0JG cm9tQ29sb3IodG8pIDogMDsKKworICAgICAgICBDb2xvciBwcmVtdWx0QmxlbmRlZChibGVuZChw cmVtdWx0RnJvbS5yZWQoKSwgcHJlbXVsdFRvLnJlZCgpLCBwcm9ncmVzcyksCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGJsZW5kKHByZW11bHRGcm9tLmdyZWVuKCksIHByZW11bHRUby5n cmVlbigpLCBwcm9ncmVzcyksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJsZW5kKHBy ZW11bHRGcm9tLmJsdWUoKSwgcHJlbXVsdFRvLmJsdWUoKSwgcHJvZ3Jlc3MpLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBibGVuZChwcmVtdWx0RnJvbS5hbHBoYSgpLCBwcmVtdWx0VG8u YWxwaGEoKSwgcHJvZ3Jlc3MpKTsKKworICAgICAgICByZXR1cm4gQ29sb3IoY29sb3JGcm9tUHJl bXVsdGlwbGllZEFSR0IocHJlbXVsdEJsZW5kZWQucmdiKCkpKTsKKyAgICB9CisKKyAgICByZXR1 cm4gQ29sb3IoYmxlbmQoZnJvbS5yZWQoKSwgdG8ucmVkKCksIHByb2dyZXNzKSwKKyAgICAgICAg ICAgICAgICAgYmxlbmQoZnJvbS5ncmVlbigpLCB0by5ncmVlbigpLCBwcm9ncmVzcyksCisgICAg ICAgICAgICAgICAgIGJsZW5kKGZyb20uYmx1ZSgpLCB0by5ibHVlKCksIHByb2dyZXNzKSwKKyAg ICAgICAgICAgICAgICAgYmxlbmQoZnJvbS5hbHBoYSgpLCB0by5hbHBoYSgpLCBwcm9ncmVzcykp OworfQorCisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL0NvbG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9Db2xvci5oCmluZGV4IGM3NzcyOGEuLjVkZjk3ZGMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0NvbG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvQ29sb3IuaApAQCAtMjYsNyArMjYsNiBAQAogI2lmbmRlZiBDb2xv cl9oCiAjZGVmaW5lIENvbG9yX2gKIAotI2luY2x1ZGUgIkFuaW1hdGlvblV0aWxpdGllcy5oIgog I2luY2x1ZGUgPHVuaWNvZGUvdWNoYXIuaD4KICNpbmNsdWRlIDx3dGYvRmFzdE1hbGxvYy5oPgog I2luY2x1ZGUgPHd0Zi9Gb3J3YXJkLmg+CkBAIC0xNzYsMzQgKzE3NSw3IEBAIGlubGluZSBib29s IG9wZXJhdG9yIT0oY29uc3QgQ29sb3ImIGEsIGNvbnN0IENvbG9yJiBiKQogICAgIHJldHVybiAh KGEgPT0gYik7CiB9CiAKLUNvbG9yIGNvbG9yRnJvbVByZW11bHRpcGxpZWRBUkdCKFJHQkEzMik7 Ci1SR0JBMzIgcHJlbXVsdGlwbGllZEFSR0JGcm9tQ29sb3IoY29uc3QgQ29sb3ImKTsKLQotaW5s aW5lIENvbG9yIGJsZW5kKGNvbnN0IENvbG9yJiBmcm9tLCBjb25zdCBDb2xvciYgdG8sIGRvdWJs ZSBwcm9ncmVzcywgYm9vbCBibGVuZFByZW11bHRpcGxpZWQgPSB0cnVlKQotewotICAgIC8vIFdl IG5lZWQgdG8gcHJlc2VydmUgdGhlIHN0YXRlIG9mIHRoZSB2YWxpZCBmbGFnIGF0IHRoZSBlbmQg b2YgdGhlIGFuaW1hdGlvbgotICAgIGlmIChwcm9ncmVzcyA9PSAxICYmICF0by5pc1ZhbGlkKCkp Ci0gICAgICAgIHJldHVybiBDb2xvcigpOwotICAgIAotICAgIGlmIChibGVuZFByZW11bHRpcGxp ZWQpIHsKLSAgICAgICAgLy8gQ29udHJhcnkgdG8gdGhlIG5hbWUsIFJHQkEzMiBhY3R1YWxseSBz dG9yZXMgQVJHQiwgc28gd2UgY2FuIGluaXRpYWxpemUgQ29sb3IgZGlyZWN0bHkgZnJvbSBwcmVt dWx0aXBsaWVkQVJHQkZyb21Db2xvcigpLgotICAgICAgICAvLyBBbHNvLCBwcmVtdWx0aXBsaWVk QVJHQkZyb21Db2xvcigpIGJhaWxzIG9uIHplcm8gYWxwaGEsIHNvIHNwZWNpYWwtY2FzZSB0aGF0 LgotICAgICAgICBDb2xvciBwcmVtdWx0RnJvbSA9IGZyb20uYWxwaGEoKSA/IHByZW11bHRpcGxp ZWRBUkdCRnJvbUNvbG9yKGZyb20pIDogMDsKLSAgICAgICAgQ29sb3IgcHJlbXVsdFRvID0gdG8u YWxwaGEoKSA/IHByZW11bHRpcGxpZWRBUkdCRnJvbUNvbG9yKHRvKSA6IDA7Ci0KLSAgICAgICAg Q29sb3IgcHJlbXVsdEJsZW5kZWQoYmxlbmQocHJlbXVsdEZyb20ucmVkKCksIHByZW11bHRUby5y ZWQoKSwgcHJvZ3Jlc3MpLAotICAgICAgICAgICAgICAgICAgICAgYmxlbmQocHJlbXVsdEZyb20u Z3JlZW4oKSwgcHJlbXVsdFRvLmdyZWVuKCksIHByb2dyZXNzKSwKLSAgICAgICAgICAgICAgICAg ICAgIGJsZW5kKHByZW11bHRGcm9tLmJsdWUoKSwgcHJlbXVsdFRvLmJsdWUoKSwgcHJvZ3Jlc3Mp LAotICAgICAgICAgICAgICAgICAgICAgYmxlbmQocHJlbXVsdEZyb20uYWxwaGEoKSwgcHJlbXVs dFRvLmFscGhhKCksIHByb2dyZXNzKSk7Ci0KLSAgICAgICAgcmV0dXJuIENvbG9yKGNvbG9yRnJv bVByZW11bHRpcGxpZWRBUkdCKHByZW11bHRCbGVuZGVkLnJnYigpKSk7Ci0gICAgfQotCi0gICAg cmV0dXJuIENvbG9yKGJsZW5kKGZyb20ucmVkKCksIHRvLnJlZCgpLCBwcm9ncmVzcyksCi0gICAg ICAgICAgICAgICAgIGJsZW5kKGZyb20uZ3JlZW4oKSwgdG8uZ3JlZW4oKSwgcHJvZ3Jlc3MpLAot ICAgICAgICAgICAgICAgICBibGVuZChmcm9tLmJsdWUoKSwgdG8uYmx1ZSgpLCBwcm9ncmVzcyks Ci0gICAgICAgICAgICAgICAgIGJsZW5kKGZyb20uYWxwaGEoKSwgdG8uYWxwaGEoKSwgcHJvZ3Jl c3MpKTsKLX0KK0NvbG9yIGJsZW5kKGNvbnN0IENvbG9yJiBmcm9tLCBjb25zdCBDb2xvciYgdG8s IGRvdWJsZSBwcm9ncmVzcywgYm9vbCBibGVuZFByZW11bHRpcGxpZWQgPSB0cnVlKTsKIAogaW5s aW5lIHVpbnQxNl90IGZhc3REaXZpZGVCeTI1NSh1aW50MTZfdCB2YWx1ZSkKIHsK 229515 2014-04-16 19:58:44 -0700 2014-04-17 00:33:50 -0700 patch color.diff text/plain 4528 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA5ZjM5Yjk2Li5kNTQwMDdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTQtMDQtMTYgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgVW5pbmxpbmUgYmxlbmQoQ29sb3IsIENvbG9yKSB0byBnZXQgQW5pbWF0aW9uVXRp bGl0aWVzIG91dCBvZiBDb2xvci5oCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMzE3ODEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0NvbG9yLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OmJsZW5kKToKKyAgICAgICAgVW4taW5saW5lLgorCisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvQ29sb3IuaDoKKyAgICAgICAgTm8gbW9yZSBBbmltYXRpb25VdGlsaXRpZXMuCisK IDIwMTQtMDQtMTYgIEFsZXhhbmRydSBDaGljdWxpdGEgIDxhY2hpY3VAYWRvYmUuY29tPgogCiAg ICAgICAgIEltcHJvdmUgcGVyZm9ybWFuY2Ugb2YgdGhlIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6 T3ZlcmxhcE1hcApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Q29sb3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQ29sb3IuY3BwCmlu ZGV4IDhiYzcxNDYuLjQyMzJhMDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0NvbG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9Db2xvci5jcHAKQEAgLTI2LDYgKzI2LDcgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNs dWRlICJDb2xvci5oIgogCisjaW5jbHVkZSAiQW5pbWF0aW9uVXRpbGl0aWVzLmgiCiAjaW5jbHVk ZSAiSGFzaFRvb2xzLmgiCiAjaW5jbHVkZSA8d3RmL0Fzc2VydGlvbnMuaD4KICNpbmNsdWRlIDx3 dGYvRGVjaW1hbE51bWJlci5oPgpAQCAtNDUzLDQgKzQ1NCwzMSBAQCBSR0JBMzIgcHJlbXVsdGlw bGllZEFSR0JGcm9tQ29sb3IoY29uc3QgQ29sb3ImIGNvbG9yKQogICAgIHJldHVybiBwaXhlbENv bG9yOwogfQogCitDb2xvciBibGVuZChjb25zdCBDb2xvciYgZnJvbSwgY29uc3QgQ29sb3ImIHRv LCBkb3VibGUgcHJvZ3Jlc3MsIGJvb2wgYmxlbmRQcmVtdWx0aXBsaWVkKQoreworICAgIC8vIFdl IG5lZWQgdG8gcHJlc2VydmUgdGhlIHN0YXRlIG9mIHRoZSB2YWxpZCBmbGFnIGF0IHRoZSBlbmQg b2YgdGhlIGFuaW1hdGlvbgorICAgIGlmIChwcm9ncmVzcyA9PSAxICYmICF0by5pc1ZhbGlkKCkp CisgICAgICAgIHJldHVybiBDb2xvcigpOworCisgICAgaWYgKGJsZW5kUHJlbXVsdGlwbGllZCkg eworICAgICAgICAvLyBDb250cmFyeSB0byB0aGUgbmFtZSwgUkdCQTMyIGFjdHVhbGx5IHN0b3Jl cyBBUkdCLCBzbyB3ZSBjYW4gaW5pdGlhbGl6ZSBDb2xvciBkaXJlY3RseSBmcm9tIHByZW11bHRp cGxpZWRBUkdCRnJvbUNvbG9yKCkuCisgICAgICAgIC8vIEFsc28sIHByZW11bHRpcGxpZWRBUkdC RnJvbUNvbG9yKCkgYmFpbHMgb24gemVybyBhbHBoYSwgc28gc3BlY2lhbC1jYXNlIHRoYXQuCisg ICAgICAgIENvbG9yIHByZW11bHRGcm9tID0gZnJvbS5hbHBoYSgpID8gcHJlbXVsdGlwbGllZEFS R0JGcm9tQ29sb3IoZnJvbSkgOiAwOworICAgICAgICBDb2xvciBwcmVtdWx0VG8gPSB0by5hbHBo YSgpID8gcHJlbXVsdGlwbGllZEFSR0JGcm9tQ29sb3IodG8pIDogMDsKKworICAgICAgICBDb2xv ciBwcmVtdWx0QmxlbmRlZChibGVuZChwcmVtdWx0RnJvbS5yZWQoKSwgcHJlbXVsdFRvLnJlZCgp LCBwcm9ncmVzcyksCisgICAgICAgICAgICBibGVuZChwcmVtdWx0RnJvbS5ncmVlbigpLCBwcmVt dWx0VG8uZ3JlZW4oKSwgcHJvZ3Jlc3MpLAorICAgICAgICAgICAgYmxlbmQocHJlbXVsdEZyb20u Ymx1ZSgpLCBwcmVtdWx0VG8uYmx1ZSgpLCBwcm9ncmVzcyksCisgICAgICAgICAgICBibGVuZChw cmVtdWx0RnJvbS5hbHBoYSgpLCBwcmVtdWx0VG8uYWxwaGEoKSwgcHJvZ3Jlc3MpKTsKKworICAg ICAgICByZXR1cm4gQ29sb3IoY29sb3JGcm9tUHJlbXVsdGlwbGllZEFSR0IocHJlbXVsdEJsZW5k ZWQucmdiKCkpKTsKKyAgICB9CisKKyAgICByZXR1cm4gQ29sb3IoYmxlbmQoZnJvbS5yZWQoKSwg dG8ucmVkKCksIHByb2dyZXNzKSwKKyAgICAgICAgYmxlbmQoZnJvbS5ncmVlbigpLCB0by5ncmVl bigpLCBwcm9ncmVzcyksCisgICAgICAgIGJsZW5kKGZyb20uYmx1ZSgpLCB0by5ibHVlKCksIHBy b2dyZXNzKSwKKyAgICAgICAgYmxlbmQoZnJvbS5hbHBoYSgpLCB0by5hbHBoYSgpLCBwcm9ncmVz cykpOworfQorCisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0NvbG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9Db2xvci5oCmluZGV4IGM3NzcyOGEuLmMwZWRiMTAgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0NvbG9yLmgKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvQ29sb3IuaApAQCAtMjYsNyArMjYsNiBAQAogI2lmbmRlZiBD b2xvcl9oCiAjZGVmaW5lIENvbG9yX2gKIAotI2luY2x1ZGUgIkFuaW1hdGlvblV0aWxpdGllcy5o IgogI2luY2x1ZGUgPHVuaWNvZGUvdWNoYXIuaD4KICNpbmNsdWRlIDx3dGYvRmFzdE1hbGxvYy5o PgogI2luY2x1ZGUgPHd0Zi9Gb3J3YXJkLmg+CkBAIC0xNzgsMzIgKzE3Nyw3IEBAIGlubGluZSBi b29sIG9wZXJhdG9yIT0oY29uc3QgQ29sb3ImIGEsIGNvbnN0IENvbG9yJiBiKQogCiBDb2xvciBj b2xvckZyb21QcmVtdWx0aXBsaWVkQVJHQihSR0JBMzIpOwogUkdCQTMyIHByZW11bHRpcGxpZWRB UkdCRnJvbUNvbG9yKGNvbnN0IENvbG9yJik7Ci0KLWlubGluZSBDb2xvciBibGVuZChjb25zdCBD b2xvciYgZnJvbSwgY29uc3QgQ29sb3ImIHRvLCBkb3VibGUgcHJvZ3Jlc3MsIGJvb2wgYmxlbmRQ cmVtdWx0aXBsaWVkID0gdHJ1ZSkKLXsKLSAgICAvLyBXZSBuZWVkIHRvIHByZXNlcnZlIHRoZSBz dGF0ZSBvZiB0aGUgdmFsaWQgZmxhZyBhdCB0aGUgZW5kIG9mIHRoZSBhbmltYXRpb24KLSAgICBp ZiAocHJvZ3Jlc3MgPT0gMSAmJiAhdG8uaXNWYWxpZCgpKQotICAgICAgICByZXR1cm4gQ29sb3Io KTsKLSAgICAKLSAgICBpZiAoYmxlbmRQcmVtdWx0aXBsaWVkKSB7Ci0gICAgICAgIC8vIENvbnRy YXJ5IHRvIHRoZSBuYW1lLCBSR0JBMzIgYWN0dWFsbHkgc3RvcmVzIEFSR0IsIHNvIHdlIGNhbiBp bml0aWFsaXplIENvbG9yIGRpcmVjdGx5IGZyb20gcHJlbXVsdGlwbGllZEFSR0JGcm9tQ29sb3Io KS4KLSAgICAgICAgLy8gQWxzbywgcHJlbXVsdGlwbGllZEFSR0JGcm9tQ29sb3IoKSBiYWlscyBv biB6ZXJvIGFscGhhLCBzbyBzcGVjaWFsLWNhc2UgdGhhdC4KLSAgICAgICAgQ29sb3IgcHJlbXVs dEZyb20gPSBmcm9tLmFscGhhKCkgPyBwcmVtdWx0aXBsaWVkQVJHQkZyb21Db2xvcihmcm9tKSA6 IDA7Ci0gICAgICAgIENvbG9yIHByZW11bHRUbyA9IHRvLmFscGhhKCkgPyBwcmVtdWx0aXBsaWVk QVJHQkZyb21Db2xvcih0bykgOiAwOwotCi0gICAgICAgIENvbG9yIHByZW11bHRCbGVuZGVkKGJs ZW5kKHByZW11bHRGcm9tLnJlZCgpLCBwcmVtdWx0VG8ucmVkKCksIHByb2dyZXNzKSwKLSAgICAg ICAgICAgICAgICAgICAgIGJsZW5kKHByZW11bHRGcm9tLmdyZWVuKCksIHByZW11bHRUby5ncmVl bigpLCBwcm9ncmVzcyksCi0gICAgICAgICAgICAgICAgICAgICBibGVuZChwcmVtdWx0RnJvbS5i bHVlKCksIHByZW11bHRUby5ibHVlKCksIHByb2dyZXNzKSwKLSAgICAgICAgICAgICAgICAgICAg IGJsZW5kKHByZW11bHRGcm9tLmFscGhhKCksIHByZW11bHRUby5hbHBoYSgpLCBwcm9ncmVzcykp OwotCi0gICAgICAgIHJldHVybiBDb2xvcihjb2xvckZyb21QcmVtdWx0aXBsaWVkQVJHQihwcmVt dWx0QmxlbmRlZC5yZ2IoKSkpOwotICAgIH0KLQotICAgIHJldHVybiBDb2xvcihibGVuZChmcm9t LnJlZCgpLCB0by5yZWQoKSwgcHJvZ3Jlc3MpLAotICAgICAgICAgICAgICAgICBibGVuZChmcm9t LmdyZWVuKCksIHRvLmdyZWVuKCksIHByb2dyZXNzKSwKLSAgICAgICAgICAgICAgICAgYmxlbmQo ZnJvbS5ibHVlKCksIHRvLmJsdWUoKSwgcHJvZ3Jlc3MpLAotICAgICAgICAgICAgICAgICBibGVu ZChmcm9tLmFscGhhKCksIHRvLmFscGhhKCksIHByb2dyZXNzKSk7Ci19CitDb2xvciBibGVuZChj b25zdCBDb2xvciYgZnJvbSwgY29uc3QgQ29sb3ImIHRvLCBkb3VibGUgcHJvZ3Jlc3MsIGJvb2wg YmxlbmRQcmVtdWx0aXBsaWVkID0gdHJ1ZSk7CiAKIGlubGluZSB1aW50MTZfdCBmYXN0RGl2aWRl QnkyNTUodWludDE2X3QgdmFsdWUpCiB7Cg==