134872 2014-07-13 12:13:18 -0700 [Cocoa] Include element snapshot in _WKActivatedElementInfo 2014-07-13 12:40:18 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mitz mitz commit-queue oldest_to_newest 1022128 0 mitz 2014-07-13 12:13:18 -0700 <rdar://problem/17295636> 1022129 1 234831 mitz 2014-07-13 12:22:07 -0700 Created attachment 234831 Add -[_WKActivatedElementInfo image] 1022130 2 commit-queue 2014-07-13 12:24:43 -0700 Attachment 234831 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/API/Cocoa/_WKActivatedElementInfoInternal.h:31: Code inside a namespace should not be indented. [whitespace/indent] [4] Total errors found: 1 in 10 files If any of these errors are false positives, please file a bug against check-webkit-style. 1022131 3 mitz 2014-07-13 12:40:18 -0700 Committed <http://trac.webkit.org/r171057>. 234831 2014-07-13 12:22:07 -0700 2014-07-13 12:39:31 -0700 Add -[_WKActivatedElementInfo image] bug-134872-20140713122150.patch text/plain 14046 mitz SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MTA1NikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM4IEBACisyMDE0LTA3LTEzICBEYW4gQmVy bnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CisKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE3Mjk1 NjM2PiBbQ29jb2FdIEluY2x1ZGUgZWxlbWVudCBzbmFwc2hvdCBpbiBfV0tBY3RpdmF0ZWRFbGVt ZW50SW5mbworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTM0ODcyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBTaGFyZWQvSW50ZXJhY3Rpb25JbmZvcm1hdGlvbkF0UG9zaXRpb24uY3BwOgorICAgICAgICAo V2ViS2l0OjpJbnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQb3NpdGlvbjo6ZW5jb2RlKTogRW5jb2Rl IHRoZSBpbWFnZSBpZiB0aGVyZSBpcyBvbmUuCisgICAgICAgIChXZWJLaXQ6OkludGVyYWN0aW9u SW5mb3JtYXRpb25BdFBvc2l0aW9uOjpkZWNvZGUpOiBEZWNvZGUgdGhlIGltYWdlIGlmIHRoZXJl IGlzIG9uZS4KKyAgICAgICAgKiBTaGFyZWQvSW50ZXJhY3Rpb25JbmZvcm1hdGlvbkF0UG9zaXRp b24uaDogQWRkZWQgYW4gaW1hZ2UgbWVtYmVyIHRvIHRoZSBzdHJ1Y3QuCisKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL0NvY29hL19XS0FjdGl2YXRlZEVsZW1lbnRJbmZvLmg6IEV4cG9zZWQgdGhl IGJvdW5kaW5nUmVjdCBwcm9wZXJ0eSBhbmQgYWRkZWQKKyAgICAgICAgYW4gaW1hZ2UgcHJvcGVy dHkuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tBY3RpdmF0ZWRFbGVtZW50SW5m by5tbToKKyAgICAgICAgKC1bX1dLQWN0aXZhdGVkRWxlbWVudEluZm8gX2luaXRXaXRoVHlwZTpV Ukw6bG9jYXRpb246dGl0bGU6cmVjdDppbWFnZTpdKTogQWRkZWQgYW4gaW1hZ2UKKyAgICAgICAg cGFyYW1ldGVyLCB3aGljaCBpcyBzdG9yZWQgaW4gYSBuZXcgaXZhci4KKyAgICAgICAgKC1bX1dL QWN0aXZhdGVkRWxlbWVudEluZm8gaW1hZ2VdKTogQWRkZWQgdGhpcyBnZXR0ZXIsIHdoaWNoIGNv bnZlcnRzIHRoZSBTaGFyZWFibGVCaXRtYXAKKyAgICAgICAgaW50byBhIGNhY2hlZCBDb2NvYSBp bWFnZSBhbmQgcmV0dXJucyBpdC4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL19XS0Fj dGl2YXRlZEVsZW1lbnRJbmZvSW50ZXJuYWwuaDogQWRkZWQgaW1hZ2UgcGFyYW1ldGVyIHRvIHRo ZQorICAgICAgICBpbml0aWFsaXplciwgcmVtb3ZlZCBfYm91bmRpbmdSZWN0IHByb3BlcnR5IGRl Y2xhcmF0aW9uIGZyb20gaGVyZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tBY3Rpb25T aGVldEFzc2lzdGFudC5tbToKKyAgICAgICAgKC1bV0tBY3Rpb25TaGVldEFzc2lzdGFudCBzaG93 SW1hZ2VTaGVldF0pOiBQYXNzIHRoZSBpbWFnZSBmcm9tIHRoZSBwb3NpdGlvbiBpbmZvcm1hdGlv bgorICAgICAgICBpbnRvIHRoZSBfV0tBY3RpdmF0ZWRFbGVtZW50SW5mbyBpbml0aWFsaXplci4K KyAgICAgICAgKC1bV0tBY3Rpb25TaGVldEFzc2lzdGFudCBzaG93TGlua1NoZWV0XSk6IERpdHRv LgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlOjpzbmFwc2hvdE5vZGUpOiBBZGRlZC4KKyAgICAgICAgKiBXZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL2lv cy9XZWJQYWdlSU9TLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpnZXRQb3NpdGlvbklu Zm9ybWF0aW9uKTogSWYgdGhlIGVsZW1lbnQgaXMgYSBsaW5rIG9yIGFuIGltYWdlLCBzdG9yZSBh CisgICAgICAgIHNuYXBzaG90IG9mIGl0IGluIHRoZSBpbWFnZSBtZW1iZXIgb2YgdGhlIEludGVy YWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uLgorCiAyMDE0LTA3LTEzICBEYW4gQmVybnN0ZWlu ICA8bWl0ekBhcHBsZS5jb20+CiAKICAgICAgICAgW0NvY29hXSBDbGVhbiB1cCBzZXNzaW9uIHN0 YXRlIEFQSSBhIGxpdHRsZQpJbmRleDogU291cmNlL1dlYktpdDIvU2hhcmVkL0ludGVyYWN0aW9u SW5mb3JtYXRpb25BdFBvc2l0aW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9T aGFyZWQvSW50ZXJhY3Rpb25JbmZvcm1hdGlvbkF0UG9zaXRpb24uY3BwCShyZXZpc2lvbiAxNzEw NTMpCisrKyBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvSW50ZXJhY3Rpb25JbmZvcm1hdGlvbkF0UG9z aXRpb24uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Miw2ICs0MiwxMSBAQCB2b2lkIEludGVyYWN0 aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uOjplCiAgICAgZW5jb2RlciA8PCB1cmw7CiAgICAgZW5j b2RlciA8PCB0aXRsZTsKICAgICBlbmNvZGVyIDw8IGJvdW5kczsKKworICAgIFNoYXJlYWJsZUJp dG1hcDo6SGFuZGxlIGhhbmRsZTsKKyAgICBpZiAoaW1hZ2UpCisgICAgICAgIGltYWdlLT5jcmVh dGVIYW5kbGUoaGFuZGxlLCBTaGFyZWRNZW1vcnk6OlJlYWRPbmx5KTsKKyAgICBlbmNvZGVyIDw8 IGhhbmRsZTsKIH0KIAogYm9vbCBJbnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQb3NpdGlvbjo6ZGVj b2RlKElQQzo6QXJndW1lbnREZWNvZGVyJiBkZWNvZGVyLCBJbnRlcmFjdGlvbkluZm9ybWF0aW9u QXRQb3NpdGlvbiYgcmVzdWx0KQpAQCAtNzAsNiArNzUsMTMgQEAgYm9vbCBJbnRlcmFjdGlvbklu Zm9ybWF0aW9uQXRQb3NpdGlvbjo6ZAogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LmJv dW5kcykpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAorICAgIFNoYXJlYWJsZUJpdG1hcDo6SGFu ZGxlIGhhbmRsZTsKKyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKGhhbmRsZSkpCisgICAgICAgIHJl dHVybiBmYWxzZTsKKworICAgIGlmICghaGFuZGxlLmlzTnVsbCgpKQorICAgICAgICByZXN1bHQu aW1hZ2UgPSBTaGFyZWFibGVCaXRtYXA6OmNyZWF0ZShoYW5kbGUsIFNoYXJlZE1lbW9yeTo6UmVh ZE9ubHkpOworCiAgICAgcmV0dXJuIHRydWU7CiB9CiAjZW5kaWYKSW5kZXg6IFNvdXJjZS9XZWJL aXQyL1NoYXJlZC9JbnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQb3NpdGlvbi5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9JbnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQb3NpdGlv bi5oCShyZXZpc2lvbiAxNzEwNTMpCisrKyBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvSW50ZXJhY3Rp b25JbmZvcm1hdGlvbkF0UG9zaXRpb24uaAkod29ya2luZyBjb3B5KQpAQCAtMjcsNiArMjcsNyBA QAogI2RlZmluZSBJbnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQb3NpdGlvbl9oCiAKICNpbmNsdWRl ICJBcmd1bWVudENvZGVycy5oIgorI2luY2x1ZGUgIlNoYXJlYWJsZUJpdG1hcC5oIgogI2luY2x1 ZGUgPFdlYkNvcmUvSW50UG9pbnQuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1NlbGVjdGlvblJlY3Qu aD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KQEAgLTUwLDYgKzUxLDcgQEAgc3Ry dWN0IEludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uIAogICAgIFN0cmluZyB1cmw7CiAg ICAgU3RyaW5nIHRpdGxlOwogICAgIFdlYkNvcmU6OkludFJlY3QgYm91bmRzOworICAgIFJlZlB0 cjxTaGFyZWFibGVCaXRtYXA+IGltYWdlOwogCiAgICAgdm9pZCBlbmNvZGUoSVBDOjpBcmd1bWVu dEVuY29kZXImKSBjb25zdDsKICAgICBzdGF0aWMgYm9vbCBkZWNvZGUoSVBDOjpBcmd1bWVudERl Y29kZXImLCBJbnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQb3NpdGlvbiYpOwpJbmRleDogU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tBY3RpdmF0ZWRFbGVtZW50SW5mby5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLQWN0aXZh dGVkRWxlbWVudEluZm8uaAkocmV2aXNpb24gMTcxMDUzKQorKysgU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9Db2NvYS9fV0tBY3RpdmF0ZWRFbGVtZW50SW5mby5oCSh3b3JraW5nIGNvcHkp CkBAIC0yNyw3ICsyNywxMSBAQAogCiAjaWYgV0tfQVBJX0VOQUJMRUQKIAotI2ltcG9ydCA8Rm91 bmRhdGlvbi9Gb3VuZGF0aW9uLmg+CisjaWYgVEFSR0VUX09TX0lQSE9ORQorQGNsYXNzIFVJSW1h Z2U7CisjZWxzZQorQGNsYXNzIE5TSW1hZ2U7CisjZW5kaWYKIAogdHlwZWRlZiBOU19FTlVNKE5T SW50ZWdlciwgX1dLQWN0aXZhdGVkRWxlbWVudFR5cGUpIHsKICAgICBfV0tBY3RpdmF0ZWRFbGVt ZW50VHlwZUxpbmssCkBAIC00MCw2ICs0NCwxMiBAQCBXS19DTEFTU19BVkFJTEFCTEUoMTBfMTAs IDhfMCkKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCByZWFkb25seSkgTlNVUkwgKlVSTDsKIEBwcm9w ZXJ0eSAobm9uYXRvbWljLCByZWFkb25seSkgTlNTdHJpbmcgKnRpdGxlOwogQHByb3BlcnR5IChu b25hdG9taWMsIHJlYWRvbmx5KSBfV0tBY3RpdmF0ZWRFbGVtZW50VHlwZSB0eXBlOworQHByb3Bl cnR5IChub25hdG9taWMsIHJlYWRvbmx5KSBDR1JlY3QgYm91bmRpbmdSZWN0OworI2lmIFRBUkdF VF9PU19JUEhPTkUKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCByZWFkb25seSwgY29weSkgVUlJbWFn ZSAqaW1hZ2U7CisjZWxzZQorQHByb3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5LCBjb3B5KSBO U0ltYWdlICppbWFnZTsKKyNlbmRpZgogCiBAZW5kCiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvQ29jb2EvX1dLQWN0aXZhdGVkRWxlbWVudEluZm8ubW0KPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tBY3RpdmF0ZWRFbGVtZW50 SW5mby5tbQkocmV2aXNpb24gMTcxMDUzKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9Db2NvYS9fV0tBY3RpdmF0ZWRFbGVtZW50SW5mby5tbQkod29ya2luZyBjb3B5KQpAQCAtMjgs MTYgKzI4LDMxIEBACiAKICNpZiBXS19BUElfRU5BQkxFRAogCisjaW1wb3J0ICJTaGFyZWFibGVC aXRtYXAuaCIKICNpbXBvcnQgPHd0Zi9SZXRhaW5QdHIuaD4KIAorI2lmIFBMQVRGT1JNKElPUykK KyNpbXBvcnQgPFVJS2l0L1VJSW1hZ2UuaD4KKyNlbmRpZgorCisjaWYgUExBVEZPUk0oTUFDKQor I2ltcG9ydCA8QXBwS2l0L05TSW1hZ2UuaD4KKyNlbmRpZgorCiBAaW1wbGVtZW50YXRpb24gX1dL QWN0aXZhdGVkRWxlbWVudEluZm8gIHsKICAgICBSZXRhaW5QdHI8TlNVUkw+IF9VUkw7CiAgICAg UmV0YWluUHRyPE5TU3RyaW5nPiBfdGl0bGU7CiAgICAgQ0dQb2ludCBfaW50ZXJhY3Rpb25Mb2Nh dGlvbjsKLSAgICBDR1JlY3QgX2JvdW5kaW5nUmVjdDsKKyAgICBSZWZQdHI8V2ViS2l0OjpTaGFy ZWFibGVCaXRtYXA+IF9pbWFnZTsKKyNpZiBQTEFURk9STShJT1MpCisgICAgUmV0YWluUHRyPFVJ SW1hZ2U+IF91aUltYWdlOworI2VuZGlmCisjaWYgUExBVEZPUk0oTUFDKQorICAgIFJldGFpblB0 cjxOU0ltYWdlPiBfbnNJbWFnZTsKKyNlbmRpZgogfQogCi0tIChpbnN0YW5jZXR5cGUpX2luaXRX aXRoVHlwZTooX1dLQWN0aXZhdGVkRWxlbWVudFR5cGUpdHlwZSBVUkw6KE5TVVJMICopdXJsIGxv Y2F0aW9uOihDR1BvaW50KWxvY2F0aW9uIHRpdGxlOihOU1N0cmluZyAqKXRpdGxlIHJlY3Q6KENH UmVjdClyZWN0CistIChpbnN0YW5jZXR5cGUpX2luaXRXaXRoVHlwZTooX1dLQWN0aXZhdGVkRWxl bWVudFR5cGUpdHlwZSBVUkw6KE5TVVJMICopdXJsIGxvY2F0aW9uOihDR1BvaW50KWxvY2F0aW9u IHRpdGxlOihOU1N0cmluZyAqKXRpdGxlIHJlY3Q6KENHUmVjdClyZWN0IGltYWdlOihXZWJLaXQ6 OlNoYXJlYWJsZUJpdG1hcCopaW1hZ2UKIHsKICAgICBpZiAoIShzZWxmID0gW3N1cGVyIGluaXRd KSkKICAgICAgICAgcmV0dXJuIG5pbDsKQEAgLTQ3LDYgKzYyLDcgQEAgLSAoaW5zdGFuY2V0eXBl KV9pbml0V2l0aFR5cGU6KF9XS0FjdGl2YQogICAgIF90aXRsZSA9IGFkb3B0TlMoW3RpdGxlIGNv cHldKTsKICAgICBfYm91bmRpbmdSZWN0ID0gcmVjdDsKICAgICBfdHlwZSA9IHR5cGU7CisgICAg X2ltYWdlID0gaW1hZ2U7CiAKICAgICByZXR1cm4gc2VsZjsKIH0KQEAgLTYxLDE1ICs3Nyw0MiBA QCAtIChOU1N0cmluZyAqKXRpdGxlCiAgICAgcmV0dXJuIF90aXRsZS5nZXQoKTsKIH0KIAotLSAo Q0dSZWN0KV9ib3VuZGluZ1JlY3QKKy0gKENHUG9pbnQpX2ludGVyYWN0aW9uTG9jYXRpb24KIHsK LSAgICByZXR1cm4gX2JvdW5kaW5nUmVjdDsKKyAgICByZXR1cm4gX2ludGVyYWN0aW9uTG9jYXRp b247CiB9CiAKLS0gKENHUG9pbnQpX2ludGVyYWN0aW9uTG9jYXRpb24KKyNpZiBQTEFURk9STShJ T1MpCistIChVSUltYWdlICopaW1hZ2UKIHsKLSAgICByZXR1cm4gX2ludGVyYWN0aW9uTG9jYXRp b247CisgICAgaWYgKF91aUltYWdlKQorICAgICAgICByZXR1cm4gW1tfdWlJbWFnZSBjb3B5XSBh dXRvcmVsZWFzZV07CisKKyAgICBpZiAoIV9pbWFnZSkKKyAgICAgICAgcmV0dXJuIG5pbDsKKwor ICAgIF91aUltYWdlID0gYWRvcHROUyhbW1VJSW1hZ2UgYWxsb2NdIGluaXRXaXRoQ0dJbWFnZTpf aW1hZ2UtPm1ha2VDR0ltYWdlQ29weSgpLmdldCgpXSk7CisgICAgX2ltYWdlID0gbnVsbHB0cjsK KworICAgIHJldHVybiBbW191aUltYWdlIGNvcHldIGF1dG9yZWxlYXNlXTsKK30KKyNlbmRpZgor CisjaWYgUExBVEZPUk0oTUFDKQorLSAoTlNJbWFnZSAqKWltYWdlCit7CisgICAgaWYgKF9uc0lt YWdlKQorICAgICAgICByZXR1cm4gW1tfbnNJbWFnZSBjb3B5XSBhdXRvcmVsZWFzZV07CisKKyAg ICBpZiAoIV9pbWFnZSkKKyAgICAgICAgcmV0dXJuIG5pbDsKKworICAgIF9uc0ltYWdlID0gYWRv cHROUyhbW05TSW1hZ2UgYWxsb2NdIGluaXRXaXRoQ0dJbWFnZTpfaW1hZ2UtPm1ha2VDR0ltYWdl Q29weSgpLmdldCgpIHNpemU6TlNTaXplRnJvbUNHU2l6ZShfYm91bmRpbmdSZWN0LnNpemUpXSk7 CisgICAgX2ltYWdlID0gbnVsbHB0cjsKKworICAgIHJldHVybiBbW19uc0ltYWdlIGNvcHldIGF1 dG9yZWxlYXNlXTsKIH0KKyNlbmRpZgogCiBAZW5kCiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvQ29jb2EvX1dLQWN0aXZhdGVkRWxlbWVudEluZm9JbnRlcm5hbC5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLQWN0aXZhdGVk RWxlbWVudEluZm9JbnRlcm5hbC5oCShyZXZpc2lvbiAxNzEwNTMpCisrKyBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0FjdGl2YXRlZEVsZW1lbnRJbmZvSW50ZXJuYWwuaAko d29ya2luZyBjb3B5KQpAQCAtMjcsMTIgKzI3LDE1IEBACiAKICNpZiBXS19BUElfRU5BQkxFRAog CituYW1lc3BhY2UgV2ViS2l0IHsKKyAgICBjbGFzcyBTaGFyZWFibGVCaXRtYXA7Cit9CisKIEBp bnRlcmZhY2UgX1dLQWN0aXZhdGVkRWxlbWVudEluZm8gKCkKIAotLSAoaW5zdGFuY2V0eXBlKV9p bml0V2l0aFR5cGU6KF9XS0FjdGl2YXRlZEVsZW1lbnRUeXBlKXR5cGUgVVJMOihOU1VSTCAqKXVy bCBsb2NhdGlvbjooQ0dQb2ludClsb2NhdGlvbiB0aXRsZTooTlNTdHJpbmcgKil0aXRsZSByZWN0 OihDR1JlY3QpcmVjdDsKKy0gKGluc3RhbmNldHlwZSlfaW5pdFdpdGhUeXBlOihfV0tBY3RpdmF0 ZWRFbGVtZW50VHlwZSl0eXBlIFVSTDooTlNVUkwgKil1cmwgbG9jYXRpb246KENHUG9pbnQpbG9j YXRpb24gdGl0bGU6KE5TU3RyaW5nICopdGl0bGUgcmVjdDooQ0dSZWN0KXJlY3QgaW1hZ2U6KFdl YktpdDo6U2hhcmVhYmxlQml0bWFwKilpbWFnZTsKIAogQHByb3BlcnR5IChub25hdG9taWMsIHJl YWRvbmx5KSBDR1BvaW50IF9pbnRlcmFjdGlvbkxvY2F0aW9uOwotQHByb3BlcnR5IChub25hdG9t aWMsIHJlYWRvbmx5KSBDR1JlY3QgX2JvdW5kaW5nUmVjdDsKIAogQGVuZAogCkluZGV4OiBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQubW0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0QXNzaXN0 YW50Lm1tCShyZXZpc2lvbiAxNzEwNTMpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9z L1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQubW0JKHdvcmtpbmcgY29weSkKQEAgLTIzMyw3ICsyMzMs NyBAQCAtICh2b2lkKXNob3dJbWFnZVNoZWV0CiAgICAgICAgIFtkZWZhdWx0QWN0aW9ucyBhZGRP YmplY3Q6W19XS0VsZW1lbnRBY3Rpb24gZWxlbWVudEFjdGlvbldpdGhUeXBlOl9XS0VsZW1lbnRB Y3Rpb25UeXBlQ29weV1dOwogCiAgICAgYXV0byBlbGVtZW50SW5mbyA9IGFkb3B0TlMoW1tfV0tB Y3RpdmF0ZWRFbGVtZW50SW5mbyBhbGxvY10gX2luaXRXaXRoVHlwZTpfV0tBY3RpdmF0ZWRFbGVt ZW50VHlwZUltYWdlCi0gICAgICAgIFVSTDp0YXJnZXRVUkwgbG9jYXRpb246cG9zaXRpb25JbmZv cm1hdGlvbi5wb2ludCB0aXRsZTpwb3NpdGlvbkluZm9ybWF0aW9uLnRpdGxlIHJlY3Q6cG9zaXRp b25JbmZvcm1hdGlvbi5ib3VuZHNdKTsKKyAgICAgICAgVVJMOnRhcmdldFVSTCBsb2NhdGlvbjpw b3NpdGlvbkluZm9ybWF0aW9uLnBvaW50IHRpdGxlOnBvc2l0aW9uSW5mb3JtYXRpb24udGl0bGUg cmVjdDpwb3NpdGlvbkluZm9ybWF0aW9uLmJvdW5kcyBpbWFnZTpwb3NpdGlvbkluZm9ybWF0aW9u LmltYWdlLmdldCgpXSk7CiAKICAgICBSZXRhaW5QdHI8TlNBcnJheT4gYWN0aW9ucyA9IF92aWV3 LnBhZ2UtPnVpQ2xpZW50KCkuYWN0aW9uc0ZvckVsZW1lbnQoZWxlbWVudEluZm8uZ2V0KCksIFdU Rjo6bW92ZShkZWZhdWx0QWN0aW9ucykpOwogCkBAIC0yNjksNyArMjY5LDcgQEAgLSAodm9pZClz aG93TGlua1NoZWV0CiAgICAgICAgIFtkZWZhdWx0QWN0aW9ucyBhZGRPYmplY3Q6W19XS0VsZW1l bnRBY3Rpb24gZWxlbWVudEFjdGlvbldpdGhUeXBlOl9XS0VsZW1lbnRBY3Rpb25UeXBlQ29weV1d OwogCiAgICAgUmV0YWluUHRyPF9XS0FjdGl2YXRlZEVsZW1lbnRJbmZvPiBlbGVtZW50SW5mbyA9 IGFkb3B0TlMoW1tfV0tBY3RpdmF0ZWRFbGVtZW50SW5mbyBhbGxvY10gX2luaXRXaXRoVHlwZTpf V0tBY3RpdmF0ZWRFbGVtZW50VHlwZUxpbmsKLSAgICAgICAgVVJMOnRhcmdldFVSTCBsb2NhdGlv bjpwb3NpdGlvbkluZm9ybWF0aW9uLnBvaW50IHRpdGxlOnBvc2l0aW9uSW5mb3JtYXRpb24udGl0 bGUgcmVjdDpwb3NpdGlvbkluZm9ybWF0aW9uLmJvdW5kc10pOworICAgICAgICBVUkw6dGFyZ2V0 VVJMIGxvY2F0aW9uOnBvc2l0aW9uSW5mb3JtYXRpb24ucG9pbnQgdGl0bGU6cG9zaXRpb25JbmZv cm1hdGlvbi50aXRsZSByZWN0OnBvc2l0aW9uSW5mb3JtYXRpb24uYm91bmRzIGltYWdlOnBvc2l0 aW9uSW5mb3JtYXRpb24uaW1hZ2UuZ2V0KCldKTsKIAogICAgIFJldGFpblB0cjxOU0FycmF5PiBh Y3Rpb25zID0gX3ZpZXcucGFnZS0+dWlDbGllbnQoKS5hY3Rpb25zRm9yRWxlbWVudChlbGVtZW50 SW5mby5nZXQoKSwgV1RGOjptb3ZlKGRlZmF1bHRBY3Rpb25zKSk7CiAKSW5kZXg6IFNvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHJldmlzaW9uIDE3MTA1 MykKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAkod29y a2luZyBjb3B5KQpAQCAtMTY5MSw2ICsxNjkxLDU3IEBAIFBhc3NSZWZQdHI8V2ViSW1hZ2U+IFdl YlBhZ2U6OnNuYXBzaG90QXQKICAgICByZXR1cm4gc25hcHNob3QucmVsZWFzZSgpOwogfQogCitQ YXNzUmVmUHRyPFdlYkltYWdlPiBXZWJQYWdlOjpzbmFwc2hvdE5vZGUoV2ViQ29yZTo6Tm9kZSYg bm9kZSwgU25hcHNob3RPcHRpb25zIG9wdGlvbnMsIHVuc2lnbmVkIG1heGltdW1QaXhlbENvdW50 KQoreworICAgIEZyYW1lKiBjb3JlRnJhbWUgPSBtX21haW5GcmFtZS0+Y29yZUZyYW1lKCk7Cisg ICAgaWYgKCFjb3JlRnJhbWUpCisgICAgICAgIHJldHVybiBudWxscHRyOworCisgICAgRnJhbWVW aWV3KiBmcmFtZVZpZXcgPSBjb3JlRnJhbWUtPnZpZXcoKTsKKyAgICBpZiAoIWZyYW1lVmlldykK KyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICBpZiAoIW5vZGUucmVuZGVyZXIoKSkKKyAg ICAgICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICBMYXlvdXRSZWN0IHRvcExldmVsUmVjdDsKKyAg ICBJbnRSZWN0IHNuYXBzaG90UmVjdCA9IHBpeGVsU25hcHBlZEludFJlY3Qobm9kZS5yZW5kZXJl cigpLT5wYWludGluZ1Jvb3RSZWN0KHRvcExldmVsUmVjdCkpOworCisgICAgZG91YmxlIHNjYWxl RmFjdG9yID0gMTsKKyAgICBJbnRTaXplIHNuYXBzaG90U2l6ZSA9IHNuYXBzaG90UmVjdC5zaXpl KCk7CisgICAgdW5zaWduZWQgbWF4aW11bUhlaWdodCA9IG1heGltdW1QaXhlbENvdW50IC8gc25h cHNob3RTaXplLndpZHRoKCk7CisgICAgaWYgKG1heGltdW1IZWlnaHQgPCBzdGF0aWNfY2FzdDx1 bnNpZ25lZD4oc25hcHNob3RTaXplLmhlaWdodCgpKSkgeworICAgICAgICBzY2FsZUZhY3RvciA9 IHN0YXRpY19jYXN0PGRvdWJsZT4obWF4aW11bUhlaWdodCkgLyBzbmFwc2hvdFNpemUuaGVpZ2h0 KCk7CisgICAgICAgIHNuYXBzaG90U2l6ZSA9IEludFNpemUoc25hcHNob3RTaXplLndpZHRoKCkg KiBzY2FsZUZhY3RvciwgbWF4aW11bUhlaWdodCk7CisgICAgfQorCisgICAgUmVmUHRyPFdlYklt YWdlPiBzbmFwc2hvdCA9IFdlYkltYWdlOjpjcmVhdGUoc25hcHNob3RTaXplLCBzbmFwc2hvdE9w dGlvbnNUb0ltYWdlT3B0aW9ucyhvcHRpb25zKSk7CisgICAgaWYgKCFzbmFwc2hvdC0+Yml0bWFw KCkpCisgICAgICAgIHJldHVybiBudWxscHRyOworCisgICAgYXV0byBncmFwaGljc0NvbnRleHQg PSBzbmFwc2hvdC0+Yml0bWFwKCktPmNyZWF0ZUdyYXBoaWNzQ29udGV4dCgpOworCisgICAgaWYg KCEob3B0aW9ucyAmIFNuYXBzaG90T3B0aW9uc0V4Y2x1ZGVEZXZpY2VTY2FsZUZhY3RvcikpIHsK KyAgICAgICAgZG91YmxlIGRldmljZVNjYWxlRmFjdG9yID0gY29yZVBhZ2UoKS0+ZGV2aWNlU2Nh bGVGYWN0b3IoKTsKKyAgICAgICAgZ3JhcGhpY3NDb250ZXh0LT5hcHBseURldmljZVNjYWxlRmFj dG9yKGRldmljZVNjYWxlRmFjdG9yKTsKKyAgICAgICAgc2NhbGVGYWN0b3IgLz0gZGV2aWNlU2Nh bGVGYWN0b3I7CisgICAgfQorCisgICAgZ3JhcGhpY3NDb250ZXh0LT5zY2FsZShGbG9hdFNpemUo c2NhbGVGYWN0b3IsIHNjYWxlRmFjdG9yKSk7CisgICAgZ3JhcGhpY3NDb250ZXh0LT50cmFuc2xh dGUoLXNuYXBzaG90UmVjdC54KCksIC1zbmFwc2hvdFJlY3QueSgpKTsKKworICAgIENvbG9yIHNh dmVkQmFja2dyb3VuZENvbG9yID0gZnJhbWVWaWV3LT5iYXNlQmFja2dyb3VuZENvbG9yKCk7Cisg ICAgZnJhbWVWaWV3LT5zZXRCYXNlQmFja2dyb3VuZENvbG9yKENvbG9yOjp0cmFuc3BhcmVudCk7 CisgICAgZnJhbWVWaWV3LT5zZXROb2RlVG9EcmF3KCZub2RlKTsKKworICAgIGZyYW1lVmlldy0+ cGFpbnRDb250ZW50c0ZvclNuYXBzaG90KGdyYXBoaWNzQ29udGV4dC5nZXQoKSwgc25hcHNob3RS ZWN0LCBGcmFtZVZpZXc6OkV4Y2x1ZGVTZWxlY3Rpb24sIEZyYW1lVmlldzo6RG9jdW1lbnRDb29y ZGluYXRlcyk7CisKKyAgICBmcmFtZVZpZXctPnNldEJhc2VCYWNrZ3JvdW5kQ29sb3Ioc2F2ZWRC YWNrZ3JvdW5kQ29sb3IpOworICAgIGZyYW1lVmlldy0+c2V0Tm9kZVRvRHJhdyhudWxscHRyKTsK KworICAgIHJldHVybiBzbmFwc2hvdC5yZWxlYXNlKCk7Cit9CisKIHZvaWQgV2ViUGFnZTo6cGFn ZURpZFNjcm9sbCgpCiB7CiAjaWYgUExBVEZPUk0oSU9TKQpJbmRleDogU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCShyZXZpc2lvbiAxNzEwNTMpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCSh3b3JraW5nIGNvcHkpCkBA IC00NDAsNiArNDQwLDcgQEAgcHVibGljOgogICAgIAogICAgIFBhc3NSZWZQdHI8V2ViSW1hZ2U+ IHNjYWxlZFNuYXBzaG90V2l0aE9wdGlvbnMoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYsIGRvdWJs ZSBhZGRpdGlvbmFsU2NhbGVGYWN0b3IsIFNuYXBzaG90T3B0aW9ucyk7CiAgICAgUGFzc1JlZlB0 cjxXZWJJbWFnZT4gc25hcHNob3RBdFNpemUoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYsIGNvbnN0 IFdlYkNvcmU6OkludFNpemUmIGJpdG1hcFNpemUsIFNuYXBzaG90T3B0aW9ucyk7CisgICAgUGFz c1JlZlB0cjxXZWJJbWFnZT4gc25hcHNob3ROb2RlKFdlYkNvcmU6Ok5vZGUmLCBTbmFwc2hvdE9w dGlvbnMsIHVuc2lnbmVkIG1heGltdW1QaXhlbENvdW50ID0gc3RkOjpudW1lcmljX2xpbWl0czx1 bnNpZ25lZD46Om1heCgpKTsKIAogICAgIHN0YXRpYyBjb25zdCBXZWJFdmVudCogY3VycmVudEV2 ZW50KCk7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2Vi UGFnZUlPUy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvaW9zL1dlYlBhZ2VJT1MubW0JKHJldmlzaW9uIDE3MTA1MykKKysrIFNvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQkod29ya2luZyBjb3B5KQpAQCAt MTg0OSw2ICsxODQ5LDExIEBAIHZvaWQgV2ViUGFnZTo6Z2V0UG9zaXRpb25JbmZvcm1hdGlvbihj b24KICAgICAgICAgICAgICAgICBsaW5rRWxlbWVudCA9IGVsZW1lbnQ7CiAgICAgICAgICAgICAg ICAgZWxlbWVudElzTGlua09ySW1hZ2UgPSB0cnVlOwogICAgICAgICAgICAgfQorCisgICAgICAg ICAgICBpZiAoZWxlbWVudElzTGlua09ySW1hZ2UpIHsKKyAgICAgICAgICAgICAgICAvLyBFbnN1 cmUgdGhhdCB0aGUgaW1hZ2UgY29udGFpbnMgYXQgbW9zdCA2MDBLIHBpeGVscywgc28gdGhhdCBp dCBpcyBub3QgdG9vIGJpZy4KKyAgICAgICAgICAgICAgICBpbmZvLmltYWdlID0gc25hcHNob3RO b2RlKCplbGVtZW50LCBTbmFwc2hvdE9wdGlvbnNTaGFyZWFibGUsIDYwMCAqIDEwMjQpLT5iaXRt YXAoKTsKKyAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlmIChsaW5rRWxlbWVudCkKICAgICAg ICAgICAgICAgICBpbmZvLnVybCA9IFsoTlNVUkwgKilsaW5rRWxlbWVudC0+ZG9jdW1lbnQoKS5j b21wbGV0ZVVSTChzdHJpcExlYWRpbmdBbmRUcmFpbGluZ0hUTUxTcGFjZXMobGlua0VsZW1lbnQt PmdldEF0dHJpYnV0ZShIVE1MTmFtZXM6OmhyZWZBdHRyKSkpIGFic29sdXRlU3RyaW5nXTsKICAg ICAgICAgICAgIGluZm8udGl0bGUgPSBlbGVtZW50LT5mYXN0R2V0QXR0cmlidXRlKEhUTUxOYW1l czo6dGl0bGVBdHRyKS5zdHJpbmcoKTsK