83089 2012-04-03 16:10:23 -0700 Fix types for location, size and rect calculations for render objects 2012-04-05 06:33:20 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60318 1 eae eae eric jchaffraix leviw simon.fraser webkit.review.bot oldest_to_newest 595000 0 eae 2012-04-03 16:10:23 -0700 Misc fixes for render objects. 595003 1 135446 eae 2012-04-03 16:14:13 -0700 Created attachment 135446 Patch 595140 2 135446 eric 2012-04-03 19:09:56 -0700 Comment on attachment 135446 Patch OK. 595212 3 eae 2012-04-03 20:54:30 -0700 Thanks Eric! 595771 4 135446 webkit.review.bot 2012-04-04 12:04:34 -0700 Comment on attachment 135446 Patch Clearing flags on attachment: 135446 Committed r113222: <http://trac.webkit.org/changeset/113222> 595772 5 webkit.review.bot 2012-04-04 12:04:38 -0700 All reviewed patches have been landed. Closing bug. 596489 6 leviw 2012-04-05 04:57:25 -0700 *** Bug 83157 has been marked as a duplicate of this bug. *** 596527 7 leviw 2012-04-05 06:33:20 -0700 *** Bug 83169 has been marked as a duplicate of this bug. *** 135446 2012-04-03 16:14:13 -0700 2012-04-04 12:04:34 -0700 Patch bug-83089-20120403161412.patch text/plain 14480 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMzEwMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDU0IEBACisyMDEyLTA0LTAzICBFbWlsIEEg RWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KKworICAgICAgICBGaXggdHlwZXMgZm9yIGxvY2F0 aW9uLCBzaXplIGFuZCByZWN0IGNhbGN1bGF0aW9ucyBmb3IgcmVuZGVyIG9iamVjdHMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgzMDg5CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4IHVzYWdlIG9mIExh eW91dFVuaXRzIGFuZCByb3VuZGluZyBmb3IgYSBjb3VwbGUgb2YgZGlmZmVyZW50IHJlbmRlcgor ICAgICAgICBvYmplY3QgY2xhc3Nlcy4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGNoYW5n ZSBpbiBmdW5jdGlvbmFsaXR5LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckRldGFpbHNN YXJrZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRGV0YWlsc01hcmtlcjo6Z2V0UGF0 aCk6CisgICAgICAgIENoYW5nZSBnZXRQYXRoIHRvIHRha2UgYSBMYXlvdXRQb2ludCBhcyB0aGUg dHJhbnNmb3JtIGhhcyBzdWJwaXhlbAorICAgICAgICBwcmVjaXNpb24gYWxyZWFkeS4KKyAgICAg ICAgCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyRmxvd1RocmVhZDo6Y29tcHV0ZUxvZ2ljYWxIZWlnaHQpOgorICAgICAg ICBDaGFuZ2UgbG9naWNhbEhlaWdodCB0byBMYXlvdXRVbml0IGFzIGl0IGlzIGNvbXB1dGVkIGZy b20gc3VicGl4ZWwKKyAgICAgICAgdmFsdWVzLgorICAgICAgICAKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVySW5wdXRTcGVlY2guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVySW5wdXRT cGVlY2g6OnBhaW50SW5wdXRGaWVsZFNwZWVjaEJ1dHRvbik6CisgICAgICAgIENoYW5nZSBidXR0 b24gcmVjdCBjb21wdXRhdGlvbiB0byBMYXlvdXRSZWN0IGFuZCBwaXhlbCBzbmFwIGp1c3QgYmVm b3JlCisgICAgICAgIHBhaW50aW5nIHRvIHByZXNlcnZlIHByZWNpc2lvbi4KKyAgICAgICAgCisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxpbmVCb3hMaXN0LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlckxpbmVCb3hMaXN0OjpyYW5nZUludGVyc2VjdHNSZWN0KToKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckxpbmVCb3hMaXN0OjpsaW5lSW50ZXJzZWN0c0RpcnR5UmVjdCk6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJMaW5lQm94TGlzdDo6cGFpbnQpOgorICAgICAgICBDaGFuZ2Ug cmFuZ2UgY2FsY3VsYXRpb25zIHRvIExheW91dFVuaXRzIHRvIHByZXNlcnZlIHByZWNpc2lvbi4K KyAgICAgICAgCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck1hcnF1ZWUuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyTWFycXVlZTo6Y29tcHV0ZVBvc2l0aW9uKToKKyAgICAgICAgQ2hh bmdlIHdpZHRoIGNhbGN1bGF0aW9ucyB0byBMYXlvdXRVbml0cyB0byBwcmVzZXJ2ZSBwcmVjaXNp b24uCisgICAgICAgIAorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUYWJsZS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJUYWJsZTo6bGF5b3V0Q2FwdGlvbik6CisgICAgICAgIENoYW5n ZSB0YWJsZSBjYXB0aW9ucyB0byBMYXlvdXRVbml0cyBhcyB0aGUgdmFsdWVzIGFyZSBjb21wdXRl ZCBmcm9tCisgICAgICAgIHN1YnBpeGVsIGNvbXBvbmVuZXRzLgorICAgICAgICAKKyAgICAgICAg KiByZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyU3R5bGU6OmdldFJvdW5kZWRCb3JkZXJGb3IpOgorICAgICAgICBTbmFwIGJvcmRlciByZWN0 IGFzIFJvdW5kZWRSZWN0cyB1c2UgaW50cyBmb3IgY3Jpc3AgcmVuZGVyaW5nLgorICAgICAgICAK KyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvU2hhZG93RGF0YS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpTaGFkb3dEYXRhOjphZGp1c3RSZWN0Rm9yU2hhZG93KToKKyAgICAgICAgQ2hhbmdlIGFk anVzdFJlY3RGb3JTaGFkb3cgdG8gdGFrZSBhIExheW91dFJlY3QgYXMgaXQgYWxyZWFkeSB1c2Vz CisgICAgICAgIExheW91dFVuaXRzLgorICAgICAgICAKIDIwMTItMDQtMDMgIEFiaGlzaGVrIEFy eWEgIDxpbmZlcm5vQGNocm9taXVtLm9yZz4KIAogICAgICAgICBDcmFzaCBpbiBTZWxlY3RvckNo ZWNrZXI6OmNoZWNrT25lU2VsZWN0b3IuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyRGV0YWlsc01hcmtlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckRldGFpbHNNYXJrZXIuY3BwCShyZXZpc2lvbiAxMTMwNDQpCisrKyBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRGV0YWlsc01hcmtlci5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTEwNSw3ICsxMDUsNyBAQCBQYXRoIFJlbmRlckRldGFpbHNNYXJrZXI6OmdldENhbm9u aWNhbFBhCiAgICAgcmV0dXJuIFBhdGgoKTsKIH0KIAotUGF0aCBSZW5kZXJEZXRhaWxzTWFya2Vy OjpnZXRQYXRoKGNvbnN0IEludFBvaW50JiBvcmlnaW4pIGNvbnN0CitQYXRoIFJlbmRlckRldGFp bHNNYXJrZXI6OmdldFBhdGgoY29uc3QgTGF5b3V0UG9pbnQmIG9yaWdpbikgY29uc3QKIHsKICAg ICBQYXRoIHJlc3VsdCA9IGdldENhbm9uaWNhbFBhdGgoKTsKICAgICByZXN1bHQudHJhbnNmb3Jt KEFmZmluZVRyYW5zZm9ybSgpLnNjYWxlKGxvZ2ljYWxIZWlnaHQoKSkpOwpJbmRleDogU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckRldGFpbHNNYXJrZXIuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRGV0YWlsc01hcmtlci5oCShyZXZpc2lvbiAx MTMwNDQpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRGV0YWlsc01hcmtlci5o CSh3b3JraW5nIGNvcHkpCkBAIC00Miw3ICs0Miw3IEBAIHByaXZhdGU6CiAKICAgICBib29sIGlz T3BlbigpIGNvbnN0OwogICAgIFBhdGggZ2V0Q2Fub25pY2FsUGF0aCgpIGNvbnN0OwotICAgIFBh dGggZ2V0UGF0aChjb25zdCBJbnRQb2ludCYgb3JpZ2luKSBjb25zdDsKKyAgICBQYXRoIGdldFBh dGgoY29uc3QgTGF5b3V0UG9pbnQmIG9yaWdpbikgY29uc3Q7CiB9OwogCiBpbmxpbmUgUmVuZGVy RGV0YWlsc01hcmtlciogdG9SZW5kZXJEZXRhaWxzTWFya2VyKFJlbmRlck9iamVjdCogb2JqZWN0 KQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbG93VGhyZWFkLmNw cAkocmV2aXNpb24gMTEzMDQ0KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZs b3dUaHJlYWQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNTQsNyArMjU0LDcgQEAgdm9pZCBSZW5k ZXJGbG93VGhyZWFkOjpjb21wdXRlTG9naWNhbFdpZAogCiB2b2lkIFJlbmRlckZsb3dUaHJlYWQ6 OmNvbXB1dGVMb2dpY2FsSGVpZ2h0KCkKIHsKLSAgICBpbnQgbG9naWNhbEhlaWdodCA9IDA7Cisg ICAgTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0ID0gMDsKIAogICAgIGZvciAoUmVuZGVyUmVnaW9u TGlzdDo6aXRlcmF0b3IgaXRlciA9IG1fcmVnaW9uTGlzdC5iZWdpbigpOyBpdGVyICE9IG1fcmVn aW9uTGlzdC5lbmQoKTsgKytpdGVyKSB7CiAgICAgICAgIFJlbmRlclJlZ2lvbiogcmVnaW9uID0g Kml0ZXI7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5wdXRTcGVlY2gu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbnB1dFNw ZWVjaC5jcHAJKHJldmlzaW9uIDExMzA0NCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJJbnB1dFNwZWVjaC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY2LDE5ICs2NiwxOSBAQCBi b29sIFJlbmRlcklucHV0U3BlZWNoOjpwYWludElucHV0RmllbGRTCiAgICAgaWYgKCFpbnB1dC0+ cmVuZGVyZXIoKS0+aXNCb3goKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIFJlbmRlckJv eCogaW5wdXRSZW5kZXJCb3ggPSB0b1JlbmRlckJveChpbnB1dC0+cmVuZGVyZXIoKSk7Ci0gICAg SW50UmVjdCBpbnB1dENvbnRlbnRCb3ggPSBpbnB1dFJlbmRlckJveC0+Y29udGVudEJveFJlY3Qo KTsKKyAgICBMYXlvdXRSZWN0IGlucHV0Q29udGVudEJveCA9IGlucHV0UmVuZGVyQm94LT5jb250 ZW50Qm94UmVjdCgpOwogCiAgICAgLy8gTWFrZSBzdXJlIHRoZSBzY2FsZWQgYnV0dG9uIHN0YXlz IHNxdWFyZSBhbmQgd2lsbCBmaXQgaW4gaXRzIHBhcmVudCdzIGJveC4KLSAgICBpbnQgYnV0dG9u U2l6ZSA9IHN0ZDo6bWluKGlucHV0Q29udGVudEJveC53aWR0aCgpLCBzdGQ6Om1pbihpbnB1dENv bnRlbnRCb3guaGVpZ2h0KCksIHJlY3QuaGVpZ2h0KCkpKTsKKyAgICBMYXlvdXRVbml0IGJ1dHRv blNpemUgPSBzdGQ6Om1pbihpbnB1dENvbnRlbnRCb3gud2lkdGgoKSwgc3RkOjptaW48TGF5b3V0 VW5pdD4oaW5wdXRDb250ZW50Qm94LmhlaWdodCgpLCByZWN0LmhlaWdodCgpKSk7CiAgICAgLy8g Q2FsY3VsYXRlIGJ1dHRvbidzIGNvb3JkaW5hdGVzIHJlbGF0aXZlIHRvIHRoZSBpbnB1dCBlbGVt ZW50LgogICAgIC8vIENlbnRlciB0aGUgYnV0dG9uIHZlcnRpY2FsbHkuICBSb3VuZCB1cCB0aG91 Z2gsIHNvIGlmIGl0IGhhcyB0byBiZSBvbmUgcGl4ZWwgb2ZmLWNlbnRlciwgaXQgd2lsbAogICAg IC8vIGJlIG9uZSBwaXhlbCBjbG9zZXIgdG8gdGhlIGJvdHRvbSBvZiB0aGUgZmllbGQuICBUaGlz IHRlbmRzIHRvIGxvb2sgYmV0dGVyIHdpdGggdGhlIHRleHQuCi0gICAgSW50UmVjdCBidXR0b25S ZWN0KG9iamVjdC0+b2Zmc2V0RnJvbUFuY2VzdG9yQ29udGFpbmVyKGlucHV0UmVuZGVyQm94KS53 aWR0aCgpLAotICAgICAgICAgICAgICAgICAgICAgICBpbnB1dENvbnRlbnRCb3gueSgpICsgKGlu cHV0Q29udGVudEJveC5oZWlnaHQoKSAtIGJ1dHRvblNpemUgKyAxKSAvIDIsCi0gICAgICAgICAg ICAgICAgICAgICAgIGJ1dHRvblNpemUsIGJ1dHRvblNpemUpOworICAgIExheW91dFJlY3QgYnV0 dG9uUmVjdChvYmplY3QtPm9mZnNldEZyb21BbmNlc3RvckNvbnRhaW5lcihpbnB1dFJlbmRlckJv eCkud2lkdGgoKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgaW5wdXRDb250ZW50Qm94Lnko KSArIChpbnB1dENvbnRlbnRCb3guaGVpZ2h0KCkgLSBidXR0b25TaXplICsgMSkgLyAyLAorICAg ICAgICAgICAgICAgICAgICAgICAgICBidXR0b25TaXplLCBidXR0b25TaXplKTsKIAogICAgIC8v IENvbXB1dGUgYW4gb2Zmc2V0IGJldHdlZW4gdGhlIHBhcnQgcmVuZGVyZXIgYW5kIHRoZSBpbnB1 dCByZW5kZXJlci4KLSAgICBJbnRTaXplIG9mZnNldEZyb21JbnB1dFJlbmRlcmVyID0gLShvYmpl Y3QtPm9mZnNldEZyb21BbmNlc3RvckNvbnRhaW5lcihpbnB1dFJlbmRlckJveCkpOworICAgIExh eW91dFNpemUgb2Zmc2V0RnJvbUlucHV0UmVuZGVyZXIgPSAtKG9iamVjdC0+b2Zmc2V0RnJvbUFu Y2VzdG9yQ29udGFpbmVyKGlucHV0UmVuZGVyQm94KSk7CiAgICAgLy8gTW92ZSB0aGUgcmVjdCBp bnRvIHBhcnRSZW5kZXJlcidzIGNvb3Jkcy4KICAgICBidXR0b25SZWN0Lm1vdmUob2Zmc2V0RnJv bUlucHV0UmVuZGVyZXIpOwogICAgIC8vIEFjY291bnQgZm9yIHRoZSBsb2NhbCBkcmF3aW5nIG9m ZnNldC4KQEAgLTk0LDcgKzk0LDcgQEAgYm9vbCBSZW5kZXJJbnB1dFNwZWVjaDo6cGFpbnRJbnB1 dEZpZWxkUwogICAgICAgICBpbWFnZSA9IGltYWdlU3RhdGVSZWNvcmRpbmcuZ2V0KCk7CiAgICAg ZWxzZSBpZiAoc3BlZWNoQnV0dG9uLT5zdGF0ZSgpID09IElucHV0RmllbGRTcGVlY2hCdXR0b25F bGVtZW50OjpSZWNvZ25pemluZykKICAgICAgICAgaW1hZ2UgPSBpbWFnZVN0YXRlV2FpdGluZy5n ZXQoKTsKLSAgICBwYWludEluZm8uY29udGV4dC0+ZHJhd0ltYWdlKGltYWdlLCBvYmplY3QtPnN0 eWxlKCktPmNvbG9yU3BhY2UoKSwgYnV0dG9uUmVjdCk7CisgICAgcGFpbnRJbmZvLmNvbnRleHQt PmRyYXdJbWFnZShpbWFnZSwgb2JqZWN0LT5zdHlsZSgpLT5jb2xvclNwYWNlKCksIHBpeGVsU25h cHBlZEludFJlY3QoYnV0dG9uUmVjdCkpOwogCiAgICAgcmV0dXJuIGZhbHNlOwogfQpJbmRleDog U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpbmVCb3hMaXN0LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGluZUJveExpc3QuY3BwCShyZXZp c2lvbiAxMTMwNDQpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGluZUJveExp c3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNDYsMTYgKzE0NiwxNiBAQCB2b2lkIFJlbmRlckxp bmVCb3hMaXN0OjpkaXJ0eUxpbmVCb3hlcygpCiAgICAgICAgIGN1cnItPmRpcnR5TGluZUJveGVz KCk7CiB9CiAKLWJvb2wgUmVuZGVyTGluZUJveExpc3Q6OnJhbmdlSW50ZXJzZWN0c1JlY3QoUmVu ZGVyQm94TW9kZWxPYmplY3QqIHJlbmRlcmVyLCBpbnQgbG9naWNhbFRvcCwgaW50IGxvZ2ljYWxC b3R0b20sIGNvbnN0IEludFJlY3QmIHJlY3QsIGNvbnN0IEludFBvaW50JiBvZmZzZXQpIGNvbnN0 Citib29sIFJlbmRlckxpbmVCb3hMaXN0OjpyYW5nZUludGVyc2VjdHNSZWN0KFJlbmRlckJveE1v ZGVsT2JqZWN0KiByZW5kZXJlciwgTGF5b3V0VW5pdCBsb2dpY2FsVG9wLCBMYXlvdXRVbml0IGxv Z2ljYWxCb3R0b20sIGNvbnN0IExheW91dFJlY3QmIHJlY3QsIGNvbnN0IExheW91dFBvaW50JiBv ZmZzZXQpIGNvbnN0CiB7CiAgICAgUmVuZGVyQm94KiBibG9jazsKICAgICBpZiAocmVuZGVyZXIt PmlzQm94KCkpCiAgICAgICAgIGJsb2NrID0gdG9SZW5kZXJCb3gocmVuZGVyZXIpOwogICAgIGVs c2UKICAgICAgICAgYmxvY2sgPSByZW5kZXJlci0+Y29udGFpbmluZ0Jsb2NrKCk7Ci0gICAgaW50 IHBoeXNpY2FsU3RhcnQgPSBibG9jay0+ZmxpcEZvcldyaXRpbmdNb2RlKGxvZ2ljYWxUb3ApOwot ICAgIGludCBwaHlzaWNhbEVuZCA9IGJsb2NrLT5mbGlwRm9yV3JpdGluZ01vZGUobG9naWNhbEJv dHRvbSk7Ci0gICAgaW50IHBoeXNpY2FsRXh0ZW50ID0gYWJzKHBoeXNpY2FsRW5kIC0gcGh5c2lj YWxTdGFydCk7CisgICAgTGF5b3V0VW5pdCBwaHlzaWNhbFN0YXJ0ID0gYmxvY2stPmZsaXBGb3JX cml0aW5nTW9kZShsb2dpY2FsVG9wKTsKKyAgICBMYXlvdXRVbml0IHBoeXNpY2FsRW5kID0gYmxv Y2stPmZsaXBGb3JXcml0aW5nTW9kZShsb2dpY2FsQm90dG9tKTsKKyAgICBMYXlvdXRVbml0IHBo eXNpY2FsRXh0ZW50ID0gYWJzKHBoeXNpY2FsRW5kIC0gcGh5c2ljYWxTdGFydCk7CiAgICAgcGh5 c2ljYWxTdGFydCA9IG1pbihwaHlzaWNhbFN0YXJ0LCBwaHlzaWNhbEVuZCk7CiAgICAgCiAgICAg aWYgKHJlbmRlcmVyLT5zdHlsZSgpLT5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpKSB7CkBAIC0x OTEsMTEgKzE5MSwxMSBAQCBib29sIFJlbmRlckxpbmVCb3hMaXN0OjphbnlMaW5lSW50ZXJzZWN0 CiAgICAgcmV0dXJuIHJhbmdlSW50ZXJzZWN0c1JlY3QocmVuZGVyZXIsIGxvZ2ljYWxUb3AsIGxv Z2ljYWxCb3R0b20sIHJlY3QsIG9mZnNldCk7CiB9CiAKLWJvb2wgUmVuZGVyTGluZUJveExpc3Q6 OmxpbmVJbnRlcnNlY3RzRGlydHlSZWN0KFJlbmRlckJveE1vZGVsT2JqZWN0KiByZW5kZXJlciwg SW5saW5lRmxvd0JveCogYm94LCBjb25zdCBQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgSW50 UG9pbnQmIG9mZnNldCkgY29uc3QKK2Jvb2wgUmVuZGVyTGluZUJveExpc3Q6OmxpbmVJbnRlcnNl Y3RzRGlydHlSZWN0KFJlbmRlckJveE1vZGVsT2JqZWN0KiByZW5kZXJlciwgSW5saW5lRmxvd0Jv eCogYm94LCBjb25zdCBQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgTGF5b3V0UG9pbnQmIG9m ZnNldCkgY29uc3QKIHsKICAgICBSb290SW5saW5lQm94KiByb290ID0gYm94LT5yb290KCk7Ci0g ICAgaW50IGxvZ2ljYWxUb3AgPSBtaW4oYm94LT5sb2dpY2FsVG9wVmlzdWFsT3ZlcmZsb3cocm9v dC0+bGluZVRvcCgpKSwgcm9vdC0+c2VsZWN0aW9uVG9wKCkpIC0gcmVuZGVyZXItPm1heGltYWxP dXRsaW5lU2l6ZShwYWludEluZm8ucGhhc2UpOwotICAgIGludCBsb2dpY2FsQm90dG9tID0gYm94 LT5sb2dpY2FsQm90dG9tVmlzdWFsT3ZlcmZsb3cocm9vdC0+bGluZUJvdHRvbSgpKSArIHJlbmRl cmVyLT5tYXhpbWFsT3V0bGluZVNpemUocGFpbnRJbmZvLnBoYXNlKTsKKyAgICBMYXlvdXRVbml0 IGxvZ2ljYWxUb3AgPSBtaW48TGF5b3V0VW5pdD4oYm94LT5sb2dpY2FsVG9wVmlzdWFsT3ZlcmZs b3cocm9vdC0+bGluZVRvcCgpKSwgcm9vdC0+c2VsZWN0aW9uVG9wKCkpIC0gcmVuZGVyZXItPm1h eGltYWxPdXRsaW5lU2l6ZShwYWludEluZm8ucGhhc2UpOworICAgIExheW91dFVuaXQgbG9naWNh bEJvdHRvbSA9IGJveC0+bG9naWNhbEJvdHRvbVZpc3VhbE92ZXJmbG93KHJvb3QtPmxpbmVCb3R0 b20oKSkgKyByZW5kZXJlci0+bWF4aW1hbE91dGxpbmVTaXplKHBhaW50SW5mby5waGFzZSk7CiAg ICAgCiAgICAgcmV0dXJuIHJhbmdlSW50ZXJzZWN0c1JlY3QocmVuZGVyZXIsIGxvZ2ljYWxUb3As IGxvZ2ljYWxCb3R0b20sIHBhaW50SW5mby5yZWN0LCBvZmZzZXQpOwogfQpAQCAtMjQ1LDcgKzI0 NSw3IEBAIHZvaWQgUmVuZGVyTGluZUJveExpc3Q6OnBhaW50KFJlbmRlckJveE0KICAgICAgICAg ICAgIGlmIChib3R0b21Gb3JQYWdpbmF0aW9uQ2hlY2sgLSB0b3BGb3JQYWdpbmF0aW9uQ2hlY2sg PD0gdi0+cHJpbnRSZWN0KCkuaGVpZ2h0KCkpIHsKICAgICAgICAgICAgICAgICBpZiAocGFpbnRP ZmZzZXQueSgpICsgYm90dG9tRm9yUGFnaW5hdGlvbkNoZWNrID4gdi0+cHJpbnRSZWN0KCkubWF4 WSgpKSB7CiAgICAgICAgICAgICAgICAgICAgIGlmIChSb290SW5saW5lQm94KiBuZXh0Um9vdEJv eCA9IGN1cnItPnJvb3QoKS0+bmV4dFJvb3RCb3goKSkKLSAgICAgICAgICAgICAgICAgICAgICAg IGJvdHRvbUZvclBhZ2luYXRpb25DaGVjayA9IG1pbihib3R0b21Gb3JQYWdpbmF0aW9uQ2hlY2ss IG1pbihuZXh0Um9vdEJveC0+bG9naWNhbFRvcFZpc3VhbE92ZXJmbG93KCksIG5leHRSb290Qm94 LT5saW5lVG9wKCkpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGJvdHRvbUZvclBhZ2luYXRp b25DaGVjayA9IG1pbihib3R0b21Gb3JQYWdpbmF0aW9uQ2hlY2ssIG1pbjxMYXlvdXRVbml0Pihu ZXh0Um9vdEJveC0+bG9naWNhbFRvcFZpc3VhbE92ZXJmbG93KCksIG5leHRSb290Qm94LT5saW5l VG9wKCkpKTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgaWYgKHBhaW50T2Zm c2V0LnkoKSArIGJvdHRvbUZvclBhZ2luYXRpb25DaGVjayA+IHYtPnByaW50UmVjdCgpLm1heFko KSkgewogICAgICAgICAgICAgICAgICAgICBpZiAocGFpbnRPZmZzZXQueSgpICsgdG9wRm9yUGFn aW5hdGlvbkNoZWNrIDwgdi0+dHJ1bmNhdGVkQXQoKSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJNYXJxdWVlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTWFycXVlZS5jcHAJKHJldmlzaW9uIDExMzA0NCkKKysrIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNYXJxdWVlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTE1 LDggKzExNSw4IEBAIGludCBSZW5kZXJNYXJxdWVlOjpjb21wdXRlUG9zaXRpb24oRU1hcnEKICAg ICBSZW5kZXJTdHlsZSogcyA9IGJveC0+c3R5bGUoKTsKICAgICBpZiAoaXNIb3Jpem9udGFsKCkp IHsKICAgICAgICAgYm9vbCBsdHIgPSBzLT5pc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKCk7Ci0gICAg ICAgIGludCBjbGllbnRXaWR0aCA9IGJveC0+Y2xpZW50V2lkdGgoKTsKLSAgICAgICAgaW50IGNv bnRlbnRXaWR0aCA9IGx0ciA/IGJveC0+bWF4UHJlZmVycmVkTG9naWNhbFdpZHRoKCkgOiBib3gt Pm1pblByZWZlcnJlZExvZ2ljYWxXaWR0aCgpOworICAgICAgICBMYXlvdXRVbml0IGNsaWVudFdp ZHRoID0gYm94LT5jbGllbnRXaWR0aCgpOworICAgICAgICBMYXlvdXRVbml0IGNvbnRlbnRXaWR0 aCA9IGx0ciA/IGJveC0+bWF4UHJlZmVycmVkTG9naWNhbFdpZHRoKCkgOiBib3gtPm1pblByZWZl cnJlZExvZ2ljYWxXaWR0aCgpOwogICAgICAgICBpZiAobHRyKQogICAgICAgICAgICAgY29udGVu dFdpZHRoICs9IChib3gtPnBhZGRpbmdSaWdodCgpIC0gYm94LT5ib3JkZXJMZWZ0KCkpOwogICAg ICAgICBlbHNlIHsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlLmNw cAkocmV2aXNpb24gMTEzMDQ0KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRh YmxlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjgyLDE3ICsyODIsMTcgQEAgTGF5b3V0VW5pdCBS ZW5kZXJUYWJsZTo6Y29udmVydFN0eWxlTG9naQogCiB2b2lkIFJlbmRlclRhYmxlOjpsYXlvdXRD YXB0aW9uKFJlbmRlclRhYmxlQ2FwdGlvbiogY2FwdGlvbikKIHsKLSAgICBJbnRSZWN0IGNhcHRp b25SZWN0KGNhcHRpb24tPngoKSwgY2FwdGlvbi0+eSgpLCBjYXB0aW9uLT53aWR0aCgpLCBjYXB0 aW9uLT5oZWlnaHQoKSk7CisgICAgTGF5b3V0UmVjdCBjYXB0aW9uUmVjdChjYXB0aW9uLT5mcmFt ZVJlY3QoKSk7CiAKICAgICBpZiAoY2FwdGlvbi0+bmVlZHNMYXlvdXQoKSkgewogICAgICAgICAv LyBUaGUgbWFyZ2lucyBtYXkgbm90IGJlIGF2YWlsYWJsZSBidXQgZW5zdXJlIHRoZSBjYXB0aW9u IGlzIGF0IGxlYXN0IGxvY2F0ZWQgYmVuZWF0aCBhbnkgcHJldmlvdXMgc2libGluZyBjYXB0aW9u CiAgICAgICAgIC8vIHNvIHRoYXQgaXQgZG9lcyBub3QgbWlzdGFrZW5seSB0aGluayBhbnkgZmxv YXRzIGluIHRoZSBwcmV2aW91cyBjYXB0aW9uIGludHJ1ZGUgaW50byBpdC4KLSAgICAgICAgY2Fw dGlvbi0+c2V0TG9naWNhbExvY2F0aW9uKEludFBvaW50KGNhcHRpb24tPm1hcmdpblN0YXJ0KCks IGNhcHRpb24tPm1hcmdpbkJlZm9yZSgpICsgbG9naWNhbEhlaWdodCgpKSk7CisgICAgICAgIGNh cHRpb24tPnNldExvZ2ljYWxMb2NhdGlvbihMYXlvdXRQb2ludChjYXB0aW9uLT5tYXJnaW5TdGFy dCgpLCBjYXB0aW9uLT5tYXJnaW5CZWZvcmUoKSArIGxvZ2ljYWxIZWlnaHQoKSkpOwogICAgICAg ICAvLyBJZiBSZW5kZXJUYWJsZUNhcHRpb24gZXZlciBnZXRzIGEgbGF5b3V0KCkgZnVuY3Rpb24s IHVzZSBpdCBoZXJlLgogICAgICAgICBjYXB0aW9uLT5sYXlvdXRJZk5lZWRlZCgpOwogICAgIH0K ICAgICAvLyBBcHBseSB0aGUgbWFyZ2lucyB0byB0aGUgbG9jYXRpb24gbm93IHRoYXQgdGhleSBh cmUgZGVmaW5pdGVseSBhdmFpbGFibGUgZnJvbSBsYXlvdXQKLSAgICBjYXB0aW9uLT5zZXRMb2dp Y2FsTG9jYXRpb24oSW50UG9pbnQoY2FwdGlvbi0+bWFyZ2luU3RhcnQoKSwgY2FwdGlvbi0+bWFy Z2luQmVmb3JlKCkgKyBsb2dpY2FsSGVpZ2h0KCkpKTsKKyAgICBjYXB0aW9uLT5zZXRMb2dpY2Fs TG9jYXRpb24oTGF5b3V0UG9pbnQoY2FwdGlvbi0+bWFyZ2luU3RhcnQoKSwgY2FwdGlvbi0+bWFy Z2luQmVmb3JlKCkgKyBsb2dpY2FsSGVpZ2h0KCkpKTsKIAogICAgIGlmICghc2VsZk5lZWRzTGF5 b3V0KCkgJiYgY2FwdGlvbi0+Y2hlY2tGb3JSZXBhaW50RHVyaW5nTGF5b3V0KCkpCiAgICAgICAg IGNhcHRpb24tPnJlcGFpbnREdXJpbmdMYXlvdXRJZk1vdmVkKGNhcHRpb25SZWN0KTsKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcAkocmV2 aXNpb24gMTEzMDQ0KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0 eWxlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTMwLDcgKzkzMCw3IEBAIFJvdW5kZWRSZWN0IFJl bmRlclN0eWxlOjpnZXRSb3VuZGVkQm9yZGUKICAgICBSb3VuZGVkUmVjdCByb3VuZGVkUmVjdChw aXhlbFNuYXBwZWRJbnRSZWN0KGJvcmRlclJlY3QpKTsKICAgICBpZiAoaGFzQm9yZGVyUmFkaXVz KCkpIHsKICAgICAgICAgUm91bmRlZFJlY3Q6OlJhZGlpIHJhZGlpID0gY2FsY1JhZGlpRm9yKHN1 cnJvdW5kLT5ib3JkZXIsIGJvcmRlclJlY3Quc2l6ZSgpLCByZW5kZXJWaWV3KTsKLSAgICAgICAg cmFkaWkuc2NhbGUoY2FsY0NvbnN0cmFpbnRTY2FsZUZvcihib3JkZXJSZWN0LCByYWRpaSkpOwor ICAgICAgICByYWRpaS5zY2FsZShjYWxjQ29uc3RyYWludFNjYWxlRm9yKHBpeGVsU25hcHBlZElu dFJlY3QoYm9yZGVyUmVjdCksIHJhZGlpKSk7CiAgICAgICAgIHJvdW5kZWRSZWN0LmluY2x1ZGVM b2dpY2FsRWRnZXMocmFkaWksIGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCksIGluY2x1ZGVMb2dp Y2FsTGVmdEVkZ2UsIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlKTsKICAgICB9CiAgICAgcmV0dXJu IHJvdW5kZWRSZWN0OwpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1NoYWRv d0RhdGEuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9T aGFkb3dEYXRhLmNwcAkocmV2aXNpb24gMTEzMDQ0KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL3N0eWxlL1NoYWRvd0RhdGEuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02OCw3ICs2OCw3IEBA IHN0YXRpYyBpbmxpbmUgdm9pZCBjYWxjdWxhdGVTaGFkb3dFeHRlbnQKICAgICB9IHdoaWxlIChz aGFkb3cpOwogfQogCi12b2lkIFNoYWRvd0RhdGE6OmFkanVzdFJlY3RGb3JTaGFkb3coSW50UmVj dCYgcmVjdCwgaW50IGFkZGl0aW9uYWxPdXRsaW5lU2l6ZSkgY29uc3QKK3ZvaWQgU2hhZG93RGF0 YTo6YWRqdXN0UmVjdEZvclNoYWRvdyhMYXlvdXRSZWN0JiByZWN0LCBpbnQgYWRkaXRpb25hbE91 dGxpbmVTaXplKSBjb25zdAogewogICAgIExheW91dFVuaXQgc2hhZG93TGVmdCA9IDA7CiAgICAg TGF5b3V0VW5pdCBzaGFkb3dSaWdodCA9IDA7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvc3R5bGUvU2hhZG93RGF0YS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9zdHlsZS9TaGFkb3dEYXRhLmgJKHJldmlzaW9uIDExMzA0NCkKKysrIFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9zdHlsZS9TaGFkb3dEYXRhLmgJKHdvcmtpbmcgY29weSkKQEAgLTc5LDcg Kzc5LDcgQEAgcHVibGljOgogICAgIGNvbnN0IFNoYWRvd0RhdGEqIG5leHQoKSBjb25zdCB7IHJl dHVybiBtX25leHQuZ2V0KCk7IH0KICAgICB2b2lkIHNldE5leHQoUGFzc093blB0cjxTaGFkb3dE YXRhPiBzaGFkb3cpIHsgbV9uZXh0ID0gc2hhZG93OyB9CiAKLSAgICB2b2lkIGFkanVzdFJlY3RG b3JTaGFkb3coSW50UmVjdCYsIGludCBhZGRpdGlvbmFsT3V0bGluZVNpemUgPSAwKSBjb25zdDsK KyAgICB2b2lkIGFkanVzdFJlY3RGb3JTaGFkb3coTGF5b3V0UmVjdCYsIGludCBhZGRpdGlvbmFs T3V0bGluZVNpemUgPSAwKSBjb25zdDsKICAgICB2b2lkIGFkanVzdFJlY3RGb3JTaGFkb3coRmxv YXRSZWN0JiwgaW50IGFkZGl0aW9uYWxPdXRsaW5lU2l6ZSA9IDApIGNvbnN0OwogCiBwcml2YXRl Ogo=