53619 2011-02-02 12:47:56 -0800 Floats should not use physical terminology for their rects. 2011-02-02 15:46:34 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 hyatt hyatt abarth eric webkit.review.bot oldest_to_newest 344150 0 hyatt 2011-02-02 12:47:56 -0800 Floats should not use physical terminology for their rects. Replace left/Top with x and y. 344153 1 80953 hyatt 2011-02-02 12:49:12 -0800 Created attachment 80953 Patch 344156 2 hyatt 2011-02-02 12:59:32 -0800 Fixed in r77403. 344324 3 webkit.review.bot 2011-02-02 15:46:34 -0800 http://trac.webkit.org/changeset/77403 might have broken GTK Linux 32-bit Release The following tests are not passing: editing/selection/find-yensign-and-backslash.html http/tests/websocket/tests/handshake-fail-by-sub-protocol-mismatch.html 80953 2011-02-02 12:49:12 -0800 2011-02-02 12:57:10 -0800 Patch patch.txt text/plain 14691 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc3NDAxKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzcgQEAKKzIwMTEtMDItMDIgIERhdmlkIEh5 YXR0ICA8aHlhdHRAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01 MzYxOQorCisgICAgICAgIEZsb2F0cyBzaG91bGQgbm90IHVzZSBwaHlzaWNhbCB0ZXJtaW5vbG9n eSBmb3IgdGhlaXIgcmVjdHMuIFJlcGxhY2UgbGVmdC90b3Agd2l0aCB4L3kgYW5kIHJpZ2h0L2Jv dHRvbQorICAgICAgICB3aXRoIG1heFgvbWF4WS4gIFRoaXMgbWF0Y2hlcyBJbnRSZWN0LgorCisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckJsb2NrOjphZGRPdmVyZmxvd0Zyb21GbG9hdHMpOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyQmxvY2s6OmZsaXBGbG9hdEZvcldyaXRpbmdNb2RlKToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckJsb2NrOjpwYWludEZsb2F0cyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6 c2VsZWN0aW9uR2Fwcyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6YWRkT3Zlcmhh bmdpbmdGbG9hdHMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmFkZEludHJ1ZGlu Z0Zsb2F0cyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6aGl0VGVzdEZsb2F0cyk6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6YWRqdXN0Rm9yQm9yZGVyRml0KToKKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckJsb2NrOjpGbG9hdGluZ09iamVjdDo6eCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9j azo6RmxvYXRpbmdPYmplY3Q6Om1heFgpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6 OkZsb2F0aW5nT2JqZWN0Ojp5KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpGbG9h dGluZ09iamVjdDo6bWF4WSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6RmxvYXRp bmdPYmplY3Q6OnNldFgpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OkZsb2F0aW5n T2JqZWN0OjpzZXRZKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpsb2dpY2FsVG9w Rm9yRmxvYXQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmxvZ2ljYWxCb3R0b21G b3JGbG9hdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6bG9naWNhbExlZnRGb3JG bG9hdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6bG9naWNhbFJpZ2h0Rm9yRmxv YXQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OnNldExvZ2ljYWxUb3BGb3JGbG9h dCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6c2V0TG9naWNhbExlZnRGb3JGbG9h dCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6eFBvc2l0aW9uRm9yRmxvYXRJbmNs dWRpbmdNYXJnaW4pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OnlQb3NpdGlvbkZv ckZsb2F0SW5jbHVkaW5nTWFyZ2luKToKKwogMjAxMS0wMi0wMiAgQWRhbSBSb2JlbiAgPGFyb2Jl bkBhcHBsZS5jb20+CiAKICAgICAgICAgRW5jb2RlL2RlY29kZSBGb3JtRGF0YSBhbmQgRm9ybURh dGFFbGVtZW50IG9iamVjdHMgY29uc2lzdGVudGx5CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2suY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCbG9jay5jcHAJKHJldmlzaW9uIDc3Mzg0KQorKysgU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTM4NCw3ICsxMzg0 LDcgQEAgdm9pZCBSZW5kZXJCbG9jazo6YWRkT3ZlcmZsb3dGcm9tRmxvYXRzKAogICAgIERlcHJl Y2F0ZWRQdHJMaXN0SXRlcmF0b3I8RmxvYXRpbmdPYmplY3Q+IGl0KCptX2Zsb2F0aW5nT2JqZWN0 cyk7CiAgICAgZm9yICg7IChyID0gaXQuY3VycmVudCgpKTsgKytpdCkgewogICAgICAgICBpZiAo ci0+bV9pc0Rlc2NlbmRhbnQpCi0gICAgICAgICAgICBhZGRPdmVyZmxvd0Zyb21DaGlsZChyLT5t X3JlbmRlcmVyLCBJbnRTaXplKGxlZnRGb3JGbG9hdEluY2x1ZGluZ01hcmdpbihyKSwgdG9wRm9y RmxvYXRJbmNsdWRpbmdNYXJnaW4ocikpKTsKKyAgICAgICAgICAgIGFkZE92ZXJmbG93RnJvbUNo aWxkKHItPm1fcmVuZGVyZXIsIEludFNpemUoeFBvc2l0aW9uRm9yRmxvYXRJbmNsdWRpbmdNYXJn aW4ociksIHlQb3NpdGlvbkZvckZsb2F0SW5jbHVkaW5nTWFyZ2luKHIpKSk7CiAgICAgfQogICAg IHJldHVybjsKIH0KQEAgLTI0OTUsOCArMjQ5NSw4IEBAIEludFBvaW50IFJlbmRlckJsb2NrOjpm bGlwRmxvYXRGb3JXcml0aW4KICAgICAvLyBpdCdzIGdvaW5nIHRvIGdldCBhZGRlZCBiYWNrIGlu LiAgV2UgaGlkZSB0aGlzIGNvbXBsaWNhdGlvbiBoZXJlIHNvIHRoYXQgdGhlIGNhbGxpbmcgY29k ZSBsb29rcyBub3JtYWwgZm9yIHRoZSB1bmZsaXBwZWQKICAgICAvLyBjYXNlLgogICAgIGlmIChz dHlsZSgpLT5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpKQotICAgICAgICByZXR1cm4gSW50UG9p bnQocG9pbnQueCgpLCBwb2ludC55KCkgKyBoZWlnaHQoKSAtIGNoaWxkLT5yZW5kZXJlcigpLT5o ZWlnaHQoKSAtIDIgKiB0b3BGb3JGbG9hdEluY2x1ZGluZ01hcmdpbihjaGlsZCkpOwotICAgIHJl dHVybiBJbnRQb2ludChwb2ludC54KCkgKyB3aWR0aCgpIC0gY2hpbGQtPndpZHRoKCkgLSAyICog bGVmdEZvckZsb2F0SW5jbHVkaW5nTWFyZ2luKGNoaWxkKSwgcG9pbnQueSgpKTsKKyAgICAgICAg cmV0dXJuIEludFBvaW50KHBvaW50LngoKSwgcG9pbnQueSgpICsgaGVpZ2h0KCkgLSBjaGlsZC0+ cmVuZGVyZXIoKS0+aGVpZ2h0KCkgLSAyICogeVBvc2l0aW9uRm9yRmxvYXRJbmNsdWRpbmdNYXJn aW4oY2hpbGQpKTsKKyAgICByZXR1cm4gSW50UG9pbnQocG9pbnQueCgpICsgd2lkdGgoKSAtIGNo aWxkLT53aWR0aCgpIC0gMiAqIHhQb3NpdGlvbkZvckZsb2F0SW5jbHVkaW5nTWFyZ2luKGNoaWxk KSwgcG9pbnQueSgpKTsKIH0KIAogdm9pZCBSZW5kZXJCbG9jazo6cGFpbnRGbG9hdHMoUGFpbnRJ bmZvJiBwYWludEluZm8sIGludCB0eCwgaW50IHR5LCBib29sIHByZXNlcnZlUGhhc2UpCkBAIC0y NTExLDcgKzI1MTEsNyBAQCB2b2lkIFJlbmRlckJsb2NrOjpwYWludEZsb2F0cyhQYWludEluZm8m CiAgICAgICAgIGlmIChyLT5tX3Nob3VsZFBhaW50ICYmICFyLT5tX3JlbmRlcmVyLT5oYXNTZWxm UGFpbnRpbmdMYXllcigpKSB7CiAgICAgICAgICAgICBQYWludEluZm8gY3VycmVudFBhaW50SW5m byhwYWludEluZm8pOwogICAgICAgICAgICAgY3VycmVudFBhaW50SW5mby5waGFzZSA9IHByZXNl cnZlUGhhc2UgPyBwYWludEluZm8ucGhhc2UgOiBQYWludFBoYXNlQmxvY2tCYWNrZ3JvdW5kOwot ICAgICAgICAgICAgSW50UG9pbnQgY2hpbGRQb2ludCA9IGZsaXBGbG9hdEZvcldyaXRpbmdNb2Rl KHIsIEludFBvaW50KHR4ICsgbGVmdEZvckZsb2F0SW5jbHVkaW5nTWFyZ2luKHIpIC0gci0+bV9y ZW5kZXJlci0+eCgpLCB0eSArIHRvcEZvckZsb2F0SW5jbHVkaW5nTWFyZ2luKHIpIC0gci0+bV9y ZW5kZXJlci0+eSgpKSk7CisgICAgICAgICAgICBJbnRQb2ludCBjaGlsZFBvaW50ID0gZmxpcEZs b2F0Rm9yV3JpdGluZ01vZGUociwgSW50UG9pbnQodHggKyB4UG9zaXRpb25Gb3JGbG9hdEluY2x1 ZGluZ01hcmdpbihyKSAtIHItPm1fcmVuZGVyZXItPngoKSwgdHkgKyB5UG9zaXRpb25Gb3JGbG9h dEluY2x1ZGluZ01hcmdpbihyKSAtIHItPm1fcmVuZGVyZXItPnkoKSkpOwogICAgICAgICAgICAg ci0+bV9yZW5kZXJlci0+cGFpbnQoY3VycmVudFBhaW50SW5mbywgY2hpbGRQb2ludC54KCksIGNo aWxkUG9pbnQueSgpKTsKICAgICAgICAgICAgIGlmICghcHJlc2VydmVQaGFzZSkgewogICAgICAg ICAgICAgICAgIGN1cnJlbnRQYWludEluZm8ucGhhc2UgPSBQYWludFBoYXNlQ2hpbGRCbG9ja0Jh Y2tncm91bmRzOwpAQCAtMjc0NSw4ICsyNzQ1LDggQEAgR2FwUmVjdHMgUmVuZGVyQmxvY2s6OnNl bGVjdGlvbkdhcHMoUmVuZAogICAgICAgICBpZiAobV9mbG9hdGluZ09iamVjdHMpIHsKICAgICAg ICAgICAgIGZvciAoRGVwcmVjYXRlZFB0ckxpc3RJdGVyYXRvcjxGbG9hdGluZ09iamVjdD4gaXQo Km1fZmxvYXRpbmdPYmplY3RzKTsgaXQuY3VycmVudCgpOyArK2l0KSB7CiAgICAgICAgICAgICAg ICAgRmxvYXRpbmdPYmplY3QqIHIgPSBpdC5jdXJyZW50KCk7Ci0gICAgICAgICAgICAgICAgSW50 UmVjdCBmbG9hdEJveCA9IEludFJlY3Qob2Zmc2V0RnJvbVJvb3RCbG9jay53aWR0aCgpICsgbGVm dEZvckZsb2F0SW5jbHVkaW5nTWFyZ2luKHIpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIG9mZnNldEZyb21Sb290QmxvY2suaGVpZ2h0KCkgKyB0b3BGb3JGbG9h dEluY2x1ZGluZ01hcmdpbihyKSwKKyAgICAgICAgICAgICAgICBJbnRSZWN0IGZsb2F0Qm94ID0g SW50UmVjdChvZmZzZXRGcm9tUm9vdEJsb2NrLndpZHRoKCkgKyB4UG9zaXRpb25Gb3JGbG9hdElu Y2x1ZGluZ01hcmdpbihyKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBvZmZzZXRGcm9tUm9vdEJsb2NrLmhlaWdodCgpICsgeVBvc2l0aW9uRm9yRmxvYXRJbmNs dWRpbmdNYXJnaW4ociksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgci0+bV9yZW5kZXJlci0+d2lkdGgoKSwgci0+bV9yZW5kZXJlci0+aGVpZ2h0KCkpOwogICAg ICAgICAgICAgICAgIHJvb3RCbG9jay0+ZmxpcEZvcldyaXRpbmdNb2RlKGZsb2F0Qm94KTsKICAg ICAgICAgICAgICAgICBmbG9hdEJveC5tb3ZlKHJvb3RCbG9ja1BoeXNpY2FsUG9zaXRpb24ueCgp LCByb290QmxvY2tQaHlzaWNhbFBvc2l0aW9uLnkoKSk7CkBAIC0zNTk5LDcgKzM1OTksNyBAQCBp bnQgUmVuZGVyQmxvY2s6OmFkZE92ZXJoYW5naW5nRmxvYXRzKFJlCiAgICAgICAgICAgICBpZiAo IWNvbnRhaW5zRmxvYXQoci0+bV9yZW5kZXJlcikpIHsKICAgICAgICAgICAgICAgICBpbnQgbGVm dE9mZnNldCA9IHN0eWxlKCktPmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBsb2dpY2FsTGVm dE9mZnNldCA6IGxvZ2ljYWxUb3BPZmZzZXQ7CiAgICAgICAgICAgICAgICAgaW50IHRvcE9mZnNl dCA9IHN0eWxlKCktPmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBsb2dpY2FsVG9wT2Zmc2V0 IDogbG9naWNhbExlZnRPZmZzZXQ7Ci0gICAgICAgICAgICAgICAgRmxvYXRpbmdPYmplY3QqIGZs b2F0aW5nT2JqID0gbmV3IEZsb2F0aW5nT2JqZWN0KHItPnR5cGUoKSwgSW50UmVjdChyLT5sZWZ0 KCkgLSBsZWZ0T2Zmc2V0LCByLT50b3AoKSAtIHRvcE9mZnNldCwgci0+d2lkdGgoKSwgci0+aGVp Z2h0KCkpKTsKKyAgICAgICAgICAgICAgICBGbG9hdGluZ09iamVjdCogZmxvYXRpbmdPYmogPSBu ZXcgRmxvYXRpbmdPYmplY3Qoci0+dHlwZSgpLCBJbnRSZWN0KHItPngoKSAtIGxlZnRPZmZzZXQs IHItPnkoKSAtIHRvcE9mZnNldCwgci0+d2lkdGgoKSwgci0+aGVpZ2h0KCkpKTsKICAgICAgICAg ICAgICAgICBmbG9hdGluZ09iai0+bV9yZW5kZXJlciA9IHItPm1fcmVuZGVyZXI7CiAKICAgICAg ICAgICAgICAgICAvLyBUaGUgbmVhcmVzdCBlbmNsb3NpbmcgbGF5ZXIgYWx3YXlzIHBhaW50cyB0 aGUgZmxvYXQgKHNvIHRoYXQgemluZGV4IGFuZCBzdGFja2luZwpAQCAtMzYzNCw3ICszNjM0LDcg QEAgaW50IFJlbmRlckJsb2NrOjphZGRPdmVyaGFuZ2luZ0Zsb2F0cyhSZQogICAgICAgICAgICAg Ly8gU2luY2UgdGhlIGZsb2F0IGRvZXNuJ3Qgb3ZlcmhhbmcsIGl0IGRpZG4ndCBnZXQgcHV0IGlu dG8gb3VyIGxpc3QuICBXZSBuZWVkIHRvIGdvIGFoZWFkIGFuZCBhZGQgaXRzIG92ZXJmbG93IGlu IHRvIHRoZQogICAgICAgICAgICAgLy8gY2hpbGQgbm93LgogICAgICAgICAgICAgaWYgKHItPm1f aXNEZXNjZW5kYW50KQotICAgICAgICAgICAgICAgIGNoaWxkLT5hZGRPdmVyZmxvd0Zyb21DaGls ZChyLT5tX3JlbmRlcmVyLCBJbnRTaXplKGxlZnRGb3JGbG9hdEluY2x1ZGluZ01hcmdpbihyKSwg dG9wRm9yRmxvYXRJbmNsdWRpbmdNYXJnaW4ocikpKTsKKyAgICAgICAgICAgICAgICBjaGlsZC0+ YWRkT3ZlcmZsb3dGcm9tQ2hpbGQoci0+bV9yZW5kZXJlciwgSW50U2l6ZSh4UG9zaXRpb25Gb3JG bG9hdEluY2x1ZGluZ01hcmdpbihyKSwgeVBvc2l0aW9uRm9yRmxvYXRJbmNsdWRpbmdNYXJnaW4o cikpKTsKICAgICAgICAgfQogICAgIH0KICAgICByZXR1cm4gbG93ZXN0RmxvYXRMb2dpY2FsQm90 dG9tOwpAQCAtMzY2Niw3ICszNjY2LDcgQEAgdm9pZCBSZW5kZXJCbG9jazo6YWRkSW50cnVkaW5n RmxvYXRzKFJlbgogICAgICAgICAgICAgICAgIGludCBsZWZ0T2Zmc2V0ID0gc3R5bGUoKS0+aXNI b3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IGxvZ2ljYWxMZWZ0T2Zmc2V0IDogbG9naWNhbFRvcE9m ZnNldDsKICAgICAgICAgICAgICAgICBpbnQgdG9wT2Zmc2V0ID0gc3R5bGUoKS0+aXNIb3Jpem9u dGFsV3JpdGluZ01vZGUoKSA/IGxvZ2ljYWxUb3BPZmZzZXQgOiBsb2dpY2FsTGVmdE9mZnNldDsK ICAgICAgICAgICAgICAgICAKLSAgICAgICAgICAgICAgICBGbG9hdGluZ09iamVjdCogZmxvYXRp bmdPYmogPSBuZXcgRmxvYXRpbmdPYmplY3Qoci0+dHlwZSgpLCBJbnRSZWN0KHItPmxlZnQoKSAt IGxlZnRPZmZzZXQsIHItPnRvcCgpIC0gdG9wT2Zmc2V0LCByLT53aWR0aCgpLCByLT5oZWlnaHQo KSkpOworICAgICAgICAgICAgICAgIEZsb2F0aW5nT2JqZWN0KiBmbG9hdGluZ09iaiA9IG5ldyBG bG9hdGluZ09iamVjdChyLT50eXBlKCksIEludFJlY3Qoci0+eCgpIC0gbGVmdE9mZnNldCwgci0+ eSgpIC0gdG9wT2Zmc2V0LCByLT53aWR0aCgpLCByLT5oZWlnaHQoKSkpOwogCiAgICAgICAgICAg ICAgICAgLy8gQXBwbHlpbmcgdGhlIGNoaWxkJ3MgbWFyZ2luIG1ha2VzIG5vIHNlbnNlIGluIHRo ZSBjYXNlIHdoZXJlIHRoZSBjaGlsZCB3YXMgcGFzc2VkIGluLgogICAgICAgICAgICAgICAgIC8v IHNpbmNlIHRoaXMgbWFyZ2luIHdhcyBhZGRlZCBhbHJlYWR5IHRocm91Z2ggdGhlIG1vZGlmaWNh dGlvbiBvZiB0aGUgfGxvZ2ljYWxMZWZ0T2Zmc2V0fCB2YXJpYWJsZQpAQCAtMzY3NSw5ICszNjc1 LDkgQEAgdm9pZCBSZW5kZXJCbG9jazo6YWRkSW50cnVkaW5nRmxvYXRzKFJlbgogICAgICAgICAg ICAgICAgIC8vIHdpbGwgZ2V0IGFwcGxpZWQgdHdpY2UuCiAgICAgICAgICAgICAgICAgaWYgKHBy ZXYgIT0gcGFyZW50KCkpIHsKICAgICAgICAgICAgICAgICAgICAgaWYgKHN0eWxlKCktPmlzSG9y aXpvbnRhbFdyaXRpbmdNb2RlKCkpCi0gICAgICAgICAgICAgICAgICAgICAgICBmbG9hdGluZ09i ai0+c2V0TGVmdChmbG9hdGluZ09iai0+bGVmdCgpICsgcHJldi0+bWFyZ2luTGVmdCgpKTsKKyAg ICAgICAgICAgICAgICAgICAgICAgIGZsb2F0aW5nT2JqLT5zZXRYKGZsb2F0aW5nT2JqLT54KCkg KyBwcmV2LT5tYXJnaW5MZWZ0KCkpOwogICAgICAgICAgICAgICAgICAgICBlbHNlCi0gICAgICAg ICAgICAgICAgICAgICAgICBmbG9hdGluZ09iai0+c2V0VG9wKGZsb2F0aW5nT2JqLT50b3AoKSAr IHByZXYtPm1hcmdpblRvcCgpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGZsb2F0aW5nT2Jq LT5zZXRZKGZsb2F0aW5nT2JqLT55KCkgKyBwcmV2LT5tYXJnaW5Ub3AoKSk7CiAgICAgICAgICAg ICAgICAgfQogICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgZmxvYXRpbmdPYmotPm1f c2hvdWxkUGFpbnQgPSBmYWxzZTsgIC8vIFdlIGFyZSBub3QgaW4gdGhlIGRpcmVjdCBpbmhlcml0 YW5jZSBjaGFpbiBmb3IgdGhpcyBmbG9hdC4gV2Ugd2lsbCBuZXZlciBwYWludCBpdC4KQEAgLTM4 NzIsOCArMzg3Miw4IEBAIGJvb2wgUmVuZGVyQmxvY2s6OmhpdFRlc3RGbG9hdHMoY29uc3QgSGkK ICAgICBEZXByZWNhdGVkUHRyTGlzdEl0ZXJhdG9yPEZsb2F0aW5nT2JqZWN0PiBpdCgqbV9mbG9h dGluZ09iamVjdHMpOwogICAgIGZvciAoaXQudG9MYXN0KCk7IChmbG9hdGluZ09iamVjdCA9IGl0 LmN1cnJlbnQoKSk7IC0taXQpIHsKICAgICAgICAgaWYgKGZsb2F0aW5nT2JqZWN0LT5tX3Nob3Vs ZFBhaW50ICYmICFmbG9hdGluZ09iamVjdC0+bV9yZW5kZXJlci0+aGFzU2VsZlBhaW50aW5nTGF5 ZXIoKSkgewotICAgICAgICAgICAgaW50IHhPZmZzZXQgPSBsZWZ0Rm9yRmxvYXRJbmNsdWRpbmdN YXJnaW4oZmxvYXRpbmdPYmplY3QpIC0gZmxvYXRpbmdPYmplY3QtPm1fcmVuZGVyZXItPngoKTsK LSAgICAgICAgICAgIGludCB5T2Zmc2V0ID0gdG9wRm9yRmxvYXRJbmNsdWRpbmdNYXJnaW4oZmxv YXRpbmdPYmplY3QpIC0gZmxvYXRpbmdPYmplY3QtPm1fcmVuZGVyZXItPnkoKTsKKyAgICAgICAg ICAgIGludCB4T2Zmc2V0ID0geFBvc2l0aW9uRm9yRmxvYXRJbmNsdWRpbmdNYXJnaW4oZmxvYXRp bmdPYmplY3QpIC0gZmxvYXRpbmdPYmplY3QtPm1fcmVuZGVyZXItPngoKTsKKyAgICAgICAgICAg IGludCB5T2Zmc2V0ID0geVBvc2l0aW9uRm9yRmxvYXRJbmNsdWRpbmdNYXJnaW4oZmxvYXRpbmdP YmplY3QpIC0gZmxvYXRpbmdPYmplY3QtPm1fcmVuZGVyZXItPnkoKTsKICAgICAgICAgICAgIElu dFBvaW50IGNoaWxkUG9pbnQgPSBmbGlwRmxvYXRGb3JXcml0aW5nTW9kZShmbG9hdGluZ09iamVj dCwgSW50UG9pbnQodHggKyB4T2Zmc2V0LCB0eSArIHlPZmZzZXQpKTsKICAgICAgICAgICAgIGlm IChmbG9hdGluZ09iamVjdC0+bV9yZW5kZXJlci0+aGl0VGVzdChyZXF1ZXN0LCByZXN1bHQsIElu dFBvaW50KHgsIHkpLCBjaGlsZFBvaW50LngoKSwgY2hpbGRQb2ludC55KCkpKSB7CiAgICAgICAg ICAgICAgICAgdXBkYXRlSGl0VGVzdFJlc3VsdChyZXN1bHQsIEludFBvaW50KHggLSBjaGlsZFBv aW50LngoKSwgeSAtIGNoaWxkUG9pbnQueSgpKSk7CkBAIC01NDgyLDcgKzU0ODIsNyBAQCB2b2lk IFJlbmRlckJsb2NrOjphZGp1c3RGb3JCb3JkZXJGaXQoaW50CiAgICAgICAgICAgICBmb3IgKDsg KHIgPSBpdC5jdXJyZW50KCkpOyArK2l0KSB7CiAgICAgICAgICAgICAgICAgLy8gT25seSBleGFt aW5lIHRoZSBvYmplY3QgaWYgb3VyIG1fc2hvdWxkUGFpbnQgZmxhZyBpcyBzZXQuCiAgICAgICAg ICAgICAgICAgaWYgKHItPm1fc2hvdWxkUGFpbnQpIHsKLSAgICAgICAgICAgICAgICAgICAgaW50 IGZsb2F0TGVmdCA9IGxlZnRGb3JGbG9hdEluY2x1ZGluZ01hcmdpbihyKSAtIHItPm1fcmVuZGVy ZXItPngoKTsKKyAgICAgICAgICAgICAgICAgICAgaW50IGZsb2F0TGVmdCA9IHhQb3NpdGlvbkZv ckZsb2F0SW5jbHVkaW5nTWFyZ2luKHIpIC0gci0+bV9yZW5kZXJlci0+eCgpOwogICAgICAgICAg ICAgICAgICAgICBpbnQgZmxvYXRSaWdodCA9IGZsb2F0TGVmdCArIHItPm1fcmVuZGVyZXItPndp ZHRoKCk7CiAgICAgICAgICAgICAgICAgICAgIGxlZnQgPSBtaW4obGVmdCwgZmxvYXRMZWZ0KTsK ICAgICAgICAgICAgICAgICAgICAgcmlnaHQgPSBtYXgocmlnaHQsIGZsb2F0UmlnaHQpOwpJbmRl eDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgJKHJldmlzaW9uIDc3Mzg0KQor KysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgJKHdvcmtpbmcgY29weSkK QEAgLTM5NywxNSArMzk3LDE1IEBAIHByaXZhdGU6CiAgICAgICAgIGJvb2wgaXNQbGFjZWQoKSBj b25zdCB7IHJldHVybiBtX2lzUGxhY2VkOyB9CiAgICAgICAgIHZvaWQgc2V0SXNQbGFjZWQoYm9v bCBwbGFjZWQgPSB0cnVlKSB7IG1faXNQbGFjZWQgPSBwbGFjZWQ7IH0KIAotICAgICAgICBpbnQg bGVmdCgpIGNvbnN0IHsgQVNTRVJUKGlzUGxhY2VkKCkpOyByZXR1cm4gbV9mcmFtZVJlY3QueCgp OyB9Ci0gICAgICAgIGludCByaWdodCgpIGNvbnN0IHsgQVNTRVJUKGlzUGxhY2VkKCkpOyByZXR1 cm4gbV9mcmFtZVJlY3QubWF4WCgpOyB9Ci0gICAgICAgIGludCB0b3AoKSBjb25zdCB7IEFTU0VS VChpc1BsYWNlZCgpKTsgcmV0dXJuIG1fZnJhbWVSZWN0LnkoKTsgfQotICAgICAgICBpbnQgYm90 dG9tKCkgY29uc3QgeyBBU1NFUlQoaXNQbGFjZWQoKSk7IHJldHVybiBtX2ZyYW1lUmVjdC5tYXhZ KCk7IH0KKyAgICAgICAgaW50IHgoKSBjb25zdCB7IEFTU0VSVChpc1BsYWNlZCgpKTsgcmV0dXJu IG1fZnJhbWVSZWN0LngoKTsgfQorICAgICAgICBpbnQgbWF4WCgpIGNvbnN0IHsgQVNTRVJUKGlz UGxhY2VkKCkpOyByZXR1cm4gbV9mcmFtZVJlY3QubWF4WCgpOyB9CisgICAgICAgIGludCB5KCkg Y29uc3QgeyBBU1NFUlQoaXNQbGFjZWQoKSk7IHJldHVybiBtX2ZyYW1lUmVjdC55KCk7IH0KKyAg ICAgICAgaW50IG1heFkoKSBjb25zdCB7IEFTU0VSVChpc1BsYWNlZCgpKTsgcmV0dXJuIG1fZnJh bWVSZWN0Lm1heFkoKTsgfQogICAgICAgICBpbnQgd2lkdGgoKSBjb25zdCB7IHJldHVybiBtX2Zy YW1lUmVjdC53aWR0aCgpOyB9CiAgICAgICAgIGludCBoZWlnaHQoKSBjb25zdCB7IHJldHVybiBt X2ZyYW1lUmVjdC5oZWlnaHQoKTsgfQogCi0gICAgICAgIHZvaWQgc2V0TGVmdChpbnQgbGVmdCkg eyBtX2ZyYW1lUmVjdC5zZXRYKGxlZnQpOyB9Ci0gICAgICAgIHZvaWQgc2V0VG9wKGludCB0b3Ap IHsgbV9mcmFtZVJlY3Quc2V0WSh0b3ApOyB9CisgICAgICAgIHZvaWQgc2V0WChpbnQgeCkgeyBt X2ZyYW1lUmVjdC5zZXRYKHgpOyB9CisgICAgICAgIHZvaWQgc2V0WShpbnQgeSkgeyBtX2ZyYW1l UmVjdC5zZXRZKHkpOyB9CiAgICAgICAgIHZvaWQgc2V0V2lkdGgoaW50IHdpZHRoKSB7IG1fZnJh bWVSZWN0LnNldFdpZHRoKHdpZHRoKTsgfQogICAgICAgICB2b2lkIHNldEhlaWdodChpbnQgaGVp Z2h0KSB7IG1fZnJhbWVSZWN0LnNldEhlaWdodChoZWlnaHQpOyB9CiAKQEAgLTQyMywyNCArNDIz LDI0IEBAIHByaXZhdGU6CiAKICAgICBJbnRQb2ludCBmbGlwRmxvYXRGb3JXcml0aW5nTW9kZShj b25zdCBGbG9hdGluZ09iamVjdCosIGNvbnN0IEludFBvaW50JikgY29uc3Q7CiAKLSAgICBpbnQg bG9naWNhbFRvcEZvckZsb2F0KGNvbnN0IEZsb2F0aW5nT2JqZWN0KiBjaGlsZCkgY29uc3QgeyBy ZXR1cm4gc3R5bGUoKS0+aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IGNoaWxkLT50b3AoKSA6 IGNoaWxkLT5sZWZ0KCk7IH0KLSAgICBpbnQgbG9naWNhbEJvdHRvbUZvckZsb2F0KGNvbnN0IEZs b2F0aW5nT2JqZWN0KiBjaGlsZCkgY29uc3QgeyByZXR1cm4gc3R5bGUoKS0+aXNIb3Jpem9udGFs V3JpdGluZ01vZGUoKSA/IGNoaWxkLT5ib3R0b20oKSA6IGNoaWxkLT5yaWdodCgpOyB9Ci0gICAg aW50IGxvZ2ljYWxMZWZ0Rm9yRmxvYXQoY29uc3QgRmxvYXRpbmdPYmplY3QqIGNoaWxkKSBjb25z dCB7IHJldHVybiBzdHlsZSgpLT5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gY2hpbGQtPmxl ZnQoKSA6IGNoaWxkLT50b3AoKTsgfQotICAgIGludCBsb2dpY2FsUmlnaHRGb3JGbG9hdChjb25z dCBGbG9hdGluZ09iamVjdCogY2hpbGQpIGNvbnN0IHsgcmV0dXJuIHN0eWxlKCktPmlzSG9yaXpv bnRhbFdyaXRpbmdNb2RlKCkgPyBjaGlsZC0+cmlnaHQoKSA6IGNoaWxkLT5ib3R0b20oKTsgfQor ICAgIGludCBsb2dpY2FsVG9wRm9yRmxvYXQoY29uc3QgRmxvYXRpbmdPYmplY3QqIGNoaWxkKSBj b25zdCB7IHJldHVybiBzdHlsZSgpLT5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gY2hpbGQt PnkoKSA6IGNoaWxkLT54KCk7IH0KKyAgICBpbnQgbG9naWNhbEJvdHRvbUZvckZsb2F0KGNvbnN0 IEZsb2F0aW5nT2JqZWN0KiBjaGlsZCkgY29uc3QgeyByZXR1cm4gc3R5bGUoKS0+aXNIb3Jpem9u dGFsV3JpdGluZ01vZGUoKSA/IGNoaWxkLT5tYXhZKCkgOiBjaGlsZC0+bWF4WCgpOyB9CisgICAg aW50IGxvZ2ljYWxMZWZ0Rm9yRmxvYXQoY29uc3QgRmxvYXRpbmdPYmplY3QqIGNoaWxkKSBjb25z dCB7IHJldHVybiBzdHlsZSgpLT5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gY2hpbGQtPngo KSA6IGNoaWxkLT55KCk7IH0KKyAgICBpbnQgbG9naWNhbFJpZ2h0Rm9yRmxvYXQoY29uc3QgRmxv YXRpbmdPYmplY3QqIGNoaWxkKSBjb25zdCB7IHJldHVybiBzdHlsZSgpLT5pc0hvcml6b250YWxX cml0aW5nTW9kZSgpID8gY2hpbGQtPm1heFgoKSA6IGNoaWxkLT5tYXhZKCk7IH0KICAgICBpbnQg bG9naWNhbFdpZHRoRm9yRmxvYXQoY29uc3QgRmxvYXRpbmdPYmplY3QqIGNoaWxkKSBjb25zdCB7 IHJldHVybiBzdHlsZSgpLT5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gY2hpbGQtPndpZHRo KCkgOiBjaGlsZC0+aGVpZ2h0KCk7IH0KICAgICB2b2lkIHNldExvZ2ljYWxUb3BGb3JGbG9hdChG bG9hdGluZ09iamVjdCogY2hpbGQsIGludCBsb2dpY2FsVG9wKQogICAgIHsKICAgICAgICAgaWYg KHN0eWxlKCktPmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpCi0gICAgICAgICAgICBjaGlsZC0+ c2V0VG9wKGxvZ2ljYWxUb3ApOworICAgICAgICAgICAgY2hpbGQtPnNldFkobG9naWNhbFRvcCk7 CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAgIGNoaWxkLT5zZXRMZWZ0KGxvZ2ljYWxUb3ApOwor ICAgICAgICAgICAgY2hpbGQtPnNldFgobG9naWNhbFRvcCk7CiAgICAgfQogICAgIHZvaWQgc2V0 TG9naWNhbExlZnRGb3JGbG9hdChGbG9hdGluZ09iamVjdCogY2hpbGQsIGludCBsb2dpY2FsTGVm dCkKICAgICB7CiAgICAgICAgIGlmIChzdHlsZSgpLT5pc0hvcml6b250YWxXcml0aW5nTW9kZSgp KQotICAgICAgICAgICAgY2hpbGQtPnNldExlZnQobG9naWNhbExlZnQpOworICAgICAgICAgICAg Y2hpbGQtPnNldFgobG9naWNhbExlZnQpOwogICAgICAgICBlbHNlCi0gICAgICAgICAgICBjaGls ZC0+c2V0VG9wKGxvZ2ljYWxMZWZ0KTsKKyAgICAgICAgICAgIGNoaWxkLT5zZXRZKGxvZ2ljYWxM ZWZ0KTsKICAgICB9CiAgICAgdm9pZCBzZXRMb2dpY2FsSGVpZ2h0Rm9yRmxvYXQoRmxvYXRpbmdP YmplY3QqIGNoaWxkLCBpbnQgbG9naWNhbEhlaWdodCkKICAgICB7CkBAIC00NTcsMjAgKzQ1Nywy MCBAQCBwcml2YXRlOgogICAgICAgICAgICAgY2hpbGQtPnNldEhlaWdodChsb2dpY2FsV2lkdGgp OwogICAgIH0KIAotICAgIGludCBsZWZ0Rm9yRmxvYXRJbmNsdWRpbmdNYXJnaW4oY29uc3QgRmxv YXRpbmdPYmplY3QqIGNoaWxkKSBjb25zdAorICAgIGludCB4UG9zaXRpb25Gb3JGbG9hdEluY2x1 ZGluZ01hcmdpbihjb25zdCBGbG9hdGluZ09iamVjdCogY2hpbGQpIGNvbnN0CiAgICAgewogICAg ICAgICBpZiAoc3R5bGUoKS0+aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSkKLSAgICAgICAgICAg IHJldHVybiBjaGlsZC0+bGVmdCgpICsgY2hpbGQtPnJlbmRlcmVyKCktPm1hcmdpbkxlZnQoKTsK KyAgICAgICAgICAgIHJldHVybiBjaGlsZC0+eCgpICsgY2hpbGQtPnJlbmRlcmVyKCktPm1hcmdp bkxlZnQoKTsKICAgICAgICAgZWxzZQotICAgICAgICAgICAgcmV0dXJuIGNoaWxkLT5sZWZ0KCkg KyBtYXJnaW5CZWZvcmVGb3JDaGlsZChjaGlsZC0+cmVuZGVyZXIoKSk7CisgICAgICAgICAgICBy ZXR1cm4gY2hpbGQtPngoKSArIG1hcmdpbkJlZm9yZUZvckNoaWxkKGNoaWxkLT5yZW5kZXJlcigp KTsKICAgICB9CiAgICAgICAgIAotICAgIGludCB0b3BGb3JGbG9hdEluY2x1ZGluZ01hcmdpbihj b25zdCBGbG9hdGluZ09iamVjdCogY2hpbGQpIGNvbnN0CisgICAgaW50IHlQb3NpdGlvbkZvckZs b2F0SW5jbHVkaW5nTWFyZ2luKGNvbnN0IEZsb2F0aW5nT2JqZWN0KiBjaGlsZCkgY29uc3QKICAg ICB7CiAgICAgICAgIGlmIChzdHlsZSgpLT5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpKQotICAg ICAgICAgICAgcmV0dXJuIGNoaWxkLT50b3AoKSArIG1hcmdpbkJlZm9yZUZvckNoaWxkKGNoaWxk LT5yZW5kZXJlcigpKTsKKyAgICAgICAgICAgIHJldHVybiBjaGlsZC0+eSgpICsgbWFyZ2luQmVm b3JlRm9yQ2hpbGQoY2hpbGQtPnJlbmRlcmVyKCkpOwogICAgICAgICBlbHNlCi0gICAgICAgICAg ICByZXR1cm4gY2hpbGQtPnRvcCgpICsgY2hpbGQtPnJlbmRlcmVyKCktPm1hcmdpblRvcCgpOwor ICAgICAgICAgICAgcmV0dXJuIGNoaWxkLT55KCkgKyBjaGlsZC0+cmVuZGVyZXIoKS0+bWFyZ2lu VG9wKCk7CiAgICAgfQogCiAgICAgLy8gVGhlIGZvbGxvd2luZyBmdW5jdGlvbnMnIGltcGxlbWVu dGF0aW9ucyBhcmUgaW4gUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcC4K