70864 2011-10-25 17:22:12 -0700 Embedded PDFs should be known to DocumentLoader 2011-10-26 11:12:27 -0700 1 1 1 Unclassified WebKit PDF 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ap ap oldest_to_newest 490484 0 ap 2011-10-25 17:22:12 -0700 Why? To better support Save As or saving to Web archive. 490489 1 112431 ap 2011-10-25 17:32:08 -0700 Created attachment 112431 proposed patch Perhaps it should ultimately be the job of PluginController implementation to save plug-in resources as necessary. But it's not clear to me how to structure that, and PDF is the only plug-in that currently needs this anyway. 490987 2 112431 darin 2011-10-26 10:21:43 -0700 Comment on attachment 112431 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=112431&action=review r=me but I’d really like you to explicitly state why this should be done > Source/WebKit2/ChangeLog:3 > + Embedded PDFs should be known to DocumentLoader This bug title doesn’t say why they should be known to DocumentLoader. And nothing in the change log says why either. 491009 3 ap 2011-10-26 10:48:44 -0700 Bug description has the rationale. 491024 4 ap 2011-10-26 11:12:27 -0700 Committed <http://trac.webkit.org/changeset/98503>. 112431 2011-10-25 17:32:08 -0700 2011-10-26 10:21:43 -0700 proposed patch SaveAs.txt text/plain 21111 ap SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk4NDEyKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTEtMTAtMjUgIEFsZXhleSBQ cm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CisKKyAgICAgICAgRW1iZWRkZWQgUERGcyBzaG91 bGQgYmUga25vd24gdG8gRG9jdW1lbnRMb2FkZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTcwODY0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjogQWRkZWQgZXhwb3J0cy4KKwog MjAxMS0xMC0yNSAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIEV2 ZW50VGFyZ2V0RmFjdG9yeS5pbiBpcyBub3Qgc29ydGVkCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9X ZWJDb3JlLmV4cC5pbgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5p bgkocmV2aXNpb24gOTgzOTQpCisrKyBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgkod29y a2luZyBjb3B5KQpAQCAtMjgzLDYgKzI4Myw3IEBAIF9fWk43V2ViQ29yZTEyUHJpbnRDb250ZXh0 RDFFdgogX19aTjdXZWJDb3JlMTJSZW5kZXJPYmplY3QxNnJlcGFpbnRSZWN0YW5nbGVFUktOU183 SW50UmVjdEViCiBfX1pON1dlYkNvcmUxMlJlbmRlcldpZGdldDI4cmVzdW1lV2lkZ2V0SGllcmFy Y2h5VXBkYXRlc0V2CiBfX1pON1dlYkNvcmUxMlJlbmRlcldpZGdldDI5c3VzcGVuZFdpZGdldEhp ZXJhcmNoeVVwZGF0ZXNFdgorX19aTjdXZWJDb3JlMTJTaGFyZWRCdWZmZXIxMHdyYXBDRkRhdGFF UEs4X19DRkRhdGEKIF9fWk43V2ViQ29yZTEyU2hhcmVkQnVmZmVyMTB3cmFwTlNEYXRhRVA2TlNE YXRhCiBfX1pON1dlYkNvcmUxMlNoYXJlZEJ1ZmZlcjEyY3JlYXRlTlNEYXRhRXYKIF9fWk43V2Vi Q29yZTEyU2hhcmVkQnVmZmVyMjRjcmVhdGVXaXRoQ29udGVudHNPZkZpbGVFUktOM1dURjZTdHJp bmdFCkBAIC01NzYsNyArNTc3LDEwIEBAIF9fWk43V2ViQ29yZTIwRGlzcGxheVNsZWVwRGlzYWJs ZXJEMUV2CiBfX1pON1dlYkNvcmUyME5vZGVSZW5kZXJpbmdDb250ZXh0QzFFUE5TXzROb2RlRQog X19aTjdXZWJDb3JlMjBOb2RlUmVuZGVyaW5nQ29udGV4dEQxRXYKIF9fWk43V2ViQ29yZTIwUmVu ZGVyRW1iZWRkZWRPYmplY3QzMHNldFNob3dzQ3Jhc2hlZFBsdWdpbkluZGljYXRvckV2CitfX1pO N1dlYkNvcmUyMFJlc291cmNlUmVzcG9uc2VCYXNlMTFzZXRNaW1lVHlwZUVSS04zV1RGNlN0cmlu Z0UKK19fWk43V2ViQ29yZTIwUmVzb3VyY2VSZXNwb25zZUJhc2UyMHNldFN1Z2dlc3RlZEZpbGVu YW1lRVJLTjNXVEY2U3RyaW5nRQogX19aTjdXZWJDb3JlMjBSZXNvdXJjZVJlc3BvbnNlQmFzZTI0 c2V0RXhwZWN0ZWRDb250ZW50TGVuZ3RoRXgKK19fWk43V2ViQ29yZTIwUmVzb3VyY2VSZXNwb25z ZUJhc2U2c2V0VVJMRVJLTlNfNEtVUkxFCiBfX1pON1dlYkNvcmUyMFJlc291cmNlUmVzcG9uc2VC YXNlQzJFdgogX19aTjdXZWJDb3JlMjBTaGFkb3dDb250ZW50RWxlbWVudDZjcmVhdGVFUE5TXzhE b2N1bWVudEUKIF9fWk43V2ViQ29yZTIwU3BhY2VTcGxpdFN0cmluZ0RhdGExMmNyZWF0ZVZlY3Rv ckV2CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdDIvQ2hhbmdlTG9nCShyZXZpc2lvbiA5ODQxMikKKysrIFNvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ2IEBACisyMDExLTEwLTI1ICBBbGV4 ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIEVtYmVkZGVkIFBERnMg c2hvdWxkIGJlIGtub3duIHRvIERvY3VtZW50TG9hZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MDg2NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbi5oOiBQ bHVnaW4gc3RyZWFtIGxvYWQgbm90aWZpY2F0aW9ucyBub3cgY29udGFpbiBhIHN1Z2dlc3RlZAor ICAgICAgICBmaWxlIG5hbWUsIGluIGNhc2UgdGhlIHBsdWctaW4gd2FudHMgdG8gc2F2ZSB0aGUg ZmlsZSBwcm9wZXJseS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9QREYvQnVpbHRJ blBERlZpZXcuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvUERGL0J1aWx0SW5QREZW aWV3LmNwcDoKKyAgICAgICAgKFdlYktpdDo6QnVpbHRJblBERlZpZXc6OmFkZEFyY2hpdmVSZXNv dXJjZSk6IEFkZCB0aGUgUERGIGFzIHJlc291cmNlIGluIERvY3VtZW50TG9hZGVyLgorICAgICAg ICAoV2ViS2l0OjpCdWlsdEluUERGVmlldzo6cGRmRG9jdW1lbnREaWRMb2FkKTogQ2FsbCBhZGRB cmNoaXZlUmVzb3VyY2UuCisgICAgICAgIChXZWJLaXQ6OkJ1aWx0SW5QREZWaWV3Ojppbml0aWFs aXplKTogV2UgbmVlZCB0byByZW1lbWJlciBzb3VyY2UgVVJMIHRvIGNyZWF0ZSBhIHJlc291cmNl CisgICAgICAgIGZvciB0aGF0LiBUaGUgVVJMIG5lZWRzIHRvIG1hdGNoIG9uZSBpbiBIaXRUZXN0 UmVzdWx0LCBzbyB3ZSBjYW4ndCB1c2UgcmVzcG9uc2UgVVJMLgorICAgICAgICAoV2ViS2l0OjpC dWlsdEluUERGVmlldzo6c3RyZWFtRGlkUmVjZWl2ZVJlc3BvbnNlKTogUmVtZW1iZXIgc3VnZ2Vz dGVkIGZpbGUgbmFtZSwgc28KKyAgICAgICAgdGhhdCB3ZSBjb3VsZCBwdXQgaXQgaW4gYXJjaGl2 ZSByZXNvdXJjZSBsYXRlci4KKyAgICAgICAgKFdlYktpdDo6QnVpbHRJblBERlZpZXc6Om1hbnVh bFN0cmVhbURpZFJlY2VpdmVSZXNwb25zZSk6IERpdHRvLgorCisgICAgICAgICogUGx1Z2luUHJv Y2Vzcy9QbHVnaW5Db250cm9sbGVyUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5D b250cm9sbGVyUHJveHk6OnN0cmVhbURpZFJlY2VpdmVSZXNwb25zZSk6CisgICAgICAgIChXZWJL aXQ6OlBsdWdpbkNvbnRyb2xsZXJQcm94eTo6bWFudWFsU3RyZWFtRGlkUmVjZWl2ZVJlc3BvbnNl KToKKyAgICAgICAgUGFzcyBhbiBlbXB0eSBzdHJpbmcgZm9yIHN1Z2dlc3RlZCBmaWxlIG5hbWUu IE5vIHBsdWctaW4gdGhhdCBydW5zIGluIGEgc2VwYXJhdGUgcHJvY2VzcworICAgICAgICBjYXJl cyBhYm91dCBpdCwgc28gaXQncyBub3Qgc2VudCB0byB0aGUgcGx1Z2luIHByb2Nlc3MuCisKKyAg ICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uY3BwOgor ICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpbjo6c3RyZWFtRGlkUmVjZWl2ZVJlc3BvbnNl KToKKyAgICAgICAgKFdlYktpdDo6TmV0c2NhcGVQbHVnaW46Om1hbnVhbFN0cmVhbURpZFJlY2Vp dmVSZXNwb25zZSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNj YXBlUGx1Z2luLmg6CisgICAgICAgIFVwZGF0ZWQgZm9yIG5ldyBzaWduYXR1cmVzLgorCisgICAg ICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb3h5LmNwcDoKKyAgICAgICAgKFdlYktp dDo6UGx1Z2luUHJveHk6OnN0cmVhbURpZFJlY2VpdmVSZXNwb25zZSk6CisgICAgICAgIChXZWJL aXQ6OlBsdWdpblByb3h5OjptYW51YWxTdHJlYW1EaWRSZWNlaXZlUmVzcG9uc2UpOgorICAgICAg ICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm94eS5oOgorICAgICAgICBVcGRhdGVkIGZv ciBuZXcgc2lnbmF0dXJlcy4KKworICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5W aWV3LmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luVmlldzo6U3RyZWFtOjpkaWRSZWNlaXZl UmVzcG9uc2UpOgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5WaWV3OjptYW51YWxMb2FkRGlkUmVj ZWl2ZVJlc3BvbnNlKToKKyAgICAgICAgUGFzcyBzdWdnZXN0ZWQgZmlsZSBuYW1lIHRvIHBsdWct aW4sIGluIGNhc2UgdGhlIHBsdWctaW4gd2FudHMgdG8gc2F2ZSB0aGUgZmlsZSBwcm9wZXJseQor CiAyMDExLTEwLTI1ICBCZXRoIERha2luICA8YmRha2luQGFwcGxlLmNvbT4KIAogICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzA4NTIKSW5kZXg6IFNvdXJj ZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvUGx1Z2luQ29udHJvbGxlclByb3h5LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1BsdWdpbkNvbnRyb2xsZXJQcm94 eS5jcHAJKHJldmlzaW9uIDk4Mzk0KQorKysgU291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9Q bHVnaW5Db250cm9sbGVyUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NDYsNyArNDQ2LDcg QEAgdm9pZCBQbHVnaW5Db250cm9sbGVyUHJveHk6OmRpZEV2YWx1YXRlSgogCiB2b2lkIFBsdWdp bkNvbnRyb2xsZXJQcm94eTo6c3RyZWFtRGlkUmVjZWl2ZVJlc3BvbnNlKHVpbnQ2NF90IHN0cmVh bUlELCBjb25zdCBTdHJpbmcmIHJlc3BvbnNlVVJMU3RyaW5nLCB1aW50MzJfdCBzdHJlYW1MZW5n dGgsIHVpbnQzMl90IGxhc3RNb2RpZmllZFRpbWUsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGNv bnN0IFN0cmluZyYgaGVhZGVycykKIHsKLSAgICBtX3BsdWdpbi0+c3RyZWFtRGlkUmVjZWl2ZVJl c3BvbnNlKHN0cmVhbUlELCBLVVJMKFBhcnNlZFVSTFN0cmluZywgcmVzcG9uc2VVUkxTdHJpbmcp LCBzdHJlYW1MZW5ndGgsIGxhc3RNb2RpZmllZFRpbWUsIG1pbWVUeXBlLCBoZWFkZXJzKTsKKyAg ICBtX3BsdWdpbi0+c3RyZWFtRGlkUmVjZWl2ZVJlc3BvbnNlKHN0cmVhbUlELCBLVVJMKFBhcnNl ZFVSTFN0cmluZywgcmVzcG9uc2VVUkxTdHJpbmcpLCBzdHJlYW1MZW5ndGgsIGxhc3RNb2RpZmll ZFRpbWUsIG1pbWVUeXBlLCBoZWFkZXJzLCBTdHJpbmcoKSk7CiB9CiAKIHZvaWQgUGx1Z2luQ29u dHJvbGxlclByb3h5OjpzdHJlYW1EaWRSZWNlaXZlRGF0YSh1aW50NjRfdCBzdHJlYW1JRCwgY29u c3QgQ29yZUlQQzo6RGF0YVJlZmVyZW5jZSYgZGF0YSkKQEAgLTQ2OSw3ICs0NjksNyBAQCB2b2lk IFBsdWdpbkNvbnRyb2xsZXJQcm94eTo6bWFudWFsU3RyZWFtCiAgICAgaWYgKG1fcGx1Z2luQ2Fu Y2VsZWRNYW51YWxTdHJlYW1Mb2FkKQogICAgICAgICByZXR1cm47CiAKLSAgICBtX3BsdWdpbi0+ bWFudWFsU3RyZWFtRGlkUmVjZWl2ZVJlc3BvbnNlKEtVUkwoUGFyc2VkVVJMU3RyaW5nLCByZXNw b25zZVVSTFN0cmluZyksIHN0cmVhbUxlbmd0aCwgbGFzdE1vZGlmaWVkVGltZSwgbWltZVR5cGUs IGhlYWRlcnMpOworICAgIG1fcGx1Z2luLT5tYW51YWxTdHJlYW1EaWRSZWNlaXZlUmVzcG9uc2Uo S1VSTChQYXJzZWRVUkxTdHJpbmcsIHJlc3BvbnNlVVJMU3RyaW5nKSwgc3RyZWFtTGVuZ3RoLCBs YXN0TW9kaWZpZWRUaW1lLCBtaW1lVHlwZSwgaGVhZGVycywgU3RyaW5nKCkpOwogfQogCiB2b2lk IFBsdWdpbkNvbnRyb2xsZXJQcm94eTo6bWFudWFsU3RyZWFtRGlkUmVjZWl2ZURhdGEoY29uc3Qg Q29yZUlQQzo6RGF0YVJlZmVyZW5jZSYgZGF0YSkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvUGx1Z2lucy9QbHVnaW4uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1BsdWdpbnMvUGx1Z2luLmgJKHJldmlzaW9uIDk4Mzk0KQorKysgU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbi5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMzMsNyAr MTMzLDcgQEAgcHVibGljOgogCiAgICAgLy8gVGVsbHMgdGhlIHBsdWctaW4gdGhhdCBhIHN0cmVh bSBoYXMgcmVjZWl2ZWQgaXRzIEhUVFAgcmVzcG9uc2UuCiAgICAgdmlydHVhbCB2b2lkIHN0cmVh bURpZFJlY2VpdmVSZXNwb25zZSh1aW50NjRfdCBzdHJlYW1JRCwgY29uc3QgV2ViQ29yZTo6S1VS TCYgcmVzcG9uc2VVUkwsIHVpbnQzMl90IHN0cmVhbUxlbmd0aCwgCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICB1aW50MzJfdCBsYXN0TW9kaWZpZWRUaW1lLCBjb25z dCBTdHJpbmcmIG1pbWVUeXBlLCBjb25zdCBTdHJpbmcmIGhlYWRlcnMpID0gMDsKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQzMl90IGxhc3RNb2RpZmllZFRp bWUsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGNvbnN0IFN0cmluZyYgaGVhZGVycywgY29uc3Qg U3RyaW5nJiBzdWdnZXN0ZWRGaWxlTmFtZSkgPSAwOwogCiAgICAgLy8gVGVsbHMgdGhlIHBsdWct aW4gdGhhdCBhIHN0cmVhbSBkaWQgcmVjZWl2ZSBkYXRhLgogICAgIHZpcnR1YWwgdm9pZCBzdHJl YW1EaWRSZWNlaXZlRGF0YSh1aW50NjRfdCBzdHJlYW1JRCwgY29uc3QgY2hhciogYnl0ZXMsIGlu dCBsZW5ndGgpID0gMDsKQEAgLTE0Niw3ICsxNDYsNyBAQCBwdWJsaWM6CiAKICAgICAvLyBUZWxs cyB0aGUgcGx1Zy1pbiB0aGF0IHRoZSBtYW51YWwgc3RyZWFtIGhhcyByZWNlaXZlZCBpdHMgSFRU UCByZXNwb25zZS4KICAgICB2aXJ0dWFsIHZvaWQgbWFudWFsU3RyZWFtRGlkUmVjZWl2ZVJlc3Bv bnNlKGNvbnN0IFdlYkNvcmU6OktVUkwmIHJlc3BvbnNlVVJMLCB1aW50MzJfdCBzdHJlYW1MZW5n dGgsIAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdWlu dDMyX3QgbGFzdE1vZGlmaWVkVGltZSwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgY29uc3QgU3Ry aW5nJiBoZWFkZXJzKSA9IDA7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICB1aW50MzJfdCBsYXN0TW9kaWZpZWRUaW1lLCBjb25zdCBTdHJpbmcmIG1pbWVU eXBlLCBjb25zdCBTdHJpbmcmIGhlYWRlcnMsIGNvbnN0IFN0cmluZyYgc3VnZ2VzdGVkRmlsZU5h bWUpID0gMDsKIAogICAgIC8vIFRlbGxzIHRoZSBwbHVnLWluIHRoYXQgdGhlIG1hbnVhbCBzdHJl YW0gZGlkIHJlY2VpdmUgZGF0YS4KICAgICB2aXJ0dWFsIHZvaWQgbWFudWFsU3RyZWFtRGlkUmVj ZWl2ZURhdGEoY29uc3QgY2hhciogYnl0ZXMsIGludCBsZW5ndGgpID0gMDsKSW5kZXg6IFNvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm94eS5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb3h5LmNwcAkocmV2 aXNpb24gOTgzOTQpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2lu UHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMzcsNyArMjM3LDcgQEAgdm9pZCBQbHVnaW5Q cm94eTo6ZGlkRXZhbHVhdGVKYXZhU2NyaXB0KAogICAgIG1fY29ubmVjdGlvbi0+Y29ubmVjdGlv bigpLT5zZW5kKE1lc3NhZ2VzOjpQbHVnaW5Db250cm9sbGVyUHJveHk6OkRpZEV2YWx1YXRlSmF2 YVNjcmlwdChyZXF1ZXN0SUQsIHJlc3VsdCksIG1fcGx1Z2luSW5zdGFuY2VJRCk7CiB9CiAKLXZv aWQgUGx1Z2luUHJveHk6OnN0cmVhbURpZFJlY2VpdmVSZXNwb25zZSh1aW50NjRfdCBzdHJlYW1J RCwgY29uc3QgS1VSTCYgcmVzcG9uc2VVUkwsIHVpbnQzMl90IHN0cmVhbUxlbmd0aCwgdWludDMy X3QgbGFzdE1vZGlmaWVkVGltZSwgY29uc3QgV1RGOjpTdHJpbmcmIG1pbWVUeXBlLCBjb25zdCBX VEY6OlN0cmluZyYgaGVhZGVycykKK3ZvaWQgUGx1Z2luUHJveHk6OnN0cmVhbURpZFJlY2VpdmVS ZXNwb25zZSh1aW50NjRfdCBzdHJlYW1JRCwgY29uc3QgS1VSTCYgcmVzcG9uc2VVUkwsIHVpbnQz Ml90IHN0cmVhbUxlbmd0aCwgdWludDMyX3QgbGFzdE1vZGlmaWVkVGltZSwgY29uc3QgV1RGOjpT dHJpbmcmIG1pbWVUeXBlLCBjb25zdCBXVEY6OlN0cmluZyYgaGVhZGVycywgY29uc3QgU3RyaW5n JiAvKiBzdWdnZXN0ZWRGaWxlTmFtZSAqLykKIHsKICAgICBtX2Nvbm5lY3Rpb24tPmNvbm5lY3Rp b24oKS0+c2VuZChNZXNzYWdlczo6UGx1Z2luQ29udHJvbGxlclByb3h5OjpTdHJlYW1EaWRSZWNl aXZlUmVzcG9uc2Uoc3RyZWFtSUQsIHJlc3BvbnNlVVJMLnN0cmluZygpLCBzdHJlYW1MZW5ndGgs IGxhc3RNb2RpZmllZFRpbWUsIG1pbWVUeXBlLCBoZWFkZXJzKSwgbV9wbHVnaW5JbnN0YW5jZUlE KTsKIH0KQEAgLTI1Nyw3ICsyNTcsNyBAQCB2b2lkIFBsdWdpblByb3h5OjpzdHJlYW1EaWRGYWls KHVpbnQ2NF90CiAgICAgbV9jb25uZWN0aW9uLT5jb25uZWN0aW9uKCktPnNlbmQoTWVzc2FnZXM6 OlBsdWdpbkNvbnRyb2xsZXJQcm94eTo6U3RyZWFtRGlkRmFpbChzdHJlYW1JRCwgd2FzQ2FuY2Vs bGVkKSwgbV9wbHVnaW5JbnN0YW5jZUlEKTsKIH0KIAotdm9pZCBQbHVnaW5Qcm94eTo6bWFudWFs U3RyZWFtRGlkUmVjZWl2ZVJlc3BvbnNlKGNvbnN0IEtVUkwmIHJlc3BvbnNlVVJMLCB1aW50MzJf dCBzdHJlYW1MZW5ndGgsICB1aW50MzJfdCBsYXN0TW9kaWZpZWRUaW1lLCBjb25zdCBXVEY6OlN0 cmluZyYgbWltZVR5cGUsIGNvbnN0IFdURjo6U3RyaW5nJiBoZWFkZXJzKQordm9pZCBQbHVnaW5Q cm94eTo6bWFudWFsU3RyZWFtRGlkUmVjZWl2ZVJlc3BvbnNlKGNvbnN0IEtVUkwmIHJlc3BvbnNl VVJMLCB1aW50MzJfdCBzdHJlYW1MZW5ndGgsICB1aW50MzJfdCBsYXN0TW9kaWZpZWRUaW1lLCBj b25zdCBXVEY6OlN0cmluZyYgbWltZVR5cGUsIGNvbnN0IFdURjo6U3RyaW5nJiBoZWFkZXJzLCBj b25zdCBTdHJpbmcmIC8qIHN1Z2dlc3RlZEZpbGVOYW1lICovKQogewogICAgIG1fY29ubmVjdGlv bi0+Y29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpQbHVnaW5Db250cm9sbGVyUHJveHk6Ok1h bnVhbFN0cmVhbURpZFJlY2VpdmVSZXNwb25zZShyZXNwb25zZVVSTC5zdHJpbmcoKSwgc3RyZWFt TGVuZ3RoLCBsYXN0TW9kaWZpZWRUaW1lLCBtaW1lVHlwZSwgaGVhZGVycyksIG1fcGx1Z2luSW5z dGFuY2VJRCk7CiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1 Z2luUHJveHkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdp bnMvUGx1Z2luUHJveHkuaAkocmV2aXNpb24gOTgzOTQpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtNzYsMTEgKzc2 LDExIEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIGZyYW1lRGlkRmluaXNoTG9hZGluZyh1 aW50NjRfdCByZXF1ZXN0SUQpOwogICAgIHZpcnR1YWwgdm9pZCBmcmFtZURpZEZhaWwodWludDY0 X3QgcmVxdWVzdElELCBib29sIHdhc0NhbmNlbGxlZCk7CiAgICAgdmlydHVhbCB2b2lkIGRpZEV2 YWx1YXRlSmF2YVNjcmlwdCh1aW50NjRfdCByZXF1ZXN0SUQsIGNvbnN0IFN0cmluZyYgcmVzdWx0 KTsKLSAgICB2aXJ0dWFsIHZvaWQgc3RyZWFtRGlkUmVjZWl2ZVJlc3BvbnNlKHVpbnQ2NF90IHN0 cmVhbUlELCBjb25zdCBXZWJDb3JlOjpLVVJMJiByZXNwb25zZVVSTCwgdWludDMyX3Qgc3RyZWFt TGVuZ3RoLCB1aW50MzJfdCBsYXN0TW9kaWZpZWRUaW1lLCBjb25zdCBXVEY6OlN0cmluZyYgbWlt ZVR5cGUsIGNvbnN0IFdURjo6U3RyaW5nJiBoZWFkZXJzKTsKKyAgICB2aXJ0dWFsIHZvaWQgc3Ry ZWFtRGlkUmVjZWl2ZVJlc3BvbnNlKHVpbnQ2NF90IHN0cmVhbUlELCBjb25zdCBXZWJDb3JlOjpL VVJMJiByZXNwb25zZVVSTCwgdWludDMyX3Qgc3RyZWFtTGVuZ3RoLCB1aW50MzJfdCBsYXN0TW9k aWZpZWRUaW1lLCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBjb25zdCBTdHJpbmcmIGhlYWRlcnMs IGNvbnN0IFN0cmluZyYgc3VnZ2VzdGVkRmlsZU5hbWUpOwogICAgIHZpcnR1YWwgdm9pZCBzdHJl YW1EaWRSZWNlaXZlRGF0YSh1aW50NjRfdCBzdHJlYW1JRCwgY29uc3QgY2hhciogYnl0ZXMsIGlu dCBsZW5ndGgpOwogICAgIHZpcnR1YWwgdm9pZCBzdHJlYW1EaWRGaW5pc2hMb2FkaW5nKHVpbnQ2 NF90IHN0cmVhbUlEKTsKICAgICB2aXJ0dWFsIHZvaWQgc3RyZWFtRGlkRmFpbCh1aW50NjRfdCBz dHJlYW1JRCwgYm9vbCB3YXNDYW5jZWxsZWQpOwotICAgIHZpcnR1YWwgdm9pZCBtYW51YWxTdHJl YW1EaWRSZWNlaXZlUmVzcG9uc2UoY29uc3QgV2ViQ29yZTo6S1VSTCYgcmVzcG9uc2VVUkwsIHVp bnQzMl90IHN0cmVhbUxlbmd0aCwgdWludDMyX3QgbGFzdE1vZGlmaWVkVGltZSwgY29uc3QgV1RG OjpTdHJpbmcmIG1pbWVUeXBlLCBjb25zdCBXVEY6OlN0cmluZyYgaGVhZGVycyk7CisgICAgdmly dHVhbCB2b2lkIG1hbnVhbFN0cmVhbURpZFJlY2VpdmVSZXNwb25zZShjb25zdCBXZWJDb3JlOjpL VVJMJiByZXNwb25zZVVSTCwgdWludDMyX3Qgc3RyZWFtTGVuZ3RoLCB1aW50MzJfdCBsYXN0TW9k aWZpZWRUaW1lLCBjb25zdCBXVEY6OlN0cmluZyYgbWltZVR5cGUsIGNvbnN0IFdURjo6U3RyaW5n JiBoZWFkZXJzLCBjb25zdCBTdHJpbmcmIHN1Z2dlc3RlZEZpbGVOYW1lKTsKICAgICB2aXJ0dWFs IHZvaWQgbWFudWFsU3RyZWFtRGlkUmVjZWl2ZURhdGEoY29uc3QgY2hhciogYnl0ZXMsIGludCBs ZW5ndGgpOwogICAgIHZpcnR1YWwgdm9pZCBtYW51YWxTdHJlYW1EaWRGaW5pc2hMb2FkaW5nKCk7 CiAgICAgdmlydHVhbCB2b2lkIG1hbnVhbFN0cmVhbURpZEZhaWwoYm9vbCB3YXNDYW5jZWxsZWQp OwpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5W aWV3LmNwcAkocmV2aXNpb24gOTgzOTQpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1Bs dWdpbnMvUGx1Z2luVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE5OSw3ICsxOTksNyBAQCB2 b2lkIFBsdWdpblZpZXc6OlN0cmVhbTo6ZGlkUmVjZWl2ZVJlc3BvCiAgICAgaWYgKGV4cGVjdGVk Q29udGVudExlbmd0aCA+IDApCiAgICAgICAgIHN0cmVhbUxlbmd0aCA9IGV4cGVjdGVkQ29udGVu dExlbmd0aDsKIAotICAgIG1fcGx1Z2luVmlldy0+bV9wbHVnaW4tPnN0cmVhbURpZFJlY2VpdmVS ZXNwb25zZShtX3N0cmVhbUlELCByZXNwb25zZVVSTCwgc3RyZWFtTGVuZ3RoLCByZXNwb25zZS5s YXN0TW9kaWZpZWREYXRlKCksIG1pbWVUeXBlLCBoZWFkZXJzKTsKKyAgICBtX3BsdWdpblZpZXct Pm1fcGx1Z2luLT5zdHJlYW1EaWRSZWNlaXZlUmVzcG9uc2UobV9zdHJlYW1JRCwgcmVzcG9uc2VV UkwsIHN0cmVhbUxlbmd0aCwgcmVzcG9uc2UubGFzdE1vZGlmaWVkRGF0ZSgpLCBtaW1lVHlwZSwg aGVhZGVycywgcmVzcG9uc2Uuc3VnZ2VzdGVkRmlsZW5hbWUoKSk7CiB9CiAKIHZvaWQgUGx1Z2lu Vmlldzo6U3RyZWFtOjpkaWRSZWNlaXZlRGF0YShOZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlcios IGNvbnN0IGNoYXIqIGJ5dGVzLCBpbnQgbGVuZ3RoKQpAQCAtMzMwLDcgKzMzMCw3IEBAIHZvaWQg UGx1Z2luVmlldzo6bWFudWFsTG9hZERpZFJlY2VpdmVSZXMKICAgICBpZiAoZXhwZWN0ZWRDb250 ZW50TGVuZ3RoID4gMCkKICAgICAgICAgc3RyZWFtTGVuZ3RoID0gZXhwZWN0ZWRDb250ZW50TGVu Z3RoOwogCi0gICAgbV9wbHVnaW4tPm1hbnVhbFN0cmVhbURpZFJlY2VpdmVSZXNwb25zZShyZXNw b25zZVVSTCwgc3RyZWFtTGVuZ3RoLCByZXNwb25zZS5sYXN0TW9kaWZpZWREYXRlKCksIG1pbWVU eXBlLCBoZWFkZXJzKTsKKyAgICBtX3BsdWdpbi0+bWFudWFsU3RyZWFtRGlkUmVjZWl2ZVJlc3Bv bnNlKHJlc3BvbnNlVVJMLCBzdHJlYW1MZW5ndGgsIHJlc3BvbnNlLmxhc3RNb2RpZmllZERhdGUo KSwgbWltZVR5cGUsIGhlYWRlcnMsIHJlc3BvbnNlLnN1Z2dlc3RlZEZpbGVuYW1lKCkpOwogfQog CiB2b2lkIFBsdWdpblZpZXc6Om1hbnVhbExvYWREaWRSZWNlaXZlRGF0YShjb25zdCBjaGFyKiBi eXRlcywgaW50IGxlbmd0aCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lu cy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luLmNwcAkocmV2aXNp b24gOTgzOTQpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUv TmV0c2NhcGVQbHVnaW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03MjQsNyArNzI0LDcgQEAgdm9p ZCBOZXRzY2FwZVBsdWdpbjo6ZGlkRXZhbHVhdGVKYXZhU2NyaQogfQogCiB2b2lkIE5ldHNjYXBl UGx1Z2luOjpzdHJlYW1EaWRSZWNlaXZlUmVzcG9uc2UodWludDY0X3Qgc3RyZWFtSUQsIGNvbnN0 IEtVUkwmIHJlc3BvbnNlVVJMLCB1aW50MzJfdCBzdHJlYW1MZW5ndGgsIAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQzMl90IGxhc3RNb2RpZmllZFRp bWUsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGNvbnN0IFN0cmluZyYgaGVhZGVycykKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1aW50MzJfdCBsYXN0TW9k aWZpZWRUaW1lLCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBjb25zdCBTdHJpbmcmIGhlYWRlcnMs IGNvbnN0IFN0cmluZyYgLyogc3VnZ2VzdGVkRmlsZU5hbWUgKi8pCiB7CiAgICAgQVNTRVJUKG1f aXNTdGFydGVkKTsKICAgICAKQEAgLTc1Nyw3ICs3NTcsNyBAQCB2b2lkIE5ldHNjYXBlUGx1Z2lu OjpzdHJlYW1EaWRGYWlsKHVpbnQ2CiB9CiAKIHZvaWQgTmV0c2NhcGVQbHVnaW46Om1hbnVhbFN0 cmVhbURpZFJlY2VpdmVSZXNwb25zZShjb25zdCBLVVJMJiByZXNwb25zZVVSTCwgdWludDMyX3Qg c3RyZWFtTGVuZ3RoLCB1aW50MzJfdCBsYXN0TW9kaWZpZWRUaW1lLCAKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBTdHJpbmcmIG1pbWVU eXBlLCBjb25zdCBTdHJpbmcmIGhlYWRlcnMpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgY29uc3QgU3Ry aW5nJiBoZWFkZXJzLCBjb25zdCBTdHJpbmcmIC8qIHN1Z2dlc3RlZEZpbGVOYW1lICovKQogewog ICAgIEFTU0VSVChtX2lzU3RhcnRlZCk7CiAgICAgQVNTRVJUKG1fbG9hZE1hbnVhbGx5KTsKSW5k ZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBs dWdpbi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9O ZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5oCShyZXZpc2lvbiA5ODM5NCkKKysrIFNvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5oCSh3b3JraW5n IGNvcHkpCkBAIC0xNzMsMTIgKzE3MywxMiBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCBm cmFtZURpZEZhaWwodWludDY0X3QgcmVxdWVzdElELCBib29sIHdhc0NhbmNlbGxlZCk7CiAgICAg dmlydHVhbCB2b2lkIGRpZEV2YWx1YXRlSmF2YVNjcmlwdCh1aW50NjRfdCByZXF1ZXN0SUQsIGNv bnN0IFN0cmluZyYgcmVzdWx0KTsKICAgICB2aXJ0dWFsIHZvaWQgc3RyZWFtRGlkUmVjZWl2ZVJl c3BvbnNlKHVpbnQ2NF90IHN0cmVhbUlELCBjb25zdCBXZWJDb3JlOjpLVVJMJiByZXNwb25zZVVS TCwgdWludDMyX3Qgc3RyZWFtTGVuZ3RoLCAKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHVpbnQzMl90IGxhc3RNb2RpZmllZFRpbWUsIGNvbnN0IFN0cmluZyYgbWlt ZVR5cGUsIGNvbnN0IFN0cmluZyYgaGVhZGVycyk7CisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICB1aW50MzJfdCBsYXN0TW9kaWZpZWRUaW1lLCBjb25zdCBTdHJpbmcm IG1pbWVUeXBlLCBjb25zdCBTdHJpbmcmIGhlYWRlcnMsIGNvbnN0IFN0cmluZyYgc3VnZ2VzdGVk RmlsZU5hbWUpOwogICAgIHZpcnR1YWwgdm9pZCBzdHJlYW1EaWRSZWNlaXZlRGF0YSh1aW50NjRf dCBzdHJlYW1JRCwgY29uc3QgY2hhciogYnl0ZXMsIGludCBsZW5ndGgpOwogICAgIHZpcnR1YWwg dm9pZCBzdHJlYW1EaWRGaW5pc2hMb2FkaW5nKHVpbnQ2NF90IHN0cmVhbUlEKTsKICAgICB2aXJ0 dWFsIHZvaWQgc3RyZWFtRGlkRmFpbCh1aW50NjRfdCBzdHJlYW1JRCwgYm9vbCB3YXNDYW5jZWxs ZWQpOwogICAgIHZpcnR1YWwgdm9pZCBtYW51YWxTdHJlYW1EaWRSZWNlaXZlUmVzcG9uc2UoY29u c3QgV2ViQ29yZTo6S1VSTCYgcmVzcG9uc2VVUkwsIHVpbnQzMl90IHN0cmVhbUxlbmd0aCwgCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1aW50MzJfdCBs YXN0TW9kaWZpZWRUaW1lLCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBjb25zdCBTdHJpbmcmIGhl YWRlcnMpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg dWludDMyX3QgbGFzdE1vZGlmaWVkVGltZSwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgY29uc3Qg U3RyaW5nJiBoZWFkZXJzLCBjb25zdCBTdHJpbmcmIHN1Z2dlc3RlZEZpbGVOYW1lKTsKICAgICB2 aXJ0dWFsIHZvaWQgbWFudWFsU3RyZWFtRGlkUmVjZWl2ZURhdGEoY29uc3QgY2hhciogYnl0ZXMs IGludCBsZW5ndGgpOwogICAgIHZpcnR1YWwgdm9pZCBtYW51YWxTdHJlYW1EaWRGaW5pc2hMb2Fk aW5nKCk7CiAgICAgdmlydHVhbCB2b2lkIG1hbnVhbFN0cmVhbURpZEZhaWwoYm9vbCB3YXNDYW5j ZWxsZWQpOwpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9CdWls dEluUERGVmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9Q bHVnaW5zL1BERi9CdWlsdEluUERGVmlldy5jcHAJKHJldmlzaW9uIDk4Mzk0KQorKysgU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9CdWlsdEluUERGVmlldy5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTMwLDYgKzMwLDggQEAKICNpbmNsdWRlICJTaGFyZWFibGVCaXRtYXAuaCIK ICNpbmNsdWRlICJXZWJFdmVudC5oIgogI2luY2x1ZGUgIldlYkV2ZW50Q29udmVyc2lvbi5oIgor I2luY2x1ZGUgPFdlYkNvcmUvQXJjaGl2ZVJlc291cmNlLmg+CisjaW5jbHVkZSA8V2ViQ29yZS9E b2N1bWVudExvYWRlci5oPgogI2luY2x1ZGUgPFdlYkNvcmUvRm9jdXNDb250cm9sbGVyLmg+CiAj aW5jbHVkZSA8V2ViQ29yZS9GcmFtZS5oPgogI2luY2x1ZGUgPFdlYkNvcmUvRnJhbWVWaWV3Lmg+ CkBAIC0xODUsOCArMTg3LDIyIEBAIHZvaWQgQnVpbHRJblBERlZpZXc6OmRlc3Ryb3lTY3JvbGxi YXIoU2MKICAgICBzY3JvbGxiYXIgPSAwOwogfQogCit2b2lkIEJ1aWx0SW5QREZWaWV3OjphZGRB cmNoaXZlUmVzb3VyY2UoKQoreworICAgIC8vIEZJWE1FOiBJdCdzIGEgaGFjayB0byBmb3JjZSBh ZGQgYSByZXNvdXJjZSB0byBEb2N1bWVudExvYWRlci4gUERGIGRvY3VtZW50cyBzaG91bGQganVz dCBiZSBmZXRjaGVkIGFzIENhY2hlZFJlc291cmNlcy4KKyAgICBSZXNvdXJjZVJlc3BvbnNlIGZh a2VSZXNwb25zZTsKKyAgICBmYWtlUmVzcG9uc2Uuc2V0U3VnZ2VzdGVkRmlsZW5hbWUobV9zdWdn ZXN0ZWRGaWxlbmFtZSk7CisgICAgZmFrZVJlc3BvbnNlLnNldFVSTChtX3NvdXJjZVVSTCk7Cisg ICAgZmFrZVJlc3BvbnNlLnNldE1pbWVUeXBlKCJhcHBsaWNhdGlvbi9wZGYiKTsKKworICAgIFJl ZlB0cjxBcmNoaXZlUmVzb3VyY2U+IHJlc291cmNlID0gQXJjaGl2ZVJlc291cmNlOjpjcmVhdGUo U2hhcmVkQnVmZmVyOjp3cmFwQ0ZEYXRhKG1fZGF0YUJ1ZmZlci5nZXQoKSksIG1fc291cmNlVVJM LCAiYXBwbGljYXRpb24vcGRmIiwgU3RyaW5nKCksIFN0cmluZygpLCBmYWtlUmVzcG9uc2UpOwor ICAgIHBsdWdpblZpZXcoKS0+ZnJhbWUoKS0+ZG9jdW1lbnQoKS0+bG9hZGVyKCktPmFkZEFyY2hp dmVSZXNvdXJjZShyZXNvdXJjZS5yZWxlYXNlKCkpOworfQorCiB2b2lkIEJ1aWx0SW5QREZWaWV3 OjpwZGZEb2N1bWVudERpZExvYWQoKQogeworICAgIGFkZEFyY2hpdmVSZXNvdXJjZSgpOworCiAg ICAgUmV0YWluUHRyPENHRGF0YVByb3ZpZGVyUmVmPiBwZGZEYXRhUHJvdmlkZXIoQWRvcHRDRiwg Q0dEYXRhUHJvdmlkZXJDcmVhdGVXaXRoQ0ZEYXRhKG1fZGF0YUJ1ZmZlci5nZXQoKSkpOwogICAg IG1fcGRmRG9jdW1lbnQuYWRvcHRDRihDR1BERkRvY3VtZW50Q3JlYXRlV2l0aFByb3ZpZGVyKHBk ZkRhdGFQcm92aWRlci5nZXQoKSkpOwogCkBAIC0yMTgsNiArMjM0LDcgQEAgYm9vbCBCdWlsdElu UERGVmlldzo6aW5pdGlhbGl6ZShjb25zdCBQYQogICAgIG1fcGFnZS0+YWRkU2Nyb2xsYWJsZUFy ZWEodGhpcyk7CiAKICAgICAvLyBMb2FkIHRoZSBzcmMgVVJMIGlmIG5lZWRlZC4KKyAgICBtX3Nv dXJjZVVSTCA9IHBhcmFtZXRlcnMudXJsOwogICAgIGlmICghcGFyYW1ldGVycy5sb2FkTWFudWFs bHkgJiYgIXBhcmFtZXRlcnMudXJsLmlzRW1wdHkoKSkKICAgICAgICAgY29udHJvbGxlcigpLT5s b2FkVVJMKHBkZkRvY3VtZW50UmVxdWVzdElELCAiR0VUIiwgcGFyYW1ldGVycy51cmwuc3RyaW5n KCksIFN0cmluZygpLCBIVFRQSGVhZGVyTWFwKCksIFZlY3Rvcjx1aW50OF90PigpLCBmYWxzZSk7 CiAKQEAgLTM3OCw5ICszOTUsMTEgQEAgdm9pZCBCdWlsdEluUERGVmlldzo6ZGlkRXZhbHVhdGVK YXZhU2NyaQogICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogfQogCi12b2lkIEJ1aWx0SW5QREZW aWV3OjpzdHJlYW1EaWRSZWNlaXZlUmVzcG9uc2UodWludDY0X3Qgc3RyZWFtSUQsIGNvbnN0IEtV UkwmLCB1aW50MzJfdCwgdWludDMyX3QsIGNvbnN0IFdURjo6U3RyaW5nJiwgY29uc3QgV1RGOjpT dHJpbmcmKQordm9pZCBCdWlsdEluUERGVmlldzo6c3RyZWFtRGlkUmVjZWl2ZVJlc3BvbnNlKHVp bnQ2NF90IHN0cmVhbUlELCBjb25zdCBLVVJMJiwgdWludDMyX3QsIHVpbnQzMl90LCBjb25zdCBT dHJpbmcmLCBjb25zdCBTdHJpbmcmLCBjb25zdCBTdHJpbmcmIHN1Z2dlc3RlZEZpbGVuYW1lKQog ewogICAgIEFTU0VSVF9VTlVTRUQoc3RyZWFtSUQsIHN0cmVhbUlEID09IHBkZkRvY3VtZW50UmVx dWVzdElEKTsKKworICAgIG1fc3VnZ2VzdGVkRmlsZW5hbWUgPSBzdWdnZXN0ZWRGaWxlbmFtZTsK IH0KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKIHZvaWQgQnVp bHRJblBERlZpZXc6OnN0cmVhbURpZFJlY2VpdmVEYXRhKHVpbnQ2NF90IHN0cmVhbUlELCBjb25z dCBjaGFyKiBieXRlcywgaW50IGxlbmd0aCkKQEAgLTQwNyw4ICs0MjYsOSBAQCB2b2lkIEJ1aWx0 SW5QREZWaWV3OjpzdHJlYW1EaWRGYWlsKHVpbnQ2CiAgICAgbV9kYXRhQnVmZmVyLmNsZWFyKCk7 CiB9CiAKLXZvaWQgQnVpbHRJblBERlZpZXc6Om1hbnVhbFN0cmVhbURpZFJlY2VpdmVSZXNwb25z ZShjb25zdCBLVVJMJiByZXNwb25zZVVSTCwgdWludDMyX3Qgc3RyZWFtTGVuZ3RoLCAgdWludDMy X3QgbGFzdE1vZGlmaWVkVGltZSwgY29uc3QgV1RGOjpTdHJpbmcmIG1pbWVUeXBlLCBjb25zdCBX VEY6OlN0cmluZyYgaGVhZGVycykKK3ZvaWQgQnVpbHRJblBERlZpZXc6Om1hbnVhbFN0cmVhbURp ZFJlY2VpdmVSZXNwb25zZShjb25zdCBLVVJMJiByZXNwb25zZVVSTCwgdWludDMyX3Qgc3RyZWFt TGVuZ3RoLCAgdWludDMyX3QgbGFzdE1vZGlmaWVkVGltZSwgY29uc3QgU3RyaW5nJiBtaW1lVHlw ZSwgY29uc3QgU3RyaW5nJiBoZWFkZXJzLCBjb25zdCBTdHJpbmcmIHN1Z2dlc3RlZEZpbGVuYW1l KQogeworICAgIG1fc3VnZ2VzdGVkRmlsZW5hbWUgPSBzdWdnZXN0ZWRGaWxlbmFtZTsKIH0KIAog dm9pZCBCdWlsdEluUERGVmlldzo6bWFudWFsU3RyZWFtRGlkUmVjZWl2ZURhdGEoY29uc3QgY2hh ciogYnl0ZXMsIGludCBsZW5ndGgpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1Bs dWdpbnMvUERGL0J1aWx0SW5QREZWaWV3LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9CdWlsdEluUERGVmlldy5oCShyZXZpc2lvbiA5ODM5NCkK KysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvQnVpbHRJblBERlZpZXcu aAkod29ya2luZyBjb3B5KQpAQCAtNjAsNiArNjAsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgd2ls bFJlbW92ZVZlcnRpY2FsU2Nyb2xsYmFyKFdlYkNvcmU6OlNjcm9sbGJhciopOwogICAgIFBhc3NS ZWZQdHI8V2ViQ29yZTo6U2Nyb2xsYmFyPiBjcmVhdGVTY3JvbGxiYXIoV2ViQ29yZTo6U2Nyb2xs YmFyT3JpZW50YXRpb24pOwogICAgIHZvaWQgZGVzdHJveVNjcm9sbGJhcihXZWJDb3JlOjpTY3Jv bGxiYXJPcmllbnRhdGlvbik7CisgICAgdm9pZCBhZGRBcmNoaXZlUmVzb3VyY2UoKTsKICAgICB2 b2lkIHBkZkRvY3VtZW50RGlkTG9hZCgpOwogICAgIHZvaWQgY2FsY3VsYXRlU2l6ZXMoKTsKICAg ICB2b2lkIHBhaW50QmFja2dyb3VuZChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQqLCBjb25zdCBX ZWJDb3JlOjpJbnRSZWN0JiBkaXJ0eVJlY3QpOwpAQCAtODEsMTEgKzgyLDExIEBAIHByaXZhdGU6 CiAgICAgdmlydHVhbCB2b2lkIGZyYW1lRGlkRmluaXNoTG9hZGluZyh1aW50NjRfdCByZXF1ZXN0 SUQpOwogICAgIHZpcnR1YWwgdm9pZCBmcmFtZURpZEZhaWwodWludDY0X3QgcmVxdWVzdElELCBi b29sIHdhc0NhbmNlbGxlZCk7CiAgICAgdmlydHVhbCB2b2lkIGRpZEV2YWx1YXRlSmF2YVNjcmlw dCh1aW50NjRfdCByZXF1ZXN0SUQsIGNvbnN0IFN0cmluZyYgcmVzdWx0KTsKLSAgICB2aXJ0dWFs IHZvaWQgc3RyZWFtRGlkUmVjZWl2ZVJlc3BvbnNlKHVpbnQ2NF90IHN0cmVhbUlELCBjb25zdCBX ZWJDb3JlOjpLVVJMJiByZXNwb25zZVVSTCwgdWludDMyX3Qgc3RyZWFtTGVuZ3RoLCB1aW50MzJf dCBsYXN0TW9kaWZpZWRUaW1lLCBjb25zdCBXVEY6OlN0cmluZyYgbWltZVR5cGUsIGNvbnN0IFdU Rjo6U3RyaW5nJiBoZWFkZXJzKTsKKyAgICB2aXJ0dWFsIHZvaWQgc3RyZWFtRGlkUmVjZWl2ZVJl c3BvbnNlKHVpbnQ2NF90IHN0cmVhbUlELCBjb25zdCBXZWJDb3JlOjpLVVJMJiByZXNwb25zZVVS TCwgdWludDMyX3Qgc3RyZWFtTGVuZ3RoLCB1aW50MzJfdCBsYXN0TW9kaWZpZWRUaW1lLCBjb25z dCBTdHJpbmcmIG1pbWVUeXBlLCBjb25zdCBTdHJpbmcmIGhlYWRlcnMsIGNvbnN0IFN0cmluZyYg c3VnZ2VzdGVkRmlsZU5hbWUpOwogICAgIHZpcnR1YWwgdm9pZCBzdHJlYW1EaWRSZWNlaXZlRGF0 YSh1aW50NjRfdCBzdHJlYW1JRCwgY29uc3QgY2hhciogYnl0ZXMsIGludCBsZW5ndGgpOwogICAg IHZpcnR1YWwgdm9pZCBzdHJlYW1EaWRGaW5pc2hMb2FkaW5nKHVpbnQ2NF90IHN0cmVhbUlEKTsK ICAgICB2aXJ0dWFsIHZvaWQgc3RyZWFtRGlkRmFpbCh1aW50NjRfdCBzdHJlYW1JRCwgYm9vbCB3 YXNDYW5jZWxsZWQpOwotICAgIHZpcnR1YWwgdm9pZCBtYW51YWxTdHJlYW1EaWRSZWNlaXZlUmVz cG9uc2UoY29uc3QgV2ViQ29yZTo6S1VSTCYgcmVzcG9uc2VVUkwsIHVpbnQzMl90IHN0cmVhbUxl bmd0aCwgdWludDMyX3QgbGFzdE1vZGlmaWVkVGltZSwgY29uc3QgV1RGOjpTdHJpbmcmIG1pbWVU eXBlLCBjb25zdCBXVEY6OlN0cmluZyYgaGVhZGVycyk7CisgICAgdmlydHVhbCB2b2lkIG1hbnVh bFN0cmVhbURpZFJlY2VpdmVSZXNwb25zZShjb25zdCBXZWJDb3JlOjpLVVJMJiByZXNwb25zZVVS TCwgdWludDMyX3Qgc3RyZWFtTGVuZ3RoLCB1aW50MzJfdCBsYXN0TW9kaWZpZWRUaW1lLCBjb25z dCBXVEY6OlN0cmluZyYgbWltZVR5cGUsIGNvbnN0IFdURjo6U3RyaW5nJiBoZWFkZXJzLCBjb25z dCBTdHJpbmcmIHN1Z2dlc3RlZEZpbGVOYW1lKTsKICAgICB2aXJ0dWFsIHZvaWQgbWFudWFsU3Ry ZWFtRGlkUmVjZWl2ZURhdGEoY29uc3QgY2hhciogYnl0ZXMsIGludCBsZW5ndGgpOwogICAgIHZp cnR1YWwgdm9pZCBtYW51YWxTdHJlYW1EaWRGaW5pc2hMb2FkaW5nKCk7CiAgICAgdmlydHVhbCB2 b2lkIG1hbnVhbFN0cmVhbURpZEZhaWwoYm9vbCB3YXNDYW5jZWxsZWQpOwpAQCAtMTQ0LDcgKzE0 NSwxMSBAQCBwcml2YXRlOgogICAgIC8vIEluIHdpbmRvdyBjb29yZGluYXRlcy4KICAgICBXZWJD b3JlOjpJbnRSZWN0IG1fZnJhbWVSZWN0OwogCisgICAgV2ViQ29yZTo6S1VSTCBtX3NvdXJjZVVS TDsKKworICAgIFN0cmluZyBtX3N1Z2dlc3RlZEZpbGVuYW1lOwogICAgIFJldGFpblB0cjxDRk11 dGFibGVEYXRhUmVmPiBtX2RhdGFCdWZmZXI7CisKICAgICBSZXRhaW5QdHI8Q0dQREZEb2N1bWVu dFJlZj4gbV9wZGZEb2N1bWVudDsKICAgICBWZWN0b3I8V2ViQ29yZTo6SW50UmVjdD4gbV9wYWdl Qm94ZXM7CiAgICAgV2ViQ29yZTo6SW50U2l6ZSBtX3BkZkRvY3VtZW50U2l6ZTsgLy8gQWxsIHBh Z2VzLCBpbmNsdWRpbmcgZ2Fwcy4K