68383 2011-09-19 13:24:22 -0700 Begin removing -[WebView _usesDocumentCalls] from WebView.mm 2011-09-19 13:26:38 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 469635 0 andersca 2011-09-19 13:24:22 -0700 Begin removing -[WebView _usesDocumentCalls] from WebView.mm 469637 1 107907 andersca 2011-09-19 13:25:07 -0700 Created attachment 107907 Patch 469639 2 andersca 2011-09-19 13:26:38 -0700 Committed r95465: <http://trac.webkit.org/changeset/95465> 107907 2011-09-19 13:25:07 -0700 2011-09-19 13:26:01 -0700 Patch bug-68383-20110919132506.patch text/plain 10770 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDk1NDY0KQorKysgU291cmNlL1dlYktpdC9t YWMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDktMTkg IEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBCZWdpbiBy ZW1vdmluZyAtW1dlYlZpZXcgX3VzZXNEb2N1bWVudENhbGxzXSBmcm9tIFdlYlZpZXcubW0KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY4MzgzCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIGNoZWNr cyBhbmQgYmVnaW4gYXNzdW1pbmcgdGhhdCAtW1dlYlZpZXcgX3VzZXNEb2N1bWVudFZpZXdzXSBh bHdheXMgCisgICAgICAgIHJldHVybnMgdHJ1ZSwgc2luY2Ugdmlld2xlc3MgV2ViS2l0MSBoYXMg YmVlbiBhYmFuZG9uZWQuCisKKyAgICAgICAgKiBXZWJWaWV3L1dlYlZpZXcubW06CisgICAgICAg ICgtW1dlYlZpZXcgc2VsZWN0ZWRGcmFtZV0pOgorICAgICAgICAoLVtXZWJWaWV3IHNldEhvc3RX aW5kb3c6XSk6CisgICAgICAgICgtW1dlYlZpZXcgYWNjZXB0c0ZpcnN0UmVzcG9uZGVyXSk6Cisg ICAgICAgICgtW1dlYlZpZXcgYmVjb21lRmlyc3RSZXNwb25kZXJdKToKKyAgICAgICAgKC1bV2Vi VmlldyBfd2ViY29yZV9lZmZlY3RpdmVGaXJzdFJlc3BvbmRlcl0pOgorICAgICAgICAoLVtXZWJW aWV3IHNldE5leHRLZXlWaWV3Ol0pOgorICAgICAgICAoLVtXZWJWaWV3IHNldEhvdmVyRmVlZGJh Y2tTdXNwZW5kZWQ6XSk6CisKIDIwMTEtMDktMTkgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2Nh QGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgY2FsbHMgdG8gLVtXZWJWaWV3IF91c2VzRG9j dW1lbnRWaWV3c10gZnJvbSBXZWJGcmFtZUxvYWRlckNsaWVudC5tbQpJbmRleDogU291cmNlL1dl YktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQv bWFjL1dlYlZpZXcvV2ViVmlldy5tbQkocmV2aXNpb24gOTU0MTkpCisrKyBTb3VyY2UvV2ViS2l0 L21hYy9XZWJWaWV3L1dlYlZpZXcubW0JKHdvcmtpbmcgY29weSkKQEAgLTM1MzEsMTQgKzM1MzEs MTIgQEAgLSAoV2ViRnJhbWUgKiltYWluRnJhbWUKIAogLSAoV2ViRnJhbWUgKilzZWxlY3RlZEZy YW1lCiB7Ci0gICAgaWYgKF9wcml2YXRlLT51c2VzRG9jdW1lbnRWaWV3cykgewotICAgICAgICAv LyBJZiB0aGUgZmlyc3QgcmVzcG9uZGVyIGlzIGEgdmlldyBpbiBvdXIgdHJlZSwgd2UgZ2V0IHRo ZSBmcmFtZSBjb250YWluaW5nIHRoZSBmaXJzdCByZXNwb25kZXIuCi0gICAgICAgIC8vIFRoaXMg aXMgZmFzdGVyIHRoYW4gc2VhcmNoaW5nIHRoZSBmcmFtZSBoaWVyYXJjaHksIGFuZCB3aWxsIGdp dmUgdXMgYSByZXN1bHQgZXZlbiBpbiB0aGUgY2FzZQotICAgICAgICAvLyB3aGVyZSB0aGUgZm9j dXNlZCBmcmFtZSBkb2Vzbid0IGFjdHVhbGx5IGNvbnRhaW4gYSBzZWxlY3Rpb24uCi0gICAgICAg IFdlYkZyYW1lICpmb2N1c2VkRnJhbWUgPSBbc2VsZiBfZm9jdXNlZEZyYW1lXTsKLSAgICAgICAg aWYgKGZvY3VzZWRGcmFtZSkKLSAgICAgICAgICAgIHJldHVybiBmb2N1c2VkRnJhbWU7Ci0gICAg fQorICAgIC8vIElmIHRoZSBmaXJzdCByZXNwb25kZXIgaXMgYSB2aWV3IGluIG91ciB0cmVlLCB3 ZSBnZXQgdGhlIGZyYW1lIGNvbnRhaW5pbmcgdGhlIGZpcnN0IHJlc3BvbmRlci4KKyAgICAvLyBU aGlzIGlzIGZhc3RlciB0aGFuIHNlYXJjaGluZyB0aGUgZnJhbWUgaGllcmFyY2h5LCBhbmQgd2ls bCBnaXZlIHVzIGEgcmVzdWx0IGV2ZW4gaW4gdGhlIGNhc2UKKyAgICAvLyB3aGVyZSB0aGUgZm9j dXNlZCBmcmFtZSBkb2Vzbid0IGFjdHVhbGx5IGNvbnRhaW4gYSBzZWxlY3Rpb24uCisgICAgV2Vi RnJhbWUgKmZvY3VzZWRGcmFtZSA9IFtzZWxmIF9mb2N1c2VkRnJhbWVdOworICAgIGlmIChmb2N1 c2VkRnJhbWUpCisgICAgICAgIHJldHVybiBmb2N1c2VkRnJhbWU7CiAgICAgCiAgICAgLy8gSWYg dGhlIGZpcnN0IHJlc3BvbmRlciBpcyBvdXRzaWRlIG9mIG91ciB2aWV3IHRyZWUsIHdlIHNlYXJj aCBmb3IgYSBmcmFtZSBjb250YWluaW5nIGEgc2VsZWN0aW9uLgogICAgIC8vIFRoZXJlIHNob3Vs ZCBiZSBhdCBtb3N0IG9ubHkgb25lIG9mIHRoZXNlLgpAQCAtMzgyNCwyMCArMzgyMiwxNiBAQCAt ICh2b2lkKXNldEhvc3RXaW5kb3c6KE5TV2luZG93ICopaG9zdFdpCiAgICAgICAgIHJldHVybjsK IAogICAgIEZyYW1lKiBjb3JlRnJhbWUgPSBbc2VsZiBfbWFpbkNvcmVGcmFtZV07Ci0gICAgaWYg KF9wcml2YXRlLT51c2VzRG9jdW1lbnRWaWV3cykgewotICAgICAgICBmb3IgKEZyYW1lKiBmcmFt ZSA9IGNvcmVGcmFtZTsgZnJhbWU7IGZyYW1lID0gZnJhbWUtPnRyZWUoKS0+dHJhdmVyc2VOZXh0 KGNvcmVGcmFtZSkpCi0gICAgICAgICAgICBbW1traXQoZnJhbWUpIGZyYW1lVmlld10gZG9jdW1l bnRWaWV3XSB2aWV3V2lsbE1vdmVUb0hvc3RXaW5kb3c6aG9zdFdpbmRvd107Ci0gICAgfQorICAg IGZvciAoRnJhbWUqIGZyYW1lID0gY29yZUZyYW1lOyBmcmFtZTsgZnJhbWUgPSBmcmFtZS0+dHJl ZSgpLT50cmF2ZXJzZU5leHQoY29yZUZyYW1lKSkKKyAgICAgICAgW1tba2l0KGZyYW1lKSBmcmFt ZVZpZXddIGRvY3VtZW50Vmlld10gdmlld1dpbGxNb3ZlVG9Ib3N0V2luZG93Omhvc3RXaW5kb3dd OwogICAgIGlmIChfcHJpdmF0ZS0+aG9zdFdpbmRvdyAmJiBbc2VsZiB3aW5kb3ddICE9IF9wcml2 YXRlLT5ob3N0V2luZG93KQogICAgICAgICBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRD ZW50ZXJdIHJlbW92ZU9ic2VydmVyOnNlbGYgbmFtZTpOU1dpbmRvd1dpbGxDbG9zZU5vdGlmaWNh dGlvbiBvYmplY3Q6X3ByaXZhdGUtPmhvc3RXaW5kb3ddOwogICAgIGlmIChob3N0V2luZG93KQog ICAgICAgICBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJdIGFkZE9ic2VydmVy OnNlbGYgc2VsZWN0b3I6QHNlbGVjdG9yKF93aW5kb3dXaWxsQ2xvc2U6KSBuYW1lOk5TV2luZG93 V2lsbENsb3NlTm90aWZpY2F0aW9uIG9iamVjdDpob3N0V2luZG93XTsKICAgICBbX3ByaXZhdGUt Pmhvc3RXaW5kb3cgcmVsZWFzZV07CiAgICAgX3ByaXZhdGUtPmhvc3RXaW5kb3cgPSBbaG9zdFdp bmRvdyByZXRhaW5dOwotICAgIGlmIChfcHJpdmF0ZS0+dXNlc0RvY3VtZW50Vmlld3MpIHsKLSAg ICAgICAgZm9yIChGcmFtZSogZnJhbWUgPSBjb3JlRnJhbWU7IGZyYW1lOyBmcmFtZSA9IGZyYW1l LT50cmVlKCktPnRyYXZlcnNlTmV4dChjb3JlRnJhbWUpKQotICAgICAgICAgICAgW1tba2l0KGZy YW1lKSBmcmFtZVZpZXddIGRvY3VtZW50Vmlld10gdmlld0RpZE1vdmVUb0hvc3RXaW5kb3ddOwot ICAgIH0KKyAgICBmb3IgKEZyYW1lKiBmcmFtZSA9IGNvcmVGcmFtZTsgZnJhbWU7IGZyYW1lID0g ZnJhbWUtPnRyZWUoKS0+dHJhdmVyc2VOZXh0KGNvcmVGcmFtZSkpCisgICAgICAgIFtbW2tpdChm cmFtZSkgZnJhbWVWaWV3XSBkb2N1bWVudFZpZXddIHZpZXdEaWRNb3ZlVG9Ib3N0V2luZG93XTsK IH0KIAogLSAoTlNXaW5kb3cgKilob3N0V2luZG93CkBAIC0zOTU4LDgwICszOTUyLDY4IEBAIC0g KE5TVmlldyAqKV9oaXRUZXN0OihOU1BvaW50ICopcG9pbnQgZHIKIAogLSAoQk9PTClhY2NlcHRz Rmlyc3RSZXNwb25kZXIKIHsKLSAgICBpZiAoX3ByaXZhdGUtPnVzZXNEb2N1bWVudFZpZXdzKQot ICAgICAgICByZXR1cm4gW1tbc2VsZiBtYWluRnJhbWVdIGZyYW1lVmlld10gYWNjZXB0c0ZpcnN0 UmVzcG9uZGVyXTsKLQotICAgIC8vIEZJWE1FIChWaWV3bGVzcyk6IE5lZWQgbW9yZSBjb2RlIGZy b20gV2ViSFRNTFZpZXcgaGVyZS4KLSAgICByZXR1cm4gWUVTOworICAgIHJldHVybiBbW1tzZWxm IG1haW5GcmFtZV0gZnJhbWVWaWV3XSBhY2NlcHRzRmlyc3RSZXNwb25kZXJdOwogfQogCiAtIChC T09MKWJlY29tZUZpcnN0UmVzcG9uZGVyCiB7Ci0gICAgaWYgKF9wcml2YXRlLT51c2VzRG9jdW1l bnRWaWV3cykgewotICAgICAgICBpZiAoX3ByaXZhdGUtPmJlY29taW5nRmlyc3RSZXNwb25kZXIp IHsKLSAgICAgICAgICAgIC8vIEZpeCBmb3IgdW5yZXBybyBpbmZpbml0ZSByZWN1cnNpb24gcmVw b3J0ZWQgaW4gUmFkYXIgNDQ0ODE4MS4gSWYgd2UgaGl0IHRoaXMgYXNzZXJ0IG9uCi0gICAgICAg ICAgICAvLyBhIGRlYnVnIGJ1aWxkLCB3ZSBzaG91bGQgZmlndXJlIG91dCB3aGF0IGNhdXNlcyB0 aGUgcHJvYmxlbSBhbmQgZG8gYSBiZXR0ZXIgZml4LgotICAgICAgICAgICAgQVNTRVJUX05PVF9S RUFDSEVEKCk7Ci0gICAgICAgICAgICByZXR1cm4gTk87Ci0gICAgICAgIH0KLSAgICAgICAgCi0g ICAgICAgIC8vIFRoaXMgd29ya3MgdG9nZXRoZXIgd2l0aCBzZXROZXh0S2V5VmlldyB0byBzcGxp Y2UgdGhlIFdlYlZpZXcgaW50bwotICAgICAgICAvLyB0aGUga2V5IGxvb3Agc2ltaWxhciB0byB0 aGUgd2F5IE5TU2Nyb2xsVmlldyBkb2VzIHRoaXMuIE5vdGUgdGhhdAotICAgICAgICAvLyBXZWJG cmFtZVZpZXcgaGFzIHZlcnkgc2ltaWxhciBjb2RlLgotICAgICAgICBOU1dpbmRvdyAqd2luZG93 ID0gW3NlbGYgd2luZG93XTsKLSAgICAgICAgV2ViRnJhbWVWaWV3ICptYWluRnJhbWVWaWV3ID0g W1tzZWxmIG1haW5GcmFtZV0gZnJhbWVWaWV3XTsKLQotICAgICAgICBOU1Jlc3BvbmRlciAqcHJl dmlvdXNGaXJzdFJlc3BvbmRlciA9IFtbc2VsZiB3aW5kb3ddIF9vbGRGaXJzdFJlc3BvbmRlckJl Zm9yZUJlY29taW5nXTsKLSAgICAgICAgQk9PTCBmcm9tT3V0c2lkZSA9ICFbcHJldmlvdXNGaXJz dFJlc3BvbmRlciBpc0tpbmRPZkNsYXNzOltOU1ZpZXcgY2xhc3NdXSB8fCAoIVsoTlNWaWV3ICop cHJldmlvdXNGaXJzdFJlc3BvbmRlciBpc0Rlc2NlbmRhbnRPZjpzZWxmXSAmJiBwcmV2aW91c0Zp cnN0UmVzcG9uZGVyICE9IHNlbGYpOwotCi0gICAgICAgIGlmIChbd2luZG93IGtleVZpZXdTZWxl Y3Rpb25EaXJlY3Rpb25dID09IE5TU2VsZWN0aW5nUHJldmlvdXMpIHsKLSAgICAgICAgICAgIE5T VmlldyAqcHJldmlvdXNWYWxpZEtleVZpZXcgPSBbc2VsZiBwcmV2aW91c1ZhbGlkS2V5Vmlld107 Ci0gICAgICAgICAgICBpZiAocHJldmlvdXNWYWxpZEtleVZpZXcgIT0gc2VsZiAmJiBwcmV2aW91 c1ZhbGlkS2V5VmlldyAhPSBtYWluRnJhbWVWaWV3KSB7Ci0gICAgICAgICAgICAgICAgX3ByaXZh dGUtPmJlY29taW5nRmlyc3RSZXNwb25kZXIgPSBZRVM7Ci0gICAgICAgICAgICAgICAgX3ByaXZh dGUtPmJlY29taW5nRmlyc3RSZXNwb25kZXJGcm9tT3V0c2lkZSA9IGZyb21PdXRzaWRlOwotICAg ICAgICAgICAgICAgIFt3aW5kb3cgbWFrZUZpcnN0UmVzcG9uZGVyOnByZXZpb3VzVmFsaWRLZXlW aWV3XTsKLSAgICAgICAgICAgICAgICBfcHJpdmF0ZS0+YmVjb21pbmdGaXJzdFJlc3BvbmRlckZy b21PdXRzaWRlID0gTk87Ci0gICAgICAgICAgICAgICAgX3ByaXZhdGUtPmJlY29taW5nRmlyc3RS ZXNwb25kZXIgPSBOTzsKLSAgICAgICAgICAgICAgICByZXR1cm4gWUVTOwotICAgICAgICAgICAg fQotICAgICAgICAgICAgcmV0dXJuIE5POwotICAgICAgICB9CisgICAgaWYgKF9wcml2YXRlLT5i ZWNvbWluZ0ZpcnN0UmVzcG9uZGVyKSB7CisgICAgICAgIC8vIEZpeCBmb3IgdW5yZXBybyBpbmZp bml0ZSByZWN1cnNpb24gcmVwb3J0ZWQgaW4gUmFkYXIgNDQ0ODE4MS4gSWYgd2UgaGl0IHRoaXMg YXNzZXJ0IG9uCisgICAgICAgIC8vIGEgZGVidWcgYnVpbGQsIHdlIHNob3VsZCBmaWd1cmUgb3V0 IHdoYXQgY2F1c2VzIHRoZSBwcm9ibGVtIGFuZCBkbyBhIGJldHRlciBmaXguCisgICAgICAgIEFT U0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICByZXR1cm4gTk87CisgICAgfQorICAgIAorICAg IC8vIFRoaXMgd29ya3MgdG9nZXRoZXIgd2l0aCBzZXROZXh0S2V5VmlldyB0byBzcGxpY2UgdGhl IFdlYlZpZXcgaW50bworICAgIC8vIHRoZSBrZXkgbG9vcCBzaW1pbGFyIHRvIHRoZSB3YXkgTlNT Y3JvbGxWaWV3IGRvZXMgdGhpcy4gTm90ZSB0aGF0CisgICAgLy8gV2ViRnJhbWVWaWV3IGhhcyB2 ZXJ5IHNpbWlsYXIgY29kZS4KKyAgICBOU1dpbmRvdyAqd2luZG93ID0gW3NlbGYgd2luZG93XTsK KyAgICBXZWJGcmFtZVZpZXcgKm1haW5GcmFtZVZpZXcgPSBbW3NlbGYgbWFpbkZyYW1lXSBmcmFt ZVZpZXddOworCisgICAgTlNSZXNwb25kZXIgKnByZXZpb3VzRmlyc3RSZXNwb25kZXIgPSBbW3Nl bGYgd2luZG93XSBfb2xkRmlyc3RSZXNwb25kZXJCZWZvcmVCZWNvbWluZ107CisgICAgQk9PTCBm cm9tT3V0c2lkZSA9ICFbcHJldmlvdXNGaXJzdFJlc3BvbmRlciBpc0tpbmRPZkNsYXNzOltOU1Zp ZXcgY2xhc3NdXSB8fCAoIVsoTlNWaWV3ICopcHJldmlvdXNGaXJzdFJlc3BvbmRlciBpc0Rlc2Nl bmRhbnRPZjpzZWxmXSAmJiBwcmV2aW91c0ZpcnN0UmVzcG9uZGVyICE9IHNlbGYpOwogCi0gICAg ICAgIGlmIChbbWFpbkZyYW1lVmlldyBhY2NlcHRzRmlyc3RSZXNwb25kZXJdKSB7CisgICAgaWYg KFt3aW5kb3cga2V5Vmlld1NlbGVjdGlvbkRpcmVjdGlvbl0gPT0gTlNTZWxlY3RpbmdQcmV2aW91 cykgeworICAgICAgICBOU1ZpZXcgKnByZXZpb3VzVmFsaWRLZXlWaWV3ID0gW3NlbGYgcHJldmlv dXNWYWxpZEtleVZpZXddOworICAgICAgICBpZiAocHJldmlvdXNWYWxpZEtleVZpZXcgIT0gc2Vs ZiAmJiBwcmV2aW91c1ZhbGlkS2V5VmlldyAhPSBtYWluRnJhbWVWaWV3KSB7CiAgICAgICAgICAg ICBfcHJpdmF0ZS0+YmVjb21pbmdGaXJzdFJlc3BvbmRlciA9IFlFUzsKICAgICAgICAgICAgIF9w cml2YXRlLT5iZWNvbWluZ0ZpcnN0UmVzcG9uZGVyRnJvbU91dHNpZGUgPSBmcm9tT3V0c2lkZTsK LSAgICAgICAgICAgIFt3aW5kb3cgbWFrZUZpcnN0UmVzcG9uZGVyOm1haW5GcmFtZVZpZXddOwor ICAgICAgICAgICAgW3dpbmRvdyBtYWtlRmlyc3RSZXNwb25kZXI6cHJldmlvdXNWYWxpZEtleVZp ZXddOwogICAgICAgICAgICAgX3ByaXZhdGUtPmJlY29taW5nRmlyc3RSZXNwb25kZXJGcm9tT3V0 c2lkZSA9IE5POwogICAgICAgICAgICAgX3ByaXZhdGUtPmJlY29taW5nRmlyc3RSZXNwb25kZXIg PSBOTzsKICAgICAgICAgICAgIHJldHVybiBZRVM7Ci0gICAgICAgIH0gCi0KKyAgICAgICAgfQog ICAgICAgICByZXR1cm4gTk87CiAgICAgfQogCi0gICAgLy8gRklYTUUgKFZpZXdsZXNzKTogTmVl ZCBtb3JlIGNvZGUgZnJvbSBXZWJIVE1MVmlldyBoZXJlLgotICAgIHJldHVybiBZRVM7CisgICAg aWYgKFttYWluRnJhbWVWaWV3IGFjY2VwdHNGaXJzdFJlc3BvbmRlcl0pIHsKKyAgICAgICAgX3By aXZhdGUtPmJlY29taW5nRmlyc3RSZXNwb25kZXIgPSBZRVM7CisgICAgICAgIF9wcml2YXRlLT5i ZWNvbWluZ0ZpcnN0UmVzcG9uZGVyRnJvbU91dHNpZGUgPSBmcm9tT3V0c2lkZTsKKyAgICAgICAg W3dpbmRvdyBtYWtlRmlyc3RSZXNwb25kZXI6bWFpbkZyYW1lVmlld107CisgICAgICAgIF9wcml2 YXRlLT5iZWNvbWluZ0ZpcnN0UmVzcG9uZGVyRnJvbU91dHNpZGUgPSBOTzsKKyAgICAgICAgX3By aXZhdGUtPmJlY29taW5nRmlyc3RSZXNwb25kZXIgPSBOTzsKKyAgICAgICAgcmV0dXJuIFlFUzsK KyAgICB9IAorCisgICAgcmV0dXJuIE5POwogfQogCiAtIChOU1ZpZXcgKilfd2ViY29yZV9lZmZl Y3RpdmVGaXJzdFJlc3BvbmRlcgogewotICAgIGlmIChfcHJpdmF0ZSAmJiBfcHJpdmF0ZS0+dXNl c0RvY3VtZW50Vmlld3MpIHsKLSAgICAgICAgaWYgKFdlYkZyYW1lVmlldyAqZnJhbWVWaWV3ID0g W1tzZWxmIG1haW5GcmFtZV0gZnJhbWVWaWV3XSkKLSAgICAgICAgICAgIHJldHVybiBbZnJhbWVW aWV3IF93ZWJjb3JlX2VmZmVjdGl2ZUZpcnN0UmVzcG9uZGVyXTsKLSAgICB9CisgICAgaWYgKFdl YkZyYW1lVmlldyAqZnJhbWVWaWV3ID0gW1tzZWxmIG1haW5GcmFtZV0gZnJhbWVWaWV3XSkKKyAg ICAgICAgcmV0dXJuIFtmcmFtZVZpZXcgX3dlYmNvcmVfZWZmZWN0aXZlRmlyc3RSZXNwb25kZXJd OworCiAgICAgcmV0dXJuIFtzdXBlciBfd2ViY29yZV9lZmZlY3RpdmVGaXJzdFJlc3BvbmRlcl07 CiB9CiAKIC0gKHZvaWQpc2V0TmV4dEtleVZpZXc6KE5TVmlldyAqKXZpZXcKIHsKLSAgICBpZiAo X3ByaXZhdGUgJiYgX3ByaXZhdGUtPnVzZXNEb2N1bWVudFZpZXdzKSB7Ci0gICAgICAgIC8vIFRo aXMgd29ya3MgdG9nZXRoZXIgd2l0aCBiZWNvbWVGaXJzdFJlc3BvbmRlciB0byBzcGxpY2UgdGhl IFdlYlZpZXcgaW50bwotICAgICAgICAvLyB0aGUga2V5IGxvb3Agc2ltaWxhciB0byB0aGUgd2F5 IE5TU2Nyb2xsVmlldyBkb2VzIHRoaXMuIE5vdGUgdGhhdAotICAgICAgICAvLyBXZWJGcmFtZVZp ZXcgaGFzIHNpbWlsYXIgY29kZS4KLSAgICAgICAgaWYgKFdlYkZyYW1lVmlldyAqbWFpbkZyYW1l VmlldyA9IFtbc2VsZiBtYWluRnJhbWVdIGZyYW1lVmlld10pIHsKLSAgICAgICAgICAgIFttYWlu RnJhbWVWaWV3IHNldE5leHRLZXlWaWV3OnZpZXddOwotICAgICAgICAgICAgcmV0dXJuOwotICAg ICAgICB9CisgICAgLy8gVGhpcyB3b3JrcyB0b2dldGhlciB3aXRoIGJlY29tZUZpcnN0UmVzcG9u ZGVyIHRvIHNwbGljZSB0aGUgV2ViVmlldyBpbnRvCisgICAgLy8gdGhlIGtleSBsb29wIHNpbWls YXIgdG8gdGhlIHdheSBOU1Njcm9sbFZpZXcgZG9lcyB0aGlzLiBOb3RlIHRoYXQKKyAgICAvLyBX ZWJGcmFtZVZpZXcgaGFzIHNpbWlsYXIgY29kZS4KKyAgICBpZiAoV2ViRnJhbWVWaWV3ICptYWlu RnJhbWVWaWV3ID0gW1tzZWxmIG1haW5GcmFtZV0gZnJhbWVWaWV3XSkgeworICAgICAgICBbbWFp bkZyYW1lVmlldyBzZXROZXh0S2V5Vmlldzp2aWV3XTsKKyAgICAgICAgcmV0dXJuOwogICAgIH0K IAogICAgIFtzdXBlciBzZXROZXh0S2V5Vmlldzp2aWV3XTsKQEAgLTQ1NTcsMjAgKzQ1MzksMTUg QEAgLSAodm9pZClzZXRIb3ZlckZlZWRiYWNrU3VzcGVuZGVkOihCT09MKQogICAgIAogICAgIF9w cml2YXRlLT5ob3ZlckZlZWRiYWNrU3VzcGVuZGVkID0gbmV3VmFsdWU7CiAKLSAgICBpZiAoX3By aXZhdGUtPnVzZXNEb2N1bWVudFZpZXdzKSB7Ci0gICAgICAgIGlkIDxXZWJEb2N1bWVudFZpZXc+ IGRvY3VtZW50VmlldyA9IFtbW3NlbGYgbWFpbkZyYW1lXSBmcmFtZVZpZXddIGRvY3VtZW50Vmll d107Ci0gICAgICAgIC8vIEZJWE1FOiBpbiBhIHBlcmZlY3Qgd29ybGQgd2UnZCBkbyB0aGlzIGlu IGEgZ2VuZXJhbCB3YXkgdGhhdCB3b3JrZWQgd2l0aCBhbnkgZG9jdW1lbnQgdmlldywKLSAgICAg ICAgLy8gc3VjaCBhcyBieSBjYWxsaW5nIGEgcHJvdG9jb2wgbWV0aG9kIG9yIHVzaW5nIHJlc3Bv bmRzVG9TZWxlY3RvciBvciBzZW5kaW5nIGEgbm90aWZpY2F0aW9uLgotICAgICAgICAvLyBCdXQg dW50aWwgdGhlcmUgaXMgYW55IG5lZWQgZm9yIHRoZXNlIG1vcmUgZ2VuZXJhbCBzb2x1dGlvbnMs IHdlJ2xsIGp1c3QgaGFyZHdpcmUgaXQgdG8gd29yawotICAgICAgICAvLyB3aXRoIFdlYkhUTUxW aWV3LgotICAgICAgICAvLyBOb3RlIHRoYXQgX2hvdmVyRmVlZGJhY2tTdXNwZW5kZWRDaGFuZ2Vk IG5lZWRzIHRvIGJlIGNhbGxlZCBvbmx5IG9uIHRoZSBtYWluIFdlYkhUTUxWaWV3LCBub3QKLSAg ICAgICAgLy8gb24gZWFjaCBzdWJmcmFtZSBzZXBhcmF0ZWx5LgotICAgICAgICBpZiAoW2RvY3Vt ZW50VmlldyBpc0tpbmRPZkNsYXNzOltXZWJIVE1MVmlldyBjbGFzc11dKQotICAgICAgICAgICAg WyhXZWJIVE1MVmlldyAqKWRvY3VtZW50VmlldyBfaG92ZXJGZWVkYmFja1N1c3BlbmRlZENoYW5n ZWRdOwotICAgICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgW3NlbGYgX3VwZGF0ZU1vdXNlb3Zl cldpdGhGYWtlRXZlbnRdOworICAgIGlkIDxXZWJEb2N1bWVudFZpZXc+IGRvY3VtZW50VmlldyA9 IFtbW3NlbGYgbWFpbkZyYW1lXSBmcmFtZVZpZXddIGRvY3VtZW50Vmlld107CisgICAgLy8gRklY TUU6IGluIGEgcGVyZmVjdCB3b3JsZCB3ZSdkIGRvIHRoaXMgaW4gYSBnZW5lcmFsIHdheSB0aGF0 IHdvcmtlZCB3aXRoIGFueSBkb2N1bWVudCB2aWV3LAorICAgIC8vIHN1Y2ggYXMgYnkgY2FsbGlu ZyBhIHByb3RvY29sIG1ldGhvZCBvciB1c2luZyByZXNwb25kc1RvU2VsZWN0b3Igb3Igc2VuZGlu ZyBhIG5vdGlmaWNhdGlvbi4KKyAgICAvLyBCdXQgdW50aWwgdGhlcmUgaXMgYW55IG5lZWQgZm9y IHRoZXNlIG1vcmUgZ2VuZXJhbCBzb2x1dGlvbnMsIHdlJ2xsIGp1c3QgaGFyZHdpcmUgaXQgdG8g d29yaworICAgIC8vIHdpdGggV2ViSFRNTFZpZXcuCisgICAgLy8gTm90ZSB0aGF0IF9ob3ZlckZl ZWRiYWNrU3VzcGVuZGVkQ2hhbmdlZCBuZWVkcyB0byBiZSBjYWxsZWQgb25seSBvbiB0aGUgbWFp biBXZWJIVE1MVmlldywgbm90CisgICAgLy8gb24gZWFjaCBzdWJmcmFtZSBzZXBhcmF0ZWx5Lgor ICAgIGlmIChbZG9jdW1lbnRWaWV3IGlzS2luZE9mQ2xhc3M6W1dlYkhUTUxWaWV3IGNsYXNzXV0p CisgICAgICAgIFsoV2ViSFRNTFZpZXcgKilkb2N1bWVudFZpZXcgX2hvdmVyRmVlZGJhY2tTdXNw ZW5kZWRDaGFuZ2VkXTsKIH0KIAogLSAoQk9PTClpc0hvdmVyRmVlZGJhY2tTdXNwZW5kZWQK