170103 2017-03-25 16:13:37 -0700 [iOS] Use snapshotting instead of printing to draw single-page PDFs 2017-03-25 17:53:30 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 aestes aestes andersca bdakin commit-queue kling thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1291276 0 aestes 2017-03-25 16:13:37 -0700 [iOS] Use snapshotting instead of printing to draw single-page PDFs 1291277 1 aestes 2017-03-25 16:14:44 -0700 rdar://problem/30542960 1291279 2 305406 aestes 2017-03-25 16:20:28 -0700 Created attachment 305406 Patch 1291282 3 305406 commit-queue 2017-03-25 17:53:27 -0700 Comment on attachment 305406 Patch Clearing flags on attachment: 305406 Committed r214406: <http://trac.webkit.org/changeset/214406> 1291283 4 commit-queue 2017-03-25 17:53:30 -0700 All reviewed patches have been landed. Closing bug. 305406 2017-03-25 16:20:28 -0700 2017-03-25 17:53:27 -0700 Patch bug-170103-20170325162027.patch text/plain 10700 aestes U3VidmVyc2lvbiBSZXZpc2lvbjogMjE0MzgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggM2I0MmUxYTJjNTE4NmQ1 ZGQ1NGVlYmUzY2Q1ODRiZTBkZmZhM2QwMy4uYjUyMmQ2Nzc5MmJkYjNiOWVhZWUyMGNkODIzOTBh NjM2NzUyN2VkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE3LTAzLTI1ICBBbmR5 IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBVc2Ugc25hcHNob3R0 aW5nIGluc3RlYWQgb2YgcHJpbnRpbmcgdG8gZHJhdyBzaW5nbGUtcGFnZSBQREZzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzAxMDMKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzMwNTQyOTYwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAg ICAgICAoV2ViS2l0OjpwYWludFNuYXBzaG90QXRTaXplKTogTW92ZWQgdGhlIHBhaW50aW5nIGxv Z2ljIGZyb20gV2ViUGFnZTo6c25hcHNob3RBdFNpemUoKSB0byBoZXJlLgorICAgICAgICAoV2Vi S2l0OjpXZWJQYWdlOjpzbmFwc2hvdEF0U2l6ZSk6IENoYW5nZWQgdG8gY2FsbCBwYWludFNuYXBz aG90QXRTaXplKCkgd2l0aCB0aGUKKyAgICAgICAgV2ViSW1hZ2UncyBncmFwaGljcyBjb250ZXh0 LgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpwZGZTbmFwc2hvdEF0U2l6ZSk6IENyZWF0ZWQg YSBDR1BERkdyYXBoaWNzQ29udGV4dCwgcGFzc2VkIGl0IHRvCisgICAgICAgIHBhaW50U25hcHNo b3RBdFNpemUoKSwgYW5kIHJldHVybmVkIHRoZSBjb250ZXh0J3MgZGF0YS4KKyAgICAgICAgKiBX ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOiBNYWRlIHNuYXBzaG90QXRTaXplKCkgYW5kIHNu YXBzaG90Tm9kZSgpIHByaXZhdGUsIGNoYW5nZWQKKyAgICAgICAgdGhlaXIgcmV0dXJuIHZhbHVl cyBmcm9tIFBhc3NSZWZQdHIgdG8gUmVmUHRyLCBhbmQgZGVjbGFyZWQgcGRmU25hcHNob3RBdFNp emUoKS4KKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW06Cisg ICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmNvbXB1dGVQYWdlc0ZvclByaW50aW5nQW5kRHJhd1Rv UERGKTogSWYgc25hcHNob3R0aW5nIHRoZSBmaXJzdCBwYWdlLAorICAgICAgICByZXR1cm5lZCBh IHBhZ2UgY291bnQgb2YgMSBhbmQgY3JlYXRlZCBhIFBERiB1c2luZyBwZGZTbmFwc2hvdEF0U2l6 ZSgpLgorCiAyMDE3LTAzLTI0ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29t PgogCiAgICAgICAgIE1ha2UgVUktc2lkZSBjb21wb3NpdGluZyBvbiBtYWNPUyBhIGJpdCBtb3Jl IHVzYWJsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3Bw CmluZGV4IGVmYjA3NGI0NjMxZDY1N2I1ODBmODhjN2FhZTM2OTkwMjgyYTY5MzEuLmE3ZjU1YTgw MmUxODBlZGZiZjI4ZDM1ODlhNDY4NmE3MmZiNmE5YWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTE5NDUsNDIgKzE5NDUsMzAgQEAgUGFz c1JlZlB0cjxXZWJJbWFnZT4gV2ViUGFnZTo6c2NhbGVkU25hcHNob3RXaXRoT3B0aW9ucyhjb25z dCBJbnRSZWN0JiByZWN0LCBkb3UKICAgICByZXR1cm4gc25hcHNob3RBdFNpemUocmVjdCwgYml0 bWFwU2l6ZSwgb3B0aW9ucyk7CiB9CiAKLVBhc3NSZWZQdHI8V2ViSW1hZ2U+IFdlYlBhZ2U6OnNu YXBzaG90QXRTaXplKGNvbnN0IEludFJlY3QmIHJlY3QsIGNvbnN0IEludFNpemUmIGJpdG1hcFNp emUsIFNuYXBzaG90T3B0aW9ucyBvcHRpb25zKQorc3RhdGljIHZvaWQgcGFpbnRTbmFwc2hvdEF0 U2l6ZShjb25zdCBJbnRSZWN0JiByZWN0LCBjb25zdCBJbnRTaXplJiBiaXRtYXBTaXplLCBTbmFw c2hvdE9wdGlvbnMgb3B0aW9ucywgRnJhbWUmIGZyYW1lLCBGcmFtZVZpZXcmIGZyYW1lVmlldywg R3JhcGhpY3NDb250ZXh0JiBncmFwaGljc0NvbnRleHQpCiB7Ci0gICAgRnJhbWUqIGNvcmVGcmFt ZSA9IG1fbWFpbkZyYW1lLT5jb3JlRnJhbWUoKTsKLSAgICBpZiAoIWNvcmVGcmFtZSkKLSAgICAg ICAgcmV0dXJuIG51bGxwdHI7Ci0KLSAgICBGcmFtZVZpZXcqIGZyYW1lVmlldyA9IGNvcmVGcmFt ZS0+dmlldygpOwotICAgIGlmICghZnJhbWVWaWV3KQotICAgICAgICByZXR1cm4gbnVsbHB0cjsK LQogICAgIEludFJlY3Qgc25hcHNob3RSZWN0ID0gcmVjdDsKICAgICBmbG9hdCBob3Jpem9udGFs U2NhbGVGYWN0b3IgPSBzdGF0aWNfY2FzdDxmbG9hdD4oYml0bWFwU2l6ZS53aWR0aCgpKSAvIHJl Y3Qud2lkdGgoKTsKICAgICBmbG9hdCB2ZXJ0aWNhbFNjYWxlRmFjdG9yID0gc3RhdGljX2Nhc3Q8 ZmxvYXQ+KGJpdG1hcFNpemUuaGVpZ2h0KCkpIC8gcmVjdC5oZWlnaHQoKTsKICAgICBmbG9hdCBz Y2FsZUZhY3RvciA9IHN0ZDo6bWF4KGhvcml6b250YWxTY2FsZUZhY3RvciwgdmVydGljYWxTY2Fs ZUZhY3Rvcik7CiAKLSAgICBhdXRvIHNuYXBzaG90ID0gV2ViSW1hZ2U6OmNyZWF0ZShiaXRtYXBT aXplLCBzbmFwc2hvdE9wdGlvbnNUb0ltYWdlT3B0aW9ucyhvcHRpb25zKSk7Ci0KLSAgICBhdXRv IGdyYXBoaWNzQ29udGV4dCA9IHNuYXBzaG90LT5iaXRtYXAoKS5jcmVhdGVHcmFwaGljc0NvbnRl eHQoKTsKLQogICAgIGlmIChvcHRpb25zICYgU25hcHNob3RPcHRpb25zUHJpbnRpbmcpIHsKLSAg ICAgICAgUHJpbnRDb250ZXh0OjpzcG9vbEFsbFBhZ2VzV2l0aEJvdW5kYXJpZXMoKmNvcmVGcmFt ZSwgKmdyYXBoaWNzQ29udGV4dCwgc25hcHNob3RSZWN0LnNpemUoKSk7Ci0gICAgICAgIHJldHVy biBzbmFwc2hvdDsKKyAgICAgICAgUHJpbnRDb250ZXh0OjpzcG9vbEFsbFBhZ2VzV2l0aEJvdW5k YXJpZXMoZnJhbWUsIGdyYXBoaWNzQ29udGV4dCwgc25hcHNob3RSZWN0LnNpemUoKSk7CisgICAg ICAgIHJldHVybjsKICAgICB9CiAKLSAgICBDb2xvciBkb2N1bWVudEJhY2tncm91bmRDb2xvciA9 IGZyYW1lVmlldy0+ZG9jdW1lbnRCYWNrZ3JvdW5kQ29sb3IoKTsKLSAgICBDb2xvciBiYWNrZ3Jv dW5kQ29sb3IgPSAoY29yZUZyYW1lLT5zZXR0aW5ncygpLmJhY2tncm91bmRTaG91bGRFeHRlbmRC ZXlvbmRQYWdlKCkgJiYgZG9jdW1lbnRCYWNrZ3JvdW5kQ29sb3IuaXNWYWxpZCgpKSA/IGRvY3Vt ZW50QmFja2dyb3VuZENvbG9yIDogZnJhbWVWaWV3LT5iYXNlQmFja2dyb3VuZENvbG9yKCk7Ci0g ICAgZ3JhcGhpY3NDb250ZXh0LT5maWxsUmVjdChJbnRSZWN0KEludFBvaW50KCksIGJpdG1hcFNp emUpLCBiYWNrZ3JvdW5kQ29sb3IpOworICAgIENvbG9yIGRvY3VtZW50QmFja2dyb3VuZENvbG9y ID0gZnJhbWVWaWV3LmRvY3VtZW50QmFja2dyb3VuZENvbG9yKCk7CisgICAgQ29sb3IgYmFja2dy b3VuZENvbG9yID0gKGZyYW1lLnNldHRpbmdzKCkuYmFja2dyb3VuZFNob3VsZEV4dGVuZEJleW9u ZFBhZ2UoKSAmJiBkb2N1bWVudEJhY2tncm91bmRDb2xvci5pc1ZhbGlkKCkpID8gZG9jdW1lbnRC YWNrZ3JvdW5kQ29sb3IgOiBmcmFtZVZpZXcuYmFzZUJhY2tncm91bmRDb2xvcigpOworICAgIGdy YXBoaWNzQ29udGV4dC5maWxsUmVjdChJbnRSZWN0KEludFBvaW50KCksIGJpdG1hcFNpemUpLCBi YWNrZ3JvdW5kQ29sb3IpOwogCiAgICAgaWYgKCEob3B0aW9ucyAmIFNuYXBzaG90T3B0aW9uc0V4 Y2x1ZGVEZXZpY2VTY2FsZUZhY3RvcikpIHsKLSAgICAgICAgZG91YmxlIGRldmljZVNjYWxlRmFj dG9yID0gY29yZVBhZ2UoKS0+ZGV2aWNlU2NhbGVGYWN0b3IoKTsKLSAgICAgICAgZ3JhcGhpY3ND b250ZXh0LT5hcHBseURldmljZVNjYWxlRmFjdG9yKGRldmljZVNjYWxlRmFjdG9yKTsKKyAgICAg ICAgZG91YmxlIGRldmljZVNjYWxlRmFjdG9yID0gZnJhbWUucGFnZSgpLT5kZXZpY2VTY2FsZUZh Y3RvcigpOworICAgICAgICBncmFwaGljc0NvbnRleHQuYXBwbHlEZXZpY2VTY2FsZUZhY3Rvcihk ZXZpY2VTY2FsZUZhY3Rvcik7CiAgICAgICAgIHNjYWxlRmFjdG9yIC89IGRldmljZVNjYWxlRmFj dG9yOwogICAgIH0KIAotICAgIGdyYXBoaWNzQ29udGV4dC0+c2NhbGUoc2NhbGVGYWN0b3IpOwot ICAgIGdyYXBoaWNzQ29udGV4dC0+dHJhbnNsYXRlKC1zbmFwc2hvdFJlY3QueCgpLCAtc25hcHNo b3RSZWN0LnkoKSk7CisgICAgZ3JhcGhpY3NDb250ZXh0LnNjYWxlKHNjYWxlRmFjdG9yKTsKKyAg ICBncmFwaGljc0NvbnRleHQudHJhbnNsYXRlKC1zbmFwc2hvdFJlY3QueCgpLCAtc25hcHNob3RS ZWN0LnkoKSk7CiAKICAgICBGcmFtZVZpZXc6OlNlbGVjdGlvbkluU25hcHNob3Qgc2hvdWxkUGFp bnRTZWxlY3Rpb24gPSBGcmFtZVZpZXc6OkluY2x1ZGVTZWxlY3Rpb247CiAgICAgaWYgKG9wdGlv bnMgJiBTbmFwc2hvdE9wdGlvbnNFeGNsdWRlU2VsZWN0aW9uSGlnaGxpZ2h0aW5nKQpAQCAtMTk5 MCwxOCArMTk3OCw2NyBAQCBQYXNzUmVmUHRyPFdlYkltYWdlPiBXZWJQYWdlOjpzbmFwc2hvdEF0 U2l6ZShjb25zdCBJbnRSZWN0JiByZWN0LCBjb25zdCBJbnRTaXplJgogICAgIGlmIChvcHRpb25z ICYgU25hcHNob3RPcHRpb25zSW5WaWV3Q29vcmRpbmF0ZXMpCiAgICAgICAgIGNvb3JkaW5hdGVT cGFjZSA9IEZyYW1lVmlldzo6Vmlld0Nvb3JkaW5hdGVzOwogCi0gICAgZnJhbWVWaWV3LT5wYWlu dENvbnRlbnRzRm9yU25hcHNob3QoKmdyYXBoaWNzQ29udGV4dCwgc25hcHNob3RSZWN0LCBzaG91 bGRQYWludFNlbGVjdGlvbiwgY29vcmRpbmF0ZVNwYWNlKTsKKyAgICBmcmFtZVZpZXcucGFpbnRD b250ZW50c0ZvclNuYXBzaG90KGdyYXBoaWNzQ29udGV4dCwgc25hcHNob3RSZWN0LCBzaG91bGRQ YWludFNlbGVjdGlvbiwgY29vcmRpbmF0ZVNwYWNlKTsKIAogICAgIGlmIChvcHRpb25zICYgU25h cHNob3RPcHRpb25zUGFpbnRTZWxlY3Rpb25SZWN0YW5nbGUpIHsKLSAgICAgICAgRmxvYXRSZWN0 IHNlbGVjdGlvblJlY3RhbmdsZSA9IG1fbWFpbkZyYW1lLT5jb3JlRnJhbWUoKS0+c2VsZWN0aW9u KCkuc2VsZWN0aW9uQm91bmRzKCk7Ci0gICAgICAgIGdyYXBoaWNzQ29udGV4dC0+c2V0U3Ryb2tl Q29sb3IoQ29sb3IoMHhGRiwgMCwgMCkpOwotICAgICAgICBncmFwaGljc0NvbnRleHQtPnN0cm9r ZVJlY3Qoc2VsZWN0aW9uUmVjdGFuZ2xlLCAxKTsKKyAgICAgICAgRmxvYXRSZWN0IHNlbGVjdGlv blJlY3RhbmdsZSA9IGZyYW1lLnNlbGVjdGlvbigpLnNlbGVjdGlvbkJvdW5kcygpOworICAgICAg ICBncmFwaGljc0NvbnRleHQuc2V0U3Ryb2tlQ29sb3IoQ29sb3IoMHhGRiwgMCwgMCkpOworICAg ICAgICBncmFwaGljc0NvbnRleHQuc3Ryb2tlUmVjdChzZWxlY3Rpb25SZWN0YW5nbGUsIDEpOwog ICAgIH0KLSAgICAKK30KKworUmVmUHRyPFdlYkltYWdlPiBXZWJQYWdlOjpzbmFwc2hvdEF0U2l6 ZShjb25zdCBJbnRSZWN0JiByZWN0LCBjb25zdCBJbnRTaXplJiBiaXRtYXBTaXplLCBTbmFwc2hv dE9wdGlvbnMgb3B0aW9ucykKK3sKKyAgICBGcmFtZSogY29yZUZyYW1lID0gbV9tYWluRnJhbWUt PmNvcmVGcmFtZSgpOworICAgIGlmICghY29yZUZyYW1lKQorICAgICAgICByZXR1cm4gbnVsbHB0 cjsKKworICAgIEZyYW1lVmlldyogZnJhbWVWaWV3ID0gY29yZUZyYW1lLT52aWV3KCk7CisgICAg aWYgKCFmcmFtZVZpZXcpCisgICAgICAgIHJldHVybiBudWxscHRyOworCisgICAgYXV0byBzbmFw c2hvdCA9IFdlYkltYWdlOjpjcmVhdGUoYml0bWFwU2l6ZSwgc25hcHNob3RPcHRpb25zVG9JbWFn ZU9wdGlvbnMob3B0aW9ucykpOworICAgIGF1dG8gZ3JhcGhpY3NDb250ZXh0ID0gc25hcHNob3Qt PmJpdG1hcCgpLmNyZWF0ZUdyYXBoaWNzQ29udGV4dCgpOworCisgICAgcGFpbnRTbmFwc2hvdEF0 U2l6ZShyZWN0LCBiaXRtYXBTaXplLCBvcHRpb25zLCAqY29yZUZyYW1lLCAqZnJhbWVWaWV3LCAq Z3JhcGhpY3NDb250ZXh0KTsKKwogICAgIHJldHVybiBzbmFwc2hvdDsKIH0KIAotUGFzc1JlZlB0 cjxXZWJJbWFnZT4gV2ViUGFnZTo6c25hcHNob3ROb2RlKFdlYkNvcmU6Ok5vZGUmIG5vZGUsIFNu YXBzaG90T3B0aW9ucyBvcHRpb25zLCB1bnNpZ25lZCBtYXhpbXVtUGl4ZWxDb3VudCkKKyNpZiBV U0UoQ0YpCitSZXRhaW5QdHI8Q0ZEYXRhUmVmPiBXZWJQYWdlOjpwZGZTbmFwc2hvdEF0U2l6ZShj b25zdCBJbnRSZWN0JiByZWN0LCBjb25zdCBJbnRTaXplJiBiaXRtYXBTaXplLCBTbmFwc2hvdE9w dGlvbnMgb3B0aW9ucykKK3sKKyAgICBGcmFtZSogY29yZUZyYW1lID0gbV9tYWluRnJhbWUtPmNv cmVGcmFtZSgpOworICAgIGlmICghY29yZUZyYW1lKQorICAgICAgICByZXR1cm4gbnVsbHB0cjsK KworICAgIEZyYW1lVmlldyogZnJhbWVWaWV3ID0gY29yZUZyYW1lLT52aWV3KCk7CisgICAgaWYg KCFmcmFtZVZpZXcpCisgICAgICAgIHJldHVybiBudWxscHRyOworCisgICAgYXV0byBkYXRhID0g YWRvcHRDRihDRkRhdGFDcmVhdGVNdXRhYmxlKGtDRkFsbG9jYXRvckRlZmF1bHQsIDApKTsKKwor I2lmIFVTRShDRykKKyAgICBhdXRvIGRhdGFDb25zdW1lciA9IGFkb3B0Q0YoQ0dEYXRhQ29uc3Vt ZXJDcmVhdGVXaXRoQ0ZEYXRhKGRhdGEuZ2V0KCkpKTsKKyAgICBhdXRvIG1lZGlhQm94ID0gQ0dS ZWN0TWFrZSgwLCAwLCBiaXRtYXBTaXplLndpZHRoKCksIGJpdG1hcFNpemUuaGVpZ2h0KCkpOwor ICAgIGF1dG8gcGRmQ29udGV4dCA9IGFkb3B0Q0YoQ0dQREZDb250ZXh0Q3JlYXRlKGRhdGFDb25z dW1lci5nZXQoKSwgJm1lZGlhQm94LCBudWxscHRyKSk7CisKKyAgICBDR1BERkNvbnRleHRCZWdp blBhZ2UocGRmQ29udGV4dC5nZXQoKSwgbnVsbHB0cik7CisKKyAgICBHcmFwaGljc0NvbnRleHQg Z3JhcGhpY3NDb250ZXh0IHsgcGRmQ29udGV4dC5nZXQoKSB9OworICAgIGdyYXBoaWNzQ29udGV4 dC5zY2FsZSh7IDEsIC0xIH0pOworICAgIGdyYXBoaWNzQ29udGV4dC50cmFuc2xhdGUoMCwgLWJp dG1hcFNpemUuaGVpZ2h0KCkpOworICAgIHBhaW50U25hcHNob3RBdFNpemUocmVjdCwgYml0bWFw U2l6ZSwgb3B0aW9ucywgKmNvcmVGcmFtZSwgKmZyYW1lVmlldywgZ3JhcGhpY3NDb250ZXh0KTsK KworICAgIENHUERGQ29udGV4dEVuZFBhZ2UocGRmQ29udGV4dC5nZXQoKSk7CisgICAgQ0dQREZD b250ZXh0Q2xvc2UocGRmQ29udGV4dC5nZXQoKSk7CisjZW5kaWYKKworICAgIHJldHVybiBXVEZN b3ZlKGRhdGEpOworfQorI2VuZGlmCisKK1JlZlB0cjxXZWJJbWFnZT4gV2ViUGFnZTo6c25hcHNo b3ROb2RlKFdlYkNvcmU6Ok5vZGUmIG5vZGUsIFNuYXBzaG90T3B0aW9ucyBvcHRpb25zLCB1bnNp Z25lZCBtYXhpbXVtUGl4ZWxDb3VudCkKIHsKICAgICBGcmFtZSogY29yZUZyYW1lID0gbV9tYWlu RnJhbWUtPmNvcmVGcmFtZSgpOwogICAgIGlmICghY29yZUZyYW1lKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaCBiL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKaW5kZXggMjEwMjI5NjE4ZDFhNGE2MGUxZmI5 YWZjMzg4ZjYzM2E0ZDUyNjA2NS4uOTAwNDZkNWVjNTA5NDVmODA5MTZjYzEyNWIyYTI2ZmUxY2Nj NjM0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh Z2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCkBA IC00OTAsOCArNDkwLDYgQEAgcHVibGljOgogI2VuZGlmCiAgICAgCiAgICAgUGFzc1JlZlB0cjxX ZWJJbWFnZT4gc2NhbGVkU25hcHNob3RXaXRoT3B0aW9ucyhjb25zdCBXZWJDb3JlOjpJbnRSZWN0 JiwgZG91YmxlIGFkZGl0aW9uYWxTY2FsZUZhY3RvciwgU25hcHNob3RPcHRpb25zKTsKLSAgICBQ YXNzUmVmUHRyPFdlYkltYWdlPiBzbmFwc2hvdEF0U2l6ZShjb25zdCBXZWJDb3JlOjpJbnRSZWN0 JiwgY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgYml0bWFwU2l6ZSwgU25hcHNob3RPcHRpb25zKTsK LSAgICBQYXNzUmVmUHRyPFdlYkltYWdlPiBzbmFwc2hvdE5vZGUoV2ViQ29yZTo6Tm9kZSYsIFNu YXBzaG90T3B0aW9ucywgdW5zaWduZWQgbWF4aW11bVBpeGVsQ291bnQgPSBzdGQ6Om51bWVyaWNf bGltaXRzPHVuc2lnbmVkPjo6bWF4KCkpOwogCiAgICAgc3RhdGljIGNvbnN0IFdlYkV2ZW50KiBj dXJyZW50RXZlbnQoKTsKIApAQCAtMTI3NCw2ICsxMjcyLDEyIEBAIHByaXZhdGU6CiAgICAgdm9p ZCB1cmxTY2hlbWVIYW5kbGVyVGFza0RpZFJlY2VpdmVEYXRhKHVpbnQ2NF90IGhhbmRsZXJJZGVu dGlmaWVyLCB1aW50NjRfdCB0YXNrSWRlbnRpZmllciwgY29uc3QgSVBDOjpEYXRhUmVmZXJlbmNl Jik7CiAgICAgdm9pZCB1cmxTY2hlbWVIYW5kbGVyVGFza0RpZENvbXBsZXRlKHVpbnQ2NF90IGhh bmRsZXJJZGVudGlmaWVyLCB1aW50NjRfdCB0YXNrSWRlbnRpZmllciwgY29uc3QgV2ViQ29yZTo6 UmVzb3VyY2VFcnJvciYpOwogCisgICAgUmVmUHRyPFdlYkltYWdlPiBzbmFwc2hvdEF0U2l6ZShj b25zdCBXZWJDb3JlOjpJbnRSZWN0JiwgY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgYml0bWFwU2l6 ZSwgU25hcHNob3RPcHRpb25zKTsKKyAgICBSZWZQdHI8V2ViSW1hZ2U+IHNuYXBzaG90Tm9kZShX ZWJDb3JlOjpOb2RlJiwgU25hcHNob3RPcHRpb25zLCB1bnNpZ25lZCBtYXhpbXVtUGl4ZWxDb3Vu dCA9IHN0ZDo6bnVtZXJpY19saW1pdHM8dW5zaWduZWQ+OjptYXgoKSk7CisjaWYgVVNFKENGKQor ICAgIFJldGFpblB0cjxDRkRhdGFSZWY+IHBkZlNuYXBzaG90QXRTaXplKGNvbnN0IFdlYkNvcmU6 OkludFJlY3QmLCBjb25zdCBXZWJDb3JlOjpJbnRTaXplJiBiaXRtYXBTaXplLCBTbmFwc2hvdE9w dGlvbnMpOworI2VuZGlmCisKICAgICB1aW50NjRfdCBtX3BhZ2VJRDsKIAogICAgIHN0ZDo6dW5p cXVlX3B0cjxXZWJDb3JlOjpQYWdlPiBtX3BhZ2U7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0gYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KaW5kZXggMzEyNjFlMjM4OTQxNTM1 ZGI2Nzc2MWIyNzAyZTFkMWQ0OGM5MzU4Zi4uNjgwOGViNGI2NzU4MmE5ZGU4OGI0ZmRhN2RiZTcw Y2VmZTUzMzdmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L2lvcy9XZWJQYWdlSU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9pb3MvV2ViUGFnZUlPUy5tbQpAQCAtMzI1MiwxMiArMzI1MiwyMSBAQCB2b2lkIFdlYlBhZ2U6 OmRpc3BhdGNoQXN5bmNocm9ub3VzVG91Y2hFdmVudHMoY29uc3QgVmVjdG9yPFdlYlRvdWNoRXZl bnQsIDE+JiBxdQogCiB2b2lkIFdlYlBhZ2U6OmNvbXB1dGVQYWdlc0ZvclByaW50aW5nQW5kRHJh d1RvUERGKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFByaW50SW5mbyYgcHJpbnRJbmZvLCB1aW50 NjRfdCBjYWxsYmFja0lELCBQYXNzUmVmUHRyPE1lc3NhZ2VzOjpXZWJQYWdlOjpDb21wdXRlUGFn ZXNGb3JQcmludGluZ0FuZERyYXdUb1BERjo6RGVsYXllZFJlcGx5PiByZXBseSkKIHsKKyAgICBp ZiAocHJpbnRJbmZvLnNuYXBzaG90Rmlyc3RQYWdlKSB7CisgICAgICAgIHJlcGx5LT5zZW5kKDEp OworICAgICAgICBJbnRTaXplIHNuYXBzaG90U2l6ZSB7IEZsb2F0U2l6ZSB7IHByaW50SW5mby5h dmFpbGFibGVQYXBlcldpZHRoLCBwcmludEluZm8uYXZhaWxhYmxlUGFwZXJIZWlnaHQgfSB9Owor ICAgICAgICBJbnRSZWN0IHNuYXBzaG90UmVjdCB7IHswLCAwfSwgc25hcHNob3RTaXplIH07Cisg ICAgICAgIGF1dG8gcGRmRGF0YSA9IHBkZlNuYXBzaG90QXRTaXplKHNuYXBzaG90UmVjdCwgc25h cHNob3RTaXplLCAwKTsKKyAgICAgICAgc2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEcmF3 VG9QREZDYWxsYmFjayhJUEM6OkRhdGFSZWZlcmVuY2UoQ0ZEYXRhR2V0Qnl0ZVB0cihwZGZEYXRh LmdldCgpKSwgQ0ZEYXRhR2V0TGVuZ3RoKHBkZkRhdGEuZ2V0KCkpKSwgY2FsbGJhY2tJRCkpOwor ICAgICAgICByZXR1cm47CisgICAgfQorCiAgICAgVmVjdG9yPFdlYkNvcmU6OkludFJlY3Q+IHBh Z2VSZWN0czsKICAgICBkb3VibGUgdG90YWxTY2FsZUZhY3RvcjsKICAgICBjb21wdXRlUGFnZXNG b3JQcmludGluZ0ltcGwoZnJhbWVJRCwgcHJpbnRJbmZvLCBwYWdlUmVjdHMsIHRvdGFsU2NhbGVG YWN0b3IpOwogCiAgICAgQVNTRVJUKHBhZ2VSZWN0cy5zaXplKCkgPj0gMSk7Ci0gICAgc3RkOjpz aXplX3QgcGFnZUNvdW50ID0gcHJpbnRJbmZvLnNuYXBzaG90Rmlyc3RQYWdlID8gMSA6IHBhZ2VS ZWN0cy5zaXplKCk7CisgICAgc3RkOjpzaXplX3QgcGFnZUNvdW50ID0gcGFnZVJlY3RzLnNpemUo KTsKICAgICBBU1NFUlQocGFnZUNvdW50IDw9IHN0ZDo6bnVtZXJpY19saW1pdHM8dWludDMyX3Q+ OjptYXgoKSk7CiAgICAgcmVwbHktPnNlbmQocGFnZUNvdW50KTsKIAo=