128611 2014-02-11 10:33:08 -0800 Some resource timing code isn't behind ENABLE(RESOURCE_TIMING). 2017-01-17 16:46:38 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED WORKSFORME P2 Normal --- 1 kling kling joepeck oldest_to_newest 979499 0 kling 2014-02-11 10:33:08 -0800 Some resource timing code isn't behind ENABLE(RESOURCE_TIMING). 979500 1 223877 kling 2014-02-11 10:35:15 -0800 Created attachment 223877 Patch 979508 2 223880 kling 2014-02-11 10:54:32 -0800 Created attachment 223880 Patch 979513 3 223883 kling 2014-02-11 11:13:32 -0800 Created attachment 223883 Patch 980243 4 223883 ossy 2014-02-13 04:06:46 -0800 Comment on attachment 223883 Patch Cleared Sam Weinig's review+ from obsolete attachment 223883 so that this bug does not appear in http://webkit.org/pending-commit. 1267568 5 joepeck 2017-01-17 16:46:38 -0800 This no longer seems relevant. RESOURCE_TIMING itself no longer exists but WEB_TIMING does. Either way, things have changed. 223877 2014-02-11 10:35:15 -0800 2014-02-11 10:54:46 -0800 Patch bug-128611.diff text/plain 5868 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkZTA5MmRjLi42Yzg2Y2U1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTQtMDItMTEgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCisgICAg ICAgIFNvbWUgcmVzb3VyY2UgdGltaW5nIGNvZGUgaXNuJ3QgYmVoaW5kIEVOQUJMRShSRVNPVVJD RV9USU1JTkcpLgorICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTI4NjExPgorCisgICAg ICAgIFB1dCBSZXNvdXJjZVJlc3BvbnNlQmFzZSBmb3IgdGhlIHJlc291cmNlIHRpbWluZyBmZWF0 dXJlIGJlaGluZAorICAgICAgICBFTkFCTEUoUkVTT1VSQ0VfVElNSU5HKSBndWFyZHMgdG8gYXZv aWQgYmxvYXRpbmcgY29tbW9uIG9iamVjdHMKKyAgICAgICAgb24gcGxhdGZvcm1zIHRoYXQgZG9u J3QgZW5hYmxlIHRoZSBmZWF0dXJlLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6YnVpbGRPYmplY3RGb3JSZXNvdXJjZVJlc3BvbnNlKToKKyAgICAg ICAgKiBwbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlUmVzcG9uc2VCYXNlLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2VCYXNlOjphZG9wdCk6CisgICAgICAgIChXZWJDb3Jl OjpSZXNvdXJjZVJlc3BvbnNlQmFzZTo6Y29weURhdGEpOgorICAgICAgICAoV2ViQ29yZTo6UmVz b3VyY2VSZXNwb25zZUJhc2U6OmNvbXBhcmUpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsv UmVzb3VyY2VSZXNwb25zZUJhc2UuaDoKKwogMjAxNC0wMi0xMSAgQnJlbnQgRnVsZ2hhbSAgPGJm dWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBDb3JyZWN0IHNvbWUgdXNlcyBvZiAnYXV0bycK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFn ZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50 LmNwcAppbmRleCA0ODBiZGU5Li45YjZiMzg4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuY3BwCkBAIC0xMDEsNiArMTAxLDcgQEAg c3RhdGljIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBidWlsZE9iamVjdEZvckhlYWRlcnMo Y29uc3QgSFRUUEhlYWRlck1hcCYgaGUKICAgICByZXR1cm4gaGVhZGVyc09iamVjdDsKIH0KIAor I2lmIEVOQUJMRShSRVNPVVJDRV9USU1JTkcpCiBzdGF0aWMgUGFzc1JlZlB0cjxJbnNwZWN0b3I6 OlR5cGVCdWlsZGVyOjpOZXR3b3JrOjpSZXNvdXJjZVRpbWluZz4gYnVpbGRPYmplY3RGb3JUaW1p bmcoY29uc3QgUmVzb3VyY2VMb2FkVGltaW5nJiB0aW1pbmcsIERvY3VtZW50TG9hZGVyKiBsb2Fk ZXIpCiB7CiAgICAgcmV0dXJuIEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6Ok5ldHdvcms6OlJlc291 cmNlVGltaW5nOjpjcmVhdGUoKQpAQCAtMTE4LDYgKzExOSw3IEBAIHN0YXRpYyBQYXNzUmVmUHRy PEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6Ok5ldHdvcms6OlJlc291cmNlVGltaW5nPiBidWlsZE9i amVjdEZvCiAgICAgICAgIC5zZXRSZWNlaXZlSGVhZGVyc0VuZCh0aW1pbmcucmVjZWl2ZUhlYWRl cnNFbmQpCiAgICAgICAgIC5yZWxlYXNlKCk7CiB9CisjZW5kaWYKIAogc3RhdGljIFBhc3NSZWZQ dHI8SW5zcGVjdG9yOjpUeXBlQnVpbGRlcjo6TmV0d29yazo6UmVxdWVzdD4gYnVpbGRPYmplY3RG b3JSZXNvdXJjZVJlcXVlc3QoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQogewpAQCAt MTQ4LDggKzE1MCwxMCBAQCBzdGF0aWMgUGFzc1JlZlB0cjxJbnNwZWN0b3I6OlR5cGVCdWlsZGVy OjpOZXR3b3JrOjpSZXNwb25zZT4gYnVpbGRPYmplY3RGb3JSZXNvdQogICAgICAgICAuc2V0Q29u bmVjdGlvbklkKHJlc3BvbnNlLmNvbm5lY3Rpb25JRCgpKTsKIAogICAgIHJlc3BvbnNlT2JqZWN0 LT5zZXRGcm9tRGlza0NhY2hlKHJlc3BvbnNlLndhc0NhY2hlZCgpKTsKKyNpZiBFTkFCTEUoUkVT T1VSQ0VfVElNSU5HKQogICAgIGlmIChyZXNwb25zZS5yZXNvdXJjZUxvYWRUaW1pbmcoKSkKICAg ICAgICAgcmVzcG9uc2VPYmplY3QtPnNldFRpbWluZyhidWlsZE9iamVjdEZvclRpbWluZygqcmVz cG9uc2UucmVzb3VyY2VMb2FkVGltaW5nKCksIGxvYWRlcikpOworI2VuZGlmCiAKICAgICByZXR1 cm4gcmVzcG9uc2VPYmplY3Q7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL1Jlc291cmNlUmVzcG9uc2VCYXNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL25ldHdvcmsvUmVzb3VyY2VSZXNwb25zZUJhc2UuY3BwCmluZGV4IDVjMDU3ZWIuLmE0MzRi ZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VS ZXNwb25zZUJhc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVz b3VyY2VSZXNwb25zZUJhc2UuY3BwCkBAIC0xMDYsNyArMTA2LDkgQEAgUGFzc093blB0cjxSZXNv dXJjZVJlc3BvbnNlPiBSZXNvdXJjZVJlc3BvbnNlQmFzZTo6YWRvcHQoUGFzc093blB0cjxDcm9z c1RocmVhZFIKIAogICAgIHJlc3BvbnNlLT5sYXp5SW5pdChDb21tb25BbmRVbmNvbW1vbkZpZWxk cyk7CiAgICAgcmVzcG9uc2UtPm1faHR0cEhlYWRlckZpZWxkcy5hZG9wdChkYXRhLT5tX2h0dHBI ZWFkZXJzLnJlbGVhc2UoKSk7CisjaWYgRU5BQkxFKFJFU09VUkNFX1RJTUlORykKICAgICByZXNw b25zZS0+c2V0UmVzb3VyY2VMb2FkVGltaW5nKGRhdGEtPm1fcmVzb3VyY2VMb2FkVGltaW5nLnJl bGVhc2UoKSk7CisjZW5kaWYKICAgICByZXNwb25zZS0+ZG9QbGF0Zm9ybUFkb3B0KGRhdGEpOwog ICAgIHJldHVybiByZXNwb25zZS5yZWxlYXNlKCk7CiB9CkBAIC0xMjIsOCArMTI0LDEwIEBAIFBh c3NPd25QdHI8Q3Jvc3NUaHJlYWRSZXNvdXJjZVJlc3BvbnNlRGF0YT4gUmVzb3VyY2VSZXNwb25z ZUJhc2U6OmNvcHlEYXRhKCkgY29uCiAgICAgZGF0YS0+bV9odHRwU3RhdHVzQ29kZSA9IGh0dHBT dGF0dXNDb2RlKCk7CiAgICAgZGF0YS0+bV9odHRwU3RhdHVzVGV4dCA9IGh0dHBTdGF0dXNUZXh0 KCkuaXNvbGF0ZWRDb3B5KCk7CiAgICAgZGF0YS0+bV9odHRwSGVhZGVycyA9IGh0dHBIZWFkZXJG aWVsZHMoKS5jb3B5RGF0YSgpOworI2lmIEVOQUJMRShSRVNPVVJDRV9USU1JTkcpCiAgICAgaWYg KG1fcmVzb3VyY2VMb2FkVGltaW5nKQogICAgICAgICBkYXRhLT5tX3Jlc291cmNlTG9hZFRpbWlu ZyA9IG1fcmVzb3VyY2VMb2FkVGltaW5nLT5kZWVwQ29weSgpOworI2VuZGlmCiAgICAgcmV0dXJu IGFzUmVzb3VyY2VSZXNwb25zZSgpLmRvUGxhdGZvcm1Db3B5RGF0YShkYXRhLnJlbGVhc2UoKSk7 CiB9CiAKQEAgLTU1MSw2ICs1NTUsNyBAQCB2b2lkIFJlc291cmNlUmVzcG9uc2VCYXNlOjpzZXRD b25uZWN0aW9uSUQodW5zaWduZWQgY29ubmVjdGlvbklEKQogICAgIG1fY29ubmVjdGlvbklEID0g Y29ubmVjdGlvbklEOwogfQogCisjaWYgRU5BQkxFKFJFU09VUkNFX1RJTUlORykKIFJlc291cmNl TG9hZFRpbWluZyogUmVzb3VyY2VSZXNwb25zZUJhc2U6OnJlc291cmNlTG9hZFRpbWluZygpIGNv bnN0CiB7CiAgICAgbGF6eUluaXQoQ29tbW9uQW5kVW5jb21tb25GaWVsZHMpOwpAQCAtNTY0LDYg KzU2OSw3IEBAIHZvaWQgUmVzb3VyY2VSZXNwb25zZUJhc2U6OnNldFJlc291cmNlTG9hZFRpbWlu ZyhQYXNzUmVmUHRyPFJlc291cmNlTG9hZFRpbWluZz4KIAogICAgIG1fcmVzb3VyY2VMb2FkVGlt aW5nID0gcmVzb3VyY2VMb2FkVGltaW5nOwogfQorI2VuZGlmCiAKIHZvaWQgUmVzb3VyY2VSZXNw b25zZUJhc2U6OmxhenlJbml0KEluaXRMZXZlbCBpbml0TGV2ZWwpIGNvbnN0CiB7CkBAIC01OTAs MTAgKzU5NiwxMiBAQCBib29sIFJlc291cmNlUmVzcG9uc2VCYXNlOjpjb21wYXJlKGNvbnN0IFJl c291cmNlUmVzcG9uc2UmIGEsIGNvbnN0IFJlc291cmNlUmVzcAogICAgICAgICByZXR1cm4gZmFs c2U7CiAgICAgaWYgKGEuaHR0cEhlYWRlckZpZWxkcygpICE9IGIuaHR0cEhlYWRlckZpZWxkcygp KQogICAgICAgICByZXR1cm4gZmFsc2U7CisjaWYgRU5BQkxFKFJFU09VUkNFX1RJTUlORykKICAg ICBpZiAoYS5yZXNvdXJjZUxvYWRUaW1pbmcoKSAmJiBiLnJlc291cmNlTG9hZFRpbWluZygpICYm ICphLnJlc291cmNlTG9hZFRpbWluZygpID09ICpiLnJlc291cmNlTG9hZFRpbWluZygpKQogICAg ICAgICByZXR1cm4gUmVzb3VyY2VSZXNwb25zZTo6cGxhdGZvcm1Db21wYXJlKGEsIGIpOwogICAg IGlmIChhLnJlc291cmNlTG9hZFRpbWluZygpICE9IGIucmVzb3VyY2VMb2FkVGltaW5nKCkpCiAg ICAgICAgIHJldHVybiBmYWxzZTsKKyNlbmRpZgogICAgIHJldHVybiBSZXNvdXJjZVJlc3BvbnNl OjpwbGF0Zm9ybUNvbXBhcmUoYSwgYik7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VSZXNwb25zZUJhc2UuaCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VSZXNwb25zZUJhc2UuaAppbmRleCA5ZDgzOGFjLi4w OGRmZTZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291 cmNlUmVzcG9uc2VCYXNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9S ZXNvdXJjZVJlc3BvbnNlQmFzZS5oCkBAIC0xMDksOCArMTA5LDEwIEBAIHB1YmxpYzoKICAgICBi b29sIHdhc0NhY2hlZCgpIGNvbnN0OwogICAgIHZvaWQgc2V0V2FzQ2FjaGVkKGJvb2wpOwogCisj aWYgRU5BQkxFKFJFU09VUkNFX1RJTUlORykKICAgICBSZXNvdXJjZUxvYWRUaW1pbmcqIHJlc291 cmNlTG9hZFRpbWluZygpIGNvbnN0OwogICAgIHZvaWQgc2V0UmVzb3VyY2VMb2FkVGltaW5nKFBh c3NSZWZQdHI8UmVzb3VyY2VMb2FkVGltaW5nPik7CisjZW5kaWYKIAogICAgIC8vIFRoZSBSZXNv dXJjZVJlc3BvbnNlIHN1YmNsYXNzIG1heSAic2hhZG93IiB0aGlzIG1ldGhvZCB0byBwcm92aWRl IHBsYXRmb3JtLXNwZWNpZmljIG1lbW9yeSB1c2FnZSBpbmZvcm1hdGlvbgogICAgIHVuc2lnbmVk IG1lbW9yeVVzYWdlKCkgY29uc3QKQEAgLTE0Nyw3ICsxNDksOSBAQCBwcm90ZWN0ZWQ6CiAgICAg U3RyaW5nIG1fc3VnZ2VzdGVkRmlsZW5hbWU7CiAgICAgU3RyaW5nIG1faHR0cFN0YXR1c1RleHQ7 CiAgICAgSFRUUEhlYWRlck1hcCBtX2h0dHBIZWFkZXJGaWVsZHM7CisjaWYgRU5BQkxFKFJFU09V UkNFX1RJTUlORykKICAgICBSZWZQdHI8UmVzb3VyY2VMb2FkVGltaW5nPiBtX3Jlc291cmNlTG9h ZFRpbWluZzsKKyNlbmRpZgogCiAgICAgaW50IG1faHR0cFN0YXR1c0NvZGU7CiAgICAgdW5zaWdu ZWQgbV9jb25uZWN0aW9uSUQ7CkBAIC0xOTYsNyArMjAwLDkgQEAgcHVibGljOgogICAgIGludCBt X2h0dHBTdGF0dXNDb2RlOwogICAgIFN0cmluZyBtX2h0dHBTdGF0dXNUZXh0OwogICAgIE93blB0 cjxDcm9zc1RocmVhZEhUVFBIZWFkZXJNYXBEYXRhPiBtX2h0dHBIZWFkZXJzOworI2lmIEVOQUJM RShSRVNPVVJDRV9USU1JTkcpCiAgICAgUmVmUHRyPFJlc291cmNlTG9hZFRpbWluZz4gbV9yZXNv dXJjZUxvYWRUaW1pbmc7CisjZW5kaWYKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK 223880 2014-02-11 10:54:32 -0800 2014-02-11 11:13:32 -0800 Patch bug-128611-2.diff text/plain 6701 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkZTA5MmRjLi40YWJiNWM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQg QEAKKzIwMTQtMDItMTEgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCisgICAg ICAgIFNvbWUgcmVzb3VyY2UgdGltaW5nIGNvZGUgaXNuJ3QgYmVoaW5kIEVOQUJMRShSRVNPVVJD RV9USU1JTkcpLgorICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTI4NjExPgorCisgICAg ICAgIFB1dCBSZXNvdXJjZVJlc3BvbnNlQmFzZSBmb3IgdGhlIHJlc291cmNlIHRpbWluZyBmZWF0 dXJlIGJlaGluZAorICAgICAgICBFTkFCTEUoUkVTT1VSQ0VfVElNSU5HKSBndWFyZHMgdG8gYXZv aWQgYmxvYXRpbmcgY29tbW9uIG9iamVjdHMKKyAgICAgICAgb24gcGxhdGZvcm1zIHRoYXQgZG9u J3QgZW5hYmxlIHRoZSBmZWF0dXJlLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6YnVpbGRPYmplY3RGb3JSZXNvdXJjZVJlc3BvbnNlKToKKyAgICAg ICAgKiBwYWdlL1BlcmZvcm1hbmNlVGltaW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBlcmZv cm1hbmNlVGltaW5nOjpyZXNvdXJjZUxvYWRUaW1pbmcpOgorICAgICAgICAqIHBsYXRmb3JtL25l dHdvcmsvUmVzb3VyY2VSZXNwb25zZUJhc2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3Vy Y2VSZXNwb25zZUJhc2U6OmFkb3B0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVzcG9u c2VCYXNlOjpjb3B5RGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlQmFz ZTo6Y29tcGFyZSk6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlc3BvbnNl QmFzZS5oOgorCiAyMDE0LTAyLTExICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29t PgogCiAgICAgICAgIENvcnJlY3Qgc29tZSB1c2VzIG9mICdhdXRvJwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuY3BwIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuY3BwCmluZGV4IDQ4MGJk ZTkuLjZjYjIxOGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JSZXNvdXJjZUFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yUmVzb3VyY2VBZ2VudC5jcHAKQEAgLTEwMSw2ICsxMDEsNyBAQCBzdGF0aWMgUGFzc1JlZlB0 cjxJbnNwZWN0b3JPYmplY3Q+IGJ1aWxkT2JqZWN0Rm9ySGVhZGVycyhjb25zdCBIVFRQSGVhZGVy TWFwJiBoZQogICAgIHJldHVybiBoZWFkZXJzT2JqZWN0OwogfQogCisjaWYgRU5BQkxFKFJFU09V UkNFX1RJTUlORykKIHN0YXRpYyBQYXNzUmVmUHRyPEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6Ok5l dHdvcms6OlJlc291cmNlVGltaW5nPiBidWlsZE9iamVjdEZvclRpbWluZyhjb25zdCBSZXNvdXJj ZUxvYWRUaW1pbmcmIHRpbWluZywgRG9jdW1lbnRMb2FkZXIqIGxvYWRlcikKIHsKICAgICByZXR1 cm4gSW5zcGVjdG9yOjpUeXBlQnVpbGRlcjo6TmV0d29yazo6UmVzb3VyY2VUaW1pbmc6OmNyZWF0 ZSgpCkBAIC0xMTgsNiArMTE5LDcgQEAgc3RhdGljIFBhc3NSZWZQdHI8SW5zcGVjdG9yOjpUeXBl QnVpbGRlcjo6TmV0d29yazo6UmVzb3VyY2VUaW1pbmc+IGJ1aWxkT2JqZWN0Rm8KICAgICAgICAg LnNldFJlY2VpdmVIZWFkZXJzRW5kKHRpbWluZy5yZWNlaXZlSGVhZGVyc0VuZCkKICAgICAgICAg LnJlbGVhc2UoKTsKIH0KKyNlbmRpZgogCiBzdGF0aWMgUGFzc1JlZlB0cjxJbnNwZWN0b3I6OlR5 cGVCdWlsZGVyOjpOZXR3b3JrOjpSZXF1ZXN0PiBidWlsZE9iamVjdEZvclJlc291cmNlUmVxdWVz dChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpCiB7CkBAIC0xNDgsOCArMTUwLDEyIEBA IHN0YXRpYyBQYXNzUmVmUHRyPEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6Ok5ldHdvcms6OlJlc3Bv bnNlPiBidWlsZE9iamVjdEZvclJlc291CiAgICAgICAgIC5zZXRDb25uZWN0aW9uSWQocmVzcG9u c2UuY29ubmVjdGlvbklEKCkpOwogCiAgICAgcmVzcG9uc2VPYmplY3QtPnNldEZyb21EaXNrQ2Fj aGUocmVzcG9uc2Uud2FzQ2FjaGVkKCkpOworI2lmIEVOQUJMRShSRVNPVVJDRV9USU1JTkcpCiAg ICAgaWYgKHJlc3BvbnNlLnJlc291cmNlTG9hZFRpbWluZygpKQogICAgICAgICByZXNwb25zZU9i amVjdC0+c2V0VGltaW5nKGJ1aWxkT2JqZWN0Rm9yVGltaW5nKCpyZXNwb25zZS5yZXNvdXJjZUxv YWRUaW1pbmcoKSwgbG9hZGVyKSk7CisjZWxzZQorICAgIFVOVVNFRF9QQVJBTShsb2FkZXIpOwor I2VuZGlmCiAKICAgICByZXR1cm4gcmVzcG9uc2VPYmplY3Q7CiB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL1BlcmZvcm1hbmNlVGltaW5nLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvUGVyZm9ybWFuY2VUaW1pbmcuY3BwCmluZGV4IGMxNDA4MGYuLmZiY2RhOTEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGVyZm9ybWFuY2VUaW1pbmcuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvUGVyZm9ybWFuY2VUaW1pbmcuY3BwCkBAIC0zNDEsMTEgKzM0MSwxNSBA QCBEb2N1bWVudExvYWRUaW1pbmcqIFBlcmZvcm1hbmNlVGltaW5nOjpkb2N1bWVudExvYWRUaW1p bmcoKSBjb25zdAogCiBSZXNvdXJjZUxvYWRUaW1pbmcqIFBlcmZvcm1hbmNlVGltaW5nOjpyZXNv dXJjZUxvYWRUaW1pbmcoKSBjb25zdAogeworI2lmIEVOQUJMRShSRVNPVVJDRV9USU1JTkcpCiAg ICAgRG9jdW1lbnRMb2FkZXIqIGxvYWRlciA9IGRvY3VtZW50TG9hZGVyKCk7CiAgICAgaWYgKCFs b2FkZXIpCiAgICAgICAgIHJldHVybiAwOwogCiAgICAgcmV0dXJuIGxvYWRlci0+cmVzcG9uc2Uo KS5yZXNvdXJjZUxvYWRUaW1pbmcoKTsKKyNlbHNlCisgICAgcmV0dXJuIG51bGxwdHI7CisjZW5k aWYKIH0KIAogdW5zaWduZWQgbG9uZyBsb25nIFBlcmZvcm1hbmNlVGltaW5nOjpyZXNvdXJjZUxv YWRUaW1lUmVsYXRpdmVUb0Fic29sdXRlKGludCByZWxhdGl2ZU1pbGxpc2Vjb25kcykgY29uc3QK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VSZXNw b25zZUJhc2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJl c3BvbnNlQmFzZS5jcHAKaW5kZXggNWMwNTdlYi4uYTQzNGJkNCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlc3BvbnNlQmFzZS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlc3BvbnNlQmFzZS5jcHAK QEAgLTEwNiw3ICsxMDYsOSBAQCBQYXNzT3duUHRyPFJlc291cmNlUmVzcG9uc2U+IFJlc291cmNl UmVzcG9uc2VCYXNlOjphZG9wdChQYXNzT3duUHRyPENyb3NzVGhyZWFkUgogCiAgICAgcmVzcG9u c2UtPmxhenlJbml0KENvbW1vbkFuZFVuY29tbW9uRmllbGRzKTsKICAgICByZXNwb25zZS0+bV9o dHRwSGVhZGVyRmllbGRzLmFkb3B0KGRhdGEtPm1faHR0cEhlYWRlcnMucmVsZWFzZSgpKTsKKyNp ZiBFTkFCTEUoUkVTT1VSQ0VfVElNSU5HKQogICAgIHJlc3BvbnNlLT5zZXRSZXNvdXJjZUxvYWRU aW1pbmcoZGF0YS0+bV9yZXNvdXJjZUxvYWRUaW1pbmcucmVsZWFzZSgpKTsKKyNlbmRpZgogICAg IHJlc3BvbnNlLT5kb1BsYXRmb3JtQWRvcHQoZGF0YSk7CiAgICAgcmV0dXJuIHJlc3BvbnNlLnJl bGVhc2UoKTsKIH0KQEAgLTEyMiw4ICsxMjQsMTAgQEAgUGFzc093blB0cjxDcm9zc1RocmVhZFJl c291cmNlUmVzcG9uc2VEYXRhPiBSZXNvdXJjZVJlc3BvbnNlQmFzZTo6Y29weURhdGEoKSBjb24K ICAgICBkYXRhLT5tX2h0dHBTdGF0dXNDb2RlID0gaHR0cFN0YXR1c0NvZGUoKTsKICAgICBkYXRh LT5tX2h0dHBTdGF0dXNUZXh0ID0gaHR0cFN0YXR1c1RleHQoKS5pc29sYXRlZENvcHkoKTsKICAg ICBkYXRhLT5tX2h0dHBIZWFkZXJzID0gaHR0cEhlYWRlckZpZWxkcygpLmNvcHlEYXRhKCk7Cisj aWYgRU5BQkxFKFJFU09VUkNFX1RJTUlORykKICAgICBpZiAobV9yZXNvdXJjZUxvYWRUaW1pbmcp CiAgICAgICAgIGRhdGEtPm1fcmVzb3VyY2VMb2FkVGltaW5nID0gbV9yZXNvdXJjZUxvYWRUaW1p bmctPmRlZXBDb3B5KCk7CisjZW5kaWYKICAgICByZXR1cm4gYXNSZXNvdXJjZVJlc3BvbnNlKCku ZG9QbGF0Zm9ybUNvcHlEYXRhKGRhdGEucmVsZWFzZSgpKTsKIH0KIApAQCAtNTUxLDYgKzU1NSw3 IEBAIHZvaWQgUmVzb3VyY2VSZXNwb25zZUJhc2U6OnNldENvbm5lY3Rpb25JRCh1bnNpZ25lZCBj b25uZWN0aW9uSUQpCiAgICAgbV9jb25uZWN0aW9uSUQgPSBjb25uZWN0aW9uSUQ7CiB9CiAKKyNp ZiBFTkFCTEUoUkVTT1VSQ0VfVElNSU5HKQogUmVzb3VyY2VMb2FkVGltaW5nKiBSZXNvdXJjZVJl c3BvbnNlQmFzZTo6cmVzb3VyY2VMb2FkVGltaW5nKCkgY29uc3QKIHsKICAgICBsYXp5SW5pdChD b21tb25BbmRVbmNvbW1vbkZpZWxkcyk7CkBAIC01NjQsNiArNTY5LDcgQEAgdm9pZCBSZXNvdXJj ZVJlc3BvbnNlQmFzZTo6c2V0UmVzb3VyY2VMb2FkVGltaW5nKFBhc3NSZWZQdHI8UmVzb3VyY2VM b2FkVGltaW5nPgogCiAgICAgbV9yZXNvdXJjZUxvYWRUaW1pbmcgPSByZXNvdXJjZUxvYWRUaW1p bmc7CiB9CisjZW5kaWYKIAogdm9pZCBSZXNvdXJjZVJlc3BvbnNlQmFzZTo6bGF6eUluaXQoSW5p dExldmVsIGluaXRMZXZlbCkgY29uc3QKIHsKQEAgLTU5MCwxMCArNTk2LDEyIEBAIGJvb2wgUmVz b3VyY2VSZXNwb25zZUJhc2U6OmNvbXBhcmUoY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgYSwgY29u c3QgUmVzb3VyY2VSZXNwCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBpZiAoYS5odHRwSGVh ZGVyRmllbGRzKCkgIT0gYi5odHRwSGVhZGVyRmllbGRzKCkpCiAgICAgICAgIHJldHVybiBmYWxz ZTsKKyNpZiBFTkFCTEUoUkVTT1VSQ0VfVElNSU5HKQogICAgIGlmIChhLnJlc291cmNlTG9hZFRp bWluZygpICYmIGIucmVzb3VyY2VMb2FkVGltaW5nKCkgJiYgKmEucmVzb3VyY2VMb2FkVGltaW5n KCkgPT0gKmIucmVzb3VyY2VMb2FkVGltaW5nKCkpCiAgICAgICAgIHJldHVybiBSZXNvdXJjZVJl c3BvbnNlOjpwbGF0Zm9ybUNvbXBhcmUoYSwgYik7CiAgICAgaWYgKGEucmVzb3VyY2VMb2FkVGlt aW5nKCkgIT0gYi5yZXNvdXJjZUxvYWRUaW1pbmcoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwor I2VuZGlmCiAgICAgcmV0dXJuIFJlc291cmNlUmVzcG9uc2U6OnBsYXRmb3JtQ29tcGFyZShhLCBi KTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNv dXJjZVJlc3BvbnNlQmFzZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNv dXJjZVJlc3BvbnNlQmFzZS5oCmluZGV4IDlkODM4YWMuLjA4ZGZlNmQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VSZXNwb25zZUJhc2UuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlUmVzcG9uc2VCYXNlLmgK QEAgLTEwOSw4ICsxMDksMTAgQEAgcHVibGljOgogICAgIGJvb2wgd2FzQ2FjaGVkKCkgY29uc3Q7 CiAgICAgdm9pZCBzZXRXYXNDYWNoZWQoYm9vbCk7CiAKKyNpZiBFTkFCTEUoUkVTT1VSQ0VfVElN SU5HKQogICAgIFJlc291cmNlTG9hZFRpbWluZyogcmVzb3VyY2VMb2FkVGltaW5nKCkgY29uc3Q7 CiAgICAgdm9pZCBzZXRSZXNvdXJjZUxvYWRUaW1pbmcoUGFzc1JlZlB0cjxSZXNvdXJjZUxvYWRU aW1pbmc+KTsKKyNlbmRpZgogCiAgICAgLy8gVGhlIFJlc291cmNlUmVzcG9uc2Ugc3ViY2xhc3Mg bWF5ICJzaGFkb3ciIHRoaXMgbWV0aG9kIHRvIHByb3ZpZGUgcGxhdGZvcm0tc3BlY2lmaWMgbWVt b3J5IHVzYWdlIGluZm9ybWF0aW9uCiAgICAgdW5zaWduZWQgbWVtb3J5VXNhZ2UoKSBjb25zdApA QCAtMTQ3LDcgKzE0OSw5IEBAIHByb3RlY3RlZDoKICAgICBTdHJpbmcgbV9zdWdnZXN0ZWRGaWxl bmFtZTsKICAgICBTdHJpbmcgbV9odHRwU3RhdHVzVGV4dDsKICAgICBIVFRQSGVhZGVyTWFwIG1f aHR0cEhlYWRlckZpZWxkczsKKyNpZiBFTkFCTEUoUkVTT1VSQ0VfVElNSU5HKQogICAgIFJlZlB0 cjxSZXNvdXJjZUxvYWRUaW1pbmc+IG1fcmVzb3VyY2VMb2FkVGltaW5nOworI2VuZGlmCiAKICAg ICBpbnQgbV9odHRwU3RhdHVzQ29kZTsKICAgICB1bnNpZ25lZCBtX2Nvbm5lY3Rpb25JRDsKQEAg LTE5Niw3ICsyMDAsOSBAQCBwdWJsaWM6CiAgICAgaW50IG1faHR0cFN0YXR1c0NvZGU7CiAgICAg U3RyaW5nIG1faHR0cFN0YXR1c1RleHQ7CiAgICAgT3duUHRyPENyb3NzVGhyZWFkSFRUUEhlYWRl ck1hcERhdGE+IG1faHR0cEhlYWRlcnM7CisjaWYgRU5BQkxFKFJFU09VUkNFX1RJTUlORykKICAg ICBSZWZQdHI8UmVzb3VyY2VMb2FkVGltaW5nPiBtX3Jlc291cmNlTG9hZFRpbWluZzsKKyNlbmRp ZgogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQo= 223883 2014-02-11 11:13:32 -0800 2014-02-13 04:06:45 -0800 Patch bug-128611-3.diff text/plain 7630 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkZTA5MmRjLi40YWJiNWM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQg QEAKKzIwMTQtMDItMTEgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCisgICAg ICAgIFNvbWUgcmVzb3VyY2UgdGltaW5nIGNvZGUgaXNuJ3QgYmVoaW5kIEVOQUJMRShSRVNPVVJD RV9USU1JTkcpLgorICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTI4NjExPgorCisgICAg ICAgIFB1dCBSZXNvdXJjZVJlc3BvbnNlQmFzZSBmb3IgdGhlIHJlc291cmNlIHRpbWluZyBmZWF0 dXJlIGJlaGluZAorICAgICAgICBFTkFCTEUoUkVTT1VSQ0VfVElNSU5HKSBndWFyZHMgdG8gYXZv aWQgYmxvYXRpbmcgY29tbW9uIG9iamVjdHMKKyAgICAgICAgb24gcGxhdGZvcm1zIHRoYXQgZG9u J3QgZW5hYmxlIHRoZSBmZWF0dXJlLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6YnVpbGRPYmplY3RGb3JSZXNvdXJjZVJlc3BvbnNlKToKKyAgICAg ICAgKiBwYWdlL1BlcmZvcm1hbmNlVGltaW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBlcmZv cm1hbmNlVGltaW5nOjpyZXNvdXJjZUxvYWRUaW1pbmcpOgorICAgICAgICAqIHBsYXRmb3JtL25l dHdvcmsvUmVzb3VyY2VSZXNwb25zZUJhc2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3Vy Y2VSZXNwb25zZUJhc2U6OmFkb3B0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVzcG9u c2VCYXNlOjpjb3B5RGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlQmFz ZTo6Y29tcGFyZSk6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlc3BvbnNl QmFzZS5oOgorCiAyMDE0LTAyLTExICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29t PgogCiAgICAgICAgIENvcnJlY3Qgc29tZSB1c2VzIG9mICdhdXRvJwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuY3BwIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuY3BwCmluZGV4IDQ4MGJk ZTkuLjZjYjIxOGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JSZXNvdXJjZUFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yUmVzb3VyY2VBZ2VudC5jcHAKQEAgLTEwMSw2ICsxMDEsNyBAQCBzdGF0aWMgUGFzc1JlZlB0 cjxJbnNwZWN0b3JPYmplY3Q+IGJ1aWxkT2JqZWN0Rm9ySGVhZGVycyhjb25zdCBIVFRQSGVhZGVy TWFwJiBoZQogICAgIHJldHVybiBoZWFkZXJzT2JqZWN0OwogfQogCisjaWYgRU5BQkxFKFJFU09V UkNFX1RJTUlORykKIHN0YXRpYyBQYXNzUmVmUHRyPEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6Ok5l dHdvcms6OlJlc291cmNlVGltaW5nPiBidWlsZE9iamVjdEZvclRpbWluZyhjb25zdCBSZXNvdXJj ZUxvYWRUaW1pbmcmIHRpbWluZywgRG9jdW1lbnRMb2FkZXIqIGxvYWRlcikKIHsKICAgICByZXR1 cm4gSW5zcGVjdG9yOjpUeXBlQnVpbGRlcjo6TmV0d29yazo6UmVzb3VyY2VUaW1pbmc6OmNyZWF0 ZSgpCkBAIC0xMTgsNiArMTE5LDcgQEAgc3RhdGljIFBhc3NSZWZQdHI8SW5zcGVjdG9yOjpUeXBl QnVpbGRlcjo6TmV0d29yazo6UmVzb3VyY2VUaW1pbmc+IGJ1aWxkT2JqZWN0Rm8KICAgICAgICAg LnNldFJlY2VpdmVIZWFkZXJzRW5kKHRpbWluZy5yZWNlaXZlSGVhZGVyc0VuZCkKICAgICAgICAg LnJlbGVhc2UoKTsKIH0KKyNlbmRpZgogCiBzdGF0aWMgUGFzc1JlZlB0cjxJbnNwZWN0b3I6OlR5 cGVCdWlsZGVyOjpOZXR3b3JrOjpSZXF1ZXN0PiBidWlsZE9iamVjdEZvclJlc291cmNlUmVxdWVz dChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpCiB7CkBAIC0xNDgsOCArMTUwLDEyIEBA IHN0YXRpYyBQYXNzUmVmUHRyPEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6Ok5ldHdvcms6OlJlc3Bv bnNlPiBidWlsZE9iamVjdEZvclJlc291CiAgICAgICAgIC5zZXRDb25uZWN0aW9uSWQocmVzcG9u c2UuY29ubmVjdGlvbklEKCkpOwogCiAgICAgcmVzcG9uc2VPYmplY3QtPnNldEZyb21EaXNrQ2Fj aGUocmVzcG9uc2Uud2FzQ2FjaGVkKCkpOworI2lmIEVOQUJMRShSRVNPVVJDRV9USU1JTkcpCiAg ICAgaWYgKHJlc3BvbnNlLnJlc291cmNlTG9hZFRpbWluZygpKQogICAgICAgICByZXNwb25zZU9i amVjdC0+c2V0VGltaW5nKGJ1aWxkT2JqZWN0Rm9yVGltaW5nKCpyZXNwb25zZS5yZXNvdXJjZUxv YWRUaW1pbmcoKSwgbG9hZGVyKSk7CisjZWxzZQorICAgIFVOVVNFRF9QQVJBTShsb2FkZXIpOwor I2VuZGlmCiAKICAgICByZXR1cm4gcmVzcG9uc2VPYmplY3Q7CiB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL1BlcmZvcm1hbmNlVGltaW5nLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvUGVyZm9ybWFuY2VUaW1pbmcuY3BwCmluZGV4IGMxNDA4MGYuLjU0ZjgyNDcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGVyZm9ybWFuY2VUaW1pbmcuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvUGVyZm9ybWFuY2VUaW1pbmcuY3BwCkBAIC0xNTgsNyArMTU4LDcgQEAg dW5zaWduZWQgbG9uZyBsb25nIFBlcmZvcm1hbmNlVGltaW5nOjpjb25uZWN0U3RhcnQoKSBjb25z dAogICAgIGlmICghbG9hZGVyKQogICAgICAgICByZXR1cm4gZG9tYWluTG9va3VwRW5kKCk7CiAK LSAgICBSZXNvdXJjZUxvYWRUaW1pbmcqIHRpbWluZyA9IGxvYWRlci0+cmVzcG9uc2UoKS5yZXNv dXJjZUxvYWRUaW1pbmcoKTsKKyAgICBSZXNvdXJjZUxvYWRUaW1pbmcqIHRpbWluZyA9IHJlc291 cmNlTG9hZFRpbWluZygpOwogICAgIGlmICghdGltaW5nKQogICAgICAgICByZXR1cm4gZG9tYWlu TG9va3VwRW5kKCk7CiAKQEAgLTE4Miw3ICsxODIsNyBAQCB1bnNpZ25lZCBsb25nIGxvbmcgUGVy Zm9ybWFuY2VUaW1pbmc6OmNvbm5lY3RFbmQoKSBjb25zdAogICAgIGlmICghbG9hZGVyKQogICAg ICAgICByZXR1cm4gY29ubmVjdFN0YXJ0KCk7CiAKLSAgICBSZXNvdXJjZUxvYWRUaW1pbmcqIHRp bWluZyA9IGxvYWRlci0+cmVzcG9uc2UoKS5yZXNvdXJjZUxvYWRUaW1pbmcoKTsKKyAgICBSZXNv dXJjZUxvYWRUaW1pbmcqIHRpbWluZyA9IHJlc291cmNlTG9hZFRpbWluZygpOwogICAgIGlmICgh dGltaW5nKQogICAgICAgICByZXR1cm4gY29ubmVjdFN0YXJ0KCk7CiAKQEAgLTIwMSw3ICsyMDEs NyBAQCB1bnNpZ25lZCBsb25nIGxvbmcgUGVyZm9ybWFuY2VUaW1pbmc6OnNlY3VyZUNvbm5lY3Rp b25TdGFydCgpIGNvbnN0CiAgICAgaWYgKCFsb2FkZXIpCiAgICAgICAgIHJldHVybiAwOwogCi0g ICAgUmVzb3VyY2VMb2FkVGltaW5nKiB0aW1pbmcgPSBsb2FkZXItPnJlc3BvbnNlKCkucmVzb3Vy Y2VMb2FkVGltaW5nKCk7CisgICAgUmVzb3VyY2VMb2FkVGltaW5nKiB0aW1pbmcgPSByZXNvdXJj ZUxvYWRUaW1pbmcoKTsKICAgICBpZiAoIXRpbWluZykKICAgICAgICAgcmV0dXJuIDA7CiAKQEAg LTM0MSwxMSArMzQxLDE1IEBAIERvY3VtZW50TG9hZFRpbWluZyogUGVyZm9ybWFuY2VUaW1pbmc6 OmRvY3VtZW50TG9hZFRpbWluZygpIGNvbnN0CiAKIFJlc291cmNlTG9hZFRpbWluZyogUGVyZm9y bWFuY2VUaW1pbmc6OnJlc291cmNlTG9hZFRpbWluZygpIGNvbnN0CiB7CisjaWYgRU5BQkxFKFJF U09VUkNFX1RJTUlORykKICAgICBEb2N1bWVudExvYWRlciogbG9hZGVyID0gZG9jdW1lbnRMb2Fk ZXIoKTsKICAgICBpZiAoIWxvYWRlcikKICAgICAgICAgcmV0dXJuIDA7CiAKICAgICByZXR1cm4g bG9hZGVyLT5yZXNwb25zZSgpLnJlc291cmNlTG9hZFRpbWluZygpOworI2Vsc2UKKyAgICByZXR1 cm4gbnVsbHB0cjsKKyNlbmRpZgogfQogCiB1bnNpZ25lZCBsb25nIGxvbmcgUGVyZm9ybWFuY2VU aW1pbmc6OnJlc291cmNlTG9hZFRpbWVSZWxhdGl2ZVRvQWJzb2x1dGUoaW50IHJlbGF0aXZlTWls bGlzZWNvbmRzKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9SZXNvdXJjZVJlc3BvbnNlQmFzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL1Jlc291cmNlUmVzcG9uc2VCYXNlLmNwcAppbmRleCA1YzA1N2ViLi5hNDM0YmQ0IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlUmVzcG9u c2VCYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNl UmVzcG9uc2VCYXNlLmNwcApAQCAtMTA2LDcgKzEwNiw5IEBAIFBhc3NPd25QdHI8UmVzb3VyY2VS ZXNwb25zZT4gUmVzb3VyY2VSZXNwb25zZUJhc2U6OmFkb3B0KFBhc3NPd25QdHI8Q3Jvc3NUaHJl YWRSCiAKICAgICByZXNwb25zZS0+bGF6eUluaXQoQ29tbW9uQW5kVW5jb21tb25GaWVsZHMpOwog ICAgIHJlc3BvbnNlLT5tX2h0dHBIZWFkZXJGaWVsZHMuYWRvcHQoZGF0YS0+bV9odHRwSGVhZGVy cy5yZWxlYXNlKCkpOworI2lmIEVOQUJMRShSRVNPVVJDRV9USU1JTkcpCiAgICAgcmVzcG9uc2Ut PnNldFJlc291cmNlTG9hZFRpbWluZyhkYXRhLT5tX3Jlc291cmNlTG9hZFRpbWluZy5yZWxlYXNl KCkpOworI2VuZGlmCiAgICAgcmVzcG9uc2UtPmRvUGxhdGZvcm1BZG9wdChkYXRhKTsKICAgICBy ZXR1cm4gcmVzcG9uc2UucmVsZWFzZSgpOwogfQpAQCAtMTIyLDggKzEyNCwxMCBAQCBQYXNzT3du UHRyPENyb3NzVGhyZWFkUmVzb3VyY2VSZXNwb25zZURhdGE+IFJlc291cmNlUmVzcG9uc2VCYXNl Ojpjb3B5RGF0YSgpIGNvbgogICAgIGRhdGEtPm1faHR0cFN0YXR1c0NvZGUgPSBodHRwU3RhdHVz Q29kZSgpOwogICAgIGRhdGEtPm1faHR0cFN0YXR1c1RleHQgPSBodHRwU3RhdHVzVGV4dCgpLmlz b2xhdGVkQ29weSgpOwogICAgIGRhdGEtPm1faHR0cEhlYWRlcnMgPSBodHRwSGVhZGVyRmllbGRz KCkuY29weURhdGEoKTsKKyNpZiBFTkFCTEUoUkVTT1VSQ0VfVElNSU5HKQogICAgIGlmIChtX3Jl c291cmNlTG9hZFRpbWluZykKICAgICAgICAgZGF0YS0+bV9yZXNvdXJjZUxvYWRUaW1pbmcgPSBt X3Jlc291cmNlTG9hZFRpbWluZy0+ZGVlcENvcHkoKTsKKyNlbmRpZgogICAgIHJldHVybiBhc1Jl c291cmNlUmVzcG9uc2UoKS5kb1BsYXRmb3JtQ29weURhdGEoZGF0YS5yZWxlYXNlKCkpOwogfQog CkBAIC01NTEsNiArNTU1LDcgQEAgdm9pZCBSZXNvdXJjZVJlc3BvbnNlQmFzZTo6c2V0Q29ubmVj dGlvbklEKHVuc2lnbmVkIGNvbm5lY3Rpb25JRCkKICAgICBtX2Nvbm5lY3Rpb25JRCA9IGNvbm5l Y3Rpb25JRDsKIH0KIAorI2lmIEVOQUJMRShSRVNPVVJDRV9USU1JTkcpCiBSZXNvdXJjZUxvYWRU aW1pbmcqIFJlc291cmNlUmVzcG9uc2VCYXNlOjpyZXNvdXJjZUxvYWRUaW1pbmcoKSBjb25zdAog ewogICAgIGxhenlJbml0KENvbW1vbkFuZFVuY29tbW9uRmllbGRzKTsKQEAgLTU2NCw2ICs1Njks NyBAQCB2b2lkIFJlc291cmNlUmVzcG9uc2VCYXNlOjpzZXRSZXNvdXJjZUxvYWRUaW1pbmcoUGFz c1JlZlB0cjxSZXNvdXJjZUxvYWRUaW1pbmc+CiAKICAgICBtX3Jlc291cmNlTG9hZFRpbWluZyA9 IHJlc291cmNlTG9hZFRpbWluZzsKIH0KKyNlbmRpZgogCiB2b2lkIFJlc291cmNlUmVzcG9uc2VC YXNlOjpsYXp5SW5pdChJbml0TGV2ZWwgaW5pdExldmVsKSBjb25zdAogewpAQCAtNTkwLDEwICs1 OTYsMTIgQEAgYm9vbCBSZXNvdXJjZVJlc3BvbnNlQmFzZTo6Y29tcGFyZShjb25zdCBSZXNvdXJj ZVJlc3BvbnNlJiBhLCBjb25zdCBSZXNvdXJjZVJlc3AKICAgICAgICAgcmV0dXJuIGZhbHNlOwog ICAgIGlmIChhLmh0dHBIZWFkZXJGaWVsZHMoKSAhPSBiLmh0dHBIZWFkZXJGaWVsZHMoKSkKICAg ICAgICAgcmV0dXJuIGZhbHNlOworI2lmIEVOQUJMRShSRVNPVVJDRV9USU1JTkcpCiAgICAgaWYg KGEucmVzb3VyY2VMb2FkVGltaW5nKCkgJiYgYi5yZXNvdXJjZUxvYWRUaW1pbmcoKSAmJiAqYS5y ZXNvdXJjZUxvYWRUaW1pbmcoKSA9PSAqYi5yZXNvdXJjZUxvYWRUaW1pbmcoKSkKICAgICAgICAg cmV0dXJuIFJlc291cmNlUmVzcG9uc2U6OnBsYXRmb3JtQ29tcGFyZShhLCBiKTsKICAgICBpZiAo YS5yZXNvdXJjZUxvYWRUaW1pbmcoKSAhPSBiLnJlc291cmNlTG9hZFRpbWluZygpKQogICAgICAg ICByZXR1cm4gZmFsc2U7CisjZW5kaWYKICAgICByZXR1cm4gUmVzb3VyY2VSZXNwb25zZTo6cGxh dGZvcm1Db21wYXJlKGEsIGIpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL1Jlc291cmNlUmVzcG9uc2VCYXNlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL1Jlc291cmNlUmVzcG9uc2VCYXNlLmgKaW5kZXggOWQ4MzhhYy4uMDhkZmU2 ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJl c3BvbnNlQmFzZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3Vy Y2VSZXNwb25zZUJhc2UuaApAQCAtMTA5LDggKzEwOSwxMCBAQCBwdWJsaWM6CiAgICAgYm9vbCB3 YXNDYWNoZWQoKSBjb25zdDsKICAgICB2b2lkIHNldFdhc0NhY2hlZChib29sKTsKIAorI2lmIEVO QUJMRShSRVNPVVJDRV9USU1JTkcpCiAgICAgUmVzb3VyY2VMb2FkVGltaW5nKiByZXNvdXJjZUxv YWRUaW1pbmcoKSBjb25zdDsKICAgICB2b2lkIHNldFJlc291cmNlTG9hZFRpbWluZyhQYXNzUmVm UHRyPFJlc291cmNlTG9hZFRpbWluZz4pOworI2VuZGlmCiAKICAgICAvLyBUaGUgUmVzb3VyY2VS ZXNwb25zZSBzdWJjbGFzcyBtYXkgInNoYWRvdyIgdGhpcyBtZXRob2QgdG8gcHJvdmlkZSBwbGF0 Zm9ybS1zcGVjaWZpYyBtZW1vcnkgdXNhZ2UgaW5mb3JtYXRpb24KICAgICB1bnNpZ25lZCBtZW1v cnlVc2FnZSgpIGNvbnN0CkBAIC0xNDcsNyArMTQ5LDkgQEAgcHJvdGVjdGVkOgogICAgIFN0cmlu ZyBtX3N1Z2dlc3RlZEZpbGVuYW1lOwogICAgIFN0cmluZyBtX2h0dHBTdGF0dXNUZXh0OwogICAg IEhUVFBIZWFkZXJNYXAgbV9odHRwSGVhZGVyRmllbGRzOworI2lmIEVOQUJMRShSRVNPVVJDRV9U SU1JTkcpCiAgICAgUmVmUHRyPFJlc291cmNlTG9hZFRpbWluZz4gbV9yZXNvdXJjZUxvYWRUaW1p bmc7CisjZW5kaWYKIAogICAgIGludCBtX2h0dHBTdGF0dXNDb2RlOwogICAgIHVuc2lnbmVkIG1f Y29ubmVjdGlvbklEOwpAQCAtMTk2LDcgKzIwMCw5IEBAIHB1YmxpYzoKICAgICBpbnQgbV9odHRw U3RhdHVzQ29kZTsKICAgICBTdHJpbmcgbV9odHRwU3RhdHVzVGV4dDsKICAgICBPd25QdHI8Q3Jv c3NUaHJlYWRIVFRQSGVhZGVyTWFwRGF0YT4gbV9odHRwSGVhZGVyczsKKyNpZiBFTkFCTEUoUkVT T1VSQ0VfVElNSU5HKQogICAgIFJlZlB0cjxSZXNvdXJjZUxvYWRUaW1pbmc+IG1fcmVzb3VyY2VM b2FkVGltaW5nOworI2VuZGlmCiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCg==