61497 2011-05-25 19:44:33 -0700 Change RenderObject to use FloatPoint::scale and FloatQuad::scale 2011-05-26 11:47:14 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60318 1 eae eae ap commit-queue darin simon.fraser oldest_to_newest 410135 0 eae 2011-05-25 19:44:33 -0700 Change RenderObject to use FloatPoint::scale and FloatQuad::scale 410138 1 94906 eae 2011-05-25 19:46:04 -0700 Created attachment 94906 Patch 410380 2 94906 eric 2011-05-26 06:16:51 -0700 Comment on attachment 94906 Patch I assume rect::scale() is already implemented? Or did I miss something in the patch? 410554 3 eae 2011-05-26 10:07:17 -0700 (In reply to comment #2) > (From update of attachment 94906 [details]) > I assume rect::scale() is already implemented? Or did I miss something in the patch? Yeah, rect::scale already exists. Thanks! 410572 4 95001 eae 2011-05-26 10:18:43 -0700 Created attachment 95001 Patch for landing 410658 5 95001 commit-queue 2011-05-26 11:47:09 -0700 Comment on attachment 95001 Patch for landing Clearing flags on attachment: 95001 Committed r87407: <http://trac.webkit.org/changeset/87407> 410659 6 commit-queue 2011-05-26 11:47:14 -0700 All reviewed patches have been landed. Closing bug. 94906 2011-05-25 19:46:04 -0700 2011-05-26 10:18:40 -0700 Patch bug-61497-20110525194603.patch text/plain 4269 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg3MzUxKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDUtMjUgIEVtaWwgQSBF a2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIENoYW5nZSBSZW5kZXJPYmplY3QgdG8gdXNlIEZsb2F0UG9pbnQ6 OnNjYWxlIGFuZCBGbG9hdFF1YWQ6OnNjYWxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD02MTQ5NworCisgICAgICAgIENvdmVyZWQgYnkgZXhpc3Rpbmcg dGVzdC4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0Zsb2F0UXVhZC5oOgorICAgICAg ICAoV2ViQ29yZTo6RmxvYXRRdWFkOjpzY2FsZSk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl ck9iamVjdC5oOgorICAgICAgICAoV2ViQ29yZTo6YWRqdXN0RmxvYXRRdWFkRm9yQWJzb2x1dGVa b29tKToKKyAgICAgICAgKFdlYkNvcmU6OmFkanVzdEZsb2F0UmVjdEZvckFic29sdXRlWm9vbSk6 CisgICAgICAgIChXZWJDb3JlOjphZGp1c3RGbG9hdFF1YWRGb3JQYWdlU2NhbGUpOgorICAgICAg ICAoV2ViQ29yZTo6YWRqdXN0RmxvYXRSZWN0Rm9yUGFnZVNjYWxlKToKKwogMjAxMS0wNS0yNCAg TU9SSVRBIEhhamltZSAgPG1vcnJpdGFAZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBi eSBEaW1pdHJpIEdsYXprb3YuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9GbG9hdFF1YWQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9GbG9hdFF1YWQuaAkocmV2aXNpb24gODcyMTYpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9GbG9hdFF1YWQuaAkod29ya2luZyBjb3B5KQpAQCAtMTEwLDYgKzExMCwx NCBAQCBwdWJsaWM6CiAgICAgICAgIG1fcDQubW92ZShkeCwgZHkpOwogICAgIH0KIAorICAgIHZv aWQgc2NhbGUoZmxvYXQgZHgsIGZsb2F0IGR5KQorICAgIHsKKyAgICAgICAgbV9wMS5zY2FsZShk eCwgZHkpOworICAgICAgICBtX3AyLnNjYWxlKGR4LCBkeSk7CisgICAgICAgIG1fcDMuc2NhbGUo ZHgsIGR5KTsKKyAgICAgICAgbV9wNC5zY2FsZShkeCwgZHkpOworICAgIH0KKwogcHJpdmF0ZToK ICAgICBGbG9hdFBvaW50IG1fcDE7CiAgICAgRmxvYXRQb2ludCBtX3AyOwpJbmRleDogU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaAkocmV2aXNpb24gODcyMTYpCisrKyBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgJKHdvcmtpbmcgY29weSkKQEAgLTEw NzYsNTcgKzEwNzYsMzAgQEAgaW5saW5lIGludCBhZGp1c3RGb3JBYnNvbHV0ZVpvb20oaW50IHZh bAogICAgIHJldHVybiBhZGp1c3RGb3JBYnNvbHV0ZVpvb20odmFsdWUsIHJlbmRlcmVyLT5zdHls ZSgpKTsKIH0KIAotaW5saW5lIEZsb2F0UG9pbnQgYWRqdXN0RmxvYXRQb2ludEZvckFic29sdXRl Wm9vbShjb25zdCBGbG9hdFBvaW50JiBwb2ludCwgUmVuZGVyT2JqZWN0KiByZW5kZXJlcikKLXsK LSAgICAvLyBUaGUgcmVzdWx0IGhlcmUgaXMgaW4gZmxvYXRzLCBzbyB3ZSBkb24ndCBuZWVkIHRo ZSB0cnVuY2F0aW9uIGhhY2sgZnJvbSB0aGUgaW50ZWdlciB2ZXJzaW9uIGFib3ZlLgotICAgIGZs b2F0IHpvb21GYWN0b3IgPSByZW5kZXJlci0+c3R5bGUoKS0+ZWZmZWN0aXZlWm9vbSgpOwotICAg IGlmICh6b29tRmFjdG9yID09IDEpCi0gICAgICAgIHJldHVybiBwb2ludDsKLSAgICByZXR1cm4g RmxvYXRQb2ludChwb2ludC54KCkgLyB6b29tRmFjdG9yLCBwb2ludC55KCkgLyB6b29tRmFjdG9y KTsKLX0KLQogaW5saW5lIHZvaWQgYWRqdXN0RmxvYXRRdWFkRm9yQWJzb2x1dGVab29tKEZsb2F0 UXVhZCYgcXVhZCwgUmVuZGVyT2JqZWN0KiByZW5kZXJlcikKIHsKLSAgICBxdWFkLnNldFAxKGFk anVzdEZsb2F0UG9pbnRGb3JBYnNvbHV0ZVpvb20ocXVhZC5wMSgpLCByZW5kZXJlcikpOwotICAg IHF1YWQuc2V0UDIoYWRqdXN0RmxvYXRQb2ludEZvckFic29sdXRlWm9vbShxdWFkLnAyKCksIHJl bmRlcmVyKSk7Ci0gICAgcXVhZC5zZXRQMyhhZGp1c3RGbG9hdFBvaW50Rm9yQWJzb2x1dGVab29t KHF1YWQucDMoKSwgcmVuZGVyZXIpKTsKLSAgICBxdWFkLnNldFA0KGFkanVzdEZsb2F0UG9pbnRG b3JBYnNvbHV0ZVpvb20ocXVhZC5wNCgpLCByZW5kZXJlcikpOworICAgIGZsb2F0IHpvb20gPSBy ZW5kZXJlci0+c3R5bGUoKS0+ZWZmZWN0aXZlWm9vbSgpOworICAgIGlmICh6b29tICE9IDEpCisg ICAgICAgIHF1YWQuc2NhbGUoMSAvIHpvb20sIDEgLyB6b29tKTsKIH0KIAogaW5saW5lIHZvaWQg YWRqdXN0RmxvYXRSZWN0Rm9yQWJzb2x1dGVab29tKEZsb2F0UmVjdCYgcmVjdCwgUmVuZGVyT2Jq ZWN0KiByZW5kZXJlcikKIHsKLSAgICBSZW5kZXJTdHlsZSogc3R5bGUgPSByZW5kZXJlci0+c3R5 bGUoKTsKLSAgICByZWN0LnNldFgoYWRqdXN0RmxvYXRGb3JBYnNvbHV0ZVpvb20ocmVjdC54KCks IHN0eWxlKSk7Ci0gICAgcmVjdC5zZXRZKGFkanVzdEZsb2F0Rm9yQWJzb2x1dGVab29tKHJlY3Qu eSgpLCBzdHlsZSkpOwotICAgIHJlY3Quc2V0V2lkdGgoYWRqdXN0RmxvYXRGb3JBYnNvbHV0ZVpv b20ocmVjdC53aWR0aCgpLCBzdHlsZSkpOwotICAgIHJlY3Quc2V0SGVpZ2h0KGFkanVzdEZsb2F0 Rm9yQWJzb2x1dGVab29tKHJlY3QuaGVpZ2h0KCksIHN0eWxlKSk7Ci19Ci0KLWlubGluZSBGbG9h dFBvaW50IGFkanVzdEZsb2F0UG9pbnRGb3JQYWdlU2NhbGUoY29uc3QgRmxvYXRQb2ludCYgcG9p bnQsIGZsb2F0IHBhZ2VTY2FsZSkKLXsKLSAgICBpZiAocGFnZVNjYWxlID09IDEpCi0gICAgICAg IHJldHVybiBwb2ludDsKLSAgICByZXR1cm4gRmxvYXRQb2ludChwb2ludC54KCkgLyBwYWdlU2Nh bGUsIHBvaW50LnkoKSAvIHBhZ2VTY2FsZSk7CisgICAgZmxvYXQgem9vbSA9IHJlbmRlcmVyLT5z dHlsZSgpLT5lZmZlY3RpdmVab29tKCk7CisgICAgaWYgKHpvb20gIT0gMSkKKyAgICAgICAgcmVj dC5zY2FsZSgxIC8gem9vbSwgMSAvIHpvb20pOwogfQogCiBpbmxpbmUgdm9pZCBhZGp1c3RGbG9h dFF1YWRGb3JQYWdlU2NhbGUoRmxvYXRRdWFkJiBxdWFkLCBmbG9hdCBwYWdlU2NhbGUpCiB7Ci0g ICAgaWYgKHBhZ2VTY2FsZSA9PSAxKQotICAgICAgICByZXR1cm47Ci0gICAgcXVhZC5zZXRQMShh ZGp1c3RGbG9hdFBvaW50Rm9yUGFnZVNjYWxlKHF1YWQucDEoKSwgcGFnZVNjYWxlKSk7Ci0gICAg cXVhZC5zZXRQMihhZGp1c3RGbG9hdFBvaW50Rm9yUGFnZVNjYWxlKHF1YWQucDIoKSwgcGFnZVNj YWxlKSk7Ci0gICAgcXVhZC5zZXRQMyhhZGp1c3RGbG9hdFBvaW50Rm9yUGFnZVNjYWxlKHF1YWQu cDMoKSwgcGFnZVNjYWxlKSk7Ci0gICAgcXVhZC5zZXRQNChhZGp1c3RGbG9hdFBvaW50Rm9yUGFn ZVNjYWxlKHF1YWQucDQoKSwgcGFnZVNjYWxlKSk7CisgICAgaWYgKHBhZ2VTY2FsZSAhPSAxKQor ICAgICAgICBxdWFkLnNjYWxlKDEgLyBwYWdlU2NhbGUsIDEgLyBwYWdlU2NhbGUpOwogfQogCiBp bmxpbmUgdm9pZCBhZGp1c3RGbG9hdFJlY3RGb3JQYWdlU2NhbGUoRmxvYXRSZWN0JiByZWN0LCBm bG9hdCBwYWdlU2NhbGUpCiB7Ci0gICAgaWYgKHBhZ2VTY2FsZSA9PSAxKQotICAgICAgICByZXR1 cm47Ci0gICAgcmVjdC5zZXRYKHJlY3QueCgpIC8gcGFnZVNjYWxlKTsKLSAgICByZWN0LnNldFko cmVjdC55KCkgLyBwYWdlU2NhbGUpOwotICAgIHJlY3Quc2V0V2lkdGgocmVjdC53aWR0aCgpIC8g cGFnZVNjYWxlKTsKLSAgICByZWN0LnNldEhlaWdodChyZWN0LmhlaWdodCgpIC8gcGFnZVNjYWxl KTsKKyAgICBpZiAocGFnZVNjYWxlICE9IDEpCisgICAgICAgIHJlY3Quc2NhbGUoMSAvIHBhZ2VT Y2FsZSwgMSAvIHBhZ2VTY2FsZSk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK 95001 2011-05-26 10:18:43 -0700 2011-05-26 11:47:09 -0700 Patch for landing bug-61497-20110526101842.patch text/plain 4269 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg3Mzk4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDUtMjYgIEVtaWwgQSBF a2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2Vp ZGVsLgorCisgICAgICAgIENoYW5nZSBSZW5kZXJPYmplY3QgdG8gdXNlIEZsb2F0UG9pbnQ6OnNj YWxlIGFuZCBGbG9hdFF1YWQ6OnNjYWxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD02MTQ5NworCisgICAgICAgIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVz dC4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0Zsb2F0UXVhZC5oOgorICAgICAgICAo V2ViQ29yZTo6RmxvYXRRdWFkOjpzY2FsZSk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9i amVjdC5oOgorICAgICAgICAoV2ViQ29yZTo6YWRqdXN0RmxvYXRRdWFkRm9yQWJzb2x1dGVab29t KToKKyAgICAgICAgKFdlYkNvcmU6OmFkanVzdEZsb2F0UmVjdEZvckFic29sdXRlWm9vbSk6Cisg ICAgICAgIChXZWJDb3JlOjphZGp1c3RGbG9hdFF1YWRGb3JQYWdlU2NhbGUpOgorICAgICAgICAo V2ViQ29yZTo6YWRqdXN0RmxvYXRSZWN0Rm9yUGFnZVNjYWxlKToKKwogMjAxMS0wNS0yNiAgQW5k cmV5IEtvc3lha292ICA8Y2FzZXFAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IFl1cnkgU2VtaWtoYXRza3kuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9GbG9hdFF1YWQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9GbG9hdFF1YWQuaAkocmV2aXNpb24gODczOTgpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9GbG9hdFF1YWQuaAkod29ya2luZyBjb3B5KQpAQCAtMTEwLDYgKzExMCwx NCBAQCBwdWJsaWM6CiAgICAgICAgIG1fcDQubW92ZShkeCwgZHkpOwogICAgIH0KIAorICAgIHZv aWQgc2NhbGUoZmxvYXQgZHgsIGZsb2F0IGR5KQorICAgIHsKKyAgICAgICAgbV9wMS5zY2FsZShk eCwgZHkpOworICAgICAgICBtX3AyLnNjYWxlKGR4LCBkeSk7CisgICAgICAgIG1fcDMuc2NhbGUo ZHgsIGR5KTsKKyAgICAgICAgbV9wNC5zY2FsZShkeCwgZHkpOworICAgIH0KKwogcHJpdmF0ZToK ICAgICBGbG9hdFBvaW50IG1fcDE7CiAgICAgRmxvYXRQb2ludCBtX3AyOwpJbmRleDogU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaAkocmV2aXNpb24gODczOTgpCisrKyBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgJKHdvcmtpbmcgY29weSkKQEAgLTEw NzYsNTcgKzEwNzYsMzAgQEAgaW5saW5lIGludCBhZGp1c3RGb3JBYnNvbHV0ZVpvb20oaW50IHZh bAogICAgIHJldHVybiBhZGp1c3RGb3JBYnNvbHV0ZVpvb20odmFsdWUsIHJlbmRlcmVyLT5zdHls ZSgpKTsKIH0KIAotaW5saW5lIEZsb2F0UG9pbnQgYWRqdXN0RmxvYXRQb2ludEZvckFic29sdXRl Wm9vbShjb25zdCBGbG9hdFBvaW50JiBwb2ludCwgUmVuZGVyT2JqZWN0KiByZW5kZXJlcikKLXsK LSAgICAvLyBUaGUgcmVzdWx0IGhlcmUgaXMgaW4gZmxvYXRzLCBzbyB3ZSBkb24ndCBuZWVkIHRo ZSB0cnVuY2F0aW9uIGhhY2sgZnJvbSB0aGUgaW50ZWdlciB2ZXJzaW9uIGFib3ZlLgotICAgIGZs b2F0IHpvb21GYWN0b3IgPSByZW5kZXJlci0+c3R5bGUoKS0+ZWZmZWN0aXZlWm9vbSgpOwotICAg IGlmICh6b29tRmFjdG9yID09IDEpCi0gICAgICAgIHJldHVybiBwb2ludDsKLSAgICByZXR1cm4g RmxvYXRQb2ludChwb2ludC54KCkgLyB6b29tRmFjdG9yLCBwb2ludC55KCkgLyB6b29tRmFjdG9y KTsKLX0KLQogaW5saW5lIHZvaWQgYWRqdXN0RmxvYXRRdWFkRm9yQWJzb2x1dGVab29tKEZsb2F0 UXVhZCYgcXVhZCwgUmVuZGVyT2JqZWN0KiByZW5kZXJlcikKIHsKLSAgICBxdWFkLnNldFAxKGFk anVzdEZsb2F0UG9pbnRGb3JBYnNvbHV0ZVpvb20ocXVhZC5wMSgpLCByZW5kZXJlcikpOwotICAg IHF1YWQuc2V0UDIoYWRqdXN0RmxvYXRQb2ludEZvckFic29sdXRlWm9vbShxdWFkLnAyKCksIHJl bmRlcmVyKSk7Ci0gICAgcXVhZC5zZXRQMyhhZGp1c3RGbG9hdFBvaW50Rm9yQWJzb2x1dGVab29t KHF1YWQucDMoKSwgcmVuZGVyZXIpKTsKLSAgICBxdWFkLnNldFA0KGFkanVzdEZsb2F0UG9pbnRG b3JBYnNvbHV0ZVpvb20ocXVhZC5wNCgpLCByZW5kZXJlcikpOworICAgIGZsb2F0IHpvb20gPSBy ZW5kZXJlci0+c3R5bGUoKS0+ZWZmZWN0aXZlWm9vbSgpOworICAgIGlmICh6b29tICE9IDEpCisg ICAgICAgIHF1YWQuc2NhbGUoMSAvIHpvb20sIDEgLyB6b29tKTsKIH0KIAogaW5saW5lIHZvaWQg YWRqdXN0RmxvYXRSZWN0Rm9yQWJzb2x1dGVab29tKEZsb2F0UmVjdCYgcmVjdCwgUmVuZGVyT2Jq ZWN0KiByZW5kZXJlcikKIHsKLSAgICBSZW5kZXJTdHlsZSogc3R5bGUgPSByZW5kZXJlci0+c3R5 bGUoKTsKLSAgICByZWN0LnNldFgoYWRqdXN0RmxvYXRGb3JBYnNvbHV0ZVpvb20ocmVjdC54KCks IHN0eWxlKSk7Ci0gICAgcmVjdC5zZXRZKGFkanVzdEZsb2F0Rm9yQWJzb2x1dGVab29tKHJlY3Qu eSgpLCBzdHlsZSkpOwotICAgIHJlY3Quc2V0V2lkdGgoYWRqdXN0RmxvYXRGb3JBYnNvbHV0ZVpv b20ocmVjdC53aWR0aCgpLCBzdHlsZSkpOwotICAgIHJlY3Quc2V0SGVpZ2h0KGFkanVzdEZsb2F0 Rm9yQWJzb2x1dGVab29tKHJlY3QuaGVpZ2h0KCksIHN0eWxlKSk7Ci19Ci0KLWlubGluZSBGbG9h dFBvaW50IGFkanVzdEZsb2F0UG9pbnRGb3JQYWdlU2NhbGUoY29uc3QgRmxvYXRQb2ludCYgcG9p bnQsIGZsb2F0IHBhZ2VTY2FsZSkKLXsKLSAgICBpZiAocGFnZVNjYWxlID09IDEpCi0gICAgICAg IHJldHVybiBwb2ludDsKLSAgICByZXR1cm4gRmxvYXRQb2ludChwb2ludC54KCkgLyBwYWdlU2Nh bGUsIHBvaW50LnkoKSAvIHBhZ2VTY2FsZSk7CisgICAgZmxvYXQgem9vbSA9IHJlbmRlcmVyLT5z dHlsZSgpLT5lZmZlY3RpdmVab29tKCk7CisgICAgaWYgKHpvb20gIT0gMSkKKyAgICAgICAgcmVj dC5zY2FsZSgxIC8gem9vbSwgMSAvIHpvb20pOwogfQogCiBpbmxpbmUgdm9pZCBhZGp1c3RGbG9h dFF1YWRGb3JQYWdlU2NhbGUoRmxvYXRRdWFkJiBxdWFkLCBmbG9hdCBwYWdlU2NhbGUpCiB7Ci0g ICAgaWYgKHBhZ2VTY2FsZSA9PSAxKQotICAgICAgICByZXR1cm47Ci0gICAgcXVhZC5zZXRQMShh ZGp1c3RGbG9hdFBvaW50Rm9yUGFnZVNjYWxlKHF1YWQucDEoKSwgcGFnZVNjYWxlKSk7Ci0gICAg cXVhZC5zZXRQMihhZGp1c3RGbG9hdFBvaW50Rm9yUGFnZVNjYWxlKHF1YWQucDIoKSwgcGFnZVNj YWxlKSk7Ci0gICAgcXVhZC5zZXRQMyhhZGp1c3RGbG9hdFBvaW50Rm9yUGFnZVNjYWxlKHF1YWQu cDMoKSwgcGFnZVNjYWxlKSk7Ci0gICAgcXVhZC5zZXRQNChhZGp1c3RGbG9hdFBvaW50Rm9yUGFn ZVNjYWxlKHF1YWQucDQoKSwgcGFnZVNjYWxlKSk7CisgICAgaWYgKHBhZ2VTY2FsZSAhPSAxKQor ICAgICAgICBxdWFkLnNjYWxlKDEgLyBwYWdlU2NhbGUsIDEgLyBwYWdlU2NhbGUpOwogfQogCiBp bmxpbmUgdm9pZCBhZGp1c3RGbG9hdFJlY3RGb3JQYWdlU2NhbGUoRmxvYXRSZWN0JiByZWN0LCBm bG9hdCBwYWdlU2NhbGUpCiB7Ci0gICAgaWYgKHBhZ2VTY2FsZSA9PSAxKQotICAgICAgICByZXR1 cm47Ci0gICAgcmVjdC5zZXRYKHJlY3QueCgpIC8gcGFnZVNjYWxlKTsKLSAgICByZWN0LnNldFko cmVjdC55KCkgLyBwYWdlU2NhbGUpOwotICAgIHJlY3Quc2V0V2lkdGgocmVjdC53aWR0aCgpIC8g cGFnZVNjYWxlKTsKLSAgICByZWN0LnNldEhlaWdodChyZWN0LmhlaWdodCgpIC8gcGFnZVNjYWxl KTsKKyAgICBpZiAocGFnZVNjYWxlICE9IDEpCisgICAgICAgIHJlY3Quc2NhbGUoMSAvIHBhZ2VT Y2FsZSwgMSAvIHBhZ2VTY2FsZSk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK