72771 2011-11-18 16:31:49 -0800 Change remaining scrollTop/Left/Width/Height methods back to int 2011-11-23 00:21:40 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 63567 1 eae eae eric leviw tkent webkit.review.bot oldest_to_newest 506193 0 eae 2011-11-18 16:31:49 -0800 As scrolling will remain int based to line up with device pixels we should change the remaining scrollTop/Left/Width/Height methods back to int. 506217 1 115909 eae 2011-11-18 16:54:53 -0800 Created attachment 115909 Patch 507728 2 eae 2011-11-22 11:45:43 -0800 Ping? 507744 3 115909 eric 2011-11-22 12:00:00 -0800 Comment on attachment 115909 Patch LGTM. 507748 4 eae 2011-11-22 12:04:39 -0800 Thanks Eric! 507972 5 115909 webkit.review.bot 2011-11-23 00:21:36 -0800 Comment on attachment 115909 Patch Clearing flags on attachment: 115909 Committed r101045: <http://trac.webkit.org/changeset/101045> 507973 6 webkit.review.bot 2011-11-23 00:21:40 -0800 All reviewed patches have been landed. Closing bug. 115909 2011-11-18 16:54:53 -0800 2011-11-23 00:21:36 -0800 Patch bug-72771-20111118165452.patch text/plain 12203 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMDgyOCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ0IEBACisyMDExLTExLTE4ICBFbWlsIEEg RWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KKworICAgICAgICBDaGFuZ2UgcmVtYWluaW5nIHNj cm9sbFRvcC9MZWZ0L1dpZHRoL0hlaWdodCBtZXRob2RzIGJhY2sgdG8gaW50CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03Mjc3MQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENoYW5nZSByZW1haW5pbmcgc2Ny b2xsVG9wL0xlZnQvV2lkdGgvSGVpZ2h0LCBzZXRTY3JvbGxMZWZ0L1RvcCBhbmQKKyAgICAgICAg dmVydGljYWxTY3JvbGxiYXJXaWR0aCwgaG9yaXpvbnRhbFNjcm9sbGJhckhlaWdodCBtZXRob2Rz IGJhY2sgdG8gaW50IGFzCisgICAgICAgIHNjcm9sbGluZyB3aWxsIHJlbWFpbiBpbnQgYmFzZWQg dG8gbGluZSB1cCB3aXRoIGRldmljZSBwaXhlbHMuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLgor CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJCb3g6OnNjcm9sbFdpZHRoKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6c2Ny b2xsSGVpZ2h0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6c2Nyb2xsTGVmdCk6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OnNjcm9sbFRvcCk6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJCb3g6OnNldFNjcm9sbExlZnQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94 OjpzZXRTY3JvbGxUb3ApOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojp2ZXJ0aWNhbFNj cm9sbGJhcldpZHRoKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6aG9yaXpvbnRhbFNj cm9sbGJhckhlaWdodCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5oOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyQm94OjpzY3JvbGxiYXJMb2dpY2FsSGVpZ2h0KToKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJM aXN0Qm94Ojp2ZXJ0aWNhbFNjcm9sbGJhcldpZHRoKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckxpc3RCb3g6OnNjcm9sbEhlaWdodCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMaXN0Qm94 OjpzY3JvbGxMZWZ0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxpc3RCb3g6OnNldFNjcm9s bExlZnQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGlzdEJveDo6c2Nyb2xsVG9wKToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckxpc3RCb3g6OnNldFNjcm9sbFRvcCk6CisgICAgICAgICog cmVuZGVyaW5nL1JlbmRlckxpc3RCb3guaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGV4 dENvbnRyb2xTaW5nbGVMaW5lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHRDb250 cm9sU2luZ2xlTGluZTo6c2Nyb2xsV2lkdGgpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGV4 dENvbnRyb2xTaW5nbGVMaW5lOjpzY3JvbGxIZWlnaHQpOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lOjpzY3JvbGxMZWZ0KToKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlclRleHRDb250cm9sU2luZ2xlTGluZTo6c2Nyb2xsVG9wKToKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlclRleHRDb250cm9sU2luZ2xlTGluZTo6c2V0U2Nyb2xsTGVmdCk6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmU6OnNldFNjcm9sbFRvcCk6Cisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sU2luZ2xlTGluZS5oOgorCiAyMDEx LTExLTE4ICBEYW5pZWwgQ2hlbmcgIDxkY2hlbmdAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtj aHJvbWl1bV0gVXNlIGNvcnJlY3QgYmFja2luZyBzdG9yZSBmb3IgQ2hyb21pdW1EYXRhT2JqZWN0 IGluIHBhc3RlYm9hcmQgd3JpdGVzLgpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJveC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJveC5jcHAJKHJldmlzaW9uIDEwMDgwMikKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCb3guY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NzUsNyArNDc1LDcgQEAgTGF5b3V0VW5p dCBSZW5kZXJCb3g6OmNsaWVudEhlaWdodCgpIGNvbgogICAgIHJldHVybiBoZWlnaHQoKSAtIGJv cmRlclRvcCgpIC0gYm9yZGVyQm90dG9tKCkgLSBob3Jpem9udGFsU2Nyb2xsYmFySGVpZ2h0KCk7 CiB9CiAKLUxheW91dFVuaXQgUmVuZGVyQm94OjpzY3JvbGxXaWR0aCgpIGNvbnN0CitpbnQgUmVu ZGVyQm94OjpzY3JvbGxXaWR0aCgpIGNvbnN0CiB7CiAgICAgaWYgKGhhc092ZXJmbG93Q2xpcCgp KQogICAgICAgICByZXR1cm4gbGF5ZXIoKS0+c2Nyb2xsV2lkdGgoKTsKQEAgLTQ4MywxMCArNDgz LDEwIEBAIExheW91dFVuaXQgUmVuZGVyQm94OjpzY3JvbGxXaWR0aCgpIGNvbnMKICAgICAvLyBG SVhNRTogTmVlZCB0byB3b3JrIHJpZ2h0IHdpdGggd3JpdGluZyBtb2Rlcy4KICAgICBpZiAoc3R5 bGUoKS0+aXNMZWZ0VG9SaWdodERpcmVjdGlvbigpKQogICAgICAgICByZXR1cm4gbWF4KGNsaWVu dFdpZHRoKCksIG1heFhMYXlvdXRPdmVyZmxvdygpIC0gYm9yZGVyTGVmdCgpKTsKLSAgICByZXR1 cm4gY2xpZW50V2lkdGgoKSAtIG1pbjxMYXlvdXRVbml0PigwLCBtaW5YTGF5b3V0T3ZlcmZsb3co KSAtIGJvcmRlckxlZnQoKSk7CisgICAgcmV0dXJuIGNsaWVudFdpZHRoKCkgLSBtaW4oMCwgbWlu WExheW91dE92ZXJmbG93KCkgLSBib3JkZXJMZWZ0KCkpOwogfQogCi1MYXlvdXRVbml0IFJlbmRl ckJveDo6c2Nyb2xsSGVpZ2h0KCkgY29uc3QKK2ludCBSZW5kZXJCb3g6OnNjcm9sbEhlaWdodCgp IGNvbnN0CiB7CiAgICAgaWYgKGhhc092ZXJmbG93Q2xpcCgpKQogICAgICAgICByZXR1cm4gbGF5 ZXIoKS0+c2Nyb2xsSGVpZ2h0KCk7CkBAIC00OTUsMjMgKzQ5NSwyMyBAQCBMYXlvdXRVbml0IFJl bmRlckJveDo6c2Nyb2xsSGVpZ2h0KCkgY29uCiAgICAgcmV0dXJuIG1heChjbGllbnRIZWlnaHQo KSwgbWF4WUxheW91dE92ZXJmbG93KCkgLSBib3JkZXJUb3AoKSk7CiB9CiAKLUxheW91dFVuaXQg UmVuZGVyQm94OjpzY3JvbGxMZWZ0KCkgY29uc3QKK2ludCBSZW5kZXJCb3g6OnNjcm9sbExlZnQo KSBjb25zdAogewogICAgIHJldHVybiBoYXNPdmVyZmxvd0NsaXAoKSA/IGxheWVyKCktPnNjcm9s bFhPZmZzZXQoKSA6IDA7CiB9CiAKLUxheW91dFVuaXQgUmVuZGVyQm94OjpzY3JvbGxUb3AoKSBj b25zdAoraW50IFJlbmRlckJveDo6c2Nyb2xsVG9wKCkgY29uc3QKIHsKICAgICByZXR1cm4gaGFz T3ZlcmZsb3dDbGlwKCkgPyBsYXllcigpLT5zY3JvbGxZT2Zmc2V0KCkgOiAwOwogfQogCi12b2lk IFJlbmRlckJveDo6c2V0U2Nyb2xsTGVmdChMYXlvdXRVbml0IG5ld0xlZnQpCit2b2lkIFJlbmRl ckJveDo6c2V0U2Nyb2xsTGVmdChpbnQgbmV3TGVmdCkKIHsKICAgICBpZiAoaGFzT3ZlcmZsb3dD bGlwKCkpCiAgICAgICAgIGxheWVyKCktPnNjcm9sbFRvWE9mZnNldChuZXdMZWZ0LCBSZW5kZXJM YXllcjo6U2Nyb2xsT2Zmc2V0Q2xhbXBlZCk7CiB9CiAKLXZvaWQgUmVuZGVyQm94OjpzZXRTY3Jv bGxUb3AoTGF5b3V0VW5pdCBuZXdUb3ApCit2b2lkIFJlbmRlckJveDo6c2V0U2Nyb2xsVG9wKGlu dCBuZXdUb3ApCiB7CiAgICAgaWYgKGhhc092ZXJmbG93Q2xpcCgpKQogICAgICAgICBsYXllcigp LT5zY3JvbGxUb1lPZmZzZXQobmV3VG9wLCBSZW5kZXJMYXllcjo6U2Nyb2xsT2Zmc2V0Q2xhbXBl ZCk7CkBAIC02NDMsMTIgKzY0MywxMiBAQCBib29sIFJlbmRlckJveDo6aW5jbHVkZUhvcml6b250 YWxTY3JvbGxiCiAgICAgICAgICYmIChzdHlsZSgpLT5vdmVyZmxvd1goKSA9PSBPU0NST0xMIHx8 IHN0eWxlKCktPm92ZXJmbG93WCgpID09IE9BVVRPKTsKIH0KIAotTGF5b3V0VW5pdCBSZW5kZXJC b3g6OnZlcnRpY2FsU2Nyb2xsYmFyV2lkdGgoKSBjb25zdAoraW50IFJlbmRlckJveDo6dmVydGlj YWxTY3JvbGxiYXJXaWR0aCgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIGluY2x1ZGVWZXJ0aWNhbFNj cm9sbGJhclNpemUoKSA/IGxheWVyKCktPnZlcnRpY2FsU2Nyb2xsYmFyV2lkdGgoKSA6IDA7CiB9 CiAKLUxheW91dFVuaXQgUmVuZGVyQm94Ojpob3Jpem9udGFsU2Nyb2xsYmFySGVpZ2h0KCkgY29u c3QKK2ludCBSZW5kZXJCb3g6Omhvcml6b250YWxTY3JvbGxiYXJIZWlnaHQoKSBjb25zdAogewog ICAgIHJldHVybiBpbmNsdWRlSG9yaXpvbnRhbFNjcm9sbGJhclNpemUoKSA/IGxheWVyKCktPmhv cml6b250YWxTY3JvbGxiYXJIZWlnaHQoKSA6IDA7CiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQm94LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJveC5oCShyZXZpc2lvbiAxMDA4MDIpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQm94LmgJKHdvcmtpbmcgY29weSkKQEAgLTE5OSwxMiArMTk5LDEyIEBAIHB1 YmxpYzoKICAgICAvLyBzY3JvbGxMZWZ0L1RvcCByZXR1cm4gdGhlIGN1cnJlbnQgc2Nyb2xsIHBv c2l0aW9uLiAgVGhlc2UgbWV0aG9kcyBhcmUgdmlydHVhbCBzbyB0aGF0IG9iamVjdHMgbGlrZQog ICAgIC8vIHRleHRhcmVhcyBjYW4gc2Nyb2xsIHNoYWRvdyBjb250ZW50IChidXQgcHJldGVuZCB0 aGF0IHRoZXkgYXJlIHRoZSBvYmplY3RzIHRoYXQgYXJlCiAgICAgLy8gc2Nyb2xsaW5nKS4KLSAg ICB2aXJ0dWFsIExheW91dFVuaXQgc2Nyb2xsTGVmdCgpIGNvbnN0OwotICAgIHZpcnR1YWwgTGF5 b3V0VW5pdCBzY3JvbGxUb3AoKSBjb25zdDsKLSAgICB2aXJ0dWFsIExheW91dFVuaXQgc2Nyb2xs V2lkdGgoKSBjb25zdDsKLSAgICB2aXJ0dWFsIExheW91dFVuaXQgc2Nyb2xsSGVpZ2h0KCkgY29u c3Q7Ci0gICAgdmlydHVhbCB2b2lkIHNldFNjcm9sbExlZnQoTGF5b3V0VW5pdCk7Ci0gICAgdmly dHVhbCB2b2lkIHNldFNjcm9sbFRvcChMYXlvdXRVbml0KTsKKyAgICB2aXJ0dWFsIGludCBzY3Jv bGxMZWZ0KCkgY29uc3Q7CisgICAgdmlydHVhbCBpbnQgc2Nyb2xsVG9wKCkgY29uc3Q7CisgICAg dmlydHVhbCBpbnQgc2Nyb2xsV2lkdGgoKSBjb25zdDsKKyAgICB2aXJ0dWFsIGludCBzY3JvbGxI ZWlnaHQoKSBjb25zdDsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0U2Nyb2xsTGVmdChpbnQpOworICAg IHZpcnR1YWwgdm9pZCBzZXRTY3JvbGxUb3AoaW50KTsKIAogICAgIHZpcnR1YWwgTGF5b3V0VW5p dCBtYXJnaW5Ub3AoKSBjb25zdCB7IHJldHVybiBtX21hcmdpblRvcDsgfQogICAgIHZpcnR1YWwg TGF5b3V0VW5pdCBtYXJnaW5Cb3R0b20oKSBjb25zdCB7IHJldHVybiBtX21hcmdpbkJvdHRvbTsg fQpAQCAtMzQwLDkgKzM0MCw5IEBAIHB1YmxpYzoKICAgICBMYXlvdXRVbml0IGF2YWlsYWJsZVdp ZHRoKCkgY29uc3QgeyByZXR1cm4gc3R5bGUoKS0+aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/ IGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCgpIDogYXZhaWxhYmxlTG9naWNhbEhlaWdodCgpOyB9CiAg ICAgTGF5b3V0VW5pdCBhdmFpbGFibGVIZWlnaHQoKSBjb25zdCB7IHJldHVybiBzdHlsZSgpLT5p c0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gYXZhaWxhYmxlTG9naWNhbEhlaWdodCgpIDogYXZh aWxhYmxlTG9naWNhbFdpZHRoKCk7IH0KIAotICAgIHZpcnR1YWwgTGF5b3V0VW5pdCB2ZXJ0aWNh bFNjcm9sbGJhcldpZHRoKCkgY29uc3Q7Ci0gICAgTGF5b3V0VW5pdCBob3Jpem9udGFsU2Nyb2xs YmFySGVpZ2h0KCkgY29uc3Q7Ci0gICAgTGF5b3V0VW5pdCBzY3JvbGxiYXJMb2dpY2FsSGVpZ2h0 KCkgY29uc3QgeyByZXR1cm4gc3R5bGUoKS0+aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IGhv cml6b250YWxTY3JvbGxiYXJIZWlnaHQoKSA6IHZlcnRpY2FsU2Nyb2xsYmFyV2lkdGgoKTsgfQor ICAgIHZpcnR1YWwgaW50IHZlcnRpY2FsU2Nyb2xsYmFyV2lkdGgoKSBjb25zdDsKKyAgICBpbnQg aG9yaXpvbnRhbFNjcm9sbGJhckhlaWdodCgpIGNvbnN0OworICAgIGludCBzY3JvbGxiYXJMb2dp Y2FsSGVpZ2h0KCkgY29uc3QgeyByZXR1cm4gc3R5bGUoKS0+aXNIb3Jpem9udGFsV3JpdGluZ01v ZGUoKSA/IGhvcml6b250YWxTY3JvbGxiYXJIZWlnaHQoKSA6IHZlcnRpY2FsU2Nyb2xsYmFyV2lk dGgoKTsgfQogICAgIHZpcnR1YWwgYm9vbCBzY3JvbGwoU2Nyb2xsRGlyZWN0aW9uLCBTY3JvbGxH cmFudWxhcml0eSwgZmxvYXQgbXVsdGlwbGllciA9IDEsIE5vZGUqKiBzdG9wTm9kZSA9IDApOwog ICAgIHZpcnR1YWwgYm9vbCBsb2dpY2FsU2Nyb2xsKFNjcm9sbExvZ2ljYWxEaXJlY3Rpb24sIFNj cm9sbEdyYW51bGFyaXR5LCBmbG9hdCBtdWx0aXBsaWVyID0gMSwgTm9kZSoqIHN0b3BOb2RlID0g MCk7CiAgICAgYm9vbCBjYW5CZVNjcm9sbGVkQW5kSGFzU2Nyb2xsYWJsZUFyZWEoKSBjb25zdDsK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0Qm94LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5jcHAJKHJldmlz aW9uIDEwMDgwMikKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0Qm94LmNw cAkod29ya2luZyBjb3B5KQpAQCAtNjM0LDcgKzYzNCw3IEBAIExheW91dFVuaXQgUmVuZGVyTGlz dEJveDo6aXRlbUhlaWdodCgpIGMKICAgICByZXR1cm4gc3R5bGUoKS0+Zm9udE1ldHJpY3MoKS5o ZWlnaHQoKSArIHJvd1NwYWNpbmc7CiB9CiAKLUxheW91dFVuaXQgUmVuZGVyTGlzdEJveDo6dmVy dGljYWxTY3JvbGxiYXJXaWR0aCgpIGNvbnN0CitpbnQgUmVuZGVyTGlzdEJveDo6dmVydGljYWxT Y3JvbGxiYXJXaWR0aCgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIG1fdkJhciAmJiAhbV92QmFyLT5p c092ZXJsYXlTY3JvbGxiYXIoKSA/IG1fdkJhci0+d2lkdGgoKSA6IExheW91dFVuaXQoMCk7CiB9 CkBAIC02NDcsMjYgKzY0NywyNiBAQCBMYXlvdXRVbml0IFJlbmRlckxpc3RCb3g6OnNjcm9sbFdp ZHRoKCkgCiAgICAgcmV0dXJuIGNsaWVudFdpZHRoKCk7CiB9CiAKLUxheW91dFVuaXQgUmVuZGVy TGlzdEJveDo6c2Nyb2xsSGVpZ2h0KCkgY29uc3QKK2ludCBSZW5kZXJMaXN0Qm94OjpzY3JvbGxI ZWlnaHQoKSBjb25zdAogewogICAgIHJldHVybiBtYXgoY2xpZW50SGVpZ2h0KCksIGxpc3RIZWln aHQoKSk7CiB9CiAKLUxheW91dFVuaXQgUmVuZGVyTGlzdEJveDo6c2Nyb2xsTGVmdCgpIGNvbnN0 CitpbnQgUmVuZGVyTGlzdEJveDo6c2Nyb2xsTGVmdCgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIDA7 CiB9CiAKLXZvaWQgUmVuZGVyTGlzdEJveDo6c2V0U2Nyb2xsTGVmdChMYXlvdXRVbml0KQordm9p ZCBSZW5kZXJMaXN0Qm94OjpzZXRTY3JvbGxMZWZ0KGludCkKIHsKIH0KIAotTGF5b3V0VW5pdCBS ZW5kZXJMaXN0Qm94OjpzY3JvbGxUb3AoKSBjb25zdAoraW50IFJlbmRlckxpc3RCb3g6OnNjcm9s bFRvcCgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIG1faW5kZXhPZmZzZXQgKiBpdGVtSGVpZ2h0KCk7 CiB9CiAKLXZvaWQgUmVuZGVyTGlzdEJveDo6c2V0U2Nyb2xsVG9wKExheW91dFVuaXQgbmV3VG9w KQordm9pZCBSZW5kZXJMaXN0Qm94OjpzZXRTY3JvbGxUb3AoaW50IG5ld1RvcCkKIHsKICAgICAv LyBEZXRlcm1pbmUgYW4gaW5kZXggYW5kIHNjcm9sbCB0byBpdC4gICAgCiAgICAgaW50IGluZGV4 ID0gbmV3VG9wIC8gaXRlbUhlaWdodCgpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxpc3RCb3guaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGlzdEJveC5oCShyZXZpc2lvbiAxMDA4MDIpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGlzdEJveC5oCSh3b3JraW5nIGNvcHkpCkBAIC04OCwxMyArODgsMTMgQEAg cHJpdmF0ZToKICAgICB2aXJ0dWFsIGJvb2wgc2hvdWxkUGFuU2Nyb2xsKCkgY29uc3QgeyByZXR1 cm4gdHJ1ZTsgfQogICAgIHZpcnR1YWwgdm9pZCBwYW5TY3JvbGwoY29uc3QgSW50UG9pbnQmKTsK IAotICAgIHZpcnR1YWwgTGF5b3V0VW5pdCB2ZXJ0aWNhbFNjcm9sbGJhcldpZHRoKCkgY29uc3Q7 Ci0gICAgdmlydHVhbCBMYXlvdXRVbml0IHNjcm9sbExlZnQoKSBjb25zdDsKLSAgICB2aXJ0dWFs IExheW91dFVuaXQgc2Nyb2xsVG9wKCkgY29uc3Q7Ci0gICAgdmlydHVhbCBMYXlvdXRVbml0IHNj cm9sbFdpZHRoKCkgY29uc3Q7Ci0gICAgdmlydHVhbCBMYXlvdXRVbml0IHNjcm9sbEhlaWdodCgp IGNvbnN0OwotICAgIHZpcnR1YWwgdm9pZCBzZXRTY3JvbGxMZWZ0KExheW91dFVuaXQpOwotICAg IHZpcnR1YWwgdm9pZCBzZXRTY3JvbGxUb3AoTGF5b3V0VW5pdCk7CisgICAgdmlydHVhbCBpbnQg dmVydGljYWxTY3JvbGxiYXJXaWR0aCgpIGNvbnN0OworICAgIHZpcnR1YWwgaW50IHNjcm9sbExl ZnQoKSBjb25zdDsKKyAgICB2aXJ0dWFsIGludCBzY3JvbGxUb3AoKSBjb25zdDsKKyAgICB2aXJ0 dWFsIGludCBzY3JvbGxXaWR0aCgpIGNvbnN0OworICAgIHZpcnR1YWwgaW50IHNjcm9sbEhlaWdo dCgpIGNvbnN0OworICAgIHZpcnR1YWwgdm9pZCBzZXRTY3JvbGxMZWZ0KGludCk7CisgICAgdmly dHVhbCB2b2lkIHNldFNjcm9sbFRvcChpbnQpOwogCiAgICAgdmlydHVhbCBib29sIG5vZGVBdFBv aW50KGNvbnN0IEhpdFRlc3RSZXF1ZXN0JiwgSGl0VGVzdFJlc3VsdCYsIGNvbnN0IExheW91dFBv aW50JiBwb2ludEluQ29udGFpbmVyLCBjb25zdCBMYXlvdXRQb2ludCYgYWNjdW11bGF0ZWRPZmZz ZXQsIEhpdFRlc3RBY3Rpb24pOwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lLmNwcAkocmV2aXNpb24gMTAw ODAyKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sU2luZ2xl TGluZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTcwNyw0MSArNzA3LDQxIEBAIHZvaWQgUmVuZGVy VGV4dENvbnRyb2xTaW5nbGVMaW5lOjphdXRvc2MKICAgICAgICAgbGF5ZXItPmF1dG9zY3JvbGwo KTsKIH0KIAotTGF5b3V0VW5pdCBSZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmU6OnNjcm9sbFdp ZHRoKCkgY29uc3QKK2ludCBSZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmU6OnNjcm9sbFdpZHRo KCkgY29uc3QKIHsKICAgICBpZiAoaW5uZXJUZXh0RWxlbWVudCgpKQogICAgICAgICByZXR1cm4g aW5uZXJUZXh0RWxlbWVudCgpLT5zY3JvbGxXaWR0aCgpOwogICAgIHJldHVybiBSZW5kZXJCbG9j azo6c2Nyb2xsV2lkdGgoKTsKIH0KIAotTGF5b3V0VW5pdCBSZW5kZXJUZXh0Q29udHJvbFNpbmds ZUxpbmU6OnNjcm9sbEhlaWdodCgpIGNvbnN0CitpbnQgUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVM aW5lOjpzY3JvbGxIZWlnaHQoKSBjb25zdAogewogICAgIGlmIChpbm5lclRleHRFbGVtZW50KCkp CiAgICAgICAgIHJldHVybiBpbm5lclRleHRFbGVtZW50KCktPnNjcm9sbEhlaWdodCgpOwogICAg IHJldHVybiBSZW5kZXJCbG9jazo6c2Nyb2xsSGVpZ2h0KCk7CiB9CiAKLUxheW91dFVuaXQgUmVu ZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lOjpzY3JvbGxMZWZ0KCkgY29uc3QKK2ludCBSZW5kZXJU ZXh0Q29udHJvbFNpbmdsZUxpbmU6OnNjcm9sbExlZnQoKSBjb25zdAogewogICAgIGlmIChpbm5l clRleHRFbGVtZW50KCkpCiAgICAgICAgIHJldHVybiBpbm5lclRleHRFbGVtZW50KCktPnNjcm9s bExlZnQoKTsKICAgICByZXR1cm4gUmVuZGVyQmxvY2s6OnNjcm9sbExlZnQoKTsKIH0KIAotTGF5 b3V0VW5pdCBSZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmU6OnNjcm9sbFRvcCgpIGNvbnN0Citp bnQgUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lOjpzY3JvbGxUb3AoKSBjb25zdAogewogICAg IGlmIChpbm5lclRleHRFbGVtZW50KCkpCiAgICAgICAgIHJldHVybiBpbm5lclRleHRFbGVtZW50 KCktPnNjcm9sbFRvcCgpOwogICAgIHJldHVybiBSZW5kZXJCbG9jazo6c2Nyb2xsVG9wKCk7CiB9 CiAKLXZvaWQgUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lOjpzZXRTY3JvbGxMZWZ0KExheW91 dFVuaXQgbmV3TGVmdCkKK3ZvaWQgUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lOjpzZXRTY3Jv bGxMZWZ0KGludCBuZXdMZWZ0KQogewogICAgIGlmIChpbm5lclRleHRFbGVtZW50KCkpCiAgICAg ICAgIGlubmVyVGV4dEVsZW1lbnQoKS0+c2V0U2Nyb2xsTGVmdChuZXdMZWZ0KTsKIH0KIAotdm9p ZCBSZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmU6OnNldFNjcm9sbFRvcChMYXlvdXRVbml0IG5l d1RvcCkKK3ZvaWQgUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lOjpzZXRTY3JvbGxUb3AoaW50 IG5ld1RvcCkKIHsKICAgICBpZiAoaW5uZXJUZXh0RWxlbWVudCgpKQogICAgICAgICBpbm5lclRl eHRFbGVtZW50KCktPnNldFNjcm9sbFRvcChuZXdUb3ApOwpJbmRleDogU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sU2luZ2xlTGluZS5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmUuaAkocmV2 aXNpb24gMTAwODAyKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250 cm9sU2luZ2xlTGluZS5oCSh3b3JraW5nIGNvcHkpCkBAIC02NiwxMiArNjYsMTIgQEAgcHJpdmF0 ZToKICAgICB2aXJ0dWFsIHZvaWQgYXV0b3Njcm9sbCgpOwogCiAgICAgLy8gU3ViY2xhc3NlZCB0 byBmb3J3YXJkIHRvIG91ciBpbm5lciBkaXYuCi0gICAgdmlydHVhbCBMYXlvdXRVbml0IHNjcm9s bExlZnQoKSBjb25zdDsKLSAgICB2aXJ0dWFsIExheW91dFVuaXQgc2Nyb2xsVG9wKCkgY29uc3Q7 Ci0gICAgdmlydHVhbCBMYXlvdXRVbml0IHNjcm9sbFdpZHRoKCkgY29uc3Q7Ci0gICAgdmlydHVh bCBMYXlvdXRVbml0IHNjcm9sbEhlaWdodCgpIGNvbnN0OwotICAgIHZpcnR1YWwgdm9pZCBzZXRT Y3JvbGxMZWZ0KExheW91dFVuaXQpOwotICAgIHZpcnR1YWwgdm9pZCBzZXRTY3JvbGxUb3AoTGF5 b3V0VW5pdCk7CisgICAgdmlydHVhbCBpbnQgc2Nyb2xsTGVmdCgpIGNvbnN0OworICAgIHZpcnR1 YWwgaW50IHNjcm9sbFRvcCgpIGNvbnN0OworICAgIHZpcnR1YWwgaW50IHNjcm9sbFdpZHRoKCkg Y29uc3Q7CisgICAgdmlydHVhbCBpbnQgc2Nyb2xsSGVpZ2h0KCkgY29uc3Q7CisgICAgdmlydHVh bCB2b2lkIHNldFNjcm9sbExlZnQoaW50KTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0U2Nyb2xsVG9w KGludCk7CiAgICAgdmlydHVhbCBib29sIHNjcm9sbChTY3JvbGxEaXJlY3Rpb24sIFNjcm9sbEdy YW51bGFyaXR5LCBmbG9hdCBtdWx0aXBsaWVyID0gMSwgTm9kZSoqIHN0b3BOb2RlID0gMCk7CiAg ICAgdmlydHVhbCBib29sIGxvZ2ljYWxTY3JvbGwoU2Nyb2xsTG9naWNhbERpcmVjdGlvbiwgU2Ny b2xsR3JhbnVsYXJpdHksIGZsb2F0IG11bHRpcGxpZXIgPSAxLCBOb2RlKiogc3RvcE5vZGUgPSAw KTsKIAo=