134269 2014-06-24 14:53:25 -0700 [iOS][WK2] Implement WKPDFView smart magnification 2014-06-26 19:11:45 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton andersca benjamin bunhere cdumez commit-queue gyuyoung.kim sergio simon.fraser oldest_to_newest 1018105 0 thorton 2014-06-24 14:53:25 -0700 <rdar://problem/17272825> 1018113 1 233746 thorton 2014-06-24 15:02:29 -0700 Created attachment 233746 patch 1018790 2 233746 thorton 2014-06-26 16:37:35 -0700 Comment on attachment 233746 patch View in context: https://bugs.webkit.org/attachment.cgi?id=233746&action=review r=dan with lots of comments below > Source/WebKit2/UIProcess/ios/WKPDFView.h:30 > #import <UIKit/UIView.h> > +#import <CorePDF/UIPDFPageView.h> sorting! > Source/WebKit2/UIProcess/ios/WKPDFView.mm:49 > +static const float smartMagnificationElementPadding = 0.05; CGFloat > Source/WebKit2/UIProcess/ios/WKPDFView.mm:72 > + bool _isStartingZoom; Big BOOL > Source/WebKit2/UIProcess/ios/WKPDFView.mm:185 > + [pageInfo.view setDelegate:self]; clear delegates > Source/WebKit2/UIProcess/ios/WKPDFView.mm:270 > + _isStartingZoom = true; YES etc > Source/WebKit2/UIProcess/ios/WKPDFView.mm:272 > + bool isImage = kind == kUIPDFObjectKindGraphic; Big BOOL > Source/WebKit2/UIProcess/ios/WKPDFView.mm:275 > + double dx = smartMagnificationElementPadding * targetRect.size.width; CGFloat > Source/WebKit2/UIProcess/ios/WKPDFView.mm:277 > + targetRect.origin.x -= dx; > + targetRect.size.width += 2 * dx; There should be a CGRect thing for this 1018836 3 thorton 2014-06-26 19:11:45 -0700 http://trac.webkit.org/changeset/170515 233746 2014-06-24 15:02:29 -0700 2014-06-26 16:37:35 -0700 patch pdfzoom.diff text/plain 8825 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA2NzViMGI4Li5iY2U1OWJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMg QEAKKzIwMTQtMDYtMjQgIFRpbW90aHkgSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29t PgorCisgICAgICAgIFtpT1NdW1dLMl0gSW1wbGVtZW50IFdLUERGVmlldyBzbWFydCBtYWduaWZp Y2F0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MzQyNjkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE3MjcyODI1PgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9X S1dlYlZpZXcubW06CisgICAgICAgICgtW1dLV2ViVmlldyBfY3VycmVudENvbnRlbnRWaWV3XSk6 CisgICAgICAgIChjb250ZW50Wm9vbVNjYWxlKToKKyAgICAgICAgRmFjdG9yIF9jdXJyZW50Q29u dGVudFZpZXcgb3V0IG9mIGNvbnRlbnRab29tU2NhbGUuCisKKyAgICAgICAgKC1bV0tXZWJWaWV3 IF96b29tVG9SZWN0OldlYkNvcmU6OmF0U2NhbGU6b3JpZ2luOldlYkNvcmU6Ol0pOgorICAgICAg ICAoLVtXS1dlYlZpZXcgX3Njcm9sbFRvUmVjdDpXZWJDb3JlOjpvcmlnaW46V2ViQ29yZTo6bWlu aW11bVNjcm9sbERpc3RhbmNlOl0pOgorICAgICAgICAoLVtXS1dlYlZpZXcgX2NvbnRlbnRSZWN0 Rm9yVXNlckludGVyYWN0aW9uXSk6CisgICAgICAgIFVzZSBpdCBpbiBhIGJ1bmNoIG1vcmUgcGxh Y2VzIHNvIHdlIHF1ZXJ5IHRoZSByaWdodCB2aWV3IHdoZW4gem9vbWluZy9zY3JvbGxpbmcgZm9y IHNtYXJ0IG1hZ25pZmljYXRpb24uCisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLUERGVmll dy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tQREZWaWV3Lm1tOgorICAgICAgICAoLVtX S1BERlZpZXcgc2Nyb2xsVmlld0RpZFNjcm9sbDpdKToKKyAgICAgICAgKC1bV0tQREZWaWV3IF9y ZXZhbGlkYXRlVmlld3NdKToKKyAgICAgICAgKC1bV0tQREZWaWV3IHpvb206dG86YXRQb2ludDpr aW5kOl0pOgorICAgICAgICAoLVtXS1BERlZpZXcgcmVzZXRab29tOl0pOgorICAgICAgICBJbXBs ZW1lbnQgem9vbTp0bzphdFBvaW50OmtpbmQ6IGFuZCByZXNldFpvb206IFVJUERGUGFnZVZpZXdE ZWxlZ2F0ZSBtZXRob2RzLgorICAgICAgICBDb252ZXJ0IHRoZSByZWN0cy9wb2ludHMgYW5kIGZv cndhcmQgdGhlbSBvbiB0byB0aGUgV0tXZWJWaWV3IHRvIGRvIHRoZSB6b29tLgorICAgICAgICBy ZXNldFpvb206IGRvZXNuJ3QgcHJvdmlkZSB0aGUgZ2VzdHVyZSBvcmlnaW4sIHNvIHdlIHpvb20g b3V0IHVzaW5nIHRoZSB2aWV3IGNlbnRlciBhcyBvdXIgb3JpZ2luLgorICAgICAgICBBdm9pZCBw YXJlbnRpbmcgbmV3IFVJUERGUGFnZVZpZXdzIHdoaWxlIHN0YXJ0aW5nIGEgem9vbTsgdGhleSds bCBlbmQgdXAgd2l0aCBhIGJpemFycmUKKyAgICAgICAgYW5pbWF0aW9uIG9uIHRoZW0gYW5kIGdv IGZseWluZyBhY3Jvc3MgdGhlIHNjcmVlbiAoZXZlbiBiZWZvcmUgX2lzQW5pbWF0aW5nWm9vbSBp cyBzZXQpLgorCiAyMDE0LTA2LTI0ICBKZXJlbXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4K IAogICAgICAgICBJbml0aWFsaXplIFdLV2ViVmlld0NvbmZpZ3VyYXRpb24gcHJvcGVydGllcyB0 byB0aGVpciBkZWZhdWx0IHZhbHVlcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggMDI1ZDZkYy4uMThlNWVmNiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KQEAgLTU4MSw2ICs1 ODEsMTEgQEAgc3RhdGljIENHU2l6ZSByb3VuZFNjcm9sbFZpZXdDb250ZW50U2l6ZShjb25zdCBX ZWJLaXQ6OldlYlBhZ2VQcm94eSYgcGFnZSwgQ0dTaXoKICAgICByZXR1cm4gQ0dTaXplTWFrZShm bG9vclRvRGV2aWNlUGl4ZWwoY29udGVudFNpemUud2lkdGgsIGRldmljZVNjYWxlRmFjdG9yKSwg Zmxvb3JUb0RldmljZVBpeGVsKGNvbnRlbnRTaXplLmhlaWdodCwgZGV2aWNlU2NhbGVGYWN0b3Ip KTsKIH0KIAorLSAoVUlWaWV3ICopX2N1cnJlbnRDb250ZW50VmlldworeworICAgIHJldHVybiBf Y3VzdG9tQ29udGVudFZpZXcgPyBfY3VzdG9tQ29udGVudFZpZXcuZ2V0KCkgOiBfY29udGVudFZp ZXcuZ2V0KCk7Cit9CisKIC0gKHZvaWQpX3NldEhhc0N1c3RvbUNvbnRlbnRWaWV3OihCT09MKXBh Z2VIYXNDdXN0b21Db250ZW50VmlldyBsb2FkZWRNSU1FVHlwZTooY29uc3QgV1RGOjpTdHJpbmcm KW1pbWVUeXBlCiB7CiAgICAgaWYgKHBhZ2VIYXNDdXN0b21Db250ZW50VmlldykgewpAQCAtNjQx LDEzICs2NDYsNyBAQCBzdGF0aWMgQ0dTaXplIHJvdW5kU2Nyb2xsVmlld0NvbnRlbnRTaXplKGNv bnN0IFdlYktpdDo6V2ViUGFnZVByb3h5JiBwYWdlLCBDR1NpegogCiBzdGF0aWMgQ0dGbG9hdCBj b250ZW50Wm9vbVNjYWxlKFdLV2ViVmlldyogd2ViVmlldykKIHsKLSAgICBVSVZpZXcgKnpvb21W aWV3OwotICAgIGlmICh3ZWJWaWV3LT5fY3VzdG9tQ29udGVudFZpZXcpCi0gICAgICAgIHpvb21W aWV3ID0gd2ViVmlldy0+X2N1c3RvbUNvbnRlbnRWaWV3LmdldCgpOwotICAgIGVsc2UKLSAgICAg ICAgem9vbVZpZXcgPSB3ZWJWaWV3LT5fY29udGVudFZpZXcuZ2V0KCk7Ci0KLSAgICBDR0Zsb2F0 IHNjYWxlID0gW1t6b29tVmlldyBsYXllcl0gYWZmaW5lVHJhbnNmb3JtXS5hOworICAgIENHRmxv YXQgc2NhbGUgPSBbW3dlYlZpZXcuX2N1cnJlbnRDb250ZW50VmlldyBsYXllcl0gYWZmaW5lVHJh bnNmb3JtXS5hOwogICAgIEFTU0VSVChzY2FsZSA9PSBbd2ViVmlldy0+X3Njcm9sbFZpZXcgem9v bVNjYWxlXSk7CiAgICAgcmV0dXJuIHNjYWxlOwogfQpAQCAtOTEzLDcgKzkxMiw3IEBAIHN0YXRp YyB2b2lkIGNoYW5nZUNvbnRlbnRPZmZzZXRCb3VuZGVkSW5WYWxpZFJhbmdlKFVJU2Nyb2xsVmll dyAqc2Nyb2xsVmlldywgV2ViCiB7CiAgICAgLy8gRklNWEU6IFNvbWUgb2YgdGhpcyBjb3VsZCBi ZSBzaGFyZWQgd2l0aCBfc2Nyb2xsVG9SZWN0LgogICAgIGNvbnN0IGRvdWJsZSB2aXNpYmxlUmVj dFNjYWxlQ2hhbmdlID0gY29udGVudFpvb21TY2FsZShzZWxmKSAvIHNjYWxlOwotICAgIGNvbnN0 IFdlYkNvcmU6OkZsb2F0UmVjdCB2aXNpYmxlUmVjdChbc2VsZiBjb252ZXJ0UmVjdDpzZWxmLmJv dW5kcyB0b1ZpZXc6X2NvbnRlbnRWaWV3LmdldCgpXSk7CisgICAgY29uc3QgV2ViQ29yZTo6Rmxv YXRSZWN0IHZpc2libGVSZWN0KFtzZWxmIGNvbnZlcnRSZWN0OnNlbGYuYm91bmRzIHRvVmlldzpz ZWxmLl9jdXJyZW50Q29udGVudFZpZXddKTsKICAgICBjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3Qg dW5vYnNjdXJlZFJlY3QoW3NlbGYgX2NvbnRlbnRSZWN0Rm9yVXNlckludGVyYWN0aW9uXSk7CiAK ICAgICBjb25zdCBXZWJDb3JlOjpGbG9hdFNpemUgdG9wTGVmdE9ic2N1cmVkSW5zZXRBZnRlclpv b20oKHVub2JzY3VyZWRSZWN0Lm1pblhNaW5ZQ29ybmVyKCkgLSB2aXNpYmxlUmVjdC5taW5YTWlu WUNvcm5lcigpKSAqIHZpc2libGVSZWN0U2NhbGVDaGFuZ2UpOwpAQCAtOTY0LDcgKzk2Myw3IEBA IHN0YXRpYyBXZWJDb3JlOjpGbG9hdFBvaW50IGNvbnN0cmFpbkNvbnRlbnRPZmZzZXQoV2ViQ29y ZTo6RmxvYXRQb2ludCBjb250ZW50T2ZmCiB7CiAgICAgV2ViQ29yZTo6RmxvYXRSZWN0IHVub2Jz Y3VyZWRDb250ZW50UmVjdChbc2VsZiBfY29udGVudFJlY3RGb3JVc2VySW50ZXJhY3Rpb25dKTsK ICAgICBXZWJDb3JlOjpGbG9hdFBvaW50IHVub2JzY3VyZWRDb250ZW50T2Zmc2V0ID0gdW5vYnNj dXJlZENvbnRlbnRSZWN0LmxvY2F0aW9uKCk7Ci0gICAgV2ViQ29yZTo6RmxvYXRTaXplIGNvbnRl bnRTaXplKFtfY29udGVudFZpZXcgYm91bmRzXS5zaXplKTsKKyAgICBXZWJDb3JlOjpGbG9hdFNp emUgY29udGVudFNpemUoW3NlbGYuX2N1cnJlbnRDb250ZW50VmlldyBib3VuZHNdLnNpemUpOwog CiAgICAgLy8gQ2VudGVyIHRoZSB0YXJnZXQgcmVjdCBpbiB0aGUgc2Nyb2xsIHZpZXcuCiAgICAg Ly8gSWYgdGhlIHRhcmdldCBkb2Vzbid0IGZpdCBpbiB0aGUgc2Nyb2xsIHZpZXcsIGNlbnRlciBv biB0aGUgZ2VzdHVyZSBsb2NhdGlvbiBpbnN0ZWFkLgpAQCAtMTI3Niw3ICsxMjc1LDcgQEAgc3Rh dGljIFdlYkNvcmU6OkZsb2F0UG9pbnQgY29uc3RyYWluQ29udGVudE9mZnNldChXZWJDb3JlOjpG bG9hdFBvaW50IGNvbnRlbnRPZmYKICAgICBVSUVkZ2VJbnNldHMgb2JzY3VyZWRJbnNldHMgPSBf b2JzY3VyZWRJbnNldHM7CiAgICAgb2JzY3VyZWRJbnNldHMuYm90dG9tID0gc3RkOjptYXgoX29i c2N1cmVkSW5zZXRzLmJvdHRvbSwgX2lucHV0Vmlld0JvdW5kcy5zaXplLmhlaWdodCk7CiAgICAg Q0dSZWN0IHVub2JzY3VyZWRSZWN0ID0gVUlFZGdlSW5zZXRzSW5zZXRSZWN0KHNlbGYuYm91bmRz LCBvYnNjdXJlZEluc2V0cyk7Ci0gICAgcmV0dXJuIFtzZWxmIGNvbnZlcnRSZWN0OnVub2JzY3Vy ZWRSZWN0IHRvVmlldzpfY29udGVudFZpZXcuZ2V0KCldOworICAgIHJldHVybiBbc2VsZiBjb252 ZXJ0UmVjdDp1bm9ic2N1cmVkUmVjdCB0b1ZpZXc6c2VsZi5fY3VycmVudENvbnRlbnRWaWV3XTsK IH0KIAogLSAodm9pZClfdXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0cwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcuaCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9pb3MvV0tQREZWaWV3LmgKaW5kZXggYThjZmE2Yy4uNmIwMzM1ZSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcuaAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLUERGVmlldy5oCkBAIC0yNyw4ICsyNyw5IEBACiAKICNp bXBvcnQgIldLV2ViVmlld0NvbnRlbnRQcm92aWRlci5oIgogI2ltcG9ydCA8VUlLaXQvVUlWaWV3 Lmg+CisjaW1wb3J0IDxDb3JlUERGL1VJUERGUGFnZVZpZXcuaD4KIAotQGludGVyZmFjZSBXS1BE RlZpZXcgOiBVSVZpZXcgPFdLV2ViVmlld0NvbnRlbnRQcm92aWRlcj4KK0BpbnRlcmZhY2UgV0tQ REZWaWV3IDogVUlWaWV3IDxXS1dlYlZpZXdDb250ZW50UHJvdmlkZXIsIFVJUERGUGFnZVZpZXdE ZWxlZ2F0ZT4KIAogQHByb3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5KSBOU1N0cmluZyAqc3Vn Z2VzdGVkRmlsZW5hbWU7CiBAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIENHUERGRG9j dW1lbnRSZWYgcGRmRG9jdW1lbnQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvaW9zL1dLUERGVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tQREZW aWV3Lm1tCmluZGV4IGRlMjgzNmYuLjY5ZjE5ZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9pb3MvV0tQREZWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9pb3MvV0tQREZWaWV3Lm1tCkBAIC0zMyw2ICszMyw3IEBACiAjaW1wb3J0IDxDb3JlUERGL1VJ UERGRG9jdW1lbnQuaD4KICNpbXBvcnQgPENvcmVQREYvVUlQREZQYWdlLmg+CiAjaW1wb3J0IDxD b3JlUERGL1VJUERGUGFnZVZpZXcuaD4KKyNpbXBvcnQgPFVJS2l0L1VJU2Nyb2xsVmlld19Qcml2 YXRlLmg+CiAjaW1wb3J0IDxXZWJDb3JlL0Zsb2F0UmVjdC5oPgogI2ltcG9ydCA8d3RmL1JldGFp blB0ci5oPgogI2ltcG9ydCA8d3RmL1ZlY3Rvci5oPgpAQCAtNDUsNiArNDYsOCBAQCBjb25zdCBD R0Zsb2F0IHBkZk1heGltdW1ab29tU2NhbGUgPSA1OwogCiBjb25zdCBmbG9hdCBvdmVyZHJhd0hl aWdodE11bHRpcGxpZXIgPSAxLjU7CiAKK3N0YXRpYyBjb25zdCBmbG9hdCBzbWFydE1hZ25pZmlj YXRpb25FbGVtZW50UGFkZGluZyA9IDAuMDU7CisKIHR5cGVkZWYgc3RydWN0IHsKICAgICBDR1Jl Y3QgZnJhbWU7CiAgICAgUmV0YWluUHRyPFVJUERGUGFnZVZpZXc+IHZpZXc7CkBAIC02NSw2ICs2 OCw4IEBAIHR5cGVkZWYgc3RydWN0IHsKICAgICBXS1dlYlZpZXcgKl93ZWJWaWV3OwogICAgIFVJ U2Nyb2xsVmlldyAqX3Njcm9sbFZpZXc7CiAgICAgVUlWaWV3ICpfZml4ZWRPdmVybGF5VmlldzsK KworICAgIGJvb2wgX2lzU3RhcnRpbmdab29tOwogfQogCiAtIChpbnN0YW5jZXR5cGUpd2ViX2lu aXRXaXRoRnJhbWU6KENHUmVjdClmcmFtZSB3ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3CkBA IC0xMzgsNyArMTQzLDcgQEAgdHlwZWRlZiBzdHJ1Y3QgewogCiAtICh2b2lkKXNjcm9sbFZpZXdE aWRTY3JvbGw6KFVJU2Nyb2xsVmlldyAqKXNjcm9sbFZpZXcKIHsKLSAgICBpZiAoc2Nyb2xsVmll dy5pc1pvb21Cb3VuY2luZykKKyAgICBpZiAoc2Nyb2xsVmlldy5pc1pvb21Cb3VuY2luZyB8fCBz Y3JvbGxWaWV3Ll9pc0FuaW1hdGluZ1pvb20pCiAgICAgICAgIHJldHVybjsKIAogICAgIFtzZWxm IF9yZXZhbGlkYXRlVmlld3NdOwpAQCAtMTQ3LDYgKzE1Miw5IEBAIHR5cGVkZWYgc3RydWN0IHsK IAogLSAodm9pZClfcmV2YWxpZGF0ZVZpZXdzCiB7CisgICAgaWYgKF9pc1N0YXJ0aW5nWm9vbSkK KyAgICAgICAgcmV0dXJuOworCiAgICAgQ0dSZWN0IHRhcmdldFJlY3QgPSBbX3Njcm9sbFZpZXcg Y29udmVydFJlY3Q6X3Njcm9sbFZpZXcuYm91bmRzIHRvVmlldzpzZWxmXTsKIAogICAgIC8vIFdl IGFwcGx5IG92ZXJkcmF3IGFmdGVyIGFwcGx5aW5nIHNjYWxlIGluIG9yZGVyIHRvIGF2b2lkIGV4 Y2Vzc2l2ZQpAQCAtMTc0LDYgKzE4Miw3IEBAIHR5cGVkZWYgc3RydWN0IHsKIAogICAgICAgICBw YWdlSW5mby52aWV3ID0gYWRvcHROUyhbW1VJUERGUGFnZVZpZXcgYWxsb2NdIGluaXRXaXRoUGFn ZTpwYWdlSW5mby5wYWdlLmdldCgpIHRpbGVkQ29udGVudDpZRVNdKTsKICAgICAgICAgW3BhZ2VJ bmZvLnZpZXcgc2V0VXNlQmFja2luZ0xheWVyOllFU107CisgICAgICAgIFtwYWdlSW5mby52aWV3 IHNldERlbGVnYXRlOnNlbGZdOwogICAgICAgICBbc2VsZiBhZGRTdWJ2aWV3OnBhZ2VJbmZvLnZp ZXcuZ2V0KCldOwogCiAgICAgICAgIFtwYWdlSW5mby52aWV3IHNldEZyYW1lOnBhZ2VJbmZvLmZy YW1lXTsKQEAgLTI1NSw2ICsyNjQsNDEgQEAgdHlwZWRlZiBzdHJ1Y3QgewogICAgIFtfc2Nyb2xs VmlldyBzZXRDb250ZW50U2l6ZTpfZG9jdW1lbnRGcmFtZS5zaXplXTsKIH0KIAorCistICh2b2lk KXpvb206KFVJUERGUGFnZVZpZXcgKilwYWdlVmlldyB0bzooQ0dSZWN0KXRhcmdldFJlY3QgYXRQ b2ludDooQ0dQb2ludClvcmlnaW4ga2luZDooVUlQREZPYmplY3RLaW5kKWtpbmQKK3sKKyAgICBf aXNTdGFydGluZ1pvb20gPSB0cnVlOworCisgICAgYm9vbCBpc0ltYWdlID0ga2luZCA9PSBrVUlQ REZPYmplY3RLaW5kR3JhcGhpYzsKKworICAgIGlmICghaXNJbWFnZSkgeworICAgICAgICBkb3Vi bGUgZHggPSBzbWFydE1hZ25pZmljYXRpb25FbGVtZW50UGFkZGluZyAqIHRhcmdldFJlY3Quc2l6 ZS53aWR0aDsKKyAgICAgICAgdGFyZ2V0UmVjdC5vcmlnaW4ueCAtPSBkeDsKKyAgICAgICAgdGFy Z2V0UmVjdC5zaXplLndpZHRoICs9IDIgKiBkeDsKKworICAgICAgICBkb3VibGUgZHkgPSBzbWFy dE1hZ25pZmljYXRpb25FbGVtZW50UGFkZGluZyAqIHRhcmdldFJlY3Quc2l6ZS5oZWlnaHQ7Cisg ICAgICAgIHRhcmdldFJlY3Qub3JpZ2luLnkgLT0gZHk7CisgICAgICAgIHRhcmdldFJlY3Quc2l6 ZS5oZWlnaHQgKz0gMiAqIGR5OworICAgIH0KKworICAgIENHUmVjdCByZWN0SW5Eb2N1bWVudENv b3JkaW5hdGVzID0gW3BhZ2VWaWV3IGNvbnZlcnRSZWN0OnRhcmdldFJlY3QgdG9WaWV3OnNlbGZd OworICAgIENHUG9pbnQgb3JpZ2luSW5Eb2N1bWVudENvb3JkaW5hdGVzID0gW3BhZ2VWaWV3IGNv bnZlcnRQb2ludDpvcmlnaW4gdG9WaWV3OnNlbGZdOworCisgICAgW193ZWJWaWV3IF96b29tVG9S ZWN0OnJlY3RJbkRvY3VtZW50Q29vcmRpbmF0ZXMgd2l0aE9yaWdpbjpvcmlnaW5JbkRvY3VtZW50 Q29vcmRpbmF0ZXMgZml0RW50aXJlUmVjdDppc0ltYWdlIG1pbmltdW1TY2FsZTpwZGZNaW5pbXVt Wm9vbVNjYWxlIG1heGltdW1TY2FsZTpwZGZNYXhpbXVtWm9vbVNjYWxlIG1pbmltdW1TY3JvbGxE aXN0YW5jZTowXTsKKworICAgIF9pc1N0YXJ0aW5nWm9vbSA9IGZhbHNlOworfQorCistICh2b2lk KXJlc2V0Wm9vbTooVUlQREZQYWdlVmlldyAqKXBhZ2VWaWV3Cit7CisgICAgX2lzU3RhcnRpbmda b29tID0gdHJ1ZTsKKworICAgIENHUG9pbnQgY2VudGVyT2ZQYWdlSW5Eb2N1bWVudENvb3JkaW5h dGVzID0gW19zY3JvbGxWaWV3IGNvbnZlcnRQb2ludDpDR1BvaW50TWFrZShfc2Nyb2xsVmlldy5i b3VuZHMub3JpZ2luLnggKyBfc2Nyb2xsVmlldy5ib3VuZHMuc2l6ZS53aWR0aCAvIDIsIF9zY3Jv bGxWaWV3LmJvdW5kcy5vcmlnaW4ueSArIF9zY3JvbGxWaWV3LmJvdW5kcy5zaXplLmhlaWdodCAv IDIpIHRvVmlldzpzZWxmXTsKKyAgICBbX3dlYlZpZXcgX3pvb21PdXRXaXRoT3JpZ2luOmNlbnRl ck9mUGFnZUluRG9jdW1lbnRDb29yZGluYXRlc107CisKKyAgICBfaXNTdGFydGluZ1pvb20gPSBm YWxzZTsKK30KKwogQGVuZAogCiAjZW5kaWYgLyogUExBVEZPUk0oSU9TKSAqLwo=