63578 2011-06-28 16:19:56 -0700 Switch RenderLayer position/size to to new layout types 2011-06-28 18:29:09 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 63567 1 eae eae eric leviw webkit.review.bot oldest_to_newest 429235 0 eae 2011-06-28 16:19:56 -0700 Switch RenderLayer location and size over to new layout types. 429262 1 98999 eae 2011-06-28 16:39:49 -0700 Created attachment 98999 Patch 429281 2 eae 2011-06-28 17:07:17 -0700 Thanks Eric! 429352 3 98999 webkit.review.bot 2011-06-28 18:29:05 -0700 Comment on attachment 98999 Patch Clearing flags on attachment: 98999 Committed r89984: <http://trac.webkit.org/changeset/89984> 429353 4 webkit.review.bot 2011-06-28 18:29:09 -0700 All reviewed patches have been landed. Closing bug. 98999 2011-06-28 16:39:49 -0700 2011-06-28 18:29:05 -0700 Patch bug-63578-20110628163948.patch text/plain 11318 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg5OTczKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzMgQEAKKzIwMTEtMDYtMjggIEVtaWwgQSBF a2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFN3aXRjaCBSZW5kZXJMYXllciBwb3NpdGlvbi9zaXplIHRvIHRv IG5ldyBsYXlvdXQgdHlwZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTYzNTc4CisKKyAgICAgICAgU3dpdGNoIGxvY2F0aW9uIGFuZCBzaXplIG1ldGhv ZHMgZm9yIFJlbmRlckxheWVyIG92ZXIgdG8gdGhlIG5ldyBsYXlvdXQgdW5pdCBhYnN0cmFjdGlv bi4KKyAgICAgICAgCisgICAgICAgIE5vIG5ldyB0ZXN0cywgbm8gZnVuY3Rpb25hbGl0eSBjaGFu Z2VzLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckxheWVyOjpyZXNpemUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5 ZXI6OnZpc2libGVIZWlnaHQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnZpc2li bGVXaWR0aCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6b2Zmc2V0RnJvbVJlc2l6 ZUNvcm5lcik6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmg6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJMYXllcjo6bG9jYXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy TGF5ZXI6OnNldExvY2F0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpzaXpl KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpzZXRTaXplKToKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckxheWVyOjpyZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVy OjpyZW5kZXJCb3hMb2NhdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6cmVu ZGVyQm94WCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6cmVuZGVyQm94WSk6Cisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyTGlzdEJveDo6dmlzaWJsZUhlaWdodCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJM aXN0Qm94Ojp2aXNpYmxlV2lkdGgpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMaXN0Qm94 Lmg6CisKIDIwMTEtMDYtMjggIExldmkgV2VpbnRyYXViICA8bGV2aXdAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgpJbmRleDogU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCShyZXZpc2lvbiA4OTk3MCkKKysrIFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE1NTUsNyAr MTU1NSw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OmF1dG9zY3JvbGwoKQogICAgIHNjcm9sbFJlY3RU b1Zpc2libGUoSW50UmVjdChjdXJyZW50RG9jdW1lbnRQb3NpdGlvbiwgSW50U2l6ZSgxLCAxKSks IFNjcm9sbEFsaWdubWVudDo6YWxpZ25Ub0VkZ2VJZk5lZWRlZCwgU2Nyb2xsQWxpZ25tZW50Ojph bGlnblRvRWRnZUlmTmVlZGVkKTsKIH0KIAotdm9pZCBSZW5kZXJMYXllcjo6cmVzaXplKGNvbnN0 IFBsYXRmb3JtTW91c2VFdmVudCYgZXZ0LCBjb25zdCBJbnRTaXplJiBvbGRPZmZzZXQpCit2b2lk IFJlbmRlckxheWVyOjpyZXNpemUoY29uc3QgUGxhdGZvcm1Nb3VzZUV2ZW50JiBldnQsIGNvbnN0 IExheW91dFNpemUmIG9sZE9mZnNldCkKIHsKICAgICAvLyBGSVhNRTogVGhpcyBzaG91bGQgYmUg cG9zc2libGUgb24gZ2VuZXJhdGVkIGNvbnRlbnQgYnV0IGlzIG5vdCByaWdodCBub3cuCiAgICAg aWYgKCFpblJlc2l6ZU1vZGUoKSB8fCAhcmVuZGVyZXIoKS0+aGFzT3ZlcmZsb3dDbGlwKCkgfHwg IXJlbmRlcmVyKCktPm5vZGUoKSkKQEAgLTE1NzYsMTcgKzE1NzYsMTcgQEAgdm9pZCBSZW5kZXJM YXllcjo6cmVzaXplKGNvbnN0IFBsYXRmb3JtTQogCiAgICAgZmxvYXQgem9vbUZhY3RvciA9IHJl bmRlcmVyLT5zdHlsZSgpLT5lZmZlY3RpdmVab29tKCk7CiAKLSAgICBJbnRTaXplIG5ld09mZnNl dCA9IG9mZnNldEZyb21SZXNpemVDb3JuZXIoZG9jdW1lbnQtPnZpZXcoKS0+d2luZG93VG9Db250 ZW50cyhldnQucG9zKCkpKTsKKyAgICBMYXlvdXRTaXplIG5ld09mZnNldCA9IG9mZnNldEZyb21S ZXNpemVDb3JuZXIoZG9jdW1lbnQtPnZpZXcoKS0+d2luZG93VG9Db250ZW50cyhldnQucG9zKCkp KTsKICAgICBuZXdPZmZzZXQuc2V0V2lkdGgobmV3T2Zmc2V0LndpZHRoKCkgLyB6b29tRmFjdG9y KTsKICAgICBuZXdPZmZzZXQuc2V0SGVpZ2h0KG5ld09mZnNldC5oZWlnaHQoKSAvIHpvb21GYWN0 b3IpOwogICAgIAotICAgIEludFNpemUgY3VycmVudFNpemUgPSBJbnRTaXplKHJlbmRlcmVyLT53 aWR0aCgpIC8gem9vbUZhY3RvciwgcmVuZGVyZXItPmhlaWdodCgpIC8gem9vbUZhY3Rvcik7Ci0g ICAgSW50U2l6ZSBtaW5pbXVtU2l6ZSA9IGVsZW1lbnQtPm1pbmltdW1TaXplRm9yUmVzaXppbmco KS5zaHJ1bmtUbyhjdXJyZW50U2l6ZSk7CisgICAgTGF5b3V0U2l6ZSBjdXJyZW50U2l6ZSA9IExh eW91dFNpemUocmVuZGVyZXItPndpZHRoKCkgLyB6b29tRmFjdG9yLCByZW5kZXJlci0+aGVpZ2h0 KCkgLyB6b29tRmFjdG9yKTsKKyAgICBMYXlvdXRTaXplIG1pbmltdW1TaXplID0gZWxlbWVudC0+ bWluaW11bVNpemVGb3JSZXNpemluZygpLnNocnVua1RvKGN1cnJlbnRTaXplKTsKICAgICBlbGVt ZW50LT5zZXRNaW5pbXVtU2l6ZUZvclJlc2l6aW5nKG1pbmltdW1TaXplKTsKICAgICAKLSAgICBJ bnRTaXplIGFkanVzdGVkT2xkT2Zmc2V0ID0gSW50U2l6ZShvbGRPZmZzZXQud2lkdGgoKSAvIHpv b21GYWN0b3IsIG9sZE9mZnNldC5oZWlnaHQoKSAvIHpvb21GYWN0b3IpOworICAgIExheW91dFNp emUgYWRqdXN0ZWRPbGRPZmZzZXQgPSBMYXlvdXRTaXplKG9sZE9mZnNldC53aWR0aCgpIC8gem9v bUZhY3Rvciwgb2xkT2Zmc2V0LmhlaWdodCgpIC8gem9vbUZhY3Rvcik7CiAgICAgCi0gICAgSW50 U2l6ZSBkaWZmZXJlbmNlID0gKGN1cnJlbnRTaXplICsgbmV3T2Zmc2V0IC0gYWRqdXN0ZWRPbGRP ZmZzZXQpLmV4cGFuZGVkVG8obWluaW11bVNpemUpIC0gY3VycmVudFNpemU7CisgICAgTGF5b3V0 U2l6ZSBkaWZmZXJlbmNlID0gKGN1cnJlbnRTaXplICsgbmV3T2Zmc2V0IC0gYWRqdXN0ZWRPbGRP ZmZzZXQpLmV4cGFuZGVkVG8obWluaW11bVNpemUpIC0gY3VycmVudFNpemU7CiAKICAgICBDU1NT dHlsZURlY2xhcmF0aW9uKiBzdHlsZSA9IGVsZW1lbnQtPnN0eWxlKCk7CiAgICAgYm9vbCBpc0Jv eFNpemluZ0JvcmRlciA9IHJlbmRlcmVyLT5zdHlsZSgpLT5ib3hTaXppbmcoKSA9PSBCT1JERVJf Qk9YOwpAQCAtMTU5OSw3ICsxNTk5LDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6cmVzaXplKGNvbnN0 IFBsYXRmb3JtTQogICAgICAgICAgICAgc3R5bGUtPnNldFByb3BlcnR5KENTU1Byb3BlcnR5TWFy Z2luTGVmdCwgU3RyaW5nOjpudW1iZXIocmVuZGVyZXItPm1hcmdpbkxlZnQoKSAvIHpvb21GYWN0 b3IpICsgInB4IiwgZmFsc2UsIGVjKTsKICAgICAgICAgICAgIHN0eWxlLT5zZXRQcm9wZXJ0eShD U1NQcm9wZXJ0eU1hcmdpblJpZ2h0LCBTdHJpbmc6Om51bWJlcihyZW5kZXJlci0+bWFyZ2luUmln aHQoKSAvIHpvb21GYWN0b3IpICsgInB4IiwgZmFsc2UsIGVjKTsKICAgICAgICAgfQotICAgICAg ICBpbnQgYmFzZVdpZHRoID0gcmVuZGVyZXItPndpZHRoKCkgLSAoaXNCb3hTaXppbmdCb3JkZXIg PyAwIDogcmVuZGVyZXItPmJvcmRlckFuZFBhZGRpbmdXaWR0aCgpKTsKKyAgICAgICAgTGF5b3V0 VW5pdCBiYXNlV2lkdGggPSByZW5kZXJlci0+d2lkdGgoKSAtIChpc0JveFNpemluZ0JvcmRlciA/ IDAgOiByZW5kZXJlci0+Ym9yZGVyQW5kUGFkZGluZ1dpZHRoKCkpOwogICAgICAgICBiYXNlV2lk dGggPSBiYXNlV2lkdGggLyB6b29tRmFjdG9yOwogICAgICAgICBzdHlsZS0+c2V0UHJvcGVydHko Q1NTUHJvcGVydHlXaWR0aCwgU3RyaW5nOjpudW1iZXIoYmFzZVdpZHRoICsgZGlmZmVyZW5jZS53 aWR0aCgpKSArICJweCIsIGZhbHNlLCBlYyk7CiAgICAgfQpAQCAtMTYxMCw3ICsxNjEwLDcgQEAg dm9pZCBSZW5kZXJMYXllcjo6cmVzaXplKGNvbnN0IFBsYXRmb3JtTQogICAgICAgICAgICAgc3R5 bGUtPnNldFByb3BlcnR5KENTU1Byb3BlcnR5TWFyZ2luVG9wLCBTdHJpbmc6Om51bWJlcihyZW5k ZXJlci0+bWFyZ2luVG9wKCkgLyB6b29tRmFjdG9yKSArICJweCIsIGZhbHNlLCBlYyk7CiAgICAg ICAgICAgICBzdHlsZS0+c2V0UHJvcGVydHkoQ1NTUHJvcGVydHlNYXJnaW5Cb3R0b20sIFN0cmlu Zzo6bnVtYmVyKHJlbmRlcmVyLT5tYXJnaW5Cb3R0b20oKSAvIHpvb21GYWN0b3IpICsgInB4Iiwg ZmFsc2UsIGVjKTsKICAgICAgICAgfQotICAgICAgICBpbnQgYmFzZUhlaWdodCA9IHJlbmRlcmVy LT5oZWlnaHQoKSAtIChpc0JveFNpemluZ0JvcmRlciA/IDAgOiByZW5kZXJlci0+Ym9yZGVyQW5k UGFkZGluZ0hlaWdodCgpKTsKKyAgICAgICAgTGF5b3V0VW5pdCBiYXNlSGVpZ2h0ID0gcmVuZGVy ZXItPmhlaWdodCgpIC0gKGlzQm94U2l6aW5nQm9yZGVyID8gMCA6IHJlbmRlcmVyLT5ib3JkZXJB bmRQYWRkaW5nSGVpZ2h0KCkpOwogICAgICAgICBiYXNlSGVpZ2h0ID0gYmFzZUhlaWdodCAvIHpv b21GYWN0b3I7CiAgICAgICAgIHN0eWxlLT5zZXRQcm9wZXJ0eShDU1NQcm9wZXJ0eUhlaWdodCwg U3RyaW5nOjpudW1iZXIoYmFzZUhlaWdodCArIGRpZmZlcmVuY2UuaGVpZ2h0KCkpICsgInB4Iiwg ZmFsc2UsIGVjKTsKICAgICB9CkBAIC0xNzk5LDEyICsxNzk5LDEyIEBAIEludFNpemUgUmVuZGVy TGF5ZXI6OmNvbnRlbnRzU2l6ZSgpIGNvbnMKICAgICByZXR1cm4gSW50U2l6ZShjb25zdF9jYXN0 PFJlbmRlckxheWVyKj4odGhpcyktPnNjcm9sbFdpZHRoKCksIGNvbnN0X2Nhc3Q8UmVuZGVyTGF5 ZXIqPih0aGlzKS0+c2Nyb2xsSGVpZ2h0KCkpOwogfQogCi1pbnQgUmVuZGVyTGF5ZXI6OnZpc2li bGVIZWlnaHQoKSBjb25zdAorTGF5b3V0VW5pdCBSZW5kZXJMYXllcjo6dmlzaWJsZUhlaWdodCgp IGNvbnN0CiB7CiAgICAgcmV0dXJuIG1fbGF5ZXJTaXplLmhlaWdodCgpOwogfQogCi1pbnQgUmVu ZGVyTGF5ZXI6OnZpc2libGVXaWR0aCgpIGNvbnN0CitMYXlvdXRVbml0IFJlbmRlckxheWVyOjp2 aXNpYmxlV2lkdGgoKSBjb25zdAogewogICAgIHJldHVybiBtX2xheWVyU2l6ZS53aWR0aCgpOwog fQpAQCAtMjAwMywxMiArMjAwMywxMiBAQCBpbnQgUmVuZGVyTGF5ZXI6Omhvcml6b250YWxTY3Jv bGxiYXJIZWlnCiAgICAgcmV0dXJuIG1faEJhci0+aGVpZ2h0KCk7CiB9CiAKLUludFNpemUgUmVu ZGVyTGF5ZXI6Om9mZnNldEZyb21SZXNpemVDb3JuZXIoY29uc3QgSW50UG9pbnQmIGFic29sdXRl UG9pbnQpIGNvbnN0CitMYXlvdXRTaXplIFJlbmRlckxheWVyOjpvZmZzZXRGcm9tUmVzaXplQ29y bmVyKGNvbnN0IExheW91dFBvaW50JiBhYnNvbHV0ZVBvaW50KSBjb25zdAogewogICAgIC8vIEN1 cnJlbnRseSB0aGUgcmVzaXplIGNvcm5lciBpcyBhbHdheXMgdGhlIGJvdHRvbSByaWdodCBjb3Ju ZXIKICAgICAvLyBGSVhNRTogVGhpcyBhc3N1bWVzIHRoZSBsb2NhdGlvbiBpcyAwLCAwLiBJcyB0 aGlzIGd1YXJhbnRlZWQgdG8gYWx3YXlzIGJlIHRoZSBjYXNlPwotICAgIEludFBvaW50IGJvdHRv bVJpZ2h0ID0gdG9Qb2ludChzaXplKCkpOwotICAgIEludFBvaW50IGxvY2FsUG9pbnQgPSBhYnNv bHV0ZVRvQ29udGVudHMoYWJzb2x1dGVQb2ludCk7CisgICAgTGF5b3V0UG9pbnQgYm90dG9tUmln aHQgPSB0b1BvaW50KHNpemUoKSk7CisgICAgTGF5b3V0UG9pbnQgbG9jYWxQb2ludCA9IGFic29s dXRlVG9Db250ZW50cyhhYnNvbHV0ZVBvaW50KTsKICAgICByZXR1cm4gbG9jYWxQb2ludCAtIGJv dHRvbVJpZ2h0OwogfQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5 ZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIu aAkocmV2aXNpb24gODk5NzApCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5 ZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMjExLDEzICsyMTEsMTMgQEAgcHVibGljOgogICAgICAg ICByZXR1cm4gY3VycjsKICAgICB9CiAgICAgCi0gICAgY29uc3QgSW50UG9pbnQmIGxvY2F0aW9u KCkgY29uc3QgeyByZXR1cm4gbV90b3BMZWZ0OyB9Ci0gICAgdm9pZCBzZXRMb2NhdGlvbihpbnQg eCwgaW50IHkpIHsgbV90b3BMZWZ0ID0gSW50UG9pbnQoeCwgeSk7IH0KKyAgICBjb25zdCBMYXlv dXRQb2ludCYgbG9jYXRpb24oKSBjb25zdCB7IHJldHVybiBtX3RvcExlZnQ7IH0KKyAgICB2b2lk IHNldExvY2F0aW9uKExheW91dFVuaXQgeCwgTGF5b3V0VW5pdCB5KSB7IG1fdG9wTGVmdCA9IExh eW91dFBvaW50KHgsIHkpOyB9CiAKLSAgICBjb25zdCBJbnRTaXplJiBzaXplKCkgY29uc3QgeyBy ZXR1cm4gbV9sYXllclNpemU7IH0KLSAgICB2b2lkIHNldFNpemUoY29uc3QgSW50U2l6ZSYgc2l6 ZSkgeyBtX2xheWVyU2l6ZSA9IHNpemU7IH0KKyAgICBjb25zdCBMYXlvdXRTaXplJiBzaXplKCkg Y29uc3QgeyByZXR1cm4gbV9sYXllclNpemU7IH0KKyAgICB2b2lkIHNldFNpemUoY29uc3QgTGF5 b3V0U2l6ZSYgc2l6ZSkgeyBtX2xheWVyU2l6ZSA9IHNpemU7IH0KIAotICAgIEludFJlY3QgcmVj dCgpIGNvbnN0IHsgcmV0dXJuIEludFJlY3QobG9jYXRpb24oKSwgc2l6ZSgpKTsgfQorICAgIExh eW91dFJlY3QgcmVjdCgpIGNvbnN0IHsgcmV0dXJuIExheW91dFJlY3QobG9jYXRpb24oKSwgc2l6 ZSgpKTsgfQogCiAgICAgaW50IHNjcm9sbFdpZHRoKCk7CiAgICAgaW50IHNjcm9sbEhlaWdodCgp OwpAQCAtMjYxLDcgKzI2MSw3IEBAIHB1YmxpYzoKICAgICBib29sIGhhc092ZXJmbG93Q29udHJv bHMoKSBjb25zdDsKICAgICBib29sIGlzUG9pbnRJblJlc2l6ZUNvbnRyb2woY29uc3QgSW50UG9p bnQmIGFic29sdXRlUG9pbnQpIGNvbnN0OwogICAgIGJvb2wgaGl0VGVzdE92ZXJmbG93Q29udHJv bHMoSGl0VGVzdFJlc3VsdCYsIGNvbnN0IEludFBvaW50JiBsb2NhbFBvaW50KTsKLSAgICBJbnRT aXplIG9mZnNldEZyb21SZXNpemVDb3JuZXIoY29uc3QgSW50UG9pbnQmIGFic29sdXRlUG9pbnQp IGNvbnN0OworICAgIExheW91dFNpemUgb2Zmc2V0RnJvbVJlc2l6ZUNvcm5lcihjb25zdCBMYXlv dXRQb2ludCYgYWJzb2x1dGVQb2ludCkgY29uc3Q7CiAKICAgICB2b2lkIHBhaW50T3ZlcmZsb3dD b250cm9scyhHcmFwaGljc0NvbnRleHQqLCBjb25zdCBJbnRQb2ludCYsIGNvbnN0IEludFJlY3Qm IGRhbWFnZVJlY3QsIGJvb2wgcGFpbnRpbmdPdmVybGF5Q29udHJvbHMgPSBmYWxzZSk7CiAgICAg dm9pZCBwYWludFNjcm9sbENvcm5lcihHcmFwaGljc0NvbnRleHQqLCBjb25zdCBJbnRQb2ludCYs IGNvbnN0IEludFJlY3QmIGRhbWFnZVJlY3QpOwpAQCAtMjcyLDcgKzI3Miw3IEBAIHB1YmxpYzoK ICAgICBib29sIHNjcm9sbChTY3JvbGxEaXJlY3Rpb24sIFNjcm9sbEdyYW51bGFyaXR5LCBmbG9h dCBtdWx0aXBsaWVyID0gMSk7CiAgICAgdm9pZCBhdXRvc2Nyb2xsKCk7CiAKLSAgICB2b2lkIHJl c2l6ZShjb25zdCBQbGF0Zm9ybU1vdXNlRXZlbnQmLCBjb25zdCBJbnRTaXplJik7CisgICAgdm9p ZCByZXNpemUoY29uc3QgUGxhdGZvcm1Nb3VzZUV2ZW50JiwgY29uc3QgTGF5b3V0U2l6ZSYpOwog ICAgIGJvb2wgaW5SZXNpemVNb2RlKCkgY29uc3QgeyByZXR1cm4gbV9pblJlc2l6ZU1vZGU7IH0K ICAgICB2b2lkIHNldEluUmVzaXplTW9kZShib29sIGIpIHsgbV9pblJlc2l6ZU1vZGUgPSBiOyB9 CiAKQEAgLTQ2Miw5ICs0NjIsOSBAQCBwcml2YXRlOgogICAgIHZvaWQgc2V0Rmlyc3RDaGlsZChS ZW5kZXJMYXllciogZmlyc3QpIHsgbV9maXJzdCA9IGZpcnN0OyB9CiAgICAgdm9pZCBzZXRMYXN0 Q2hpbGQoUmVuZGVyTGF5ZXIqIGxhc3QpIHsgbV9sYXN0ID0gbGFzdDsgfQogCi0gICAgSW50UG9p bnQgcmVuZGVyQm94TG9jYXRpb24oKSBjb25zdCB7IHJldHVybiByZW5kZXJlcigpLT5pc0JveCgp ID8gdG9SZW5kZXJCb3gocmVuZGVyZXIoKSktPmxvY2F0aW9uKCkgOiBJbnRQb2ludCgpOyB9Ci0g ICAgaW50IHJlbmRlckJveFgoKSBjb25zdCB7IHJldHVybiByZW5kZXJCb3hMb2NhdGlvbigpLngo KTsgfQotICAgIGludCByZW5kZXJCb3hZKCkgY29uc3QgeyByZXR1cm4gcmVuZGVyQm94TG9jYXRp b24oKS55KCk7IH0KKyAgICBMYXlvdXRQb2ludCByZW5kZXJCb3hMb2NhdGlvbigpIGNvbnN0IHsg cmV0dXJuIHJlbmRlcmVyKCktPmlzQm94KCkgPyB0b1JlbmRlckJveChyZW5kZXJlcigpKS0+bG9j YXRpb24oKSA6IExheW91dFBvaW50KCk7IH0KKyAgICBMYXlvdXRVbml0IHJlbmRlckJveFgoKSBj b25zdCB7IHJldHVybiByZW5kZXJCb3hMb2NhdGlvbigpLngoKTsgfQorICAgIExheW91dFVuaXQg cmVuZGVyQm94WSgpIGNvbnN0IHsgcmV0dXJuIHJlbmRlckJveExvY2F0aW9uKCkueSgpOyB9CiAK ICAgICB2b2lkIGNvbGxlY3RMYXllcnMoVmVjdG9yPFJlbmRlckxheWVyKj4qJiwgVmVjdG9yPFJl bmRlckxheWVyKj4qJik7CiAKQEAgLTU0MCw4ICs1NDAsOCBAQCBwcml2YXRlOgogICAgIHZpcnR1 YWwgSW50UG9pbnQgbWluaW11bVNjcm9sbFBvc2l0aW9uKCkgY29uc3Q7CiAgICAgdmlydHVhbCBJ bnRQb2ludCBtYXhpbXVtU2Nyb2xsUG9zaXRpb24oKSBjb25zdDsKICAgICB2aXJ0dWFsIEludFJl Y3QgdmlzaWJsZUNvbnRlbnRSZWN0KGJvb2wgaW5jbHVkZVNjcm9sbGJhcnMpIGNvbnN0OwotICAg IHZpcnR1YWwgaW50IHZpc2libGVIZWlnaHQoKSBjb25zdDsKLSAgICB2aXJ0dWFsIGludCB2aXNp YmxlV2lkdGgoKSBjb25zdDsKKyAgICB2aXJ0dWFsIExheW91dFVuaXQgdmlzaWJsZUhlaWdodCgp IGNvbnN0OworICAgIHZpcnR1YWwgTGF5b3V0VW5pdCB2aXNpYmxlV2lkdGgoKSBjb25zdDsKICAg ICB2aXJ0dWFsIEludFNpemUgY29udGVudHNTaXplKCkgY29uc3Q7CiAgICAgdmlydHVhbCBJbnRT aXplIG92ZXJoYW5nQW1vdW50KCkgY29uc3Q7CiAgICAgdmlydHVhbCBJbnRQb2ludCBjdXJyZW50 TW91c2VQb3NpdGlvbigpIGNvbnN0OwpAQCAtNjM1LDEwICs2MzUsMTAgQEAgcHJvdGVjdGVkOgog ICAgIEludFNpemUgbV9yZWxhdGl2ZU9mZnNldDsKIAogICAgIC8vIE91ciAoeCx5KSBjb29yZGlu YXRlcyBhcmUgaW4gb3VyIHBhcmVudCBsYXllcidzIGNvb3JkaW5hdGUgc3BhY2UuCi0gICAgSW50 UG9pbnQgbV90b3BMZWZ0OworICAgIExheW91dFBvaW50IG1fdG9wTGVmdDsKIAogICAgIC8vIFRo ZSBsYXllcidzIHdpZHRoL2hlaWdodAotICAgIEludFNpemUgbV9sYXllclNpemU7CisgICAgTGF5 b3V0U2l6ZSBtX2xheWVyU2l6ZTsKIAogICAgIC8vIE91ciBzY3JvbGwgb2Zmc2V0cyBpZiB0aGUg dmlldyBpcyBzY3JvbGxlZC4KICAgICBJbnRTaXplIG1fc2Nyb2xsT2Zmc2V0OwpJbmRleDogU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0Qm94LmNwcAkocmV2aXNpb24gODk5NzAp CisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTc3NywxMiArNzc3LDEyIEBAIEludFNpemUgUmVuZGVyTGlzdEJveDo6Y29udGVu dHNTaXplKCkgY28KICAgICByZXR1cm4gSW50U2l6ZShzY3JvbGxXaWR0aCgpLCBzY3JvbGxIZWln aHQoKSk7CiB9CiAKLWludCBSZW5kZXJMaXN0Qm94Ojp2aXNpYmxlSGVpZ2h0KCkgY29uc3QKK0xh eW91dFVuaXQgUmVuZGVyTGlzdEJveDo6dmlzaWJsZUhlaWdodCgpIGNvbnN0CiB7CiAgICAgcmV0 dXJuIGhlaWdodCgpOwogfQogCi1pbnQgUmVuZGVyTGlzdEJveDo6dmlzaWJsZVdpZHRoKCkgY29u c3QKK0xheW91dFVuaXQgUmVuZGVyTGlzdEJveDo6dmlzaWJsZVdpZHRoKCkgY29uc3QKIHsKICAg ICByZXR1cm4gd2lkdGgoKTsKIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMaXN0Qm94LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxpc3RCb3guaAkocmV2aXNpb24gODk5NzApCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGlzdEJveC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMTMsOCArMTEzLDggQEAgcHJpdmF0 ZToKICAgICB2aXJ0dWFsIEludFBvaW50IGNvbnZlcnRGcm9tQ29udGFpbmluZ1ZpZXdUb1Njcm9s bGJhcihjb25zdCBTY3JvbGxiYXIqLCBjb25zdCBJbnRQb2ludCYpIGNvbnN0OwogICAgIHZpcnR1 YWwgU2Nyb2xsYmFyKiB2ZXJ0aWNhbFNjcm9sbGJhcigpIGNvbnN0IHsgcmV0dXJuIG1fdkJhci5n ZXQoKTsgfQogICAgIHZpcnR1YWwgSW50U2l6ZSBjb250ZW50c1NpemUoKSBjb25zdDsKLSAgICB2 aXJ0dWFsIGludCB2aXNpYmxlSGVpZ2h0KCkgY29uc3Q7Ci0gICAgdmlydHVhbCBpbnQgdmlzaWJs ZVdpZHRoKCkgY29uc3Q7CisgICAgdmlydHVhbCBMYXlvdXRVbml0IHZpc2libGVIZWlnaHQoKSBj b25zdDsKKyAgICB2aXJ0dWFsIExheW91dFVuaXQgdmlzaWJsZVdpZHRoKCkgY29uc3Q7CiAgICAg dmlydHVhbCBJbnRQb2ludCBjdXJyZW50TW91c2VQb3NpdGlvbigpIGNvbnN0OwogICAgIHZpcnR1 YWwgYm9vbCBzaG91bGRTdXNwZW5kU2Nyb2xsQW5pbWF0aW9ucygpIGNvbnN0OwogICAgIHZpcnR1 YWwgYm9vbCBpc09uQWN0aXZlUGFnZSgpIGNvbnN0Owo=