82183 2012-03-26 03:33:39 -0700 Update localSelectionRect to return a LayoutRect 2012-03-26 16:01:44 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60318 1 leviw leviw eae eric jchaffraix webkit.review.bot oldest_to_newest 587578 0 leviw 2012-03-26 03:33:39 -0700 localSelectionRect returns a rect in coordinates local to its renderer, and therefor be in LayoutUnits. 587582 1 133766 leviw 2012-03-26 03:43:33 -0700 Created attachment 133766 Patch 588249 2 133766 webkit.review.bot 2012-03-26 16:01:40 -0700 Comment on attachment 133766 Patch Clearing flags on attachment: 133766 Committed r112166: <http://trac.webkit.org/changeset/112166> 588250 3 webkit.review.bot 2012-03-26 16:01:44 -0700 All reviewed patches have been landed. Closing bug. 133766 2012-03-26 03:43:33 -0700 2012-03-26 16:01:40 -0700 Patch bug-82183-20120326114330.patch text/plain 12578 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMjA3MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQxIEBACisyMDEyLTAzLTI2ICBMZXZpIFdl aW50cmF1YiAgPGxldml3QGNocm9taXVtLm9yZz4KKworICAgICAgICBVcGRhdGUgbG9jYWxTZWxl Y3Rpb25SZWN0IHRvIHJldHVybiBhIExheW91dFJlY3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgyMTgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgbG9jYWxTZWxlY3Rpb25SZWN0IHJldHVybnMgYSByZWN0 YW5nbGUgaW4gdGhlIGNvb3JkaW5hdGUgc3BhY2Ugb2YgaXRzIHJlbmRlcmVyLAorICAgICAgICBh bmQgdGhlcmVmb3Igc2hvdWxkIHJlbWFpbiBMYXlvdXRVbml0cyB1bnRpbCBiZWluZyBwcm9tb3Rl ZCB0byBhYnNvbHV0ZQorICAgICAgICBjb29yZGluYXRlcyBvciBwYWludGVkLiBBbHNvIGZpeGlu ZyBhbiBpbmNvcnJlY3QgY29udmVyc2lvbiBvZiBzdGFydFBvcyBhbmQKKyAgICAgICAgZW5kUG9z IGluIHNlbGVjdGlvblJlY3RGb3JSZXBhaW50LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gTm8g Y2hhbmdlIGluIGJlaGF2aW9yLgorCisgICAgICAgICogcmVuZGVyaW5nL0lubGluZVRleHRCb3gu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lVGV4dEJveDo6bG9jYWxTZWxlY3Rpb25SZWN0 KTogQ29udGludWluZyB0byB1c2UgZW5jbG9zaW5nSW50UmVjdAorICAgICAgICBmb3IgdGhlIHZh bHVlIGJlaW5nIHJldHVybmVkIGZyb20gdGhlIGZvbnQgZW5naW5lIHNpbmNlIHRoZXNlIGZsb2F0 aW5nIHBvaW50CisgICAgICAgIHZhbHVlcyBzaG91bGQgbm90IGJlIHBpeGVsIHNuYXBwZWQuCisg ICAgICAgICogcmVuZGVyaW5nL0lubGluZVRleHRCb3guaDoKKyAgICAgICAgKElubGluZVRleHRC b3gpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJSZXBsYWNlZDo6bG9jYWxTZWxlY3Rpb25SZWN0KToKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQuaDoKKyAgICAgICAgKFJlbmRlclJlcGxhY2VkKToKKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpsb2Nh bFF1YWRGb3JUZXh0Qm94KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHQ6OmFic29sdXRl UmVjdHNGb3JSYW5nZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUZXh0OjphYnNvbHV0ZVF1 YWRzRm9yUmFuZ2UpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGV4dDo6c2VsZWN0aW9uUmVj dEZvclJlcGFpbnQpOiBGaXhpbmcgYW4gaW5jb3JyZWN0IGNvbnZlcnNpb24gb2YKKyAgICAgICAg c3RhcnQvZW5kUG9zIHRvIExheW91dFVuaXRzLiBUaGVzZSB2YWx1ZXMgcmVwcmVzZW50IGEgcmFu Z2Ugb2Ygc2VsZWN0ZWQgY2hhcmFjdGVycywKKyAgICAgICAgbm90IGxheW91dCB2YWx1ZXMhCisg ICAgICAgICogcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdJbmxpbmVUZXh0LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlclNWR0lubGluZVRleHQ6OmxvY2FsQ2FyZXRSZWN0KToKKyAgICAgICAg KiByZW5kZXJpbmcvc3ZnL1NWR0lubGluZVRleHRCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6 U1ZHSW5saW5lVGV4dEJveDo6bG9jYWxTZWxlY3Rpb25SZWN0KToKKyAgICAgICAgKiByZW5kZXJp bmcvc3ZnL1NWR0lubGluZVRleHRCb3guaDoKKyAgICAgICAgKFNWR0lubGluZVRleHRCb3gpOgor CiAyMDEyLTAzLTI2ICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIFtDaHJvbWl1bV0gV2ViIEluc3BlY3RvcjogZGVkaWNhdGVkIHdvcmtlciBpbnNwZWN0 b3IgaXMgZW1wdHkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVUZXh0Qm94 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJv eC5jcHAJKHJldmlzaW9uIDExMjA2MikKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9Jbmxp bmVUZXh0Qm94LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTc0LDE5ICsxNzQsMTkgQEAgc3RhdGlj IHZvaWQgYWRqdXN0Q2hhcmFjdGVyc0FuZExlbmd0aEZvcgogICAgIGxlbmd0aCArPSBoeXBoZW5T dHJpbmcubGVuZ3RoKCk7CiB9CiAKLUludFJlY3QgSW5saW5lVGV4dEJveDo6bG9jYWxTZWxlY3Rp b25SZWN0KGludCBzdGFydFBvcywgaW50IGVuZFBvcykKK0xheW91dFJlY3QgSW5saW5lVGV4dEJv eDo6bG9jYWxTZWxlY3Rpb25SZWN0KGludCBzdGFydFBvcywgaW50IGVuZFBvcykKIHsKICAgICBp bnQgc1BvcyA9IG1heChzdGFydFBvcyAtIG1fc3RhcnQsIDApOwogICAgIGludCBlUG9zID0gbWlu KGVuZFBvcyAtIG1fc3RhcnQsIChpbnQpbV9sZW4pOwogICAgIAogICAgIGlmIChzUG9zID4gZVBv cykKLSAgICAgICAgcmV0dXJuIEludFJlY3QoKTsKKyAgICAgICAgcmV0dXJuIExheW91dFJlY3Qo KTsKIAogICAgIEZvbnRDYWNoZVB1cmdlUHJldmVudGVyIGZvbnRDYWNoZVB1cmdlUHJldmVudGVy OwogCiAgICAgUmVuZGVyVGV4dCogdGV4dE9iaiA9IHRleHRSZW5kZXJlcigpOwotICAgIGludCBz ZWxUb3AgPSBzZWxlY3Rpb25Ub3AoKTsKLSAgICBpbnQgc2VsSGVpZ2h0ID0gc2VsZWN0aW9uSGVp Z2h0KCk7CisgICAgTGF5b3V0VW5pdCBzZWxUb3AgPSBzZWxlY3Rpb25Ub3AoKTsKKyAgICBMYXlv dXRVbml0IHNlbEhlaWdodCA9IHNlbGVjdGlvbkhlaWdodCgpOwogICAgIFJlbmRlclN0eWxlKiBz dHlsZVRvVXNlID0gdGV4dE9iai0+c3R5bGUobV9maXJzdExpbmUpOwogICAgIGNvbnN0IEZvbnQm IGZvbnQgPSBzdHlsZVRvVXNlLT5mb250KCk7CiAKQEAgLTE5NiwxOSArMTk2LDE5IEBAIEludFJl Y3QgSW5saW5lVGV4dEJveDo6bG9jYWxTZWxlY3Rpb25SZWMKICAgICBpZiAocmVzcGVjdEh5cGhl bikKICAgICAgICAgZW5kUG9zID0gdGV4dFJ1bi5sZW5ndGgoKTsKIAotICAgIEludFJlY3QgciA9 IGVuY2xvc2luZ0ludFJlY3QoZm9udC5zZWxlY3Rpb25SZWN0Rm9yVGV4dCh0ZXh0UnVuLCBGbG9h dFBvaW50KGxvZ2ljYWxMZWZ0KCksIHNlbFRvcCksIHNlbEhlaWdodCwgc1BvcywgZVBvcykpOwor ICAgIExheW91dFJlY3QgciA9IGVuY2xvc2luZ0ludFJlY3QoZm9udC5zZWxlY3Rpb25SZWN0Rm9y VGV4dCh0ZXh0UnVuLCBGbG9hdFBvaW50KGxvZ2ljYWxMZWZ0KCksIHNlbFRvcCksIHNlbEhlaWdo dCwgc1BvcywgZVBvcykpOwogCi0gICAgaW50IGxvZ2ljYWxXaWR0aCA9IHIud2lkdGgoKTsKKyAg ICBMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCA9IHIud2lkdGgoKTsKICAgICBpZiAoci54KCkgPiBs b2dpY2FsUmlnaHQoKSkKICAgICAgICAgbG9naWNhbFdpZHRoICA9IDA7CiAgICAgZWxzZSBpZiAo ci5tYXhYKCkgPiBsb2dpY2FsUmlnaHQoKSkKICAgICAgICAgbG9naWNhbFdpZHRoID0gbG9naWNh bFJpZ2h0KCkgLSByLngoKTsKIAotICAgIEludFBvaW50IHRvcFBvaW50ID0gaXNIb3Jpem9udGFs KCkgPyBJbnRQb2ludChyLngoKSwgc2VsVG9wKSA6IEludFBvaW50KHNlbFRvcCwgci54KCkpOwot ICAgIGludCB3aWR0aCA9IGlzSG9yaXpvbnRhbCgpID8gbG9naWNhbFdpZHRoIDogc2VsSGVpZ2h0 OwotICAgIGludCBoZWlnaHQgPSBpc0hvcml6b250YWwoKSA/IHNlbEhlaWdodCA6IGxvZ2ljYWxX aWR0aDsKKyAgICBMYXlvdXRQb2ludCB0b3BQb2ludCA9IGlzSG9yaXpvbnRhbCgpID8gTGF5b3V0 UG9pbnQoci54KCksIHNlbFRvcCkgOiBMYXlvdXRQb2ludChzZWxUb3AsIHIueCgpKTsKKyAgICBM YXlvdXRVbml0IHdpZHRoID0gaXNIb3Jpem9udGFsKCkgPyBsb2dpY2FsV2lkdGggOiBzZWxIZWln aHQ7CisgICAgTGF5b3V0VW5pdCBoZWlnaHQgPSBpc0hvcml6b250YWwoKSA/IHNlbEhlaWdodCA6 IGxvZ2ljYWxXaWR0aDsKIAotICAgIHJldHVybiBJbnRSZWN0KHRvcFBvaW50LCBJbnRTaXplKHdp ZHRoLCBoZWlnaHQpKTsKKyAgICByZXR1cm4gTGF5b3V0UmVjdCh0b3BQb2ludCwgTGF5b3V0U2l6 ZSh3aWR0aCwgaGVpZ2h0KSk7CiB9CiAKIHZvaWQgSW5saW5lVGV4dEJveDo6ZGVsZXRlTGluZShS ZW5kZXJBcmVuYSogYXJlbmEpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5l VGV4dEJveC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVU ZXh0Qm94LmgJKHJldmlzaW9uIDExMjA2MikKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9J bmxpbmVUZXh0Qm94LmgJKHdvcmtpbmcgY29weSkKQEAgLTExMCw3ICsxMTAsNyBAQCBwcml2YXRl OgogcHVibGljOgogICAgIHZpcnR1YWwgRmxvYXRSZWN0IGNhbGN1bGF0ZUJvdW5kYXJpZXMoKSBj b25zdCB7IHJldHVybiBGbG9hdFJlY3QoeCgpLCB5KCksIHdpZHRoKCksIGhlaWdodCgpKTsgfQog Ci0gICAgdmlydHVhbCBJbnRSZWN0IGxvY2FsU2VsZWN0aW9uUmVjdChpbnQgc3RhcnRQb3MsIGlu dCBlbmRQb3MpOworICAgIHZpcnR1YWwgTGF5b3V0UmVjdCBsb2NhbFNlbGVjdGlvblJlY3QoaW50 IHN0YXJ0UG9zLCBpbnQgZW5kUG9zKTsKICAgICBib29sIGlzU2VsZWN0ZWQoaW50IHN0YXJ0UG9z LCBpbnQgZW5kUG9zKSBjb25zdDsKICAgICB2b2lkIHNlbGVjdGlvblN0YXJ0RW5kKGludCYgc1Bv cywgaW50JiBlUG9zKTsKIApJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJl cGxhY2VkLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy UmVwbGFjZWQuY3BwCShyZXZpc2lvbiAxMTIwNjIpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyUmVwbGFjZWQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00ODgsMjAgKzQ4OCwyMCBA QCBMYXlvdXRSZWN0IFJlbmRlclJlcGxhY2VkOjpzZWxlY3Rpb25SZWN0CiAgICAgcmV0dXJuIHJl Y3Q7CiB9CiAKLUludFJlY3QgUmVuZGVyUmVwbGFjZWQ6OmxvY2FsU2VsZWN0aW9uUmVjdChib29s IGNoZWNrV2hldGhlclNlbGVjdGVkKSBjb25zdAorTGF5b3V0UmVjdCBSZW5kZXJSZXBsYWNlZDo6 bG9jYWxTZWxlY3Rpb25SZWN0KGJvb2wgY2hlY2tXaGV0aGVyU2VsZWN0ZWQpIGNvbnN0CiB7CiAg ICAgaWYgKGNoZWNrV2hldGhlclNlbGVjdGVkICYmICFpc1NlbGVjdGVkKCkpCi0gICAgICAgIHJl dHVybiBJbnRSZWN0KCk7CisgICAgICAgIHJldHVybiBMYXlvdXRSZWN0KCk7CiAKICAgICBpZiAo IW1faW5saW5lQm94V3JhcHBlcikKICAgICAgICAgLy8gV2UncmUgYSBibG9jay1sZXZlbCByZXBs YWNlZCBlbGVtZW50LiAgSnVzdCByZXR1cm4gb3VyIG93biBkaW1lbnNpb25zLgotICAgICAgICBy ZXR1cm4gSW50UmVjdChJbnRQb2ludCgpLCBzaXplKCkpOworICAgICAgICByZXR1cm4gTGF5b3V0 UmVjdChMYXlvdXRQb2ludCgpLCBzaXplKCkpOwogICAgIAogICAgIFJvb3RJbmxpbmVCb3gqIHJv b3QgPSBtX2lubGluZUJveFdyYXBwZXItPnJvb3QoKTsKLSAgICBpbnQgbmV3TG9naWNhbFRvcCA9 IHJvb3QtPmJsb2NrKCktPnN0eWxlKCktPmlzRmxpcHBlZEJsb2Nrc1dyaXRpbmdNb2RlKCkgPyBt X2lubGluZUJveFdyYXBwZXItPmxvZ2ljYWxCb3R0b20oKSAtIHJvb3QtPnNlbGVjdGlvbkJvdHRv bSgpIDogcm9vdC0+c2VsZWN0aW9uVG9wKCkgLSBtX2lubGluZUJveFdyYXBwZXItPmxvZ2ljYWxU b3AoKTsKKyAgICBMYXlvdXRVbml0IG5ld0xvZ2ljYWxUb3AgPSByb290LT5ibG9jaygpLT5zdHls ZSgpLT5pc0ZsaXBwZWRCbG9ja3NXcml0aW5nTW9kZSgpID8gbV9pbmxpbmVCb3hXcmFwcGVyLT5s b2dpY2FsQm90dG9tKCkgLSByb290LT5zZWxlY3Rpb25Cb3R0b20oKSA6IHJvb3QtPnNlbGVjdGlv blRvcCgpIC0gbV9pbmxpbmVCb3hXcmFwcGVyLT5sb2dpY2FsVG9wKCk7CiAgICAgaWYgKHJvb3Qt PmJsb2NrKCktPnN0eWxlKCktPmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpCi0gICAgICAgIHJl dHVybiBJbnRSZWN0KDAsIG5ld0xvZ2ljYWxUb3AsIHdpZHRoKCksIHJvb3QtPnNlbGVjdGlvbkhl aWdodCgpKTsKLSAgICByZXR1cm4gSW50UmVjdChuZXdMb2dpY2FsVG9wLCAwLCByb290LT5zZWxl Y3Rpb25IZWlnaHQoKSwgaGVpZ2h0KCkpOworICAgICAgICByZXR1cm4gTGF5b3V0UmVjdCgwLCBu ZXdMb2dpY2FsVG9wLCB3aWR0aCgpLCByb290LT5zZWxlY3Rpb25IZWlnaHQoKSk7CisgICAgcmV0 dXJuIExheW91dFJlY3QobmV3TG9naWNhbFRvcCwgMCwgcm9vdC0+c2VsZWN0aW9uSGVpZ2h0KCks IGhlaWdodCgpKTsKIH0KIAogdm9pZCBSZW5kZXJSZXBsYWNlZDo6c2V0U2VsZWN0aW9uU3RhdGUo U2VsZWN0aW9uU3RhdGUgc3RhdGUpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyUmVwbGFjZWQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyUmVwbGFjZWQuaAkocmV2aXNpb24gMTEyMDYyKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclJlcGxhY2VkLmgJKHdvcmtpbmcgY29weSkKQEAgLTU5LDcgKzU5LDcgQEAgcHJv dGVjdGVkOgogCiAgICAgdmlydHVhbCB2b2lkIHBhaW50KFBhaW50SW5mbyYsIGNvbnN0IExheW91 dFBvaW50Jik7CiAgICAgYm9vbCBzaG91bGRQYWludChQYWludEluZm8mLCBjb25zdCBMYXlvdXRQ b2ludCYpOwotICAgIEludFJlY3QgbG9jYWxTZWxlY3Rpb25SZWN0KGJvb2wgY2hlY2tXaGV0aGVy U2VsZWN0ZWQgPSB0cnVlKSBjb25zdDsgLy8gVGhpcyBpcyBpbiBsb2NhbCBjb29yZGluYXRlcywg YnV0IGl0J3MgYSBwaHlzaWNhbCByZWN0IChzbyB0aGUgdG9wIGxlZnQgY29ybmVyIGlzIHBoeXNp Y2FsIHRvcCBsZWZ0KS4KKyAgICBMYXlvdXRSZWN0IGxvY2FsU2VsZWN0aW9uUmVjdChib29sIGNo ZWNrV2hldGhlclNlbGVjdGVkID0gdHJ1ZSkgY29uc3Q7IC8vIFRoaXMgaXMgaW4gbG9jYWwgY29v cmRpbmF0ZXMsIGJ1dCBpdCdzIGEgcGh5c2ljYWwgcmVjdCAoc28gdGhlIHRvcCBsZWZ0IGNvcm5l ciBpcyBwaHlzaWNhbCB0b3AgbGVmdCkuCiAKIHByaXZhdGU6CiAgICAgdmlydHVhbCBSZW5kZXJC b3gqIGVtYmVkZGVkQ29udGVudEJveCgpIGNvbnN0IHsgcmV0dXJuIDA7IH0KSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAJKHJldmlzaW9uIDExMjA2MikKKysrIFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmNwcAkod29ya2luZyBjb3B5KQpAQCAt MzEyLDcgKzMxMiw3IEBAIHZvaWQgUmVuZGVyVGV4dDo6YWJzb2x1dGVSZWN0cyhWZWN0b3I8SW4K IHN0YXRpYyBGbG9hdFJlY3QgbG9jYWxRdWFkRm9yVGV4dEJveChJbmxpbmVUZXh0Qm94KiBib3gs IHVuc2lnbmVkIHN0YXJ0LCB1bnNpZ25lZCBlbmQsIGJvb2wgdXNlU2VsZWN0aW9uSGVpZ2h0KQog ewogICAgIHVuc2lnbmVkIHJlYWxFbmQgPSBtaW4oYm94LT5lbmQoKSArIDEsIGVuZCk7Ci0gICAg SW50UmVjdCByID0gYm94LT5sb2NhbFNlbGVjdGlvblJlY3Qoc3RhcnQsIHJlYWxFbmQpOworICAg IExheW91dFJlY3QgciA9IGJveC0+bG9jYWxTZWxlY3Rpb25SZWN0KHN0YXJ0LCByZWFsRW5kKTsK ICAgICBpZiAoci5oZWlnaHQoKSkgewogICAgICAgICBpZiAoIXVzZVNlbGVjdGlvbkhlaWdodCkg ewogICAgICAgICAgICAgLy8gQ2hhbmdlIHRoZSBoZWlnaHQgYW5kIHkgcG9zaXRpb24gKG9yIHdp ZHRoIGFuZCB4IGZvciB2ZXJ0aWNhbCB0ZXh0KQpAQCAtMzQ3LDcgKzM0Nyw3IEBAIHZvaWQgUmVu ZGVyVGV4dDo6YWJzb2x1dGVSZWN0c0ZvclJhbmdlKFYKICAgICAgICAgaWYgKHN0YXJ0IDw9IGJv eC0+c3RhcnQoKSAmJiBib3gtPmVuZCgpIDwgZW5kKSB7CiAgICAgICAgICAgICBGbG9hdFJlY3Qg ciA9IGJveC0+Y2FsY3VsYXRlQm91bmRhcmllcygpOwogICAgICAgICAgICAgaWYgKHVzZVNlbGVj dGlvbkhlaWdodCkgewotICAgICAgICAgICAgICAgIEludFJlY3Qgc2VsZWN0aW9uUmVjdCA9IGJv eC0+bG9jYWxTZWxlY3Rpb25SZWN0KHN0YXJ0LCBlbmQpOworICAgICAgICAgICAgICAgIExheW91 dFJlY3Qgc2VsZWN0aW9uUmVjdCA9IGJveC0+bG9jYWxTZWxlY3Rpb25SZWN0KHN0YXJ0LCBlbmQp OwogICAgICAgICAgICAgICAgIGlmIChib3gtPmlzSG9yaXpvbnRhbCgpKSB7CiAgICAgICAgICAg ICAgICAgICAgIHIuc2V0SGVpZ2h0KHNlbGVjdGlvblJlY3QuaGVpZ2h0KCkpOwogICAgICAgICAg ICAgICAgICAgICByLnNldFkoc2VsZWN0aW9uUmVjdC55KCkpOwpAQCAtNDMwLDggKzQzMCw3IEBA IHZvaWQgUmVuZGVyVGV4dDo6YWJzb2x1dGVRdWFkc0ZvclJhbmdlKFYKICAgICAgICAgaWYgKHN0 YXJ0IDw9IGJveC0+c3RhcnQoKSAmJiBib3gtPmVuZCgpIDwgZW5kKSB7CiAgICAgICAgICAgICBG bG9hdFJlY3QgciA9IGJveC0+Y2FsY3VsYXRlQm91bmRhcmllcygpOwogICAgICAgICAgICAgaWYg KHVzZVNlbGVjdGlvbkhlaWdodCkgewotICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBsb2NhbFNl bGVjdGlvblJlY3Qgc2hvdWxkIHN3aXRjaCB0byByZXR1cm4gRmxvYXRSZWN0IHNvb24gd2l0aCB0 aGUgc3VicGl4ZWxsYXlvdXQgYnJhbmNoLgotICAgICAgICAgICAgICAgIEludFJlY3Qgc2VsZWN0 aW9uUmVjdCA9IGJveC0+bG9jYWxTZWxlY3Rpb25SZWN0KHN0YXJ0LCBlbmQpOworICAgICAgICAg ICAgICAgIExheW91dFJlY3Qgc2VsZWN0aW9uUmVjdCA9IGJveC0+bG9jYWxTZWxlY3Rpb25SZWN0 KHN0YXJ0LCBlbmQpOwogICAgICAgICAgICAgICAgIGlmIChib3gtPmlzSG9yaXpvbnRhbCgpKSB7 CiAgICAgICAgICAgICAgICAgICAgIHIuc2V0SGVpZ2h0KHNlbGVjdGlvblJlY3QuaGVpZ2h0KCkp OwogICAgICAgICAgICAgICAgICAgICByLnNldFkoc2VsZWN0aW9uUmVjdC55KCkpOwpAQCAtMTU0 OCw3ICsxNTQ3LDcgQEAgTGF5b3V0UmVjdCBSZW5kZXJUZXh0OjpzZWxlY3Rpb25SZWN0Rm9yUgog CiAgICAgLy8gTm93IGNhbGN1bGF0ZSBzdGFydFBvcyBhbmQgZW5kUG9zIGZvciBwYWludGluZyBz ZWxlY3Rpb24uCiAgICAgLy8gV2UgaW5jbHVkZSBhIHNlbGVjdGlvbiB3aGlsZSBlbmRQb3MgPiAw Ci0gICAgTGF5b3V0VW5pdCBzdGFydFBvcywgZW5kUG9zOworICAgIGludCBzdGFydFBvcywgZW5k UG9zOwogICAgIGlmIChzZWxlY3Rpb25TdGF0ZSgpID09IFNlbGVjdGlvbkluc2lkZSkgewogICAg ICAgICAvLyBXZSBhcmUgZnVsbHkgc2VsZWN0ZWQuCiAgICAgICAgIHN0YXJ0UG9zID0gMDsKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHSW5saW5lVGV4dC5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdJbmxp bmVUZXh0LmNwcAkocmV2aXNpb24gMTEyMDYyKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L3N2Zy9SZW5kZXJTVkdJbmxpbmVUZXh0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQ3LDEzICsx NDcsMTMgQEAgTGF5b3V0UmVjdCBSZW5kZXJTVkdJbmxpbmVUZXh0Ojpsb2NhbENhcgogCiAgICAg Ly8gVXNlIHRoZSBlZGdlIG9mIHRoZSBzZWxlY3Rpb24gcmVjdCB0byBkZXRlcm1pbmUgdGhlIGNh cmV0IHJlY3QuCiAgICAgaWYgKHN0YXRpY19jYXN0PHVuc2lnbmVkPihjYXJldE9mZnNldCkgPCB0 ZXh0Qm94LT5zdGFydCgpICsgdGV4dEJveC0+bGVuKCkpIHsKLSAgICAgICAgSW50UmVjdCByZWN0 ID0gdGV4dEJveC0+bG9jYWxTZWxlY3Rpb25SZWN0KGNhcmV0T2Zmc2V0LCBjYXJldE9mZnNldCAr IDEpOwotICAgICAgICBpbnQgeCA9IGJveC0+aXNMZWZ0VG9SaWdodERpcmVjdGlvbigpID8gcmVj dC54KCkgOiByZWN0Lm1heFgoKTsKKyAgICAgICAgTGF5b3V0UmVjdCByZWN0ID0gdGV4dEJveC0+ bG9jYWxTZWxlY3Rpb25SZWN0KGNhcmV0T2Zmc2V0LCBjYXJldE9mZnNldCArIDEpOworICAgICAg ICBMYXlvdXRVbml0IHggPSBib3gtPmlzTGVmdFRvUmlnaHREaXJlY3Rpb24oKSA/IHJlY3QueCgp IDogcmVjdC5tYXhYKCk7CiAgICAgICAgIHJldHVybiBMYXlvdXRSZWN0KHgsIHJlY3QueSgpLCBj YXJldFdpZHRoLCByZWN0LmhlaWdodCgpKTsKICAgICB9CiAKLSAgICBJbnRSZWN0IHJlY3QgPSB0 ZXh0Qm94LT5sb2NhbFNlbGVjdGlvblJlY3QoY2FyZXRPZmZzZXQgLSAxLCBjYXJldE9mZnNldCk7 Ci0gICAgaW50IHggPSBib3gtPmlzTGVmdFRvUmlnaHREaXJlY3Rpb24oKSA/IHJlY3QubWF4WCgp IDogcmVjdC54KCk7CisgICAgTGF5b3V0UmVjdCByZWN0ID0gdGV4dEJveC0+bG9jYWxTZWxlY3Rp b25SZWN0KGNhcmV0T2Zmc2V0IC0gMSwgY2FyZXRPZmZzZXQpOworICAgIExheW91dFVuaXQgeCA9 IGJveC0+aXNMZWZ0VG9SaWdodERpcmVjdGlvbigpID8gcmVjdC5tYXhYKCkgOiByZWN0LngoKTsK ICAgICByZXR1cm4gTGF5b3V0UmVjdCh4LCByZWN0LnkoKSwgY2FyZXRXaWR0aCwgcmVjdC5oZWln aHQoKSk7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvU1ZHSW5saW5l VGV4dEJveC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9T VkdJbmxpbmVUZXh0Qm94LmNwcAkocmV2aXNpb24gMTEyMDYyKQorKysgU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL3N2Zy9TVkdJbmxpbmVUZXh0Qm94LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTI4 LDEzICsxMjgsMTMgQEAgRmxvYXRSZWN0IFNWR0lubGluZVRleHRCb3g6OnNlbGVjdGlvblJlYwog ICAgIHJldHVybiBzZWxlY3Rpb25SZWN0OwogfQogCi1JbnRSZWN0IFNWR0lubGluZVRleHRCb3g6 OmxvY2FsU2VsZWN0aW9uUmVjdChpbnQgc3RhcnRQb3NpdGlvbiwgaW50IGVuZFBvc2l0aW9uKQor TGF5b3V0UmVjdCBTVkdJbmxpbmVUZXh0Qm94Ojpsb2NhbFNlbGVjdGlvblJlY3QoaW50IHN0YXJ0 UG9zaXRpb24sIGludCBlbmRQb3NpdGlvbikKIHsKICAgICBpbnQgYm94U3RhcnQgPSBzdGFydCgp OwogICAgIHN0YXJ0UG9zaXRpb24gPSBtYXgoc3RhcnRQb3NpdGlvbiAtIGJveFN0YXJ0LCAwKTsK ICAgICBlbmRQb3NpdGlvbiA9IG1pbihlbmRQb3NpdGlvbiAtIGJveFN0YXJ0LCBzdGF0aWNfY2Fz dDxpbnQ+KGxlbigpKSk7CiAgICAgaWYgKHN0YXJ0UG9zaXRpb24gPj0gZW5kUG9zaXRpb24pCi0g ICAgICAgIHJldHVybiBJbnRSZWN0KCk7CisgICAgICAgIHJldHVybiBMYXlvdXRSZWN0KCk7CiAK ICAgICBSZW5kZXJUZXh0KiB0ZXh0ID0gdGV4dFJlbmRlcmVyKCk7CiAgICAgQVNTRVJUKHRleHQp OwpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9TVkdJbmxpbmVUZXh0Qm94LmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9TVkdJbmxpbmVUZXh0 Qm94LmgJKHJldmlzaW9uIDExMjA2MikKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcv U1ZHSW5saW5lVGV4dEJveC5oCSh3b3JraW5nIGNvcHkpCkBAIC00Nyw3ICs0Nyw3IEBAIHB1Ymxp YzoKIAogICAgIHZvaWQgcGFpbnRTZWxlY3Rpb25CYWNrZ3JvdW5kKFBhaW50SW5mbyYpOwogICAg IHZpcnR1YWwgdm9pZCBwYWludChQYWludEluZm8mLCBjb25zdCBMYXlvdXRQb2ludCYsIExheW91 dFVuaXQgbGluZVRvcCwgTGF5b3V0VW5pdCBsaW5lQm90dG9tKTsKLSAgICB2aXJ0dWFsIEludFJl Y3QgbG9jYWxTZWxlY3Rpb25SZWN0KGludCBzdGFydFBvc2l0aW9uLCBpbnQgZW5kUG9zaXRpb24p OworICAgIHZpcnR1YWwgTGF5b3V0UmVjdCBsb2NhbFNlbGVjdGlvblJlY3QoaW50IHN0YXJ0UG9z aXRpb24sIGludCBlbmRQb3NpdGlvbik7CiAKICAgICBib29sIG1hcFN0YXJ0RW5kUG9zaXRpb25z SW50b0ZyYWdtZW50Q29vcmRpbmF0ZXMoY29uc3QgU1ZHVGV4dEZyYWdtZW50JiwgaW50JiBzdGFy dFBvc2l0aW9uLCBpbnQmIGVuZFBvc2l0aW9uKSBjb25zdDsKIAo=