169439 2017-03-09 13:44:56 -0800 [iOS] Add SPI to print to a single tall PDF page 2017-03-09 14:37:20 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 aestes aestes commit-queue webkit-bug-importer oldest_to_newest 1285556 0 aestes 2017-03-09 13:44:56 -0800 [iOS] Add SPI to print to a single tall PDF page 1285557 1 aestes 2017-03-09 13:46:05 -0800 rdar://problem/30120532 1285559 2 303982 aestes 2017-03-09 13:50:32 -0800 Created attachment 303982 Patch 1285563 3 303982 thorton 2017-03-09 13:55:26 -0800 Comment on attachment 303982 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=303982&action=review > Source/WebKit2/UIProcess/_WKWebViewPrintFormatter.mm:38 > +@interface UIPrintPageRenderer () > +@property (nonatomic) CGRect paperRect; > +@property (nonatomic) CGRect printableRect; > +@end Should be in UIKitSPI. > Source/WebKit2/UIProcess/ios/WKContentView.mm:698 > + static const CGFloat maximumPDFHeight = 200 * 72; // maximum PDF height for a single page is 200 inches O... kay. Is that a PDF spec thing, or a CGPDF thing, or what? Can we (at some point) get it from somewhere isntead of hardcoding it? 1285564 4 aestes 2017-03-09 13:56:34 -0800 (In reply to comment #3) > Comment on attachment 303982 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=303982&action=review > > > Source/WebKit2/UIProcess/_WKWebViewPrintFormatter.mm:38 > > +@interface UIPrintPageRenderer () > > +@property (nonatomic) CGRect paperRect; > > +@property (nonatomic) CGRect printableRect; > > +@end > > Should be in UIKitSPI. It's not SPI :( > > > Source/WebKit2/UIProcess/ios/WKContentView.mm:698 > > + static const CGFloat maximumPDFHeight = 200 * 72; // maximum PDF height for a single page is 200 inches > > O... kay. Is that a PDF spec thing, or a CGPDF thing, or what? Can we (at > some point) get it from somewhere isntead of hardcoding it? I believe it's a PDF spec thing. I'll investigate whether we can get this elsewhere. 1285612 5 303982 commit-queue 2017-03-09 14:37:16 -0800 Comment on attachment 303982 Patch Clearing flags on attachment: 303982 Committed r213674: <http://trac.webkit.org/changeset/213674> 1285613 6 commit-queue 2017-03-09 14:37:20 -0800 All reviewed patches have been landed. Closing bug. 303982 2017-03-09 13:50:32 -0800 2017-03-09 14:37:16 -0800 Patch bug-169439-20170309135032.patch text/plain 9690 aestes U3VidmVyc2lvbiBSZXZpc2lvbjogMjEzNTA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNTM1NDMzMjUwOWU4ODNh MTA0MmQ4ZTFkYzI5Y2JkZjhlZGMzYTlhYS4uMzM2MWE2NTQ2OGZhZTk4NjJiZDc5MzUyMTU5NjBi ZGEyMmNkYTJlYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE3LTAzLTA5ICBBbmR5 IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBBZGQgU1BJIHRvIHBy aW50IHRvIGEgc2luZ2xlIHRhbGwgUERGIHBhZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE2OTQzOQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzAx MjA1MzI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBTaGFyZWQvUHJpbnRJbmZvLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UHJpbnRJbmZvOjplbmNv ZGUpOiBFbmNvZGVkIHNuYXBzaG90Rmlyc3RQYWdlLgorICAgICAgICAoV2ViS2l0OjpQcmludElu Zm86OmRlY29kZSk6IERlY29kZWQgc25hcHNob3RGaXJzdFBhZ2UuCisgICAgICAgIChXZWJLaXQ6 OlByaW50SW5mbzo6UHJpbnRJbmZvKTogRGVsZXRlZC4KKyAgICAgICAgKiBTaGFyZWQvUHJpbnRJ bmZvLmg6IEluaXRpYWxpemVkIG1lbWJlciB2YXJpYWJsZXMgaW4gcGxhY2UgaW5zdGVhZCBvZiBp biBhIGRlZmF1bHQgY3Rvci4KKyAgICAgICAgKiBVSVByb2Nlc3MvX1dLV2ViVmlld1ByaW50Rm9y bWF0dGVyLmg6IERlY2xhcmVkIEJPT0wgcHJvcGVydHkgc25hcHNob3RGaXJzdFBhZ2UuCisgICAg ICAgICogVUlQcm9jZXNzL19XS1dlYlZpZXdQcmludEZvcm1hdHRlci5tbToKKyAgICAgICAgKC1b X1dLV2ViVmlld1ByaW50Rm9ybWF0dGVyIF9zZXRTbmFwc2hvdFBhcGVyUmVjdDpdKTogQWRkZWQg dG8gc2V0IGEgY3VzdG9tIHBhcGVyIHNpemUuCisgICAgICAgICgtW19XS1dlYlZpZXdQcmludEZv cm1hdHRlciByZWN0Rm9yUGFnZUF0SW5kZXg6XSk6IFJldHVybmVkIHRoZSBjdXN0b20gcGFwZXIg cmVjdCBpZgorICAgICAgICBzbmFwc2hvdEZpcnN0UGFnZSBpcyB0cnVlLgorICAgICAgICAqIFVJ UHJvY2Vzcy9fV0tXZWJWaWV3UHJpbnRGb3JtYXR0ZXJJbnRlcm5hbC5oOiAKKyAgICAgICAgKiBV SVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcubW06CisgICAgICAgICgtW1dLQ29udGVudFZpZXcg X3drX3BhZ2VDb3VudEZvclByaW50Rm9ybWF0dGVyOl0pOiBDb21wdXRlZCB0aGUgY3VzdG9tIHBh cGVyIHNpemUgdG8gYmUgdGhlCisgICAgICAgIHNtYWxsZXIgb2YgdGhlIGRvY3VtZW50IGhlaWdo dCBhbmQgdGhlIG1heGltdW0gUERGIHBhZ2UgaGVpZ2h0LgorICAgICAgICAqIFVJUHJvY2Vzcy9p b3MvV0tQREZWaWV3Lm1tOgorICAgICAgICAoLVtXS1BERlZpZXcgX3drX3BhZ2VDb3VudEZvclBy aW50Rm9ybWF0dGVyOl0pOiBDaGFuZ2VkIHRvIHJldHVybiBhIG1heGltdW0gcGFnZSBzaXplIG9m IDEKKyAgICAgICAgaWYgc25hcHNob3RGaXJzdFBhZ2UgaXMgdHJ1ZS4KKyAgICAgICAgKiBXZWJQ cm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW06CisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2U6OmNvbXB1dGVQYWdlc0ZvclByaW50aW5nQW5kRHJhd1RvUERGKTogRGl0dG8uCisKIDIwMTct MDMtMDYgIEFha2FzaCBKYWluICA8YWFrYXNoX2phaW5AYXBwbGUuY29tPgogCiAgICAgICAgIEVu YWJsZSBTVVBQT1JUU19URVhUX0JBU0VEX0FQSSBpbiBXZWJLaXQyIGZvciBpT1MKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9QcmludEluZm8uY3BwIGIvU291cmNlL1dlYktpdDIv U2hhcmVkL1ByaW50SW5mby5jcHAKaW5kZXggMjFiMTVhMzlhNWUzN2UzNTIwYWFjZTMzNDliZTIy YzE4MTQ5YTk5ZC4uN2JkNzU0ZWNlODNmYjBmNDU0NWNlMmE4OTBjMDA2MTQwMzkxOGIzMiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1ByaW50SW5mby5jcHAKKysrIGIvU291cmNl L1dlYktpdDIvU2hhcmVkL1ByaW50SW5mby5jcHAKQEAgLTM1LDEzICszNSw2IEBACiAKIG5hbWVz cGFjZSBXZWJLaXQgewogCi1QcmludEluZm86OlByaW50SW5mbygpCi0gICAgOiBwYWdlU2V0dXBT Y2FsZUZhY3RvcigwKQotICAgICwgYXZhaWxhYmxlUGFwZXJXaWR0aCgwKQotICAgICwgYXZhaWxh YmxlUGFwZXJIZWlnaHQoMCkKLXsKLX0KLQogdm9pZCBQcmludEluZm86OmVuY29kZShJUEM6OkVu Y29kZXImIGVuY29kZXIpIGNvbnN0CiB7CiAgICAgZW5jb2RlciA8PCBwYWdlU2V0dXBTY2FsZUZh Y3RvcjsKQEAgLTUzLDYgKzQ2LDEwIEBAIHZvaWQgUHJpbnRJbmZvOjplbmNvZGUoSVBDOjpFbmNv ZGVyJiBlbmNvZGVyKSBjb25zdAogICAgIElQQzo6ZW5jb2RlKGVuY29kZXIsIHBhZ2VTZXR1cC5n ZXQoKSk7CiAgICAgZW5jb2Rlci5lbmNvZGVFbnVtKHByaW50TW9kZSk7CiAjZW5kaWYKKworI2lm IFBMQVRGT1JNKElPUykKKyAgICBlbmNvZGVyIDw8IHNuYXBzaG90Rmlyc3RQYWdlOworI2VuZGlm CiB9CiAKIGJvb2wgUHJpbnRJbmZvOjpkZWNvZGUoSVBDOjpEZWNvZGVyJiBkZWNvZGVyLCBQcmlu dEluZm8mIGluZm8pCkBAIC03Myw2ICs3MCwxMSBAQCBib29sIFByaW50SW5mbzo6ZGVjb2RlKElQ Qzo6RGVjb2RlciYgZGVjb2RlciwgUHJpbnRJbmZvJiBpbmZvKQogICAgICAgICByZXR1cm4gZmFs c2U7CiAjZW5kaWYKIAorI2lmIFBMQVRGT1JNKElPUykKKyAgICBpZiAoIWRlY29kZXIuZGVjb2Rl KGluZm8uc25hcHNob3RGaXJzdFBhZ2UpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisjZW5kaWYK KwogICAgIHJldHVybiB0cnVlOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvUHJpbnRJbmZvLmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvUHJpbnRJbmZvLmgKaW5kZXgg MGM4NjIzMzlhMzBhNmFkNWU2YTgyOGNhMDM1Mzc0M2VmOGEyMDk5Yy4uOWZhNjRlNjgyZmNmZmMz ZTA2NDg3ZmUyOGNhN2EwZTg0OGI3YjMwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hh cmVkL1ByaW50SW5mby5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9QcmludEluZm8uaApA QCAtMjMsOCArMjMsNyBAQAogICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICov CiAKLSNpZm5kZWYgUHJpbnRJbmZvX2gKLSNkZWZpbmUgUHJpbnRJbmZvX2gKKyNwcmFnbWEgb25j ZQogCiAjaWYgVVNFKEFQUEtJVCkKIE9CSkNfQ0xBU1MgTlNQcmludEluZm87CkBAIC00NSw3ICs0 NCw3IEBAIGNsYXNzIEVuY29kZXI7CiBuYW1lc3BhY2UgV2ViS2l0IHsKIAogc3RydWN0IFByaW50 SW5mbyB7Ci0gICAgUHJpbnRJbmZvKCk7CisgICAgUHJpbnRJbmZvKCkgPSBkZWZhdWx0OwogI2lm IFBMQVRGT1JNKEdUSykKICAgICBlbnVtIFByaW50TW9kZSB7CiAgICAgICAgIFByaW50TW9kZUFz eW5jLApAQCAtNTcsOSArNTYsMTIgQEAgc3RydWN0IFByaW50SW5mbyB7CiAgICAgZXhwbGljaXQg UHJpbnRJbmZvKE5TUHJpbnRJbmZvICopOwogI2VuZGlmCiAKLSAgICBmbG9hdCBwYWdlU2V0dXBT Y2FsZUZhY3RvcjsKLSAgICBmbG9hdCBhdmFpbGFibGVQYXBlcldpZHRoOwotICAgIGZsb2F0IGF2 YWlsYWJsZVBhcGVySGVpZ2h0OworICAgIGZsb2F0IHBhZ2VTZXR1cFNjYWxlRmFjdG9yIHsgMCB9 OworICAgIGZsb2F0IGF2YWlsYWJsZVBhcGVyV2lkdGggeyAwIH07CisgICAgZmxvYXQgYXZhaWxh YmxlUGFwZXJIZWlnaHQgeyAwIH07CisjaWYgUExBVEZPUk0oSU9TKQorICAgIGJvb2wgc25hcHNo b3RGaXJzdFBhZ2UgeyBmYWxzZSB9OworI2VuZGlmCiAKICNpZiBQTEFURk9STShHVEspCiAgICAg R1JlZlB0cjxHdGtQcmludFNldHRpbmdzPiBwcmludFNldHRpbmdzOwpAQCAtNzIsNSArNzQsMyBA QCBzdHJ1Y3QgUHJpbnRJbmZvIHsKIH07CiAKIH0KLQotI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvX1dLV2ViVmlld1ByaW50Rm9ybWF0dGVyLmggYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvX1dLV2ViVmlld1ByaW50Rm9ybWF0dGVyLmgKaW5kZXggMjZhOGZk NjBmMjQ5ZmJiMjQyMjJlM2ZiOGU1ZTRhN2ViM2Q1YTNkMy4uMTk2NWU0ZjAxZGM5NjgyZGQ2OTk5 NjNhNzU1NjM5M2Y5YjhjOTc1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L19XS1dlYlZpZXdQcmludEZvcm1hdHRlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9fV0tXZWJWaWV3UHJpbnRGb3JtYXR0ZXIuaApAQCAtMzQsNiArMzQsNyBAQCBXS19DTEFTU19B VkFJTEFCTEUoaW9zKDguMCkpCiBAaW50ZXJmYWNlIF9XS1dlYlZpZXdQcmludEZvcm1hdHRlciA6 IFVJVmlld1ByaW50Rm9ybWF0dGVyCiAKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBzdHJvbmcpIF9X S0ZyYW1lSGFuZGxlICpmcmFtZVRvUHJpbnQ7CitAcHJvcGVydHkgKG5vbmF0b21pYykgQk9PTCBz bmFwc2hvdEZpcnN0UGFnZTsKIAogQGVuZAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvX1dLV2ViVmlld1ByaW50Rm9ybWF0dGVyLm1tIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL19XS1dlYlZpZXdQcmludEZvcm1hdHRlci5tbQppbmRleCBkYWFiNmNhZGQ0NDdkOGFi MzRiNDU2ODQxYTQ1MDJjZjc0ZWFlMTFlLi5jODA5NzBhMmI2OWMxMzdiNDkwMjcwMjcwYWIwNzEy MzM4YWM3MjZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvX1dLV2ViVmll d1ByaW50Rm9ybWF0dGVyLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9fV0tXZWJW aWV3UHJpbnRGb3JtYXR0ZXIubW0KQEAgLTMyLDYgKzMyLDExIEBACiAjaW1wb3J0ICJfV0tGcmFt ZUhhbmRsZS5oIgogI2ltcG9ydCA8d3RmL1JldGFpblB0ci5oPgogCitAaW50ZXJmYWNlIFVJUHJp bnRQYWdlUmVuZGVyZXIgKCkKK0Bwcm9wZXJ0eSAobm9uYXRvbWljKSBDR1JlY3QgcGFwZXJSZWN0 OworQHByb3BlcnR5IChub25hdG9taWMpIENHUmVjdCBwcmludGFibGVSZWN0OworQGVuZAorCiBA aW1wbGVtZW50YXRpb24gX1dLV2ViVmlld1ByaW50Rm9ybWF0dGVyIHsKICAgICBSZXRhaW5QdHI8 X1dLRnJhbWVIYW5kbGU+IF9mcmFtZVRvUHJpbnQ7CiAgICAgUmV0YWluUHRyPENHUERGRG9jdW1l bnRSZWY+IF9wcmludGVkRG9jdW1lbnQ7CkBAIC01NCw2ICs1OSwxMyBAQCAtIChXS1dlYlZpZXcg Kilfd2ViVmlldwogICAgIHJldHVybiBzdGF0aWNfY2FzdDxXS1dlYlZpZXcgKj4odmlldyk7CiB9 CiAKKy0gKHZvaWQpX3NldFNuYXBzaG90UGFwZXJSZWN0OihDR1JlY3QpcGFwZXJSZWN0Cit7Cisg ICAgVUlQcmludFBhZ2VSZW5kZXJlciAqcHJpbnRQYWdlUmVuZGVyZXIgPSBzZWxmLnByaW50UGFn ZVJlbmRlcmVyOworICAgIHByaW50UGFnZVJlbmRlcmVyLnBhcGVyUmVjdCA9IHBhcGVyUmVjdDsK KyAgICBwcmludFBhZ2VSZW5kZXJlci5wcmludGFibGVSZWN0ID0gcGFwZXJSZWN0OworfQorCiAt IChOU0ludGVnZXIpX3JlY2FsY1BhZ2VDb3VudAogewogICAgIF9wcmludGVkRG9jdW1lbnQgPSBu dWxscHRyOwpAQCAtNjMsNiArNzUsOCBAQCAtIChOU0ludGVnZXIpX3JlY2FsY1BhZ2VDb3VudAog CiAtIChDR1JlY3QpcmVjdEZvclBhZ2VBdEluZGV4OihOU0ludGVnZXIpcGFnZUluZGV4CiB7Cisg ICAgaWYgKHNlbGYuc25hcHNob3RGaXJzdFBhZ2UpCisgICAgICAgIHJldHVybiBzZWxmLnByaW50 UGFnZVJlbmRlcmVyLnBhcGVyUmVjdDsKICAgICByZXR1cm4gW3NlbGYgX3BhZ2VDb250ZW50UmVj dDpwYWdlSW5kZXggPT0gc2VsZi5zdGFydFBhZ2VdOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvX1dLV2ViVmlld1ByaW50Rm9ybWF0dGVySW50ZXJuYWwuaCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9fV0tXZWJWaWV3UHJpbnRGb3JtYXR0ZXJJbnRlcm5hbC5o CmluZGV4IDQ1MWEwZDUwNDc0NTI4NDhlODFlMmQ4YjRiODdkZjAwZDgyNjE4YWYuLjFmY2Y2NWRk ODMyY2Q5YjY4OWQwMTkyNjA1OTdkYzJhZjFlMWI0NjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9fV0tXZWJWaWV3UHJpbnRGb3JtYXR0ZXJJbnRlcm5hbC5oCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9fV0tXZWJWaWV3UHJpbnRGb3JtYXR0ZXJJbnRlcm5hbC5o CkBAIC0zMSw2ICszMSwxMCBAQAogLSAoQ0dSZWN0KV9wYWdlQ29udGVudFJlY3Q6KEJPT0wpZmly c3RQYWdlOwogQGVuZAogCitAaW50ZXJmYWNlIF9XS1dlYlZpZXdQcmludEZvcm1hdHRlciAoKQor LSAodm9pZClfc2V0U25hcHNob3RQYXBlclJlY3Q6KENHUmVjdClwYXBlclJlY3Q7CitAZW5kCisK IEBwcm90b2NvbCBfV0tXZWJWaWV3UHJpbnRQcm92aWRlciA8TlNPYmplY3Q+CiAtIChOU1VJbnRl Z2VyKV93a19wYWdlQ291bnRGb3JQcmludEZvcm1hdHRlcjooX1dLV2ViVmlld1ByaW50Rm9ybWF0 dGVyICopcHJpbnRGb3JtYXR0ZXI7CiBAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIENH UERGRG9jdW1lbnRSZWYgX3drX3ByaW50ZWREb2N1bWVudDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5tbQppbmRleCBkM2I3NTBlOGVjYTc4ZWE0ZDkyN2Rj NzJhNzdiM2IwYzg4YjUzMjU4Li5lYTQzN2U4ZDAzOWI1Zjk0YTNkYWIwMjNjMzE2ODk5YTRkODA3 OTZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZp ZXcubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3Lm1t CkBAIC02OTMsNiArNjkzLDEyIEBAIC0gKE5TVUludGVnZXIpX3drX3BhZ2VDb3VudEZvclByaW50 Rm9ybWF0dGVyOihfV0tXZWJWaWV3UHJpbnRGb3JtYXR0ZXIgKilwcmludEZvCiAKICAgICBQcmlu dEluZm8gcHJpbnRJbmZvOwogICAgIHByaW50SW5mby5wYWdlU2V0dXBTY2FsZUZhY3RvciA9IDE7 CisgICAgcHJpbnRJbmZvLnNuYXBzaG90Rmlyc3RQYWdlID0gcHJpbnRGb3JtYXR0ZXIuc25hcHNo b3RGaXJzdFBhZ2U7CisgICAgaWYgKHByaW50SW5mby5zbmFwc2hvdEZpcnN0UGFnZSkgeworICAg ICAgICBzdGF0aWMgY29uc3QgQ0dGbG9hdCBtYXhpbXVtUERGSGVpZ2h0ID0gMjAwICogNzI7IC8v IG1heGltdW0gUERGIGhlaWdodCBmb3IgYSBzaW5nbGUgcGFnZSBpcyAyMDAgaW5jaGVzCisgICAg ICAgIHByaW50aW5nUmVjdCA9IChDR1JlY3QpIHsgQ0dQb2ludFplcm8sIHsgc2VsZi5ib3VuZHMu c2l6ZS53aWR0aCwgc3RkOjptaW4oX3dlYlZpZXcuc2Nyb2xsVmlldy5jb250ZW50U2l6ZS5oZWln aHQsIG1heGltdW1QREZIZWlnaHQpIH0gfTsKKyAgICAgICAgW3ByaW50Rm9ybWF0dGVyIF9zZXRT bmFwc2hvdFBhcGVyUmVjdDpwcmludGluZ1JlY3RdOworICAgIH0KICAgICBwcmludEluZm8uYXZh aWxhYmxlUGFwZXJXaWR0aCA9IENHUmVjdEdldFdpZHRoKHByaW50aW5nUmVjdCk7CiAgICAgcHJp bnRJbmZvLmF2YWlsYWJsZVBhcGVySGVpZ2h0ID0gQ0dSZWN0R2V0SGVpZ2h0KHByaW50aW5nUmVj dCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tQREZWaWV3 Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcubW0KaW5kZXggODQy ZGNkMGFjZDEzMWQxNzNkNGFlYWUwOWZhY2IzNDY3N2UxNTRjYi4uMTE5NGVlYTc4OGY4ZWVlMzgx ZmY0MDI1NmVlNTA3ZmIyYmY4N2YzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL2lvcy9XS1BERlZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9X S1BERlZpZXcubW0KQEAgLTgyNSw5ICs4MjUsMTQgQEAgQGltcGxlbWVudGF0aW9uIFdLUERGVmll dyAoX1dLV2ViVmlld1ByaW50Rm9ybWF0dGVyKQogLSAoTlNVSW50ZWdlcilfd2tfcGFnZUNvdW50 Rm9yUHJpbnRGb3JtYXR0ZXI6KF9XS1dlYlZpZXdQcmludEZvcm1hdHRlciAqKXByaW50Rm9ybWF0 dGVyCiB7CiAgICAgQ0dQREZEb2N1bWVudFJlZiBkb2N1bWVudCA9IF9jZ1BERkRvY3VtZW50Lmdl dCgpOwotICAgIGlmIChDR1BERkRvY3VtZW50QWxsb3dzUHJpbnRpbmcoZG9jdW1lbnQpKQotICAg ICAgICByZXR1cm4gQ0dQREZEb2N1bWVudEdldE51bWJlck9mUGFnZXMoZG9jdW1lbnQpOwotICAg IHJldHVybiAwOworICAgIGlmICghQ0dQREZEb2N1bWVudEFsbG93c1ByaW50aW5nKGRvY3VtZW50 KSkKKyAgICAgICAgcmV0dXJuIDA7CisKKyAgICBzaXplX3QgbnVtYmVyT2ZQYWdlcyA9IENHUERG RG9jdW1lbnRHZXROdW1iZXJPZlBhZ2VzKGRvY3VtZW50KTsKKyAgICBpZiAocHJpbnRGb3JtYXR0 ZXIuc25hcHNob3RGaXJzdFBhZ2UpCisgICAgICAgIHJldHVybiBzdGQ6Om1pbjxOU1VJbnRlZ2Vy PihudW1iZXJPZlBhZ2VzLCAxKTsKKworICAgIHJldHVybiBudW1iZXJPZlBhZ2VzOwogfQogCiAt IChDR1BERkRvY3VtZW50UmVmKV93a19wcmludGVkRG9jdW1lbnQKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbSBiL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQppbmRleCA4NWVmOGRm MzNhYWI4OTZhMTJjODJiNTAwM2QzZGQ0OGY2MGU4NmM4Li5jZWYxNWQwOTM5NGVlNDViMjcwMjBh NDRhMDIxZTBmZjMzYjhjYTU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCkBAIC0zOSw2ICszOSw3IEBACiAjaW1wb3J0ICJJ bnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQb3NpdGlvbi5oIgogI2ltcG9ydCAiTG9nZ2luZy5oIgog I2ltcG9ydCAiUGx1Z2luVmlldy5oIgorI2ltcG9ydCAiUHJpbnRJbmZvLmgiCiAjaW1wb3J0ICJS ZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYS5oIgogI2ltcG9ydCAiVXNlckRhdGEuaCIKICNpbXBv cnQgIlZpc2libGVDb250ZW50UmVjdFVwZGF0ZUluZm8uaCIKQEAgLTMyNTksNyArMzI2MCw4IEBA IHZvaWQgV2ViUGFnZTo6Y29tcHV0ZVBhZ2VzRm9yUHJpbnRpbmdBbmREcmF3VG9QREYodWludDY0 X3QgZnJhbWVJRCwgY29uc3QgUHJpbnRJCiAgICAgZG91YmxlIHRvdGFsU2NhbGVGYWN0b3I7CiAg ICAgY29tcHV0ZVBhZ2VzRm9yUHJpbnRpbmdJbXBsKGZyYW1lSUQsIHByaW50SW5mbywgcGFnZVJl Y3RzLCB0b3RhbFNjYWxlRmFjdG9yKTsKIAotICAgIHN0ZDo6c2l6ZV90IHBhZ2VDb3VudCA9IHBh Z2VSZWN0cy5zaXplKCk7CisgICAgQVNTRVJUKHBhZ2VSZWN0cy5zaXplKCkgPj0gMSk7CisgICAg c3RkOjpzaXplX3QgcGFnZUNvdW50ID0gcHJpbnRJbmZvLnNuYXBzaG90Rmlyc3RQYWdlID8gMSA6 IHBhZ2VSZWN0cy5zaXplKCk7CiAgICAgQVNTRVJUKHBhZ2VDb3VudCA8PSBzdGQ6Om51bWVyaWNf bGltaXRzPHVpbnQzMl90Pjo6bWF4KCkpOwogICAgIHJlcGx5LT5zZW5kKHBhZ2VDb3VudCk7CiAK