63008 2011-06-20 13:20:05 -0700 wx printing fixes 2011-06-20 13:22:57 -0700 1 1 1 Unclassified WebKit WebKit wx 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 robin webkit-unassigned kevino oldest_to_newest 423904 0 97848 robin 2011-06-20 13:20:05 -0700 Created attachment 97848 print fixes patch Make showing the dialog optional, and add handling for Javascript print() calls. 423908 1 kevino 2011-06-20 13:22:57 -0700 Landed in r89284, thanks! 97848 2011-06-20 13:20:05 -0700 2011-06-20 13:20:56 -0700 print fixes patch print_fixes.patch text/plain 9899 robin SW5kZXg6IFNvdXJjZS9XZWJLaXQvd3gvV2ViS2l0U3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFd4 LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC93eC9XZWJLaXRTdXBwb3J0L0ZyYW1lTG9h ZGVyQ2xpZW50V3guaAkocmV2aXNpb24gODkyODEpCisrKyBTb3VyY2UvV2ViS2l0L3d4L1dlYktp dFN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRXeC5oCSh3b3JraW5nIGNvcHkpCkBAIC01NSw3ICs1 NSwxMCBAQAogICAgIHB1YmxpYzoKICAgICAgICAgRnJhbWVMb2FkZXJDbGllbnRXeCgpOwogICAg ICAgICB+RnJhbWVMb2FkZXJDbGllbnRXeCgpOworICAgICAgICAKKyAgICAgICAgd3hXZWJGcmFt ZSogd2ViRnJhbWUoKSB7IHJldHVybiBtX3dlYkZyYW1lOyB9CiAgICAgICAgIHZvaWQgc2V0RnJh bWUod3hXZWJGcmFtZSAqZnJhbWUpOworICAgICAgICB3eFdlYlZpZXcqIHdlYlZpZXcoKSB7IHJl dHVybiBtX3dlYlZpZXc7IH0KICAgICAgICAgdm9pZCBzZXRXZWJWaWV3KHd4V2ViVmlldyAqd2Vi dmlldyk7CiAKICAgICAgICAgdmlydHVhbCBib29sIGhhc1dlYlZpZXcoKSBjb25zdDsgLy8gbWFp bmx5IGZvciBhc3NlcnRpb25zCkluZGV4OiBTb3VyY2UvV2ViS2l0L3d4L1dlYktpdFN1cHBvcnQv Q2hyb21lQ2xpZW50V3guY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvd3gvV2ViS2l0 U3VwcG9ydC9DaHJvbWVDbGllbnRXeC5jcHAJKHJldmlzaW9uIDg5MjgxKQorKysgU291cmNlL1dl YktpdC93eC9XZWJLaXRTdXBwb3J0L0Nocm9tZUNsaWVudFd4LmNwcAkod29ya2luZyBjb3B5KQpA QCAtNDE1LDkgKzQxNSwxNSBAQAogICAgICAgICBtX3dlYlZpZXctPlNldFRvb2xUaXAodGlwKTsK IH0KIAotdm9pZCBDaHJvbWVDbGllbnRXeDo6cHJpbnQoRnJhbWUqKQordm9pZCBDaHJvbWVDbGll bnRXeDo6cHJpbnQoRnJhbWUqIGZyYW1lKQogewotICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAg d3hXZWJGcmFtZSogd2ViRnJhbWUgPSBraXQoZnJhbWUpOworICAgIGlmICh3ZWJGcmFtZSkgewor ICAgICAgICB3eFdlYlZpZXdQcmludEZyYW1lRXZlbnQgZXZlbnQobV93ZWJWaWV3KTsKKyAgICAg ICAgZXZlbnQuU2V0V2ViRnJhbWUod2ViRnJhbWUpOworICAgICAgICBpZiAoIW1fd2ViVmlldy0+ R2V0RXZlbnRIYW5kbGVyKCktPlByb2Nlc3NFdmVudChldmVudCkpCisgICAgICAgICAgICB3ZWJG cmFtZS0+UHJpbnQodHJ1ZSk7CisgICAgfQogfQogCiAjaWYgRU5BQkxFKERBVEFCQVNFKQpJbmRl eDogU291cmNlL1dlYktpdC93eC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dC93eC9DaGFuZ2VMb2cJKHJldmlzaW9uIDg5MjgxKQorKysgU291cmNlL1dlYktpdC93eC9DaGFu Z2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMyBAQAorMjAxMS0wNi0yMCAgUm9iaW4g RHVubiAgPHJvYmluQGFsbGR1bm4uY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIE1ha2Ugc2hvd2luZyB0aGUgZGlhbG9nIG9wdGlvbmFsLCBhbmQg YWRkIGhhbmRsaW5nIGZvciBKYXZhc2NyaXB0IHByaW50KCkgY2FsbHMuCisKKyAgICAgICAgKiBX ZWJGcmFtZS5jcHA6CisgICAgICAgIChraXQpOgorICAgICAgICAod3hXZWJGcmFtZTo6UHJpbnQp OgorICAgICAgICAqIFdlYkZyYW1lLmg6CisgICAgICAgICogV2ViS2l0U3VwcG9ydC9DaHJvbWVD bGllbnRXeC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDaHJvbWVDbGllbnRXeDo6cHJpbnQpOgor ICAgICAgICAqIFdlYktpdFN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRXeC5oOgorICAgICAgICAo V2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRXeDo6d2ViRnJhbWUpOgorICAgICAgICAoV2ViQ29y ZTo6RnJhbWVMb2FkZXJDbGllbnRXeDo6d2ViVmlldyk6CisgICAgICAgICogV2ViVmlldy5jcHA6 CisgICAgICAgICh3eFdlYlZpZXdQcmludEZyYW1lRXZlbnQ6Ond4V2ViVmlld1ByaW50RnJhbWVF dmVudCk6CisgICAgICAgICogV2ViVmlldy5oOgorICAgICAgICAqIGJpbmRpbmdzL3B5dGhvbi93 ZWJ2aWV3Lmk6CisKIDIwMTEtMDYtMjAgIEtldmluIE9sbGl2aWVyICA8a2V2aW5vQHRoZW9sbGl2 aWVycy5jb20+CiAKICAgICAgICAgW3d4XSBVbnJldmlld2VkIGJ1aWxkIGZpeCBhZnRlciBtZXRo b2QgcmVuYW1lLgpJbmRleDogU291cmNlL1dlYktpdC93eC9XZWJWaWV3LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0L3d4L1dlYlZpZXcuY3BwCShyZXZpc2lvbiA4OTI4MSkKKysrIFNv dXJjZS9XZWJLaXQvd3gvV2ViVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI1Miw2ICsyNTIs MTggQEAKICAgICAgICAgU2V0SWQod2luLT5HZXRJZCgpKTsKIH0KIAorSU1QTEVNRU5UX0RZTkFN SUNfQ0xBU1Mod3hXZWJWaWV3UHJpbnRGcmFtZUV2ZW50LCB3eENvbW1hbmRFdmVudCkKKworREVG SU5FX0VWRU5UX1RZUEUod3hFVlRfV0VCVklFV19QUklOVF9GUkFNRSkKKword3hXZWJWaWV3UHJp bnRGcmFtZUV2ZW50Ojp3eFdlYlZpZXdQcmludEZyYW1lRXZlbnQod3hXaW5kb3cqIHdpbikKK3sK KyAgICBTZXRFdmVudFR5cGUod3hFVlRfV0VCVklFV19QUklOVF9GUkFNRSk7CisgICAgU2V0RXZl bnRPYmplY3Qod2luKTsKKyAgICBpZiAod2luKQorICAgICAgICBTZXRJZCh3aW4tPkdldElkKCkp OworfQorCiAvLy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLQogLy8gRE9NIEVsZW1lbnQgaW5mbyBkYXRhIHR5cGUKIC8vLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCkluZGV4OiBTb3Vy Y2UvV2ViS2l0L3d4L2JpbmRpbmdzL3B5dGhvbi93ZWJ2aWV3LmkKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdC93eC9iaW5kaW5ncy9weXRob24vd2Vidmlldy5pCShyZXZpc2lvbiA4OTI4MSkK KysrIFNvdXJjZS9XZWJLaXQvd3gvYmluZGluZ3MvcHl0aG9uL3dlYnZpZXcuaQkod29ya2luZyBj b3B5KQpAQCAtMTcwLDYgKzE3MCw3IEBACiAlY29uc3RhbnQgd3hFdmVudFR5cGUgd3hFVlRfV0VC VklFV19SRUNFSVZFRF9USVRMRTsKICVjb25zdGFudCB3eEV2ZW50VHlwZSB3eEVWVF9XRUJWSUVX X0NPTlRFTlRTX0NIQU5HRUQ7CiAlY29uc3RhbnQgd3hFdmVudFR5cGUgd3hFVlRfV0VCVklFV19T RUxFQ1RJT05fQ0hBTkdFRDsKKyVjb25zdGFudCB3eEV2ZW50VHlwZSB3eEVWVF9XRUJWSUVXX1BS SU5UX0ZSQU1FOwogCiAlcHl0aG9uY29kZSB7CiBFVlRfV0VCVklFV19CRUZPUkVfTE9BRCA9IHd4 LlB5RXZlbnRCaW5kZXIoIHd4RVZUX1dFQlZJRVdfQkVGT1JFX0xPQUQsIDEgKQpAQCAtMTgwLDQg KzE4MSw1IEBACiBFVlRfV0VCVklFV19SRUNFSVZFRF9USVRMRSA9IHd4LlB5RXZlbnRCaW5kZXIo IHd4RVZUX1dFQlZJRVdfUkVDRUlWRURfVElUTEUsIDEgKQogRVZUX1dFQlZJRVdfQ09OVEVOVFNf Q0hBTkdFRCA9IHd4LlB5RXZlbnRCaW5kZXIoIHd4RVZUX1dFQlZJRVdfQ09OVEVOVFNfQ0hBTkdF RCwgMSApCiBFVlRfV0VCVklFV19TRUxFQ1RJT05fQ0hBTkdFRCA9IHd4LlB5RXZlbnRCaW5kZXIo IHd4RVZUX1dFQlZJRVdfU0VMRUNUSU9OX0NIQU5HRUQsIDEgKQorRVZUX1dFQlZJRVdfUFJJTlRf RlJBTUUgPSB3eC5QeUV2ZW50QmluZGVyKCB3eEVWVF9XRUJWSUVXX1BSSU5UX0ZSQU1FLCAxICkK IH0KSW5kZXg6IFNvdXJjZS9XZWJLaXQvd3gvV2ViVmlldy5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQvd3gvV2ViVmlldy5oCShyZXZpc2lvbiA4OTI4MSkKKysrIFNvdXJjZS9XZWJLaXQv d3gvV2ViVmlldy5oCSh3b3JraW5nIGNvcHkpCkBAIC01NDUsNiArNTQ1LDIxIEBACiAgICAgd3hF dmVudCAqQ2xvbmUodm9pZCkgY29uc3QgeyByZXR1cm4gbmV3IHd4V2ViVmlld1NlbGVjdGlvbkNo YW5nZWRFdmVudCgqdGhpcyk7IH0KIH07CiAKK2NsYXNzIFdYRExMSU1QRVhQX1dFQktJVCB3eFdl YlZpZXdQcmludEZyYW1lRXZlbnQgOiBwdWJsaWMgd3hDb21tYW5kRXZlbnQgeworI2lmbmRlZiBT V0lHCisgICAgREVDTEFSRV9EWU5BTUlDX0NMQVNTKHd4V2ViVmlld1ByaW50RnJhbWVFdmVudCkK KyNlbmRpZgorICAgIAorcHVibGljOgorICAgIHd4V2ViVmlld1ByaW50RnJhbWVFdmVudCh3eFdp bmRvdyogd2luID0gMCk7CisgICAgd3hFdmVudCAqQ2xvbmUodm9pZCkgY29uc3QgeyByZXR1cm4g bmV3IHd4V2ViVmlld1ByaW50RnJhbWVFdmVudCgqdGhpcyk7IH0KKyAgICAKKyAgICB3eFdlYkZy YW1lKiBHZXRXZWJGcmFtZSgpIHsgcmV0dXJuIG1fd2ViRnJhbWU7IH0KKyAgICB2b2lkIFNldFdl YkZyYW1lKHd4V2ViRnJhbWUqIGZyYW1lKSB7IG1fd2ViRnJhbWUgPSBmcmFtZTsgfQorcHJpdmF0 ZToKKyAgICB3eFdlYkZyYW1lKiBtX3dlYkZyYW1lOworfTsKKwogdHlwZWRlZiB2b2lkICh3eEV2 dEhhbmRsZXI6Oip3eFdlYlZpZXdMb2FkRXZlbnRGdW5jdGlvbikod3hXZWJWaWV3TG9hZEV2ZW50 Jik7CiB0eXBlZGVmIHZvaWQgKHd4RXZ0SGFuZGxlcjo6Knd4V2ViVmlld0JlZm9yZUxvYWRFdmVu dEZ1bmN0aW9uKSh3eFdlYlZpZXdCZWZvcmVMb2FkRXZlbnQmKTsKIHR5cGVkZWYgdm9pZCAod3hF dnRIYW5kbGVyOjoqd3hXZWJWaWV3TmV3V2luZG93RXZlbnRGdW5jdGlvbikod3hXZWJWaWV3TmV3 V2luZG93RXZlbnQmKTsKQEAgLTU1Nyw2ICs1NzIsNyBAQAogdHlwZWRlZiB2b2lkICh3eEV2dEhh bmRsZXI6Oip3eFdlYlZpZXdXaW5kb3dPYmplY3RDbGVhcmVkRnVuY3Rpb24pKHd4V2ViVmlld1dp bmRvd09iamVjdENsZWFyZWRFdmVudCYpOwogdHlwZWRlZiB2b2lkICh3eEV2dEhhbmRsZXI6Oip3 eFdlYlZpZXdDb250ZW50c0NoYW5nZWRGdW5jdGlvbikod3hXZWJWaWV3Q29udGVudHNDaGFuZ2Vk RXZlbnQmKTsKIHR5cGVkZWYgdm9pZCAod3hFdnRIYW5kbGVyOjoqd3hXZWJWaWV3U2VsZWN0aW9u Q2hhbmdlZEZ1bmN0aW9uKSh3eFdlYlZpZXdTZWxlY3Rpb25DaGFuZ2VkRXZlbnQmKTsKK3R5cGVk ZWYgdm9pZCAod3hFdnRIYW5kbGVyOjoqd3hXZWJWaWV3UHJpbnRGcmFtZUZ1bmN0aW9uKSh3eFdl YlZpZXdQcmludEZyYW1lRXZlbnQmKTsKIAogI2RlZmluZSB3eFdlYlZpZXdMb2FkRXZlbnRIYW5k bGVyKGZ1bmMpIFwKICAgICAod3hPYmplY3RFdmVudEZ1bmN0aW9uKSh3eEV2ZW50RnVuY3Rpb24p d3hTdGF0aWNDYXN0RXZlbnQod3hXZWJWaWV3TG9hZEV2ZW50RnVuY3Rpb24sICZmdW5jKQpAQCAt NTgyLDcgKzU5OCw5IEBACiAgICAgKHd4T2JqZWN0RXZlbnRGdW5jdGlvbikod3hFdmVudEZ1bmN0 aW9uKXd4U3RhdGljQ2FzdEV2ZW50KHd4V2ViVmlld0NvbnRlbnRzQ2hhbmdlZEV2ZW50RnVuY3Rp b24sICZmdW5jKQogI2RlZmluZSB3eFdlYlZpZXdTZWxlY3Rpb25DaGFuZ2VkRXZlbnRIYW5kbGVy KGZ1bmMpIFwKICAgICAod3hPYmplY3RFdmVudEZ1bmN0aW9uKSh3eEV2ZW50RnVuY3Rpb24pd3hT dGF0aWNDYXN0RXZlbnQod3hXZWJWaWV3U2VsZWN0aW9uQ2hhbmdlZEV2ZW50RnVuY3Rpb24sICZm dW5jKQotICAgIAorI2RlZmluZSB3eFdlYlZpZXdQcmludEZyYW1lRXZlbnRIYW5kbGVyKGZ1bmMp IFwKKyAgICAod3hPYmplY3RFdmVudEZ1bmN0aW9uKSh3eEV2ZW50RnVuY3Rpb24pd3hTdGF0aWND YXN0RXZlbnQod3hXZWJWaWV3UHJpbnRGcmFtZUV2ZW50RnVuY3Rpb24sICZmdW5jKQorCiAjaWZu ZGVmIFNXSUcKIEJFR0lOX0RFQ0xBUkVfRVZFTlRfVFlQRVMoKQogICAgIERFQ0xBUkVfRVhQT1JU RURfRVZFTlRfVFlQRShXWERMTElNUEVYUF9XRUJLSVQsIHd4RVZUX1dFQlZJRVdfQkVGT1JFX0xP QUQsIHd4SURfQU5ZKQpAQCAtNTk3LDYgKzYxNSw3IEBACiAgICAgREVDTEFSRV9FWFBPUlRFRF9F VkVOVF9UWVBFKFdYRExMSU1QRVhQX1dFQktJVCwgd3hFVlRfV0VCVklFV19XSU5ET1dfT0JKRUNU X0NMRUFSRUQsIHd4SURfQU5ZKQogICAgIERFQ0xBUkVfRVhQT1JURURfRVZFTlRfVFlQRShXWERM TElNUEVYUF9XRUJLSVQsIHd4RVZUX1dFQlZJRVdfQ09OVEVOVFNfQ0hBTkdFRCwgd3hJRF9BTlkp CiAgICAgREVDTEFSRV9FWFBPUlRFRF9FVkVOVF9UWVBFKFdYRExMSU1QRVhQX1dFQktJVCwgd3hF VlRfV0VCVklFV19TRUxFQ1RJT05fQ0hBTkdFRCwgd3hJRF9BTlkpCisgICAgREVDTEFSRV9FWFBP UlRFRF9FVkVOVF9UWVBFKFdYRExMSU1QRVhQX1dFQktJVCwgd3hFVlRfV0VCVklFV19QUklOVF9G UkFNRSwgd3hJRF9BTlkpCiBFTkRfREVDTEFSRV9FVkVOVF9UWVBFUygpCiAjZW5kaWYKIApAQCAt Njk1LDYgKzcxNCwxMyBAQAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICh3eE9iamVjdEV2 ZW50RnVuY3Rpb24pICAgXAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICh3eFdlYlZpZXdT ZWxlY3Rpb25DaGFuZ2VkRXZlbnRGdW5jdGlvbikgJiBmdW5jLCBcCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgc3RhdGljX2Nhc3Q8d3hPYmplY3QqPigwKSksCisKKyNkZWZpbmUgRVZUX1dF QlZJRVdfUFJJTlRfRlJBTUUod2luaWQsIGZ1bmMpICAgICAgICAgICAgICAgICAgICAgICBcCisg ICAgICAgICAgICBERUNMQVJFX0VWRU5UX1RBQkxFX0VOVFJZKHd4RVZUX1dFQlZJRVdfUFJJTlRf RlJBTUUsIFwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICB3aW5pZCwgXAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHd4SURfQU5ZLCBcCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgKHd4T2JqZWN0RXZlbnRGdW5jdGlvbikgICBcCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgKHd4V2ViVmlld1ByaW50RnJhbWVFdmVudEZ1bmN0aW9uKSAmIGZ1bmMsIFwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICBzdGF0aWNfY2FzdDx3eE9iamVjdCo+KDApKSwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICNlbmRp ZiAvLyBpZm5kZWYgV1hXRUJWSUVXX0gKSW5kZXg6IFNvdXJjZS9XZWJLaXQvd3gvV2ViRnJhbWUu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvd3gvV2ViRnJhbWUuY3BwCShyZXZpc2lv biA4OTI4MSkKKysrIFNvdXJjZS9XZWJLaXQvd3gvV2ViRnJhbWUuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0zMiw2ICszMiw3IEBACiAjaW5jbHVkZSAiRmxvYXRSZWN0LmgiCiAjaW5jbHVkZSAiRnJh bWUuaCIKICNpbmNsdWRlICJGcmFtZUxvYWRlci5oIgorI2luY2x1ZGUgIkZyYW1lTG9hZGVyQ2xp ZW50V3guaCIKICNpbmNsdWRlICJGcmFtZVZpZXcuaCIKICNpbmNsdWRlICJHcmFwaGljc0NvbnRl eHQuaCIKICNpbmNsdWRlICJIaXRUZXN0UmVzdWx0LmgiCkBAIC0xNzUsNiArMTc2LDIwIEBACiB9 OwogI2VuZGlmCiAKK3d4V2ViRnJhbWUqIGtpdChXZWJDb3JlOjpGcmFtZSogZnJhbWUpCit7Cisg ICAgaWYgKCFmcmFtZSkKKyAgICAgICAgcmV0dXJuIDA7CisgICAgaWYgKCFmcmFtZS0+bG9hZGVy KCkpCisgICAgICAgIHJldHVybiAwOworICAgIAorICAgIFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xp ZW50V3gqIGxvYWRlckNsaWVudCA9IGR5bmFtaWNfY2FzdDxXZWJDb3JlOjpGcmFtZUxvYWRlckNs aWVudFd4Kj4oZnJhbWUtPmxvYWRlcigpLT5jbGllbnQoKSk7CisgICAgaWYgKGxvYWRlckNsaWVu dCkKKyAgICAgICAgcmV0dXJuIGxvYWRlckNsaWVudC0+d2ViRnJhbWUoKTsKKyAgICAKKyAgICBy ZXR1cm4gMDsKK30KKwogd3hXZWJGcmFtZTo6d3hXZWJGcmFtZSh3eFdlYlZpZXcqIGNvbnRhaW5l ciwgd3hXZWJGcmFtZSogcGFyZW50LCBXZWJWaWV3RnJhbWVEYXRhKiBkYXRhKSA6CiAgICAgbV90 ZXh0TWFnbmlmaWVyKDEuMCksCiAgICAgbV9pc0luaXRpYWxpemVkKGZhbHNlKSwKQEAgLTU1Niw3 ICs1NzEsNyBAQAogCiB9CiAKLXZvaWQgd3hXZWJGcmFtZTo6UHJpbnQoKQordm9pZCB3eFdlYkZy YW1lOjpQcmludChib29sIHNob3dEaWFsb2cpCiB7CiAjaWYgd3hDSEVDS19WRVJTSU9OKDIsIDks IDEpCiAgICAgaWYgKCFtX2ltcGwtPmZyYW1lKQpAQCAtNTgzLDE1ICs1OTgsMjIgQEAKICAgICBw cmludGRhdGEuU2V0RnJvbVBhZ2UoMSk7CiAgICAgcHJpbnRkYXRhLlNldFRvUGFnZShwcmludG91 dC0+R2V0UGFnZUNvdW50KCkpOwogCi0gICAgd3hQcmludERpYWxvZyBkaWFsb2coMCwgJnByaW50 ZGF0YSk7Ci0gICAgaWYgKGRpYWxvZy5TaG93TW9kYWwoKSA9PSB3eElEX09LKSB7ICAgIAotICAg ICAgICB3eFByaW50RGlhbG9nRGF0YSBkYXRhKGRpYWxvZy5HZXRQcmludERpYWxvZ0RhdGEoKSk7 Ci0gICAgICAgIHByaW50b3V0LT5TZXRGaXJzdFBhZ2UoZGF0YS5HZXRGcm9tUGFnZSgpKTsKLSAg ICAgICAgcHJpbnRvdXQtPlNldExhc3RQYWdlKGRhdGEuR2V0VG9QYWdlKCkpOwotICAgICAgICB3 eFByaW50ZXIgcHJpbnRlcigmZGF0YSk7CisgICAgd3hQcmludERpYWxvZ0RhdGEgZGF0YShwcmlu dGRhdGEpOworCisgICAgaWYgKHNob3dEaWFsb2cpIHsKKyAgICAgICAgd3hQcmludERpYWxvZyBk aWFsb2coMCwgJmRhdGEpOworICAgICAgICBpZiAoZGlhbG9nLlNob3dNb2RhbCgpID09IHd4SURf T0spIHsKKyAgICAgICAgICAgIGRhdGEgPSBkaWFsb2cuR2V0UHJpbnREaWFsb2dEYXRhKCk7Cisg ICAgICAgICAgICBwcmludG91dC0+U2V0Rmlyc3RQYWdlKGRhdGEuR2V0RnJvbVBhZ2UoKSk7Cisg ICAgICAgICAgICBwcmludG91dC0+U2V0TGFzdFBhZ2UoZGF0YS5HZXRUb1BhZ2UoKSk7CisgICAg ICAgIH0gZWxzZQorICAgICAgICAgICAgcmV0dXJuOworICAgIH0KKyAgICAKKyAgICB3eFByaW50 ZXIgcHJpbnRlcigmZGF0YSk7CiAgICAgICAgIAotICAgICAgICBwcmludGVyLlByaW50KDAsIHBy aW50b3V0LCBmYWxzZSk7Ci0gICAgfQorICAgIHByaW50ZXIuUHJpbnQoMCwgcHJpbnRvdXQsIGZh bHNlKTsKKyAgICAgICAgCiAjZWxzZQogICAgIHd4RkFJTF9NU0cod3hUKCJQcmludGluZyBpcyBv bmx5IHN1cHBvcnRlZCBpbiB3eFdpZGdldHMgMi45LjEgYW5kIGFib3ZlLiIpKTsKICNlbmRpZgpJ bmRleDogU291cmNlL1dlYktpdC93eC9XZWJGcmFtZS5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvd3gvV2ViRnJhbWUuaAkocmV2aXNpb24gODkyODEpCisrKyBTb3VyY2UvV2ViS2l0L3d4 L1dlYkZyYW1lLmgJKHdvcmtpbmcgY29weSkKQEAgLTExNSw3ICsxMTUsNyBAQAogICAgIGJvb2wg R29Gb3J3YXJkKCk7CiAgICAgdm9pZCBTdG9wKCk7CiAgICAgdm9pZCBSZWxvYWQoKTsKLSAgICB2 b2lkIFByaW50KCk7CisgICAgdm9pZCBQcmludChib29sIHNob3dEaWFsb2cgPSB0cnVlKTsKICAg ICAKICAgICBib29sIENhbkdvQmFjaygpOwogICAgIGJvb2wgQ2FuR29Gb3J3YXJkKCk7CkBAIC0x ODAsNCArMTgwLDYgQEAKICAgICAKIH07CiAKK3d4V2ViRnJhbWUqIGtpdChXZWJDb3JlOjpGcmFt ZSopOworCiAjZW5kaWYgLy8gaWZuZGVmIFdYV0VCRlJBTUVfSAo=