131325 2014-04-07 16:11:12 -0700 [iOS WebKit2] WKPDFView fades in tiles, PDFs load very flashily 2014-04-07 17:08:24 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton andersca sam simon.fraser oldest_to_newest 998274 0 thorton 2014-04-07 16:11:12 -0700 We should add and remove views as we scroll, and use a backing layer to avoid flashiness. <rdar://problem/16382960> 998281 1 228769 thorton 2014-04-07 16:32:09 -0700 Created attachment 228769 patch 998282 2 228769 andersca 2014-04-07 16:39:01 -0700 Comment on attachment 228769 patch View in context: https://bugs.webkit.org/attachment.cgi?id=228769&action=review > Source/WebKit2/UIProcess/Cocoa/WKWebViewContentProvider.h:38 > // FIXME: This should be API. I think you should extend this FIXME to say that we should come up with a solution for the UIScrollViewDelegate “problem”. > Source/WebKit2/UIProcess/ios/WKPDFView.mm:134 > + if (CGRectIntersectsRect(pageInfo.frame, targetRect)) { Please change this to if (!CGRectIntersectsRect(pageInfo.frame, targetRect)) { [pageInfo.view removeFromSuperview]; pageInfo.view = nullptr; continue; } 998283 3 228769 andersca 2014-04-07 16:39:33 -0700 Comment on attachment 228769 patch View in context: https://bugs.webkit.org/attachment.cgi?id=228769&action=review > Source/WebKit2/UIProcess/ios/WKPDFView.mm:171 > + pageInfo.view = nullptr; No need to initialize view here since it's a RetainPtr. 998306 4 thorton 2014-04-07 17:08:24 -0700 http://trac.webkit.org/changeset/166896 228769 2014-04-07 16:32:09 -0700 2014-04-07 16:39:33 -0700 patch pdf.diff text/plain 9038 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBiYTBlZmVlLi5kNGVlYjljIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzQg QEAKKzIwMTQtMDQtMDcgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgW2lPUyBXZWJLaXQyXSBXS1BERlZpZXcgZmFkZXMgaW4gdGlsZXMsIFBERnMgbG9h ZCB2ZXJ5IGZsYXNoaWx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMzEzMjUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE2MzgyOTYwPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9Db2NvYS9XS1dlYlZpZXcubW06CisgICAgICAgICgtW1dLV2ViVmlldyBzY3JvbGxWaWV3RGlk U2Nyb2xsOl0pOgorICAgICAgICBGb3J3YXJkIHNjcm9sbCBldmVudHMgdG8gdGhlIGN1cnJlbnQg Y3VzdG9tIGNvbnRlbnQgcHJvdmlkZXIuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvV0tX ZWJWaWV3Q29udGVudFByb3ZpZGVyLmg6CisgICAgICAgIE1ha2UgY29udGVudCBwcm92aWRlcnMg VUlTY3JvbGxWaWV3RGVsZWdhdGVzICh0aG91Z2ggd2Ugb25seSBmb3J3YXJkIGRpZFNjcm9sbCBm b3Igbm93KS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tQREZWaWV3Lm1tOgorICAgICAg ICAoLVtXS1BERlZpZXcgd2ViX3NldENvbnRlbnRQcm92aWRlckRhdGE6c3VnZ2VzdGVkRmlsZW5h bWU6XSk6CisgICAgICAgICgtW1dLUERGVmlldyB3ZWJfc2V0TWluaW11bVNpemU6XSk6CisgICAg ICAgICgtW1dLUERGVmlldyB3ZWJfc2V0U2Nyb2xsVmlldzpdKToKKyAgICAgICAgKC1bV0tQREZW aWV3IHNjcm9sbFZpZXdEaWRTY3JvbGw6XSk6CisgICAgICAgICgtW1dLUERGVmlldyBfcmV2YWxp ZGF0ZVZpZXdzXSk6CisgICAgICAgICgtW1dLUERGVmlldyBfY29tcHV0ZVBhZ2VBbmREb2N1bWVu dEZyYW1lc10pOgorICAgICAgICAoLVtXS1BERlZpZXcgbGF5b3V0Vmlld3NdKTogRGVsZXRlZC4K KyAgICAgICAgS2VlcCB0cmFjayBvZiBlYWNoIFVJUERGUGFnZSwgVUlQREZQYWdlVmlldywgYW5k IGl0cyBmcmFtZSAoaW4gdW5zY2FsZWQvZG9jdW1lbnQgY29vcmRpbmF0ZXMpLgorICAgICAgICBD b21wdXRlIGFsbCB0aGUgcmVjdHMgdXAgZnJvbnQgKGFuZCByZS1jb21wdXRlIHVwb24gcm90YXRp b24sIGxvYWRpbmcsIGV0Yy4pLgorICAgICAgICBXaGVuIHNjcm9sbGluZywgZmluZCBhbGwgdGhl IHBhZ2VzIHRoYXQgaW50ZXJzZWN0IHRoZSB2aWV3IChpbmZsYXRlZCBieSAxLjV4IGluIGVhY2gK KyAgICAgICAgdmVydGljYWwgZGlyZWN0aW9uKSwgYW5kIGVuc3VyZSB0aGF0IHBhZ2VzIHRoYXQg YXJlIGluc2lkZSB0aGF0IHJlY3QgaGF2ZQorICAgICAgICBVSVBERlBhZ2VWaWV3cyBpbnN0YWxs ZWQsIGFuZCBvbmVzIHRoYXQgYXJlIG91dHNpZGUgdGhhdCByZWN0IGRvIG5vdC4KKyAgICAgICAg VXNlIHNldFVzZUJhY2tpbmdMYXllciB0byBlbnN1cmUgdGhhdCB3ZSBoYXZlIGEgbG93LXJlc29s dXRpb24gbGF5ZXIgYmVoaW5kIHRoZQorICAgICAgICB0aWxlZCBsYXllciB0byBhdm9pZCBmbGFz aGluZXNzLgorCiAyMDE0LTA0LTA2ICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CiAK ICAgICAgICAgQ2xlYW4gdXAgV0tHZXN0dXJlVHlwZXMuaApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQppbmRleCBhOWUyYmVkLi5jNmY3YmQ5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5t bQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQpA QCAtNjU2LDYgKzY1Niw5IEBAIHN0YXRpYyBXZWJDb3JlOjpGbG9hdFBvaW50IGNvbnN0cmFpbkNv bnRlbnRPZmZzZXQoV2ViQ29yZTo6RmxvYXRQb2ludCBjb250ZW50T2ZmCiAKIC0gKHZvaWQpc2Ny b2xsVmlld0RpZFNjcm9sbDooVUlTY3JvbGxWaWV3ICopc2Nyb2xsVmlldwogeworICAgIGlmICgh W3NlbGYgdXNlc1N0YW5kYXJkQ29udGVudFZpZXddKQorICAgICAgICBbX2N1c3RvbUNvbnRlbnRW aWV3IHNjcm9sbFZpZXdEaWRTY3JvbGw6KFVJU2Nyb2xsVmlldyAqKXNjcm9sbFZpZXddOworCiAg ICAgW3NlbGYgX3VwZGF0ZVZpc2libGVDb250ZW50UmVjdHNdOwogfQogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvV0tXZWJWaWV3Q29udGVudFByb3ZpZGVyLmgg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvV0tXZWJWaWV3Q29udGVudFByb3ZpZGVy LmgKaW5kZXggMWUzNWRiZS4uZDI1MjM5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0NvY29hL1dLV2ViVmlld0NvbnRlbnRQcm92aWRlci5oCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9Db2NvYS9XS1dlYlZpZXdDb250ZW50UHJvdmlkZXIuaApAQCAtMzIsMTAg KzMyLDExIEBACiBAY2xhc3MgTlNEYXRhOwogQGNsYXNzIFVJU2Nyb2xsVmlldzsKIEBwcm90b2Nv bCBOU09iamVjdDsKK0Bwcm90b2NvbCBVSVNjcm9sbFZpZXdEZWxlZ2F0ZTsKIHN0cnVjdCBDR1Np emU7CiAKIC8vIEZJWE1FOiBUaGlzIHNob3VsZCBiZSBBUEkuCi1AcHJvdG9jb2wgV0tXZWJWaWV3 Q29udGVudFByb3ZpZGVyIDxOU09iamVjdD4KK0Bwcm90b2NvbCBXS1dlYlZpZXdDb250ZW50UHJv dmlkZXIgPE5TT2JqZWN0LCBVSVNjcm9sbFZpZXdEZWxlZ2F0ZT4KIAogLSAodm9pZCl3ZWJfc2V0 Q29udGVudFByb3ZpZGVyRGF0YTooTlNEYXRhICopZGF0YSBzdWdnZXN0ZWRGaWxlbmFtZTooTlNT dHJpbmcgKilmaWxlbmFtZTsKIC0gKHZvaWQpd2ViX3NldE1pbmltdW1TaXplOihDR1NpemUpc2l6 ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tQREZWaWV3Lm1t IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcubW0KaW5kZXggNTg1YmRl Zi4uMjVhYmNjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS1BE RlZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcubW0K QEAgLTMxLDE3ICszMSwzMSBAQAogI2ltcG9ydCA8Q29yZUdyYXBoaWNzL0NHUERGRG9jdW1lbnRQ cml2YXRlLmg+CiAjaW1wb3J0IDxDb3JlUERGL1VJUERGRG9jdW1lbnQuaD4KICNpbXBvcnQgPENv cmVQREYvVUlQREZQYWdlVmlldy5oPgorI2ltcG9ydCA8V2ViQ29yZS9GbG9hdFJlY3QuaD4KICNp bXBvcnQgPHd0Zi9SZXRhaW5QdHIuaD4KICNpbXBvcnQgPHd0Zi9WZWN0b3IuaD4KIAordXNpbmcg bmFtZXNwYWNlIFdlYkNvcmU7CisKIGNvbnN0IENHRmxvYXQgcGRmUGFnZU1hcmdpbiA9IDg7CiBj b25zdCBDR0Zsb2F0IHBkZk1pbmltdW1ab29tU2NhbGUgPSAxOwogY29uc3QgQ0dGbG9hdCBwZGZN YXhpbXVtWm9vbVNjYWxlID0gNTsKIAorY29uc3QgZmxvYXQgb3ZlcmRyYXdIZWlnaHRNdWx0aXBs aWVyID0gMS41OworCit0eXBlZGVmIHN0cnVjdCB7CisgICAgQ0dSZWN0IGZyYW1lOworICAgIFJl dGFpblB0cjxVSVBERlBhZ2VWaWV3PiB2aWV3OworICAgIFJldGFpblB0cjxVSVBERlBhZ2U+IHBh Z2U7Cit9IFBERlBhZ2VJbmZvOworCiBAaW1wbGVtZW50YXRpb24gV0tQREZWaWV3IHsKICAgICBS ZXRhaW5QdHI8VUlQREZEb2N1bWVudD4gX3BkZkRvY3VtZW50OwogICAgIFJldGFpblB0cjxOU1N0 cmluZz4gX3N1Z2dlc3RlZEZpbGVuYW1lOwotICAgIFZlY3RvcjxVSVBERlBhZ2VWaWV3Kj4gX3Bh Z2VWaWV3czsKKworICAgIFZlY3RvcjxQREZQYWdlSW5mbz4gX3BhZ2VzOworICAgIENHUmVjdCBf ZG9jdW1lbnRGcmFtZTsKKwogICAgIENHU2l6ZSBfbWluaW11bVNpemU7CiAgICAgVUlTY3JvbGxW aWV3ICpfc2Nyb2xsVmlldzsKIH0KQEAgLTcwLDY3ICs4NCwxMDMgQEAgY29uc3QgQ0dGbG9hdCBw ZGZNYXhpbXVtWm9vbVNjYWxlID0gNTsKIHsKICAgICBfc3VnZ2VzdGVkRmlsZW5hbWUgPSBhZG9w dE5TKFtmaWxlbmFtZSBjb3B5XSk7CiAKLSAgICBmb3IgKGF1dG8mIHBhZ2VWaWV3IDogX3BhZ2VW aWV3cykKLSAgICAgICAgW3BhZ2VWaWV3IHJlbW92ZUZyb21TdXBlcnZpZXddOworICAgIGZvciAo YXV0byYgcGFnZSA6IF9wYWdlcykKKyAgICAgICAgW3BhZ2UudmlldyByZW1vdmVGcm9tU3VwZXJ2 aWV3XTsKIAotICAgIF9wYWdlVmlld3MuY2xlYXIoKTsKKyAgICBfcGFnZXMuY2xlYXIoKTsKIAog ICAgIFJldGFpblB0cjxDR0RhdGFQcm92aWRlcj4gZGF0YVByb3ZpZGVyID0gYWRvcHRDRihDR0Rh dGFQcm92aWRlckNyZWF0ZVdpdGhDRkRhdGEoKENGRGF0YVJlZilkYXRhKSk7CiAgICAgUmV0YWlu UHRyPENHUERGRG9jdW1lbnRSZWY+IGNnUERGRG9jdW1lbnQgPSBhZG9wdENGKENHUERGRG9jdW1l bnRDcmVhdGVXaXRoUHJvdmlkZXIoZGF0YVByb3ZpZGVyLmdldCgpKSk7CiAgICAgX3BkZkRvY3Vt ZW50ID0gYWRvcHROUyhbW1VJUERGRG9jdW1lbnQgYWxsb2NdIGluaXRXaXRoQ0dQREZEb2N1bWVu dDpjZ1BERkRvY3VtZW50LmdldCgpXSk7CiAKLSAgICBmb3IgKE5TVUludGVnZXIgcGFnZSA9IDA7 IHBhZ2UgPCBbX3BkZkRvY3VtZW50IG51bWJlck9mUGFnZXNdOyArK3BhZ2UpIHsKLSAgICAgICAg VUlQREZQYWdlICpwZGZQYWdlID0gW19wZGZEb2N1bWVudCBwYWdlQXRJbmRleDpwYWdlXTsKLQot ICAgICAgICBpZiAoIXBkZlBhZ2UpCi0gICAgICAgICAgICBjb250aW51ZTsKLQotICAgICAgICAv LyBGSVhNRTogV2Ugc2hvdWxkIGNyZWF0ZSBhbmQgZGVzdHJveSB2aWV3cyBpbnN0ZWFkIG9mIGRl cGVuZGluZyBvbiB0aWxpbmcuCi0gICAgICAgIFJldGFpblB0cjxVSVBERlBhZ2VWaWV3PiBwYWdl VmlldyA9IGFkb3B0TlMoW1tVSVBERlBhZ2VWaWV3IGFsbG9jXSBpbml0V2l0aFBhZ2U6cGRmUGFn ZSB0aWxlZENvbnRlbnQ6WUVTXSk7Ci0gICAgICAgIFtzZWxmIGFkZFN1YnZpZXc6cGFnZVZpZXcu Z2V0KCldOwotICAgICAgICBfcGFnZVZpZXdzLmFwcGVuZChwYWdlVmlldy5nZXQoKSk7Ci0KLSAg ICAgICAgW3BhZ2VWaWV3IGNvbnRlbnRMYXllcl0uY29udGVudHNTY2FsZSA9IHNlbGYud2luZG93 LnNjcmVlbi5zY2FsZTsKLSAgICB9Ci0KLSAgICBbc2VsZiBsYXlvdXRWaWV3c107CisgICAgW3Nl bGYgX2NvbXB1dGVQYWdlQW5kRG9jdW1lbnRGcmFtZXNdOworICAgIFtzZWxmIF9yZXZhbGlkYXRl Vmlld3NdOwogfQogCiAtICh2b2lkKXdlYl9zZXRNaW5pbXVtU2l6ZTooQ0dTaXplKXNpemUKIHsK ICAgICBfbWluaW11bVNpemUgPSBzaXplOwogCi0gICAgW3NlbGYgbGF5b3V0Vmlld3NdOworICAg IFtzZWxmIF9jb21wdXRlUGFnZUFuZERvY3VtZW50RnJhbWVzXTsKKyAgICBbc2VsZiBfcmV2YWxp ZGF0ZVZpZXdzXTsKIH0KIAogLSAodm9pZCl3ZWJfc2V0U2Nyb2xsVmlldzooVUlTY3JvbGxWaWV3 ICopc2Nyb2xsVmlldwogewogICAgIF9zY3JvbGxWaWV3ID0gc2Nyb2xsVmlldzsKKworICAgIFtf c2Nyb2xsVmlldyBzZXRNaW5pbXVtWm9vbVNjYWxlOnBkZk1pbmltdW1ab29tU2NhbGVdOworICAg IFtfc2Nyb2xsVmlldyBzZXRNYXhpbXVtWm9vbVNjYWxlOnBkZk1heGltdW1ab29tU2NhbGVdOwor ICAgIFtfc2Nyb2xsVmlldyBzZXRDb250ZW50U2l6ZTpfZG9jdW1lbnRGcmFtZS5zaXplXTsKIH0K IAotLSAodm9pZClsYXlvdXRWaWV3cworLSAodm9pZClzY3JvbGxWaWV3RGlkU2Nyb2xsOihVSVNj cm9sbFZpZXcgKilzY3JvbGxWaWV3CiB7Ci0gICAgQ0dSZWN0IHBhZ2VGcmFtZSA9IENHUmVjdE1h a2UoMCwgMCwgX21pbmltdW1TaXplLndpZHRoLCBfbWluaW11bVNpemUuaGVpZ2h0KTsKKyAgICBp ZiAoc2Nyb2xsVmlldy5pc1pvb21Cb3VuY2luZykKKyAgICAgICAgcmV0dXJuOwogCi0gICAgZm9y IChhdXRvJiBwYWdlVmlldyA6IF9wYWdlVmlld3MpIHsKLSAgICAgICAgQ0dTaXplIHBhZ2VTaXpl ID0gW3BhZ2VWaWV3LnBhZ2Ugc2l6ZV07CisgICAgW3NlbGYgX3JldmFsaWRhdGVWaWV3c107Cit9 CiAKLSAgICAgICAgcGFnZUZyYW1lLnNpemUuaGVpZ2h0ID0gcGFnZVNpemUuaGVpZ2h0IC8gcGFn ZVNpemUud2lkdGggKiBwYWdlRnJhbWUuc2l6ZS53aWR0aDsKKy0gKHZvaWQpX3JldmFsaWRhdGVW aWV3cworeworICAgIENHUmVjdCB0YXJnZXRSZWN0ID0gW19zY3JvbGxWaWV3IGNvbnZlcnRSZWN0 Ol9zY3JvbGxWaWV3LmJvdW5kcyB0b1ZpZXc6c2VsZl07CisKKyAgICAvLyBXZSBhcHBseSBvdmVy ZHJhdyBhZnRlciBhcHBseWluZyBzY2FsZSBpbiBvcmRlciB0byBhdm9pZCBleGNlc3NpdmUKKyAg ICAvLyBtZW1vcnkgdXNlIGNhdXNlZCBieSBzY2FsaW5nIHRoZSBvdmVyZHJhdy4KKyAgICB0YXJn ZXRSZWN0ID0gQ0dSZWN0SW5zZXQodGFyZ2V0UmVjdCwgMCwgLXRhcmdldFJlY3Quc2l6ZS5oZWln aHQgKiBvdmVyZHJhd0hlaWdodE11bHRpcGxpZXIpOworCisgICAgZm9yIChhdXRvJiBwYWdlSW5m byA6IF9wYWdlcykgeworICAgICAgICBpZiAoQ0dSZWN0SW50ZXJzZWN0c1JlY3QocGFnZUluZm8u ZnJhbWUsIHRhcmdldFJlY3QpKSB7CisgICAgICAgICAgICBpZiAocGFnZUluZm8udmlldykKKyAg ICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIHBhZ2VJbmZvLnZpZXcgPSBhZG9w dE5TKFtbVUlQREZQYWdlVmlldyBhbGxvY10gaW5pdFdpdGhQYWdlOnBhZ2VJbmZvLnBhZ2UuZ2V0 KCkgdGlsZWRDb250ZW50OllFU10pOworICAgICAgICAgICAgW3BhZ2VJbmZvLnZpZXcgc2V0VXNl QmFja2luZ0xheWVyOllFU107CisgICAgICAgICAgICBbc2VsZiBhZGRTdWJ2aWV3OnBhZ2VJbmZv LnZpZXcuZ2V0KCldOworCisgICAgICAgICAgICBbcGFnZUluZm8udmlldyBzZXRGcmFtZTpwYWdl SW5mby5mcmFtZV07CisgICAgICAgICAgICBbcGFnZUluZm8udmlldyBjb250ZW50TGF5ZXJdLmNv bnRlbnRzU2NhbGUgPSBzZWxmLndpbmRvdy5zY3JlZW4uc2NhbGU7CisgICAgICAgIH0gZWxzZSB7 CisgICAgICAgICAgICBbcGFnZUluZm8udmlldyByZW1vdmVGcm9tU3VwZXJ2aWV3XTsKKyAgICAg ICAgICAgIHBhZ2VJbmZvLnZpZXcgPSBudWxscHRyOworICAgICAgICB9CisgICAgfQorfQorCist ICh2b2lkKV9jb21wdXRlUGFnZUFuZERvY3VtZW50RnJhbWVzCit7CisgICAgTlNVSW50ZWdlciBw YWdlQ291bnQgPSBbX3BkZkRvY3VtZW50IG51bWJlck9mUGFnZXNdOworCisgICAgZm9yIChhdXRv JiBwYWdlSW5mbyA6IF9wYWdlcykKKyAgICAgICAgW3BhZ2VJbmZvLnZpZXcgcmVtb3ZlRnJvbVN1 cGVydmlld107CiAKKyAgICBfcGFnZXMuY2xlYXIoKTsKKyAgICBfcGFnZXMucmVzZXJ2ZUNhcGFj aXR5KHBhZ2VDb3VudCk7CisKKyAgICBDR1JlY3QgcGFnZUZyYW1lID0gQ0dSZWN0TWFrZSgwLCAw LCBfbWluaW11bVNpemUud2lkdGgsIF9taW5pbXVtU2l6ZS5oZWlnaHQpOworICAgIGZvciAoTlNV SW50ZWdlciBwYWdlTnVtYmVyID0gMDsgcGFnZU51bWJlciA8IHBhZ2VDb3VudDsgKytwYWdlTnVt YmVyKSB7CisgICAgICAgIFVJUERGUGFnZSAqcGFnZSA9IFtfcGRmRG9jdW1lbnQgcGFnZUF0SW5k ZXg6cGFnZU51bWJlcl07CisgICAgICAgIGlmICghcGFnZSkKKyAgICAgICAgICAgIGNvbnRpbnVl OworCisgICAgICAgIENHU2l6ZSBwYWdlU2l6ZSA9IFtwYWdlIHNpemVdOworICAgICAgICBwYWdl RnJhbWUuc2l6ZS5oZWlnaHQgPSBwYWdlU2l6ZS5oZWlnaHQgLyBwYWdlU2l6ZS53aWR0aCAqIHBh Z2VGcmFtZS5zaXplLndpZHRoOwogICAgICAgICBDR1JlY3QgcGFnZUZyYW1lV2l0aE1hcmdpbkFw cGxpZWQgPSBDR1JlY3RJbnNldChwYWdlRnJhbWUsIHBkZlBhZ2VNYXJnaW4sIHBkZlBhZ2VNYXJn aW4pOwotICAgICAgICBbcGFnZVZpZXcgc2V0RnJhbWU6cGFnZUZyYW1lV2l0aE1hcmdpbkFwcGxp ZWRdOwogCisgICAgICAgIFBERlBhZ2VJbmZvIHBhZ2VJbmZvOworICAgICAgICBwYWdlSW5mby52 aWV3ID0gbnVsbHB0cjsKKyAgICAgICAgcGFnZUluZm8ucGFnZSA9IHBhZ2U7CisgICAgICAgIHBh Z2VJbmZvLmZyYW1lID0gcGFnZUZyYW1lV2l0aE1hcmdpbkFwcGxpZWQ7CisgICAgICAgIF9wYWdl cy5hcHBlbmQocGFnZUluZm8pOwogICAgICAgICBwYWdlRnJhbWUub3JpZ2luLnkgKz0gcGFnZUZy YW1lLnNpemUuaGVpZ2h0IC0gcGRmUGFnZU1hcmdpbjsKICAgICB9CiAKLSAgICBDR1JlY3QgbmV3 RnJhbWUgPSBbc2VsZiBmcmFtZV07Ci0gICAgbmV3RnJhbWUuc2l6ZS53aWR0aCA9IF9taW5pbXVt U2l6ZS53aWR0aDsKLSAgICBuZXdGcmFtZS5zaXplLmhlaWdodCA9IHN0ZDo6bWF4KHBhZ2VGcmFt ZS5vcmlnaW4ueSArIHBkZlBhZ2VNYXJnaW4sIF9taW5pbXVtU2l6ZS5oZWlnaHQpOwotICAgIFtz ZWxmIHNldEZyYW1lOm5ld0ZyYW1lXTsKKyAgICBfZG9jdW1lbnRGcmFtZSA9IFtzZWxmIGZyYW1l XTsKKyAgICBfZG9jdW1lbnRGcmFtZS5zaXplLndpZHRoID0gX21pbmltdW1TaXplLndpZHRoOwor ICAgIF9kb2N1bWVudEZyYW1lLnNpemUuaGVpZ2h0ID0gc3RkOjptYXgocGFnZUZyYW1lLm9yaWdp bi55ICsgcGRmUGFnZU1hcmdpbiwgX21pbmltdW1TaXplLmhlaWdodCk7CiAKLSAgICBbX3Njcm9s bFZpZXcgc2V0Q29udGVudFNpemU6bmV3RnJhbWUuc2l6ZV07Ci0gICAgW19zY3JvbGxWaWV3IHNl dE1pbmltdW1ab29tU2NhbGU6cGRmTWluaW11bVpvb21TY2FsZV07Ci0gICAgW19zY3JvbGxWaWV3 IHNldE1heGltdW1ab29tU2NhbGU6cGRmTWF4aW11bVpvb21TY2FsZV07CisgICAgW3NlbGYgc2V0 RnJhbWU6X2RvY3VtZW50RnJhbWVdOworICAgIFtfc2Nyb2xsVmlldyBzZXRDb250ZW50U2l6ZTpf ZG9jdW1lbnRGcmFtZS5zaXplXTsKIH0KIAogQGVuZAo=