50574 2010-12-06 10:29:06 -0800 AX: refactor AccessibilityRenderObject::doAccessibilityHitTest 2010-12-10 18:01:42 -0800 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 cfleizach cfleizach buildbot darin dglazkov webkit.review.bot oldest_to_newest 317702 0 cfleizach 2010-12-06 10:29:06 -0800 We should refactor AccessibilityRenderObject::doAccessibilityHitTest( so that there's a better way to handle the cases that need to do sub-element hit testing (like list boxes, sliders and image maps) 320350 1 76245 cfleizach 2010-12-10 13:13:34 -0800 Created attachment 76245 Patch 320412 2 webkit.review.bot 2010-12-10 14:22:07 -0800 Attachment 76245 did not build on chromium: Build output: http://queues.webkit.org/results/6923047 320440 3 buildbot 2010-12-10 15:11:17 -0800 Attachment 76245 did not build on win: Build output: http://queues.webkit.org/results/6970038 320470 4 76274 cfleizach 2010-12-10 15:53:49 -0800 Created attachment 76274 Patch 320524 5 cfleizach 2010-12-10 18:01:42 -0800 http://trac.webkit.org/changeset/73825 76245 2010-12-10 13:13:34 -0800 2010-12-10 15:53:46 -0800 Patch bug-50574-20101210131333.patch text/plain 10104 cfleizach SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3Mzc4OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzMgQEAKKzIwMTAtMTItMTAgIENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBWDogcmVmYWN0b3IgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6ZG9BY2Nlc3NpYmlsaXR5 SGl0VGVzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NTA1NzQKKworICAgICAgICBSZWZhY3RvcnMgYWNjZXNzaWJpbGl0eSBoaXQgdGVzdGluZyB0byBh bGxvdyBmb3IgYSBtb3JlIGZsZXhpYmxlIG1vZGVsIHdoZW4gaGFuZGxpbmcgZWxlbWVudHMgCisg ICAgICAgIHdpdGggZmFrZSBzdWItZWxlbWVudHMgKGxpa2Ugc2xpZGVycyBvciBsaXN0IGJveGVz KS4KKworICAgICAgICBSZW5hbWVkIGRvQWNjZXNzaWJpbGl0eUhpdFRlc3QgLT4gc3RhcnRBY2Nl c3NpYmlsaXR5SGl0VGVzdCwgd2hpY2ggaXMgY2FsbGVkIG9uIHRoZSByb290CisgICAgICAgIGFj Y2Vzc2liaWxpdHkgcmVuZGVyIG9iamVjdC4gVGhlbiBzdWJjbGFzc2VycyBhcmUgYWJsZSB0byBv dmVycmlkZSBhY2Nlc3NpYmlsaXR5SGl0VGVzdCB0byByZXR1cm4KKyAgICAgICAgdGhlaXIgb3du IHNwZWNpZmljIGVsZW1lbnRzLgorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmls aXR5TGlzdEJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5TGlzdEJveDo6 YWNjZXNzaWJpbGl0eUhpdFRlc3QpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJp bGl0eUxpc3RCb3guaDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmpl Y3QuaDoKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlPYmplY3Q6OmFjY2Vzc2liaWxp dHlIaXRUZXN0KToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJP YmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6 c3RhcnRBY2Nlc3NpYmlsaXR5SGl0VGVzdCk6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nl c3NpYmlsaXR5UmVuZGVyT2JqZWN0Lmg6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3Np YmlsaXR5U2xpZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlTbGlkZXI6 OmFjY2Vzc2liaWxpdHlIaXRUZXN0KToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2li aWxpdHlTbGlkZXIuaDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3NpYmlsaXR5 T2JqZWN0V3JhcHBlckF0ay5jcHA6CisgICAgICAgICh3ZWJraXRfYWNjZXNzaWJsZV9jb21wb25l bnRfcmVmX2FjY2Vzc2libGVfYXRfcG9pbnQpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvbWFj L0FjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyLm1tOgorICAgICAgICAoLVtBY2Nlc3NpYmlsaXR5 T2JqZWN0V3JhcHBlciBhY2Nlc3NpYmlsaXR5SGl0VGVzdDpdKToKKwogMjAxMC0xMi0xMCAgSmVz c2llIEJlcmxpbiAgPGpiZXJsaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFdpbmRvd3MgYnVpbGQg Zml4LiBVbnJldmlld2VkLgpJbmRleDogV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxp dHlMaXN0Qm94LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNz aWJpbGl0eUxpc3RCb3guY3BwCShyZXZpc2lvbiA3MzczOSkKKysrIFdlYkNvcmUvYWNjZXNzaWJp bGl0eS9BY2Nlc3NpYmlsaXR5TGlzdEJveC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE2Myw3ICsx NjMsNyBAQCBib29sIEFjY2Vzc2liaWxpdHlMaXN0Qm94OjphY2Nlc3NpYmlsaXR5CiAgICAgcmV0 dXJuIGZhbHNlOwogfQogCi1BY2Nlc3NpYmlsaXR5T2JqZWN0KiBBY2Nlc3NpYmlsaXR5TGlzdEJv eDo6ZG9BY2Nlc3NpYmlsaXR5SGl0VGVzdChjb25zdCBJbnRQb2ludCYgcG9pbnQpIGNvbnN0CitB Y2Nlc3NpYmlsaXR5T2JqZWN0KiBBY2Nlc3NpYmlsaXR5TGlzdEJveDo6YWNjZXNzaWJpbGl0eUhp dFRlc3QoY29uc3QgSW50UG9pbnQmIHBvaW50KSBjb25zdAogewogICAgIC8vIHRoZSBpbnRlcm5h bCBIVE1MU2VsZWN0RWxlbWVudCBtZXRob2RzIGZvciByZXR1cm5pbmcgYSBsaXN0Ym94IG9wdGlv biBhdCBhIHBvaW50CiAgICAgLy8gaWdub3JlIG9wdGdyb3VwIGVsZW1lbnRzLgpJbmRleDogV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlMaXN0Qm94LmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlMaXN0Qm94LmgJKHJldmlzaW9uIDcz NzM5KQorKysgV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlMaXN0Qm94LmgJKHdv cmtpbmcgY29weSkKQEAgLTQxLDcgKzQxLDYgQEAgcHVibGljOgogICAgIHN0YXRpYyBQYXNzUmVm UHRyPEFjY2Vzc2liaWxpdHlMaXN0Qm94PiBjcmVhdGUoUmVuZGVyT2JqZWN0Kik7CiAgICAgdmly dHVhbCB+QWNjZXNzaWJpbGl0eUxpc3RCb3goKTsKICAgICAKLSAgICB2aXJ0dWFsIEFjY2Vzc2li aWxpdHlPYmplY3QqIGRvQWNjZXNzaWJpbGl0eUhpdFRlc3QoY29uc3QgSW50UG9pbnQmKSBjb25z dDsKICAgICB2aXJ0dWFsIGJvb2wgaXNMaXN0Qm94KCkgY29uc3QgeyByZXR1cm4gdHJ1ZTsgfQog ICAgIAogICAgIHZpcnR1YWwgYm9vbCBjYW5TZXRGb2N1c0F0dHJpYnV0ZSgpIGNvbnN0IHsgcmV0 dXJuIHRydWU7IH0KQEAgLTU3LDYgKzU2LDcgQEAgcHVibGljOgogcHJpdmF0ZTogICAgCiAgICAg QWNjZXNzaWJpbGl0eU9iamVjdCogbGlzdEJveE9wdGlvbkFjY2Vzc2liaWxpdHlPYmplY3QoSFRN TEVsZW1lbnQqKSBjb25zdDsKICAgICB2aXJ0dWFsIGJvb2wgYWNjZXNzaWJpbGl0eUlzSWdub3Jl ZCgpIGNvbnN0OworICAgIHZpcnR1YWwgQWNjZXNzaWJpbGl0eU9iamVjdCogYWNjZXNzaWJpbGl0 eUhpdFRlc3QoY29uc3QgSW50UG9pbnQmKSBjb25zdDsKIH07CiAgICAgCiB9IC8vIG5hbWVzcGFj ZSBXZWJDb3JlCkluZGV4OiBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVj dC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2Jq ZWN0LmgJKHJldmlzaW9uIDczNzM5KQorKysgV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2li aWxpdHlPYmplY3QuaAkod29ya2luZyBjb3B5KQpAQCAtMzY4LDcgKzM2OCw5IEBAIHB1YmxpYzoK ICAgICB2aXJ0dWFsIHZvaWQgc2V0QVJJQUdyYWJiZWQoYm9vbCkgeyB9CiAgICAgdmlydHVhbCB2 b2lkIGRldGVybWluZUFSSUFEcm9wRWZmZWN0cyhWZWN0b3I8U3RyaW5nPiYpIHsgfQogICAgIAot ICAgIHZpcnR1YWwgQWNjZXNzaWJpbGl0eU9iamVjdCogZG9BY2Nlc3NpYmlsaXR5SGl0VGVzdChj b25zdCBJbnRQb2ludCYpIGNvbnN0IHsgcmV0dXJuIDA7IH0KKyAgICAvLyBDYWxsZWQgb24gQVgg b2JqZWN0IGFmdGVyIHRoZSByZW5kZXIgdHJlZSBkZXRlcm1pbmVzIHRoaXMgaXMgdGhlIHJpZ2h0 IHJlbmRlciBvYmplY3QuCisgICAgdmlydHVhbCBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBhY2Nlc3Np YmlsaXR5SGl0VGVzdChjb25zdCBJbnRQb2ludCYpIGNvbnN0IHsgcmV0dXJuIGNvbnN0X2Nhc3Q8 QWNjZXNzaWJpbGl0eU9iamVjdCo+KHRoaXMpOyB9CisKICAgICB2aXJ0dWFsIEFjY2Vzc2liaWxp dHlPYmplY3QqIGZvY3VzZWRVSUVsZW1lbnQoKSBjb25zdCB7IHJldHVybiAwOyB9CiAKICAgICB2 aXJ0dWFsIEFjY2Vzc2liaWxpdHlPYmplY3QqIGZpcnN0Q2hpbGQoKSBjb25zdCB7IHJldHVybiAw OyB9CkluZGV4OiBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVj dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlS ZW5kZXJPYmplY3QuY3BwCShyZXZpc2lvbiA3MzczOSkKKysrIFdlYkNvcmUvYWNjZXNzaWJpbGl0 eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjczMyw3 ICsyNzMzLDcgQEAgQWNjZXNzaWJpbGl0eU9iamVjdCogQWNjZXNzaWJpbGl0eVJlbmRlcgogICAg IHJldHVybiAwOwogfQogICAgIAotQWNjZXNzaWJpbGl0eU9iamVjdCogQWNjZXNzaWJpbGl0eVJl bmRlck9iamVjdDo6ZG9BY2Nlc3NpYmlsaXR5SGl0VGVzdChjb25zdCBJbnRQb2ludCYgcG9pbnQp IGNvbnN0CitBY2Nlc3NpYmlsaXR5T2JqZWN0KiBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Ojpz dGFydEFjY2Vzc2liaWxpdHlIaXRUZXN0KGNvbnN0IEludFBvaW50JiBwb2ludCkgY29uc3QKIHsK ICAgICBpZiAoIW1fcmVuZGVyZXIgfHwgIW1fcmVuZGVyZXItPmhhc0xheWVyKCkpCiAgICAgICAg IHJldHVybiAwOwpAQCAtMjc1OSwxNyArMjc1OSwxMSBAQCBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBB Y2Nlc3NpYmlsaXR5UmVuZGVyCiAgICAgICAgIHJldHVybiAwOwogICAgIAogICAgIEFjY2Vzc2li aWxpdHlPYmplY3QqIHJlc3VsdCA9IG9iai0+ZG9jdW1lbnQoKS0+YXhPYmplY3RDYWNoZSgpLT5n ZXRPckNyZWF0ZShvYmopOworICAgIHJlc3VsdC0+dXBkYXRlQ2hpbGRyZW5JZk5lY2Vzc2FyeSgp OwogCi0gICAgaWYgKG9iai0+aXNCb3hNb2RlbE9iamVjdCgpICYmIHRvUmVuZGVyQm94TW9kZWxP YmplY3Qob2JqKS0+aXNMaXN0Qm94KCkpIHsKLSAgICAgICAgLy8gTWFrZSBzdXJlIHRoZSBjaGls ZHJlbiBhcmUgaW5pdGlhbGl6ZWQgc28gdGhhdCBoaXQgdGVzdGluZyBmaW5kcyB0aGUgcmlnaHQg ZWxlbWVudC4KLSAgICAgICAgQWNjZXNzaWJpbGl0eUxpc3RCb3gqIGxpc3RCb3ggPSBzdGF0aWNf Y2FzdDxBY2Nlc3NpYmlsaXR5TGlzdEJveCo+KHJlc3VsdCk7Ci0gICAgICAgIGxpc3RCb3gtPnVw ZGF0ZUNoaWxkcmVuSWZOZWNlc3NhcnkoKTsKLSAgICAgICAgcmV0dXJuIGxpc3RCb3gtPmRvQWNj ZXNzaWJpbGl0eUhpdFRlc3QocG9pbnQpOwotICAgIH0KKyAgICAvLyBBbGxvdyB0aGUgZWxlbWVu dCB0byBwZXJmb3JtIGFueSBoaXQtdGVzdGluZyBpdCBtaWdodCBuZWVkIHRvIGRvIHRvIHJlYWNo IG5vbi1yZW5kZXIgY2hpbGRyZW4uCisgICAgcmVzdWx0ID0gcmVzdWx0LT5hY2Nlc3NpYmlsaXR5 SGl0VGVzdChwb2ludCk7CiAgICAgCi0gICAgaWYgKHJlc3VsdC0+aXNJbnB1dFNsaWRlcigpKSAK LSAgICAgICAgcmV0dXJuIHJlc3VsdC0+ZG9BY2Nlc3NpYmlsaXR5SGl0VGVzdChwb2ludCk7Ci0K ICAgICBpZiAocmVzdWx0LT5hY2Nlc3NpYmlsaXR5SXNJZ25vcmVkKCkpIHsKICAgICAgICAgLy8g SWYgdGhpcyBlbGVtZW50IGlzIHRoZSBsYWJlbCBvZiBhIGNvbnRyb2wsIGEgaGl0IHRlc3Qgc2hv dWxkIHJldHVybiB0aGUgY29udHJvbC4KICAgICAgICAgQWNjZXNzaWJpbGl0eU9iamVjdCogY29u dHJvbE9iamVjdCA9IHJlc3VsdC0+Y29ycmVzcG9uZGluZ0NvbnRyb2xGb3JMYWJlbEVsZW1lbnQo KTsKSW5kZXg6IFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0 LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5k ZXJPYmplY3QuaAkocmV2aXNpb24gNzM3MzkpCisrKyBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNj ZXNzaWJpbGl0eVJlbmRlck9iamVjdC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMjcsNyArMTI3LDYg QEAgcHVibGljOgogICAgIHZpcnR1YWwgaW50IGxheW91dENvdW50KCkgY29uc3Q7CiAgICAgdmly dHVhbCBkb3VibGUgZXN0aW1hdGVkTG9hZGluZ1Byb2dyZXNzKCkgY29uc3Q7CiAgICAgCi0gICAg dmlydHVhbCBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBkb0FjY2Vzc2liaWxpdHlIaXRUZXN0KGNvbnN0 IEludFBvaW50JikgY29uc3Q7CiAgICAgdmlydHVhbCBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBmb2N1 c2VkVUlFbGVtZW50KCkgY29uc3Q7CiAgICAgdmlydHVhbCBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBm aXJzdENoaWxkKCkgY29uc3Q7CiAgICAgdmlydHVhbCBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBsYXN0 Q2hpbGQoKSBjb25zdDsKQEAgLTE1MCw3ICsxNDksMTAgQEAgcHVibGljOgogICAgIHZvaWQgdXBk YXRlQWNjZXNzaWJpbGl0eVJvbGUoKTsKICAgICAKICAgICB2aXJ0dWFsIEFYT2JqZWN0Q2FjaGUq IGF4T2JqZWN0Q2FjaGUoKSBjb25zdDsKLSAgICAKKworICAgIC8vIFNob3VsZCBiZSBjYWxsZWQg b24gdGhlIHJvb3QgYWNjZXNzaWJpbGl0eSBvYmplY3QgdG8ga2ljayBvZmYgYSBoaXQgdGVzdC4K KyAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBzdGFydEFjY2Vzc2liaWxpdHlIaXRUZXN0KGNvbnN0 IEludFBvaW50JikgY29uc3Q7CisKICAgICB2aXJ0dWFsIEVsZW1lbnQqIGFjdGlvbkVsZW1lbnQo KSBjb25zdDsKICAgICBFbGVtZW50KiBtb3VzZUJ1dHRvbkxpc3RlbmVyKCkgY29uc3Q7CiAgICAg RnJhbWVWaWV3KiBmcmFtZVZpZXdJZlJlbmRlclZpZXcoKSBjb25zdDsKSW5kZXg6IFdlYkNvcmUv YWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5U2xpZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVNsaWRlci5jcHAJKHJldmlzaW9uIDczNzM5 KQorKysgV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlTbGlkZXIuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC05OSw3ICs5OSw3IEBAIGNvbnN0IEF0b21pY1N0cmluZyYgQWNjZXNzaWJp bGl0eVNsaWRlcjoKICAgICByZXR1cm4gZWxlbWVudCgpLT5nZXRBdHRyaWJ1dGUoYXR0cmlidXRl KTsKIH0KICAgICAKLUFjY2Vzc2liaWxpdHlPYmplY3QqIEFjY2Vzc2liaWxpdHlTbGlkZXI6OmRv QWNjZXNzaWJpbGl0eUhpdFRlc3QoY29uc3QgSW50UG9pbnQmIHBvaW50KSBjb25zdAorQWNjZXNz aWJpbGl0eU9iamVjdCogQWNjZXNzaWJpbGl0eVNsaWRlcjo6YWNjZXNzaWJpbGl0eUhpdFRlc3Qo Y29uc3QgSW50UG9pbnQmIHBvaW50KSBjb25zdAogewogICAgIGlmIChtX2NoaWxkcmVuLnNpemUo KSkgewogICAgICAgICBBU1NFUlQobV9jaGlsZHJlbi5zaXplKCkgPT0gMSk7CkluZGV4OiBXZWJD b3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVNsaWRlci5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5U2xpZGVyLmgJKHJldmlzaW9uIDczNzM5 KQorKysgV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlTbGlkZXIuaAkod29ya2lu ZyBjb3B5KQpAQCAtNDcsNyArNDcsNyBAQCBwcm90ZWN0ZWQ6CiBwcml2YXRlOgogICAgIEhUTUxJ bnB1dEVsZW1lbnQqIGVsZW1lbnQoKSBjb25zdDsKICAgICB2aXJ0dWFsIGJvb2wgYWNjZXNzaWJp bGl0eUlzSWdub3JlZCgpIGNvbnN0OwotICAgIHZpcnR1YWwgQWNjZXNzaWJpbGl0eU9iamVjdCog ZG9BY2Nlc3NpYmlsaXR5SGl0VGVzdChjb25zdCBJbnRQb2ludCYpIGNvbnN0OworICAgIHZpcnR1 YWwgQWNjZXNzaWJpbGl0eU9iamVjdCogYWNjZXNzaWJpbGl0eUhpdFRlc3QoY29uc3QgSW50UG9p bnQmKSBjb25zdDsKIAogICAgIHZpcnR1YWwgQWNjZXNzaWJpbGl0eVJvbGUgcm9sZVZhbHVlKCkg Y29uc3QgeyByZXR1cm4gU2xpZGVyUm9sZTsgfSAgICAKICAgICB2aXJ0dWFsIGJvb2wgaXNTbGlk ZXIoKSBjb25zdCB7IHJldHVybiB0cnVlOyB9CkluZGV4OiBXZWJDb3JlL2FjY2Vzc2liaWxpdHkv Z3RrL0FjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQXRrLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL2FjY2Vzc2liaWxpdHkvZ3RrL0FjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQXRrLmNwcAko cmV2aXNpb24gNzM3MzkpCisrKyBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvZ3RrL0FjY2Vzc2liaWxp dHlPYmplY3RXcmFwcGVyQXRrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTc4OSw3ICsxNzg5LDEx IEBAIHN0YXRpYyBJbnRQb2ludCBhdGtUb0NvbnRlbnRzKEFjY2Vzc2liaWwKIHN0YXRpYyBBdGtP YmplY3QqIHdlYmtpdF9hY2Nlc3NpYmxlX2NvbXBvbmVudF9yZWZfYWNjZXNzaWJsZV9hdF9wb2lu dChBdGtDb21wb25lbnQqIGNvbXBvbmVudCwgZ2ludCB4LCBnaW50IHksIEF0a0Nvb3JkVHlwZSBj b29yZFR5cGUpCiB7CiAgICAgSW50UG9pbnQgcG9zID0gYXRrVG9Db250ZW50cyhjb3JlKGNvbXBv bmVudCksIGNvb3JkVHlwZSwgeCwgeSk7Ci0gICAgQWNjZXNzaWJpbGl0eU9iamVjdCogdGFyZ2V0 ID0gY29yZShjb21wb25lbnQpLT5kb0FjY2Vzc2liaWxpdHlIaXRUZXN0KHBvcyk7CisgICAgCisg ICAgQVNTRVJUKGNvcmUoY29tcG9uZW50KS0+aXNBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0KCkp OworICAgIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QqIGF4UmVuZGVyT2JqZWN0ID0gdG9BY2Nl c3NpYmlsaXR5UmVuZGVyT2JqZWN0KGNvcmUoY29tcG9uZW50KSk7CisKKyAgICBBY2Nlc3NpYmls aXR5T2JqZWN0KiB0YXJnZXQgPSBheFJlbmRlck9iamVjdC0+c3RhcnRBY2Nlc3NpYmlsaXR5SGl0 VGVzdChwb3MpOwogICAgIGlmICghdGFyZ2V0KQogICAgICAgICByZXR1cm4gMDsKICAgICBnX29i amVjdF9yZWYodGFyZ2V0LT53cmFwcGVyKCkpOwpJbmRleDogV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L21hYy9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlci5tbQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3Jl L2FjY2Vzc2liaWxpdHkvbWFjL0FjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyLm1tCShyZXZpc2lv biA3MzczOSkKKysrIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvQWNjZXNzaWJpbGl0eU9iamVj dFdyYXBwZXIubW0JKHdvcmtpbmcgY29weSkKQEAgLTE5NDgsNyArMTk0OCwxMCBAQCAtIChpZClh Y2Nlc3NpYmlsaXR5SGl0VGVzdDooTlNQb2ludClwb2luCiAgICAgaWYgKCFbc2VsZiB1cGRhdGVP YmplY3RCYWNraW5nU3RvcmVdKQogICAgICAgICByZXR1cm4gbmlsOwogCi0gICAgUmVmUHRyPEFj Y2Vzc2liaWxpdHlPYmplY3Q+IGF4T2JqZWN0ID0gbV9vYmplY3QtPmRvQWNjZXNzaWJpbGl0eUhp dFRlc3QoSW50UG9pbnQocG9pbnQpKTsKKyAgICBBU1NFUlQobV9vYmplY3QtPmlzQWNjZXNzaWJp bGl0eVJlbmRlck9iamVjdCgpKTsKKyAgICBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0KiBheFJl bmRlck9iamVjdCA9IHRvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdChtX29iamVjdCk7CisKKyAg ICBSZWZQdHI8QWNjZXNzaWJpbGl0eU9iamVjdD4gYXhPYmplY3QgPSBheFJlbmRlck9iamVjdC0+ c3RhcnRBY2Nlc3NpYmlsaXR5SGl0VGVzdChJbnRQb2ludChwb2ludCkpOwogICAgIGlmIChheE9i amVjdCkKICAgICAgICAgcmV0dXJuIE5TQWNjZXNzaWJpbGl0eVVuaWdub3JlZEFuY2VzdG9yKGF4 T2JqZWN0LT53cmFwcGVyKCkpOwogICAgIHJldHVybiBOU0FjY2Vzc2liaWxpdHlVbmlnbm9yZWRB bmNlc3RvcihzZWxmKTsK 76274 2010-12-10 15:53:49 -0800 2010-12-10 16:01:40 -0800 Patch bug-50574-20101210155348.patch text/plain 12881 cfleizach SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3MzgxMSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzQgQEAKKzIwMTAtMTItMTAgIENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBWDogcmVmYWN0b3IgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6ZG9BY2Nlc3NpYmlsaXR5 SGl0VGVzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NTA1NzQKKworICAgICAgICBSZWZhY3RvcnMgYWNjZXNzaWJpbGl0eSBoaXQgdGVzdGluZyB0byBh bGxvdyBmb3IgYSBtb3JlIGZsZXhpYmxlIG1vZGVsIHdoZW4gaGFuZGxpbmcgZWxlbWVudHMKKyAg ICAgICAgd2l0aCBmYWtlIHN1Yi1lbGVtZW50cyAobGlrZSBzbGlkZXJzIG9yIGxpc3QgYm94ZXMp LgorCisgICAgICAgIFJlbmFtZWQgZG9BY2Nlc3NpYmlsaXR5SGl0VGVzdCAtPiBhY2Nlc3NpYmls aXR5SGl0VGVzdCwgd2hpY2ggaXMgY2FsbGVkIG9uIHRoZSByb290CisgICAgICAgIGFjY2Vzc2li aWxpdHkgcmVuZGVyIG9iamVjdC4gVGhlbiBzdWJjbGFzc2VycyBhcmUgYWJsZSB0byBvdmVycmlk ZSAKKyAgICAgICAgZWxlbWVudEFjY2Vzc2liaWxpdHlIaXRUZXN0IHRvIHJldHVybiB0aGVpciBv d24gc3BlY2lmaWMgZWxlbWVudHMuCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2li aWxpdHlMaXN0Qm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlMaXN0Qm94 OjplbGVtZW50QWNjZXNzaWJpbGl0eUhpdFRlc3QpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkv QWNjZXNzaWJpbGl0eUxpc3RCb3guaDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2li aWxpdHlPYmplY3QuaDoKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlPYmplY3Q6OmFj Y2Vzc2liaWxpdHlIaXRUZXN0KToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlPYmpl Y3Q6OmVsZW1lbnRBY2Nlc3NpYmlsaXR5SGl0VGVzdCk6CisgICAgICAgICogYWNjZXNzaWJpbGl0 eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vz c2liaWxpdHlSZW5kZXJPYmplY3Q6OmFjY2Vzc2liaWxpdHlIaXRUZXN0KToKKyAgICAgICAgKiBh Y2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuaDoKKyAgICAgICAgKiBhY2Nl c3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlTbGlkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNj ZXNzaWJpbGl0eVNsaWRlcjo6ZWxlbWVudEFjY2Vzc2liaWxpdHlIaXRUZXN0KToKKyAgICAgICAg KiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlTbGlkZXIuaDoKKyAgICAgICAgKiBhY2Nlc3Np YmlsaXR5L2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckF0ay5jcHA6CisgICAgICAgICh3 ZWJraXRfYWNjZXNzaWJsZV9jb21wb25lbnRfcmVmX2FjY2Vzc2libGVfYXRfcG9pbnQpOgorICAg ICAgICAqIGFjY2Vzc2liaWxpdHkvbWFjL0FjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyLm1tOgor ICAgICAgICAoLVtBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlciBhY2Nlc3NpYmlsaXR5SGl0VGVz dDpdKToKKwogMjAxMC0xMi0xMCAgS2VubmV0aCBSdXNzZWxsICA8a2JyQGdvb2dsZS5jb20+CiAK ICAgICAgICAgVW5yZXZpZXdlZCwgYW5vdGhlciBidWlsZCBmaXguICNpbmNsdWRlIDx3dGYvVW51 c2VkUGFyYW0uaD4gbmVlZGVkCkluZGV4OiBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJp bGl0eUxpc3RCb3guY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nl c3NpYmlsaXR5TGlzdEJveC5jcHAJKHJldmlzaW9uIDczNzM5KQorKysgV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L0FjY2Vzc2liaWxpdHlMaXN0Qm94LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTYzLDcg KzE2Myw3IEBAIGJvb2wgQWNjZXNzaWJpbGl0eUxpc3RCb3g6OmFjY2Vzc2liaWxpdHkKICAgICBy ZXR1cm4gZmFsc2U7CiB9CiAKLUFjY2Vzc2liaWxpdHlPYmplY3QqIEFjY2Vzc2liaWxpdHlMaXN0 Qm94Ojpkb0FjY2Vzc2liaWxpdHlIaXRUZXN0KGNvbnN0IEludFBvaW50JiBwb2ludCkgY29uc3QK K0FjY2Vzc2liaWxpdHlPYmplY3QqIEFjY2Vzc2liaWxpdHlMaXN0Qm94OjplbGVtZW50QWNjZXNz aWJpbGl0eUhpdFRlc3QoY29uc3QgSW50UG9pbnQmIHBvaW50KSBjb25zdAogewogICAgIC8vIHRo ZSBpbnRlcm5hbCBIVE1MU2VsZWN0RWxlbWVudCBtZXRob2RzIGZvciByZXR1cm5pbmcgYSBsaXN0 Ym94IG9wdGlvbiBhdCBhIHBvaW50CiAgICAgLy8gaWdub3JlIG9wdGdyb3VwIGVsZW1lbnRzLgpJ bmRleDogV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlMaXN0Qm94LmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlMaXN0Qm94LmgJKHJl dmlzaW9uIDczNzM5KQorKysgV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlMaXN0 Qm94LmgJKHdvcmtpbmcgY29weSkKQEAgLTQxLDcgKzQxLDYgQEAgcHVibGljOgogICAgIHN0YXRp YyBQYXNzUmVmUHRyPEFjY2Vzc2liaWxpdHlMaXN0Qm94PiBjcmVhdGUoUmVuZGVyT2JqZWN0Kik7 CiAgICAgdmlydHVhbCB+QWNjZXNzaWJpbGl0eUxpc3RCb3goKTsKICAgICAKLSAgICB2aXJ0dWFs IEFjY2Vzc2liaWxpdHlPYmplY3QqIGRvQWNjZXNzaWJpbGl0eUhpdFRlc3QoY29uc3QgSW50UG9p bnQmKSBjb25zdDsKICAgICB2aXJ0dWFsIGJvb2wgaXNMaXN0Qm94KCkgY29uc3QgeyByZXR1cm4g dHJ1ZTsgfQogICAgIAogICAgIHZpcnR1YWwgYm9vbCBjYW5TZXRGb2N1c0F0dHJpYnV0ZSgpIGNv bnN0IHsgcmV0dXJuIHRydWU7IH0KQEAgLTU3LDYgKzU2LDcgQEAgcHVibGljOgogcHJpdmF0ZTog ICAgCiAgICAgQWNjZXNzaWJpbGl0eU9iamVjdCogbGlzdEJveE9wdGlvbkFjY2Vzc2liaWxpdHlP YmplY3QoSFRNTEVsZW1lbnQqKSBjb25zdDsKICAgICB2aXJ0dWFsIGJvb2wgYWNjZXNzaWJpbGl0 eUlzSWdub3JlZCgpIGNvbnN0OworICAgIHZpcnR1YWwgQWNjZXNzaWJpbGl0eU9iamVjdCogZWxl bWVudEFjY2Vzc2liaWxpdHlIaXRUZXN0KGNvbnN0IEludFBvaW50JikgY29uc3Q7CiB9OwogICAg IAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0Fj Y2Vzc2liaWxpdHlPYmplY3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2FjY2Vzc2liaWxpdHkv QWNjZXNzaWJpbGl0eU9iamVjdC5oCShyZXZpc2lvbiA3MzczOSkKKysrIFdlYkNvcmUvYWNjZXNz aWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmgJKHdvcmtpbmcgY29weSkKQEAgLTM2OCw3ICsz NjgsMTEgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBzZXRBUklBR3JhYmJlZChib29sKSB7 IH0KICAgICB2aXJ0dWFsIHZvaWQgZGV0ZXJtaW5lQVJJQURyb3BFZmZlY3RzKFZlY3RvcjxTdHJp bmc+JikgeyB9CiAgICAgCi0gICAgdmlydHVhbCBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBkb0FjY2Vz c2liaWxpdHlIaXRUZXN0KGNvbnN0IEludFBvaW50JikgY29uc3QgeyByZXR1cm4gMDsgfQorICAg IC8vIENhbGxlZCBvbiB0aGUgcm9vdCBBWCBvYmplY3QgdG8gcmV0dXJuIHRoZSBkZWVwZXN0IGF2 YWlsYWJsZSBlbGVtZW50LgorICAgIHZpcnR1YWwgQWNjZXNzaWJpbGl0eU9iamVjdCogYWNjZXNz aWJpbGl0eUhpdFRlc3QoY29uc3QgSW50UG9pbnQmKSBjb25zdCB7IHJldHVybiAwOyB9CisgICAg Ly8gQ2FsbGVkIG9uIHRoZSBBWCBvYmplY3QgYWZ0ZXIgdGhlIHJlbmRlciB0cmVlIGRldGVybWlu ZXMgd2hpY2ggaXMgdGhlIHJpZ2h0IEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuCisgICAgdmly dHVhbCBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBlbGVtZW50QWNjZXNzaWJpbGl0eUhpdFRlc3QoY29u c3QgSW50UG9pbnQmKSBjb25zdCB7IHJldHVybiBjb25zdF9jYXN0PEFjY2Vzc2liaWxpdHlPYmpl Y3QqPih0aGlzKTsgfQorCiAgICAgdmlydHVhbCBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBmb2N1c2Vk VUlFbGVtZW50KCkgY29uc3QgeyByZXR1cm4gMDsgfQogCiAgICAgdmlydHVhbCBBY2Nlc3NpYmls aXR5T2JqZWN0KiBmaXJzdENoaWxkKCkgY29uc3QgeyByZXR1cm4gMDsgfQpAQCAtNTc2LDcgKzU4 MCw3IEBAIHByb3RlY3RlZDoKICAgICAKICAgICB2aXJ0dWFsIHZvaWQgY2xlYXJDaGlsZHJlbigp OwogICAgIHZpcnR1YWwgYm9vbCBpc0RldGFjaGVkKCkgY29uc3QgeyByZXR1cm4gdHJ1ZTsgfQot ICAgIAorCiAjaWYgUExBVEZPUk0oR1RLKQogICAgIGJvb2wgYWxsb3dzVGV4dFJhbmdlcygpIGNv bnN0OwogICAgIHVuc2lnbmVkIGdldExlbmd0aEZvclRleHRSYW5nZSgpIGNvbnN0OwpJbmRleDog V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0 LmNwcAkocmV2aXNpb24gNzM3MzkpCisrKyBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJp bGl0eVJlbmRlck9iamVjdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI3MzMsNyArMjczMyw3IEBA IEFjY2Vzc2liaWxpdHlPYmplY3QqIEFjY2Vzc2liaWxpdHlSZW5kZXIKICAgICByZXR1cm4gMDsK IH0KICAgICAKLUFjY2Vzc2liaWxpdHlPYmplY3QqIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6 OmRvQWNjZXNzaWJpbGl0eUhpdFRlc3QoY29uc3QgSW50UG9pbnQmIHBvaW50KSBjb25zdAorQWNj ZXNzaWJpbGl0eU9iamVjdCogQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6YWNjZXNzaWJpbGl0 eUhpdFRlc3QoY29uc3QgSW50UG9pbnQmIHBvaW50KSBjb25zdAogewogICAgIGlmICghbV9yZW5k ZXJlciB8fCAhbV9yZW5kZXJlci0+aGFzTGF5ZXIoKSkKICAgICAgICAgcmV0dXJuIDA7CkBAIC0y NzU5LDE3ICsyNzU5LDExIEBAIEFjY2Vzc2liaWxpdHlPYmplY3QqIEFjY2Vzc2liaWxpdHlSZW5k ZXIKICAgICAgICAgcmV0dXJuIDA7CiAgICAgCiAgICAgQWNjZXNzaWJpbGl0eU9iamVjdCogcmVz dWx0ID0gb2JqLT5kb2N1bWVudCgpLT5heE9iamVjdENhY2hlKCktPmdldE9yQ3JlYXRlKG9iaik7 CisgICAgcmVzdWx0LT51cGRhdGVDaGlsZHJlbklmTmVjZXNzYXJ5KCk7CiAKLSAgICBpZiAob2Jq LT5pc0JveE1vZGVsT2JqZWN0KCkgJiYgdG9SZW5kZXJCb3hNb2RlbE9iamVjdChvYmopLT5pc0xp c3RCb3goKSkgewotICAgICAgICAvLyBNYWtlIHN1cmUgdGhlIGNoaWxkcmVuIGFyZSBpbml0aWFs aXplZCBzbyB0aGF0IGhpdCB0ZXN0aW5nIGZpbmRzIHRoZSByaWdodCBlbGVtZW50LgotICAgICAg ICBBY2Nlc3NpYmlsaXR5TGlzdEJveCogbGlzdEJveCA9IHN0YXRpY19jYXN0PEFjY2Vzc2liaWxp dHlMaXN0Qm94Kj4ocmVzdWx0KTsKLSAgICAgICAgbGlzdEJveC0+dXBkYXRlQ2hpbGRyZW5JZk5l Y2Vzc2FyeSgpOwotICAgICAgICByZXR1cm4gbGlzdEJveC0+ZG9BY2Nlc3NpYmlsaXR5SGl0VGVz dChwb2ludCk7Ci0gICAgfQorICAgIC8vIEFsbG93IHRoZSBlbGVtZW50IHRvIHBlcmZvcm0gYW55 IGhpdC10ZXN0aW5nIGl0IG1pZ2h0IG5lZWQgdG8gZG8gdG8gcmVhY2ggbm9uLXJlbmRlciBjaGls ZHJlbi4KKyAgICByZXN1bHQgPSByZXN1bHQtPmVsZW1lbnRBY2Nlc3NpYmlsaXR5SGl0VGVzdChw b2ludCk7CiAgICAgCi0gICAgaWYgKHJlc3VsdC0+aXNJbnB1dFNsaWRlcigpKSAKLSAgICAgICAg cmV0dXJuIHJlc3VsdC0+ZG9BY2Nlc3NpYmlsaXR5SGl0VGVzdChwb2ludCk7Ci0KICAgICBpZiAo cmVzdWx0LT5hY2Nlc3NpYmlsaXR5SXNJZ25vcmVkKCkpIHsKICAgICAgICAgLy8gSWYgdGhpcyBl bGVtZW50IGlzIHRoZSBsYWJlbCBvZiBhIGNvbnRyb2wsIGEgaGl0IHRlc3Qgc2hvdWxkIHJldHVy biB0aGUgY29udHJvbC4KICAgICAgICAgQWNjZXNzaWJpbGl0eU9iamVjdCogY29udHJvbE9iamVj dCA9IHJlc3VsdC0+Y29ycmVzcG9uZGluZ0NvbnRyb2xGb3JMYWJlbEVsZW1lbnQoKTsKSW5kZXg6 IFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Qu aAkocmV2aXNpb24gNzM3MzkpCisrKyBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0 eVJlbmRlck9iamVjdC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMjcsNyArMTI3LDYgQEAgcHVibGlj OgogICAgIHZpcnR1YWwgaW50IGxheW91dENvdW50KCkgY29uc3Q7CiAgICAgdmlydHVhbCBkb3Vi bGUgZXN0aW1hdGVkTG9hZGluZ1Byb2dyZXNzKCkgY29uc3Q7CiAgICAgCi0gICAgdmlydHVhbCBB Y2Nlc3NpYmlsaXR5T2JqZWN0KiBkb0FjY2Vzc2liaWxpdHlIaXRUZXN0KGNvbnN0IEludFBvaW50 JikgY29uc3Q7CiAgICAgdmlydHVhbCBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBmb2N1c2VkVUlFbGVt ZW50KCkgY29uc3Q7CiAgICAgdmlydHVhbCBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBmaXJzdENoaWxk KCkgY29uc3Q7CiAgICAgdmlydHVhbCBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBsYXN0Q2hpbGQoKSBj b25zdDsKQEAgLTE1MCw3ICsxNDksMTAgQEAgcHVibGljOgogICAgIHZvaWQgdXBkYXRlQWNjZXNz aWJpbGl0eVJvbGUoKTsKICAgICAKICAgICB2aXJ0dWFsIEFYT2JqZWN0Q2FjaGUqIGF4T2JqZWN0 Q2FjaGUoKSBjb25zdDsKLSAgICAKKworICAgIC8vIFNob3VsZCBiZSBjYWxsZWQgb24gdGhlIHJv b3QgYWNjZXNzaWJpbGl0eSBvYmplY3QgdG8ga2ljayBvZmYgYSBoaXQgdGVzdC4KKyAgICB2aXJ0 dWFsIEFjY2Vzc2liaWxpdHlPYmplY3QqIGFjY2Vzc2liaWxpdHlIaXRUZXN0KGNvbnN0IEludFBv aW50JikgY29uc3Q7CisKICAgICB2aXJ0dWFsIEVsZW1lbnQqIGFjdGlvbkVsZW1lbnQoKSBjb25z dDsKICAgICBFbGVtZW50KiBtb3VzZUJ1dHRvbkxpc3RlbmVyKCkgY29uc3Q7CiAgICAgRnJhbWVW aWV3KiBmcmFtZVZpZXdJZlJlbmRlclZpZXcoKSBjb25zdDsKSW5kZXg6IFdlYkNvcmUvYWNjZXNz aWJpbGl0eS9BY2Nlc3NpYmlsaXR5U2xpZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVNsaWRlci5jcHAJKHJldmlzaW9uIDczNzM5KQorKysg V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlTbGlkZXIuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC05OSw3ICs5OSw3IEBAIGNvbnN0IEF0b21pY1N0cmluZyYgQWNjZXNzaWJpbGl0eVNs aWRlcjoKICAgICByZXR1cm4gZWxlbWVudCgpLT5nZXRBdHRyaWJ1dGUoYXR0cmlidXRlKTsKIH0K ICAgICAKLUFjY2Vzc2liaWxpdHlPYmplY3QqIEFjY2Vzc2liaWxpdHlTbGlkZXI6OmRvQWNjZXNz aWJpbGl0eUhpdFRlc3QoY29uc3QgSW50UG9pbnQmIHBvaW50KSBjb25zdAorQWNjZXNzaWJpbGl0 eU9iamVjdCogQWNjZXNzaWJpbGl0eVNsaWRlcjo6ZWxlbWVudEFjY2Vzc2liaWxpdHlIaXRUZXN0 KGNvbnN0IEludFBvaW50JiBwb2ludCkgY29uc3QKIHsKICAgICBpZiAobV9jaGlsZHJlbi5zaXpl KCkpIHsKICAgICAgICAgQVNTRVJUKG1fY2hpbGRyZW4uc2l6ZSgpID09IDEpOwpJbmRleDogV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlTbGlkZXIuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVNsaWRlci5oCShyZXZpc2lvbiA3Mzcz OSkKKysrIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5U2xpZGVyLmgJKHdvcmtp bmcgY29weSkKQEAgLTQ3LDcgKzQ3LDcgQEAgcHJvdGVjdGVkOgogcHJpdmF0ZToKICAgICBIVE1M SW5wdXRFbGVtZW50KiBlbGVtZW50KCkgY29uc3Q7CiAgICAgdmlydHVhbCBib29sIGFjY2Vzc2li aWxpdHlJc0lnbm9yZWQoKSBjb25zdDsKLSAgICB2aXJ0dWFsIEFjY2Vzc2liaWxpdHlPYmplY3Qq IGRvQWNjZXNzaWJpbGl0eUhpdFRlc3QoY29uc3QgSW50UG9pbnQmKSBjb25zdDsKKyAgICB2aXJ0 dWFsIEFjY2Vzc2liaWxpdHlPYmplY3QqIGVsZW1lbnRBY2Nlc3NpYmlsaXR5SGl0VGVzdChjb25z dCBJbnRQb2ludCYpIGNvbnN0OwogCiAgICAgdmlydHVhbCBBY2Nlc3NpYmlsaXR5Um9sZSByb2xl VmFsdWUoKSBjb25zdCB7IHJldHVybiBTbGlkZXJSb2xlOyB9ICAgIAogICAgIHZpcnR1YWwgYm9v bCBpc1NsaWRlcigpIGNvbnN0IHsgcmV0dXJuIHRydWU7IH0KSW5kZXg6IFdlYkNvcmUvYWNjZXNz aWJpbGl0eS9ndGsvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJBdGsuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJB dGsuY3BwCShyZXZpc2lvbiA3MzczOSkKKysrIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9ndGsvQWNj ZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJBdGsuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNzg5LDcg KzE3ODksOCBAQCBzdGF0aWMgSW50UG9pbnQgYXRrVG9Db250ZW50cyhBY2Nlc3NpYmlsCiBzdGF0 aWMgQXRrT2JqZWN0KiB3ZWJraXRfYWNjZXNzaWJsZV9jb21wb25lbnRfcmVmX2FjY2Vzc2libGVf YXRfcG9pbnQoQXRrQ29tcG9uZW50KiBjb21wb25lbnQsIGdpbnQgeCwgZ2ludCB5LCBBdGtDb29y ZFR5cGUgY29vcmRUeXBlKQogewogICAgIEludFBvaW50IHBvcyA9IGF0a1RvQ29udGVudHMoY29y ZShjb21wb25lbnQpLCBjb29yZFR5cGUsIHgsIHkpOwotICAgIEFjY2Vzc2liaWxpdHlPYmplY3Qq IHRhcmdldCA9IGNvcmUoY29tcG9uZW50KS0+ZG9BY2Nlc3NpYmlsaXR5SGl0VGVzdChwb3MpOwor ICAgIAorICAgIEFjY2Vzc2liaWxpdHlPYmplY3QqIHRhcmdldCA9IGNvcmUoY29tcG9uZW50KS0+ YWNjZXNzaWJpbGl0eUhpdFRlc3QocG9zKTsKICAgICBpZiAoIXRhcmdldCkKICAgICAgICAgcmV0 dXJuIDA7CiAgICAgZ19vYmplY3RfcmVmKHRhcmdldC0+d3JhcHBlcigpKTsKSW5kZXg6IFdlYkNv cmUvYWNjZXNzaWJpbGl0eS9tYWMvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIubW0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9BY2Nlc3NpYmlsaXR5T2JqZWN0V3Jh cHBlci5tbQkocmV2aXNpb24gNzM3MzkpCisrKyBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL0Fj Y2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xOTQ4LDcgKzE5 NDgsNyBAQCAtIChpZClhY2Nlc3NpYmlsaXR5SGl0VGVzdDooTlNQb2ludClwb2luCiAgICAgaWYg KCFbc2VsZiB1cGRhdGVPYmplY3RCYWNraW5nU3RvcmVdKQogICAgICAgICByZXR1cm4gbmlsOwog Ci0gICAgUmVmUHRyPEFjY2Vzc2liaWxpdHlPYmplY3Q+IGF4T2JqZWN0ID0gbV9vYmplY3QtPmRv QWNjZXNzaWJpbGl0eUhpdFRlc3QoSW50UG9pbnQocG9pbnQpKTsKKyAgICBSZWZQdHI8QWNjZXNz aWJpbGl0eU9iamVjdD4gYXhPYmplY3QgPSBtX29iamVjdC0+YWNjZXNzaWJpbGl0eUhpdFRlc3Qo SW50UG9pbnQocG9pbnQpKTsKICAgICBpZiAoYXhPYmplY3QpCiAgICAgICAgIHJldHVybiBOU0Fj Y2Vzc2liaWxpdHlVbmlnbm9yZWRBbmNlc3RvcihheE9iamVjdC0+d3JhcHBlcigpKTsKICAgICBy ZXR1cm4gTlNBY2Nlc3NpYmlsaXR5VW5pZ25vcmVkQW5jZXN0b3Ioc2VsZik7CkluZGV4OiBXZWJL aXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9DaGFu Z2VMb2cJKHJldmlzaW9uIDczODExKQorKysgV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDEwLTEyLTEwICBDaHJpcyBGbGVpemFjaCAg PGNmbGVpemFjaEBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQVg6IHJlZmFjdG9yIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmRv QWNjZXNzaWJpbGl0eUhpdFRlc3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTUwNTc0CisKKyAgICAgICAgKiBzcmMvV2ViQWNjZXNzaWJpbGl0eU9iamVj dC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkFjY2Vzc2liaWxpdHlPYmplY3Q6OmhpdFRlc3Qp OgorCiAyMDEwLTEyLTEwICBLZW5uZXRoIFJ1c3NlbGwgIDxrYnJAZ29vZ2xlLmNvbT4KIAogICAg ICAgICBSZXZpZXdlZCBieSBKYW1lcyBSb2JpbnNvbi4KSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9z cmMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcAkocmV2aXNpb24gNzM3MzkpCisrKyBX ZWJLaXQvY2hyb21pdW0vc3JjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3QuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0zNzksNyArMzc5LDcgQEAgV2ViQWNjZXNzaWJpbGl0eU9iamVjdCBXZWJBY2Nlc3Np YmlsaXR5TwogCiAgICAgbV9wcml2YXRlLT51cGRhdGVCYWNraW5nU3RvcmUoKTsKICAgICBJbnRQ b2ludCBjb250ZW50c1BvaW50ID0gbV9wcml2YXRlLT5kb2N1bWVudEZyYW1lVmlldygpLT53aW5k b3dUb0NvbnRlbnRzKHBvaW50KTsKLSAgICBSZWZQdHI8QWNjZXNzaWJpbGl0eU9iamVjdD4gaGl0 ID0gbV9wcml2YXRlLT5kb0FjY2Vzc2liaWxpdHlIaXRUZXN0KGNvbnRlbnRzUG9pbnQpOworICAg IFJlZlB0cjxBY2Nlc3NpYmlsaXR5T2JqZWN0PiBoaXQgPSBtX3ByaXZhdGUtPmFjY2Vzc2liaWxp dHlIaXRUZXN0KGNvbnRlbnRzUG9pbnQpOwogCiAgICAgaWYgKGhpdC5nZXQoKSkKICAgICAgICAg cmV0dXJuIFdlYkFjY2Vzc2liaWxpdHlPYmplY3QoaGl0KTsKSW5kZXg6IFdlYktpdC93aW4vQ2hh bmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93aW4vQ2hhbmdlTG9nCShyZXZpc2lvbiA3Mzgx MSkKKysrIFdlYktpdC93aW4vQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMg QEAKKzIwMTAtMTItMTAgIENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBWDogcmVmYWN0 b3IgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6ZG9BY2Nlc3NpYmlsaXR5SGl0VGVzdAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTA1NzQKKworICAg ICAgICAqIEFjY2Vzc2libGVCYXNlLmNwcDoKKyAgICAgICAgKEFjY2Vzc2libGVCYXNlOjphY2NI aXRUZXN0KToKKwogMjAxMC0xMi0wOSAgQnJpYW4gV2VpbnN0ZWluICA8YndlaW5zdGVpbkBhcHBs ZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBSb2Jlbi4KSW5kZXg6IFdlYktpdC93 aW4vQWNjZXNzaWJsZUJhc2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93aW4vQWNjZXNzaWJs ZUJhc2UuY3BwCShyZXZpc2lvbiA3MzczOSkKKysrIFdlYktpdC93aW4vQWNjZXNzaWJsZUJhc2Uu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC01NzQsNyArNTc0LDcgQEAgSFJFU1VMVCBTVERNRVRIT0RD QUxMVFlQRSBBY2Nlc3NpYmxlQmFzZQogICAgICAgICByZXR1cm4gRV9GQUlMOwogCiAgICAgSW50 UG9pbnQgcG9pbnQgPSBtX29iamVjdC0+ZG9jdW1lbnRGcmFtZVZpZXcoKS0+c2NyZWVuVG9Db250 ZW50cyhJbnRQb2ludCh4LCB5KSk7Ci0gICAgQWNjZXNzaWJpbGl0eU9iamVjdCogY2hpbGRPYmog PSBtX29iamVjdC0+ZG9BY2Nlc3NpYmlsaXR5SGl0VGVzdChwb2ludCk7CisgICAgQWNjZXNzaWJp bGl0eU9iamVjdCogY2hpbGRPYmogPSBtX29iamVjdC0+YWNjZXNzaWJpbGl0eUhpdFRlc3QocG9p bnQpOwogCiAgICAgaWYgKCFjaGlsZE9iaikgewogICAgICAgICAvLyBJZiB3ZSBkaWQgbm90IGhp dCBhbnkgY2hpbGQgb2JqZWN0cywgdGVzdCB3aGV0aGVyIHRoZSBwb2ludCBoaXQgdXMsIGFuZAo=