55961 2011-03-08 12:30:14 -0800 WebKit2: Implement Windows glue for Undo/Redo 2011-03-08 17:36:04 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Windows 7 RESOLVED FIXED InRadar, PlatformOnly P2 Normal --- 1 jeffm jeffm oldest_to_newest 364104 0 jeffm 2011-03-08 12:30:14 -0800 Now that the crossplatform and mac specific undo/redo support has been added to WebKit2, we need to add the necessary glue to make it work on windows. 364105 1 jeffm 2011-03-08 12:30:26 -0800 <rdar://problem/8449521> 364111 2 jeffm 2011-03-08 12:38:14 -0800 See also bug 55962, WebKit2: Expose WebEditCommandProxy in the C API on Windows 364249 3 85114 jeffm 2011-03-08 17:26:30 -0800 Created attachment 85114 Patch 364256 4 jeffm 2011-03-08 17:36:04 -0800 Committed r80609: <http://trac.webkit.org/changeset/80609> 85114 2011-03-08 17:26:30 -0800 2011-03-08 17:32:52 -0800 Patch bug-55961-20110308172629.patch text/plain 14153 jeffm SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgwNjA1KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzYgQEAKKzIwMTEtMDMtMDggIEplZmYgTWls bGVyICA8amVmZm1AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFdlYktpdDI6IEltcGxlbWVudCBXaW5kb3dzIGdsdWUgZm9yIFVuZG8v UmVkbworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTU5 NjEKKyAgICAgICAgCisgICAgICAgIEV4cG9zZSBVbmRvL1JlZG8gaW5mcmFzdHJ1Y3R1cmUgdGhy b3VnaCBXS1ZpZXcgb24gV2luZG93cyBieQorICAgICAgICBhZGRpbmcgYW4gdW5kbyBjbGllbnQg YXMgd2VsbCBhcyBBUElzIHRvIHJlYXBwbHkgYW5kIHVuYXBwbHkKKyAgICAgICAgYW4gZWRpdCBj b21tYW5kLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL3dpbi9XS1ZpZXcuY3BwOgorICAg ICAgICAoV0tWaWV3U2V0Vmlld1VuZG9DbGllbnQpOiBBZGRlZC4KKyAgICAgICAgKFdLVmlld1Jl YXBwbHlFZGl0Q29tbWFuZCk6IEFkZGVkLgorICAgICAgICAoV0tWaWV3VW5hcHBseUVkaXRDb21t YW5kKTogQWRkZWQuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL3dpbi9XS1ZpZXcuaDogQWRk ZWQgV0tWaWV3VW5kb0NsaWVudCwgV0tWaWV3U2V0Vmlld1VuZG9DbGllbnQoKSwgYW5kIFdLVmll d1VuYXBwbHlFZGl0Q29tbWFuZCgpLgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHku Y3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmlzVmFsaWRFZGl0Q29tbWFuZCk6 IEFkZGVkLCB1c2VkIHRvIHZhbGlkYXRlZCBhbiBlZGl0IGNvbW1hbmQgZnJvbSBhIFdLVmlldyBB UEkuCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOiBBZGRlZCBpc1ZhbGlkRWRp dENvbW1hbmQoKS4KKyAgICAgICAgKiBVSVByb2Nlc3Mvd2luL1dlYlVuZG9DbGllbnQuY3BwOiBB ZGRlZCwgQVBJQ2xpZW50IGZvciBXS1ZpZXdVbmRvQ2xpZW50LiAKKyAgICAgICAgKFdlYktpdDo6 V2ViVW5kb0NsaWVudDo6cmVnaXN0ZXJFZGl0Q29tbWFuZCk6IEFkZGVkLgorICAgICAgICAoV2Vi S2l0OjpXZWJVbmRvQ2xpZW50OjpjbGVhckFsbEVkaXRDb21tYW5kcyk6IEFkZGVkLgorICAgICAg ICAqIFVJUHJvY2Vzcy93aW4vV2ViVW5kb0NsaWVudC5oOiBBZGRlZCwgQVBJQ2xpZW50IGZvciBX S1ZpZXdVbmRvQ2xpZW50LgorICAgICAgICAqIFVJUHJvY2Vzcy93aW4vV2ViVmlldy5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYlZpZXc6OmluaXRpYWxpemVVbmRvQ2xpZW50KTogQWRkZWQuCisg ICAgICAgIChXZWJLaXQ6OldlYlZpZXc6OmNsb3NlKTogQ2xlYXIgb3V0IHVuZG8gY2xpZW50Lgor ICAgICAgICAoV2ViS2l0OjpXZWJWaWV3OjpyZWdpc3RlckVkaXRDb21tYW5kKTogSW1wbGVtZW50 ZWQgdG8gY2FsbCB0aHJvdWdoIHRvIFdLVmlld1VuZG9DbGllbnQuCisgICAgICAgIChXZWJLaXQ6 OldlYlZpZXc6OmNsZWFyQWxsRWRpdENvbW1hbmRzKTogSW1wbG1lbnRlZCB0byBjYWxsIHRocm91 Z2ggdG8gV0tWaWV3VW5kb0NsaWVudC4KKyAgICAgICAgKFdlYktpdDo6V2ViVmlldzo6cmVhcHBs eUVkaXRDb21tYW5kKTogQWRkZWQuCisgICAgICAgIChXZWJLaXQ6OldlYlZpZXc6OnVuYXBwbHlF ZGl0Q29tbWFuZCk6IEFkZGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy93aW4vV2ViVmlldy5oOiBB ZGRlZCB1bmRvIGNsaWVudCBzdXBwb3J0LgorICAgICAgICAqIHdpbi9XZWJLaXQyLnZjcHJvajog QWRkZWQgV2ViVW5kb0NsaWVudC5jcHAgYW5kIFdlYlVuZG9DbGllbnQuaC4KKwogMjAxMS0wMy0w OCAgSmVmZiBNaWxsZXIgIDxqZWZmbUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg U2FtIFdlaW5pZy4KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku Y3BwCShyZXZpc2lvbiA4MDYwNSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMjk4LDYgKzIyOTgsMTEgQEAgdm9pZCBXZWJQ YWdlUHJveHk6OnJlbW92ZUVkaXRDb21tYW5kKFdlYgogICAgIHByb2Nlc3MoKS0+c2VuZChNZXNz YWdlczo6V2ViUGFnZTo6RGlkUmVtb3ZlRWRpdENvbW1hbmQoY29tbWFuZC0+Y29tbWFuZElEKCkp LCBtX3BhZ2VJRCk7CiB9CiAKK2Jvb2wgV2ViUGFnZVByb3h5Ojppc1ZhbGlkRWRpdENvbW1hbmQo V2ViRWRpdENvbW1hbmRQcm94eSogY29tbWFuZCkKK3sKKyAgICByZXR1cm4gbV9lZGl0Q29tbWFu ZFNldC5maW5kKGNvbW1hbmQpICE9IG1fZWRpdENvbW1hbmRTZXQuZW5kKCk7Cit9CisKIGludDY0 X3QgV2ViUGFnZVByb3h5OjpzcGVsbERvY3VtZW50VGFnKCkKIHsKICAgICBpZiAoIW1faGFzU3Bl bGxEb2N1bWVudFRhZykgewpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuaAkocmV2aXNpb24gODA2MDUpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTM5NSw2ICszOTUsNyBAQCBwdWJsaWM6CiAgICAg ZW51bSBVbmRvT3JSZWRvIHsgVW5kbywgUmVkbyB9OwogICAgIHZvaWQgYWRkRWRpdENvbW1hbmQo V2ViRWRpdENvbW1hbmRQcm94eSopOwogICAgIHZvaWQgcmVtb3ZlRWRpdENvbW1hbmQoV2ViRWRp dENvbW1hbmRQcm94eSopOworICAgIGJvb2wgaXNWYWxpZEVkaXRDb21tYW5kKFdlYkVkaXRDb21t YW5kUHJveHkqKTsKICAgICB2b2lkIHJlZ2lzdGVyRWRpdENvbW1hbmQoUGFzc1JlZlB0cjxXZWJF ZGl0Q29tbWFuZFByb3h5PiwgVW5kb09yUmVkbyk7CiAKICAgICBXZWJQcm9jZXNzUHJveHkqIHBy b2Nlc3MoKSBjb25zdDsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy93aW4v V0tWaWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Mv d2luL1dLVmlldy5jcHAJKHJldmlzaW9uIDgwNjA1KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9DL3dpbi9XS1ZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04MSwzICs4MSwyMCBA QCBXS1ZpZXdGaW5kSW5kaWNhdG9yQ2FsbGJhY2sgV0tWaWV3R2V0RmluCiB7ICAgIAogICAgIHJl dHVybiB0b0ltcGwodmlld1JlZiktPmdldEZpbmRJbmRpY2F0b3JDYWxsYmFjayhjb250ZXh0KTsK IH0KKwordm9pZCBXS1ZpZXdTZXRWaWV3VW5kb0NsaWVudChXS1ZpZXdSZWYgdmlld1JlZiwgY29u c3QgV0tWaWV3VW5kb0NsaWVudCogd2tDbGllbnQpCit7CisgICAgaWYgKHdrQ2xpZW50ICYmIHdr Q2xpZW50LT52ZXJzaW9uKQorICAgICAgICByZXR1cm47CisgICAgdG9JbXBsKHZpZXdSZWYpLT5p bml0aWFsaXplVW5kb0NsaWVudCh3a0NsaWVudCk7Cit9CisKK3ZvaWQgV0tWaWV3UmVhcHBseUVk aXRDb21tYW5kKFdLVmlld1JlZiB2aWV3UmVmLCBXS0VkaXRDb21tYW5kUmVmIGNvbW1hbmQpCit7 CisgICAgdG9JbXBsKHZpZXdSZWYpLT5yZWFwcGx5RWRpdENvbW1hbmQodG9JbXBsKGNvbW1hbmQp KTsKK30KKwordm9pZCBXS1ZpZXdVbmFwcGx5RWRpdENvbW1hbmQoV0tWaWV3UmVmIHZpZXdSZWYs IFdLRWRpdENvbW1hbmRSZWYgY29tbWFuZCkKK3sKKyAgICB0b0ltcGwodmlld1JlZiktPnVuYXBw bHlFZGl0Q29tbWFuZCh0b0ltcGwoY29tbWFuZCkpOworfQpJbmRleDogU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9DL3dpbi9XS1ZpZXcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL0Mvd2luL1dLVmlldy5oCShyZXZpc2lvbiA4MDYwNSkKKysrIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy93aW4vV0tWaWV3LmgJKHdvcmtpbmcgY29weSkKQEAg LTMzLDYgKzMzLDI0IEBACiBleHRlcm4gIkMiIHsKICNlbmRpZgogCisvLyBVbmRvIENsaWVudC4K K2VudW0geworICAgIGtXS1ZpZXdVbmRvID0gMCwKKyAgICBrV0tWaWV3UmVkbyA9IDEKK307Cit0 eXBlZGVmIHVpbnQzMl90IFdLVmlld1VuZG9UeXBlOworCit0eXBlZGVmIHZvaWQgKCpXS1ZpZXdS ZWdpc3RlckVkaXRDb21tYW5kQ2FsbGJhY2spKFdLVmlld1JlZiwgV0tFZGl0Q29tbWFuZFJlZiwg aW50MzJfdCB1bmRvT3JSZWRvLCBjb25zdCB2b2lkICpjbGllbnRJbmZvKTsKK3R5cGVkZWYgdm9p ZCAoKldLVmlld0NsZWFyQWxsRWRpdENvbW1hbmRzQ2FsbGJhY2spKFdLVmlld1JlZiwgY29uc3Qg dm9pZCAqY2xpZW50SW5mbyk7CisKK3N0cnVjdCBXS1ZpZXdVbmRvQ2xpZW50IHsKKyAgICBpbnQg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHZlcnNpb247CisgICAgY29uc3Qgdm9pZCAqICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjbGllbnRJbmZvOworICAgIFdLVmlld1Jl Z2lzdGVyRWRpdENvbW1hbmRDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgcmVnaXN0ZXJFZGl0Q29tbWFuZDsKKyAgICBXS1ZpZXdDbGVhckFsbEVkaXRDb21tYW5kc0Nh bGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNsZWFyQWxsRWRpdENvbW1h bmRzOworfTsKK3R5cGVkZWYgc3RydWN0IFdLVmlld1VuZG9DbGllbnQgV0tWaWV3VW5kb0NsaWVu dDsKKwogV0tfRVhQT1JUIFdLVHlwZUlEIFdLVmlld0dldFR5cGVJRCgpOwogCiBXS19FWFBPUlQg V0tWaWV3UmVmIFdLVmlld0NyZWF0ZShSRUNUIHJlY3QsIFdLQ29udGV4dFJlZiBjb250ZXh0LCBX S1BhZ2VHcm91cFJlZiBwYWdlR3JvdXAsIEhXTkQgcGFyZW50V2luZG93KTsKQEAgLTQxLDYgKzU5 LDEwIEBAIFdLX0VYUE9SVCBIV05EIFdLVmlld0dldFdpbmRvdyhXS1ZpZXdSZWYKIAogV0tfRVhQ T1JUIFdLUGFnZVJlZiBXS1ZpZXdHZXRQYWdlKFdLVmlld1JlZiB2aWV3KTsKIAorV0tfRVhQT1JU IHZvaWQgV0tWaWV3U2V0Vmlld1VuZG9DbGllbnQoV0tWaWV3UmVmIHZpZXcsIGNvbnN0IFdLVmll d1VuZG9DbGllbnQqIGNsaWVudCk7CitXS19FWFBPUlQgdm9pZCBXS1ZpZXdSZWFwcGx5RWRpdENv bW1hbmQoV0tWaWV3UmVmIHZpZXcsIFdLRWRpdENvbW1hbmRSZWYgY29tbWFuZCk7CitXS19FWFBP UlQgdm9pZCBXS1ZpZXdVbmFwcGx5RWRpdENvbW1hbmQoV0tWaWV3UmVmIHZpZXcsIFdLRWRpdENv bW1hbmRSZWYgY29tbWFuZCk7CisKIFdLX0VYUE9SVCB2b2lkIFdLVmlld1NldFBhcmVudFdpbmRv dyhXS1ZpZXdSZWYgdmlldywgSFdORCBwYXJlbnRXaW5kb3cpOwogV0tfRVhQT1JUIHZvaWQgV0tW aWV3V2luZG93QW5jZXN0cnlEaWRDaGFuZ2UoV0tWaWV3UmVmIHZpZXcpOwogV0tfRVhQT1JUIHZv aWQgV0tWaWV3U2V0SXNJbldpbmRvdyhXS1ZpZXdSZWYgdmlldywgYm9vbCBpc0luV2luZG93KTsK SW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVW5kb0NsaWVudC5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3dpbi9XZWJVbmRvQ2xpZW50LmNw cAkocmV2aXNpb24gMCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVW5kb0Ns aWVudC5jcHAJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNTMgQEAKKy8qCisgKiBDb3B5cmlnaHQg KEMpIDIwMTEgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJp YnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91 dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxv d2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNv dXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwg dGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAq IDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJv dmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0 aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9v ciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAq IFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJV VE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMs IElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElF UyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVS UE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMg Q09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJ REVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMg KElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJ VFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9S IEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhF T1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJ VFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJ TkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFE VklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaW5j bHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiV2ViVW5kb0NsaWVudC5oIgorCisjaW5jbHVkZSAi V0tBUElDYXN0LmgiCisjaW5jbHVkZSAiV2ViRWRpdENvbW1hbmRQcm94eS5oIgorI2luY2x1ZGUg IldlYlZpZXcuaCIKKworbmFtZXNwYWNlIFdlYktpdCB7CisKK3ZvaWQgV2ViVW5kb0NsaWVudDo6 cmVnaXN0ZXJFZGl0Q29tbWFuZChXZWJWaWV3KiB2aWV3LCBQYXNzUmVmUHRyPFdlYkVkaXRDb21t YW5kUHJveHk+IHBycENvbW1hbmQsIFdlYlBhZ2VQcm94eTo6VW5kb09yUmVkbyB1bmRvT3JSZWRv KQoreworICAgIGlmICghbV9jbGllbnQucmVnaXN0ZXJFZGl0Q29tbWFuZCkKKyAgICAgICAgcmV0 dXJuOworCisgICAgUmVmUHRyPFdlYkVkaXRDb21tYW5kUHJveHk+IGNvbW1hbmQgPSBwcnBDb21t YW5kOworICAgIG1fY2xpZW50LnJlZ2lzdGVyRWRpdENvbW1hbmQodG9BUEkodmlldyksIHRvQVBJ KGNvbW1hbmQucmVsZWFzZSgpLnJlbGVhc2VSZWYoKSksICh1bmRvT3JSZWRvID09IFdlYlBhZ2VQ cm94eTo6VW5kbykgPyBrV0tWaWV3VW5kbyA6IGtXS1ZpZXdSZWRvLCBtX2NsaWVudC5jbGllbnRJ bmZvKTsKK30KKwordm9pZCBXZWJVbmRvQ2xpZW50OjpjbGVhckFsbEVkaXRDb21tYW5kcyhXZWJW aWV3KiB2aWV3KQoreworICAgIGlmICghbV9jbGllbnQuY2xlYXJBbGxFZGl0Q29tbWFuZHMpCisg ICAgICAgIHJldHVybjsKKyAgICAKKyAgICBtX2NsaWVudC5jbGVhckFsbEVkaXRDb21tYW5kcyh0 b0FQSSh2aWV3KSwgbV9jbGllbnQuY2xpZW50SW5mbyk7Cit9CisKK30gLy8gbmFtZXNwYWNlIFdl YktpdAorCgpQcm9wZXJ0eSBjaGFuZ2VzIG9uOiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mvd2lu L1dlYlVuZG9DbGllbnQuY3BwCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KQWRkZWQ6IHN2bjplb2wtc3R5bGUKICAgKyBu YXRpdmUKCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlVuZG9DbGllbnQu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlVuZG9DbGll bnQuaAkocmV2aXNpb24gMCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVW5k b0NsaWVudC5oCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDQ2IEBACisvKgorICogQ29weXJpZ2h0 IChDKSAyMDExIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3Ry aWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhv dXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xs b3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBz b3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2Us IHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisg KiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFi b3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQg dGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQv b3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisg KiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklC VVRPUlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVT LCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJ RVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBV UlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRT IENPTlRSSUJVVE9SUworICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5D SURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VT IChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNU SVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBP UiBCVVNJTkVTUworICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRI RU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklM SVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklT SU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBB RFZJU0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI2lm bmRlZiBXZWJVbmRvQ2xpZW50X2gKKyNkZWZpbmUgV2ViVW5kb0NsaWVudF9oCisKKyNpbmNsdWRl ICJBUElDbGllbnQuaCIKKyNpbmNsdWRlICJXS1ZpZXcuaCIKKyNpbmNsdWRlICJXZWJQYWdlUHJv eHkuaCIKKyNpbmNsdWRlIDx3dGYvRm9yd2FyZC5oPgorCituYW1lc3BhY2UgV2ViS2l0IHsKKwor Y2xhc3MgV2ViRWRpdENvbW1hbmRQcm94eTsKKworY2xhc3MgV2ViVW5kb0NsaWVudCA6IHB1Ymxp YyBBUElDbGllbnQ8V0tWaWV3VW5kb0NsaWVudD4geworcHVibGljOgorICAgIHZvaWQgcmVnaXN0 ZXJFZGl0Q29tbWFuZChXZWJWaWV3KiwgUGFzc1JlZlB0cjxXZWJFZGl0Q29tbWFuZFByb3h5Piwg V2ViUGFnZVByb3h5OjpVbmRvT3JSZWRvKTsKKyAgICB2b2lkIGNsZWFyQWxsRWRpdENvbW1hbmRz KFdlYlZpZXcqKTsKK307CisKK30gLy8gbmFtZXNwYWNlIFdlYktpdAorCisjZW5kaWYgLy8gV2Vi VW5kb0NsaWVudF9oCgpQcm9wZXJ0eSBjaGFuZ2VzIG9uOiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3Mvd2luL1dlYlVuZG9DbGllbnQuaApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkFkZGVkOiBzdm46ZXhlY3V0YWJsZQog ICArICoKQWRkZWQ6IHN2bjplb2wtc3R5bGUKICAgKyBuYXRpdmUKCkluZGV4OiBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5jcHAJKHJldmlzaW9uIDgwNjA1KQorKysgU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjg0 LDYgKzI4NCwxMSBAQCB2b2lkIFdlYlZpZXc6OmluaXRpYWxpemUoKQogICAgIDo6UmVnaXN0ZXJE cmFnRHJvcChtX3dpbmRvdywgdGhpcyk7CiB9CiAKK3ZvaWQgV2ViVmlldzo6aW5pdGlhbGl6ZVVu ZG9DbGllbnQoY29uc3QgV0tWaWV3VW5kb0NsaWVudCogY2xpZW50KQoreworICAgIG1fdW5kb0Ns aWVudC5pbml0aWFsaXplKGNsaWVudCk7Cit9CisKIHZvaWQgV2ViVmlldzo6c2V0UGFyZW50V2lu ZG93KEhXTkQgcGFyZW50V2luZG93KQogewogICAgIGlmIChtX3dpbmRvdykgewpAQCAtNjQyLDYg KzY0Nyw3IEBAIHZvaWQgV2ViVmlldzo6c3RvcFRyYWNraW5nTW91c2VMZWF2ZSgpCiAKIHZvaWQg V2ViVmlldzo6Y2xvc2UoKQogeworICAgIG1fdW5kb0NsaWVudC5pbml0aWFsaXplKDApOwogICAg IDo6UmV2b2tlRHJhZ0Ryb3AobV93aW5kb3cpOwogICAgIHNldFBhcmVudFdpbmRvdygwKTsKICAg ICBtX3BhZ2UtPmNsb3NlKCk7CkBAIC03OTUsMTIgKzgwMSwzMSBAQCB2b2lkIFdlYlZpZXc6OnNl dFZpZXdwb3J0QXJndW1lbnRzKGNvbnN0CiB7CiB9CiAKLXZvaWQgV2ViVmlldzo6cmVnaXN0ZXJF ZGl0Q29tbWFuZChQYXNzUmVmUHRyPFdlYkVkaXRDb21tYW5kUHJveHk+LCBXZWJQYWdlUHJveHk6 OlVuZG9PclJlZG8pCit2b2lkIFdlYlZpZXc6OnJlZ2lzdGVyRWRpdENvbW1hbmQoUGFzc1JlZlB0 cjxXZWJFZGl0Q29tbWFuZFByb3h5PiBwcnBDb21tYW5kLCBXZWJQYWdlUHJveHk6OlVuZG9PclJl ZG8gdW5kb09yUmVkbykKIHsKKyAgICBSZWZQdHI8V2ViRWRpdENvbW1hbmRQcm94eT4gY29tbWFu ZCA9IHBycENvbW1hbmQ7CisgICAgbV91bmRvQ2xpZW50LnJlZ2lzdGVyRWRpdENvbW1hbmQodGhp cywgY29tbWFuZCwgdW5kb09yUmVkbyk7CiB9CiAKIHZvaWQgV2ViVmlldzo6Y2xlYXJBbGxFZGl0 Q29tbWFuZHMoKQogeworICAgIG1fdW5kb0NsaWVudC5jbGVhckFsbEVkaXRDb21tYW5kcyh0aGlz KTsKK30KKwordm9pZCBXZWJWaWV3OjpyZWFwcGx5RWRpdENvbW1hbmQoV2ViRWRpdENvbW1hbmRQ cm94eSogY29tbWFuZCkKK3sKKyAgICBpZiAoIW1fcGFnZS0+aXNWYWxpZCgpIHx8ICFtX3BhZ2Ut PmlzVmFsaWRFZGl0Q29tbWFuZChjb21tYW5kKSkKKyAgICAgICAgcmV0dXJuOworICAgIAorICAg IGNvbW1hbmQtPnJlYXBwbHkoKTsKK30KKwordm9pZCBXZWJWaWV3Ojp1bmFwcGx5RWRpdENvbW1h bmQoV2ViRWRpdENvbW1hbmRQcm94eSogY29tbWFuZCkKK3sKKyAgICBpZiAoIW1fcGFnZS0+aXNW YWxpZCgpIHx8ICFtX3BhZ2UtPmlzVmFsaWRFZGl0Q29tbWFuZChjb21tYW5kKSkKKyAgICAgICAg cmV0dXJuOworICAgIAorICAgIGNvbW1hbmQtPnVuYXBwbHkoKTsKIH0KIAogRmxvYXRSZWN0IFdl YlZpZXc6OmNvbnZlcnRUb0RldmljZVNwYWNlKGNvbnN0IEZsb2F0UmVjdCYgcmVjdCkKSW5kZXg6 IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5oCShyZXZpc2lvbiA4MDYwNSkKKysr IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5oCSh3b3JraW5nIGNvcHkpCkBA IC0zMCw2ICszMCw3IEBACiAjaW5jbHVkZSAiUGFnZUNsaWVudC5oIgogI2luY2x1ZGUgIldLVmll dy5oIgogI2luY2x1ZGUgIldlYlBhZ2VQcm94eS5oIgorI2luY2x1ZGUgIldlYlVuZG9DbGllbnQu aCIKICNpbmNsdWRlIDxTaGxPYmouaD4KICNpbmNsdWRlIDxXZWJDb3JlL0NPTVB0ci5oPgogI2lu Y2x1ZGUgPFdlYkNvcmUvRHJhZ0FjdGlvbnMuaD4KQEAgLTY0LDYgKzY1LDEwIEBAIHB1YmxpYzoK ICAgICB2b2lkIHNldEZpbmRJbmRpY2F0b3JDYWxsYmFjayhXS1ZpZXdGaW5kSW5kaWNhdG9yQ2Fs bGJhY2ssIHZvaWQqKTsKICAgICBXS1ZpZXdGaW5kSW5kaWNhdG9yQ2FsbGJhY2sgZ2V0RmluZElu ZGljYXRvckNhbGxiYWNrKHZvaWQqKik7CiAgICAgdm9pZCBpbml0aWFsaXplKCk7CisgICAgCisg ICAgdm9pZCBpbml0aWFsaXplVW5kb0NsaWVudChjb25zdCBXS1ZpZXdVbmRvQ2xpZW50Kik7Cisg ICAgdm9pZCByZWFwcGx5RWRpdENvbW1hbmQoV2ViRWRpdENvbW1hbmRQcm94eSopOworICAgIHZv aWQgdW5hcHBseUVkaXRDb21tYW5kKFdlYkVkaXRDb21tYW5kUHJveHkqKTsKIAogICAgIC8vIElV bmtub3duCiAgICAgdmlydHVhbCBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIFF1ZXJ5SW50ZXJm YWNlKFJFRklJRCByaWlkLCB2b2lkKiogcHB2T2JqZWN0KTsKQEAgLTE5NCw2ICsxOTksOCBAQCBw cml2YXRlOgogCiAgICAgdW5zaWduZWQgbV9pbklNRUNvbXBvc2l0aW9uOwogCisgICAgV2ViVW5k b0NsaWVudCBtX3VuZG9DbGllbnQ7CisKICAgICBXS1ZpZXdGaW5kSW5kaWNhdG9yQ2FsbGJhY2sg bV9maW5kSW5kaWNhdG9yQ2FsbGJhY2s7CiAgICAgdm9pZCogbV9maW5kSW5kaWNhdG9yQ2FsbGJh Y2tDb250ZXh0OwogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi93aW4vV2ViS2l0Mi52Y3Byb2oKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvd2luL1dlYktpdDIudmNwcm9qCShyZXZpc2lvbiA4 MDYwNSkKKysrIFNvdXJjZS9XZWJLaXQyL3dpbi9XZWJLaXQyLnZjcHJvagkod29ya2luZyBjb3B5 KQpAQCAtMzEyNiw2ICszMTI2LDE0IEBACiAJCQkJCT4KIAkJCQk8L0ZpbGU+CiAJCQkJPEZpbGUK KwkJCQkJUmVsYXRpdmVQYXRoPSIuLlxVSVByb2Nlc3Ncd2luXFdlYlVuZG9DbGllbnQuY3BwIgor CQkJCQk+CisJCQkJPC9GaWxlPgorCQkJCTxGaWxlCisJCQkJCVJlbGF0aXZlUGF0aD0iLi5cVUlQ cm9jZXNzXHdpblxXZWJVbmRvQ2xpZW50LmgiCisJCQkJCT4KKwkJCQk8L0ZpbGU+CisJCQkJPEZp bGUKIAkJCQkJUmVsYXRpdmVQYXRoPSIuLlxVSVByb2Nlc3Ncd2luXFdlYlZpZXcuY3BwIgogCQkJ CQk+CiAJCQkJPC9GaWxlPgo=