185230 2018-05-02 17:41:27 -0700 Use IOSurfaces for CoreImage operations where possible 2018-05-04 17:27:11 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 dino dino ews-watchlist jonlee webkit-bug-importer oldest_to_newest 1419950 0 dino 2018-05-02 17:41:27 -0700 Use IOSurfaces for CoreImage operations where possible 1419951 1 webkit-bug-importer 2018-05-02 17:41:56 -0700 <rdar://problem/39926929> 1419954 2 339371 dino 2018-05-02 17:45:29 -0700 Created attachment 339371 Patch 1420791 3 339371 jonlee 2018-05-04 11:44:58 -0700 Comment on attachment 339371 Patch A new patch will be uploaded to address some offline comments. 1420956 4 339613 dino 2018-05-04 16:49:09 -0700 Created attachment 339613 Patch 1420957 5 ews-watchlist 2018-05-04 16:50:32 -0700 Attachment 339613 did not pass style-queue: ERROR: Source/WebCore/rendering/RenderThemeIOS.h:34: Bad include order. Mixing system and custom headers. [build/include_order] [4] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1420960 6 dino 2018-05-04 16:54:35 -0700 oops already fixed include order 1420968 7 339614 dino 2018-05-04 16:59:10 -0700 Created attachment 339614 Patch 1420981 8 dino 2018-05-04 17:27:11 -0700 Committed r231394: <https://trac.webkit.org/changeset/231394> 339371 2018-05-02 17:45:29 -0700 2018-05-04 16:49:08 -0700 Patch bug-185230-20180502174529.patch text/plain 4941 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMjMxMjAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmQ2OWRhMmQzN2JjMzc0 MDFmNGExNTQ0MDdmZDNhNzUwZDc1NzQwYy4uY2ZiOWMwNzAxMTAwODYwOTgxMjYyOWNkYzM0YzFj ZjhlMmJlOGI1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE4LTA1LTAyICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgSU9TdXJmYWNlcyBmb3Ig Q29yZUltYWdlIG9wZXJhdGlvbnMgd2hlcmUgcG9zc2libGUKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NTIzMAorICAgICAgICA8cmRhcjovL3Byb2Js ZW0vMzk5MjY5Mjk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgT24gaU9TIGhhcmR3YXJlLCB3ZSBjYW4gdXNlIElPU3VyZmFjZXMgYXMgYSByZW5kZXJp bmcgZGVzdGluYXRpb24KKyAgICAgICAgZm9yIENvcmVJbWFnZSwgd2hpY2ggbWVhbnMgd2UncmUg a2VlcGluZyBkYXRhIG9uIHRoZSBHUFUKKyAgICAgICAgZm9yIHJlbmRlcmluZy4KKworICAgICAg ICBBcyBhIGRyaXZlLWJ5IGZpeCwgSSB1c2VkIGEgY29udmVuaWVuY2UgbWV0aG9kIGZvciBHYXVz c2lhbiBibHVycy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZUlPUy5tbToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lSU9TOjpwYWludFN5c3RlbVByZXZpZXdCYWRnZSk6 CisKIDIwMTgtMDUtMDIgIERlYW4gSmFja3NvbiAgPGRpbm9AYXBwbGUuY29tPgogCiAgICAgICAg IERyYXcgU3lzdGVtUHJldmlldyBiYWRnZSB0byBzcGVjaWZpY2F0aW9uIG9uIGlPUwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lSU9TLm1tIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lSU9TLm1tCmluZGV4IGQ4MTliMDAyMmM4YjQ1 NDA3YTg2Y2UwMmIyY2UxY2RiMDkwNGIyZDAuLmFiNjU3YmZiMzMwZjIwZjhlN2YyZWMxNjQyZTZm Njk2ZmQzZTMwNGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU aGVtZUlPUy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVJT1Mu bW0KQEAgLTQ5LDYgKzQ5LDcgQEAKICNpbXBvcnQgIkhUTUxJbnB1dEVsZW1lbnQuaCIKICNpbXBv cnQgIkhUTUxOYW1lcy5oIgogI2ltcG9ydCAiSFRNTFNlbGVjdEVsZW1lbnQuaCIKKyNpbXBvcnQg IklPU3VyZmFjZS5oIgogI2ltcG9ydCAiSWNvbi5oIgogI2ltcG9ydCAiTG9jYWxpemVkRGF0ZUNh Y2hlLmgiCiAjaW1wb3J0ICJOb2RlUmVuZGVyU3R5bGUuaCIKQEAgLTE4MjYsMTkgKzE4MjcsMTkg QEAgU3RyaW5nIFJlbmRlclRoZW1lSU9TOjpleHRyYURlZmF1bHRTdHlsZVNoZWV0KCkKICNpZiBV U0UoU1lTVEVNX1BSRVZJRVcpCiB2b2lkIFJlbmRlclRoZW1lSU9TOjpwYWludFN5c3RlbVByZXZp ZXdCYWRnZShJbWFnZSYgaW1hZ2UsIGNvbnN0IFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBG bG9hdFJlY3QmIHJlY3QpCiB7Ci0gICAgc3RhdGljIGNvbnN0IGZsb2F0IGxhcmdlQmFkZ2VEaW1l bnNpb24gPSA3MDsKLSAgICBzdGF0aWMgY29uc3QgZmxvYXQgbGFyZ2VCYWRnZU9mZnNldCA9IDIw OworICAgIHN0YXRpYyBjb25zdCBpbnQgbGFyZ2VCYWRnZURpbWVuc2lvbiA9IDcwOworICAgIHN0 YXRpYyBjb25zdCBpbnQgbGFyZ2VCYWRnZU9mZnNldCA9IDIwOwogCi0gICAgc3RhdGljIGNvbnN0 IGZsb2F0IHNtYWxsQmFkZ2VEaW1lbnNpb24gPSAzNTsKLSAgICBzdGF0aWMgY29uc3QgZmxvYXQg c21hbGxCYWRnZU9mZnNldCA9IDg7CisgICAgc3RhdGljIGNvbnN0IGludCBzbWFsbEJhZGdlRGlt ZW5zaW9uID0gMzU7CisgICAgc3RhdGljIGNvbnN0IGludCBzbWFsbEJhZGdlT2Zmc2V0ID0gODsK IAotICAgIHN0YXRpYyBjb25zdCBmbG9hdCBtaW5pbXVtU2l6ZUZvckxhcmdlQmFkZ2UgPSAyNDA7 CisgICAgc3RhdGljIGNvbnN0IGludCBtaW5pbXVtU2l6ZUZvckxhcmdlQmFkZ2UgPSAyNDA7CiAK ICAgICBib29sIHVzZVNtYWxsQmFkZ2UgPSByZWN0LndpZHRoKCkgPCBtaW5pbXVtU2l6ZUZvckxh cmdlQmFkZ2UgfHwgcmVjdC5oZWlnaHQoKSA8IG1pbmltdW1TaXplRm9yTGFyZ2VCYWRnZTsKLSAg ICBmbG9hdCBiYWRnZU9mZnNldCA9IHVzZVNtYWxsQmFkZ2UgPyBzbWFsbEJhZGdlT2Zmc2V0IDog bGFyZ2VCYWRnZU9mZnNldDsKLSAgICBmbG9hdCBiYWRnZURpbWVuc2lvbiA9IHVzZVNtYWxsQmFk Z2UgPyBzbWFsbEJhZGdlRGltZW5zaW9uIDogbGFyZ2VCYWRnZURpbWVuc2lvbjsKKyAgICBpbnQg YmFkZ2VPZmZzZXQgPSB1c2VTbWFsbEJhZGdlID8gc21hbGxCYWRnZU9mZnNldCA6IGxhcmdlQmFk Z2VPZmZzZXQ7CisgICAgaW50IGJhZGdlRGltZW5zaW9uID0gdXNlU21hbGxCYWRnZSA/IHNtYWxs QmFkZ2VEaW1lbnNpb24gOiBsYXJnZUJhZGdlRGltZW5zaW9uOwogCi0gICAgZmxvYXQgbWluaW11 bURpbWVuc2lvbiA9IGJhZGdlRGltZW5zaW9uICsgMiAqIGJhZGdlT2Zmc2V0OworICAgIGludCBt aW5pbXVtRGltZW5zaW9uID0gYmFkZ2VEaW1lbnNpb24gKyAyICogYmFkZ2VPZmZzZXQ7CiAgICAg aWYgKHJlY3Qud2lkdGgoKSA8IG1pbmltdW1EaW1lbnNpb24gfHwgcmVjdC5oZWlnaHQoKSA8IG1p bmltdW1EaW1lbnNpb24pCiAgICAgICAgIHJldHVybjsKIApAQCAtMTg2MCwxNCArMTg2MSwxMSBA QCB2b2lkIFJlbmRlclRoZW1lSU9TOjpwYWludFN5c3RlbVByZXZpZXdCYWRnZShJbWFnZSYgaW1h Z2UsIGNvbnN0IFBhaW50SW5mbyYgcGFpbgogICAgIENJSW1hZ2UgKmNsYW1wZWRJbWFnZSA9IFtz Y2FsZWRJbWFnZSBpbWFnZUJ5Q2xhbXBpbmdUb1JlY3Q6ZmxpcHBlZEluc2V0QmFkZ2VSZWN0XTsK IAogICAgIC8vIEJsdXIuCi0gICAgQ0lGaWx0ZXIgKmJsdXJGaWx0ZXIgPSBbQ0lGaWx0ZXIgZmls dGVyV2l0aE5hbWU6QCJDSUdhdXNzaWFuQmx1ciJdOwotICAgIFtibHVyRmlsdGVyIHNldERlZmF1 bHRzXTsKLSAgICBbYmx1ckZpbHRlciBzZXRWYWx1ZTpAKDEwKSBmb3JLZXk6a0NJSW5wdXRSYWRp dXNLZXldOwotICAgIFtibHVyRmlsdGVyIHNldFZhbHVlOmNsYW1wZWRJbWFnZSBmb3JLZXk6a0NJ SW5wdXRJbWFnZUtleV07CisgICAgQ0lJbWFnZSAqYmx1cnJlZEltYWdlID0gW2NsYW1wZWRJbWFn ZSBpbWFnZUJ5QXBwbHlpbmdHYXVzc2lhbkJsdXJXaXRoU2lnbWE6MTBdOwogCiAgICAgLy8gU2F0 dXJhdGUuCiAgICAgQ0lGaWx0ZXIgKnNhdHVyYXRpb25GaWx0ZXIgPSBbQ0lGaWx0ZXIgZmlsdGVy V2l0aE5hbWU6QCJDSUNvbG9yQ29udHJvbHMiXTsKLSAgICBbc2F0dXJhdGlvbkZpbHRlciBzZXRW YWx1ZTpibHVyRmlsdGVyLm91dHB1dEltYWdlIGZvcktleTprQ0lJbnB1dEltYWdlS2V5XTsKKyAg ICBbc2F0dXJhdGlvbkZpbHRlciBzZXRWYWx1ZTpibHVycmVkSW1hZ2UgZm9yS2V5OmtDSUlucHV0 SW1hZ2VLZXldOwogICAgIFtzYXR1cmF0aW9uRmlsdGVyIHNldFZhbHVlOkAxLjggZm9yS2V5OmtD SUlucHV0U2F0dXJhdGlvbktleV07CiAKICAgICAvLyBUaW50LgpAQCAtMTg5Miw3ICsxODkwLDE4 IEBAIHZvaWQgUmVuZGVyVGhlbWVJT1M6OnBhaW50U3lzdGVtUHJldmlld0JhZGdlKEltYWdlJiBp bWFnZSwgY29uc3QgUGFpbnRJbmZvJiBwYWluCiAKICAgICBpZiAoIW1fY2lDb250ZXh0KQogICAg ICAgICBtX2NpQ29udGV4dCA9IFtDSUNvbnRleHQgY29udGV4dF07Ci0gICAgUmV0YWluUHRyPENH SW1hZ2VSZWY+IGNnSW1hZ2UgPSBhZG9wdENGKFttX2NpQ29udGV4dC5nZXQoKSBjcmVhdGVDR0lt YWdlOnNvdXJjZU92ZXJGaWx0ZXIub3V0cHV0SW1hZ2UgZnJvbVJlY3Q6ZmxpcHBlZEluc2V0QmFk Z2VSZWN0XSk7CisKKyAgICBSZXRhaW5QdHI8Q0dJbWFnZVJlZj4gY2dJbWFnZTsKKyNpZiBIQVZF KElPU1VSRkFDRSkKKyAgICAvLyBDcm9wIHRoZSByZXN1bHQgdG8gdGhlIGJhZGdlIGxvY2F0aW9u LgorICAgIENJSW1hZ2UgKmNyb3BwZWRJbWFnZSA9IFtzb3VyY2VPdmVyRmlsdGVyLm91dHB1dElt YWdlIGltYWdlQnlDcm9wcGluZ1RvUmVjdDpmbGlwcGVkSW5zZXRCYWRnZVJlY3RdOworICAgIENJ SW1hZ2UgKnRyYW5zbGF0ZWRJbWFnZSA9IFtjcm9wcGVkSW1hZ2UgaW1hZ2VCeUFwcGx5aW5nVHJh bnNmb3JtOkNHQWZmaW5lVHJhbnNmb3JtTWFrZVRyYW5zbGF0aW9uKC1mbGlwcGVkSW5zZXRCYWRn ZVJlY3Qub3JpZ2luLngsIC1mbGlwcGVkSW5zZXRCYWRnZVJlY3Qub3JpZ2luLnkpXTsKKyAgICBh dXRvIHN1cmZhY2UgPSBJT1N1cmZhY2U6OmNyZWF0ZSh7IGJhZGdlRGltZW5zaW9uLCBiYWRnZURp bWVuc2lvbiB9LCBzUkdCQ29sb3JTcGFjZVJlZigpKTsKKyAgICBbbV9jaUNvbnRleHQuZ2V0KCkg cmVuZGVyOnRyYW5zbGF0ZWRJbWFnZSB0b0lPU3VyZmFjZTpzdXJmYWNlLT5zdXJmYWNlKCkgYm91 bmRzOkNHUmVjdE1ha2UoMCwgMCwgYmFkZ2VEaW1lbnNpb24sIGJhZGdlRGltZW5zaW9uKSBjb2xv clNwYWNlOnNSR0JDb2xvclNwYWNlUmVmKCldOworICAgIGNnSW1hZ2UgPSBzdXJmYWNlLT5jcmVh dGVJbWFnZSgpOworI2Vsc2UKKyAgICBjZ0ltYWdlID0gYWRvcHRDRihbbV9jaUNvbnRleHQuZ2V0 KCkgY3JlYXRlQ0dJbWFnZTpzb3VyY2VPdmVyRmlsdGVyLm91dHB1dEltYWdlIGZyb21SZWN0OmZs aXBwZWRJbnNldEJhZGdlUmVjdF0pOworI2VuZGlmCiAKICAgICBDR0NvbnRleHRTYXZlR1N0YXRl KGN0eCk7CiAgICAgQ0dDb250ZXh0VHJhbnNsYXRlQ1RNKGN0eCwgYWJzb2x1dGVCYWRnZVJlY3Qu b3JpZ2luLngsIGFic29sdXRlQmFkZ2VSZWN0Lm9yaWdpbi55KTsK 339613 2018-05-04 16:49:09 -0700 2018-05-04 16:59:09 -0700 Patch bug-185230-20180504164908.patch text/plain 6276 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMjMxMzEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTg0Mjg5M2Q4NjJmZjVh ZGNkNzdhMTZjZGYxMDgxNmQ5YzU4MWIzZC4uNzg5OTIzZjU3NmUxOGQ5YzI2MzkwOGI5MTZiMzc4 MjZjOGY4MmFmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE4LTA1LTAyICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgSU9TdXJmYWNlcyBmb3Ig Q29yZUltYWdlIG9wZXJhdGlvbnMgd2hlcmUgcG9zc2libGUKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NTIzMAorICAgICAgICA8cmRhcjovL3Byb2Js ZW0vMzk5MjY5Mjk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgT24gaU9TIGhhcmR3YXJlLCB3ZSBjYW4gdXNlIElPU3VyZmFjZXMgYXMgYSByZW5kZXJp bmcgZGVzdGluYXRpb24KKyAgICAgICAgZm9yIENvcmVJbWFnZSwgd2hpY2ggbWVhbnMgd2UncmUg a2VlcGluZyBkYXRhIG9uIHRoZSBHUFUKKyAgICAgICAgZm9yIHJlbmRlcmluZy4KKworICAgICAg ICBBcyBhIGRyaXZlLWJ5IGZpeCwgSSB1c2VkIGEgY29udmVuaWVuY2UgbWV0aG9kIGZvciBHYXVz c2lhbiBibHVycy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZUlPUy5tbToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lSU9TOjpwYWludFN5c3RlbVByZXZpZXdCYWRnZSk6 CisKIDIwMTgtMDUtMDMgIENvbW1pdCBRdWV1ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJraXQub3JnPgog CiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIyMzEyMjMgYW5kIHIyMzEyODguCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVJT1MuaCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUlPUy5oCmluZGV4IGFhYTc3ZmQwMjFm MTI5NmIwMmIzNjlkOTExNjI1YmUwMDI5OTMzYzEuLjM3M2ViNDUxZTlhODc0ZjQxYzZmZWEzOWJi MjkyYjljMjllNzgzMzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJUaGVtZUlPUy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUlP Uy5oCkBAIC0yOSw3ICsyOSwxMCBAQAogCiAjaW5jbHVkZSAiUmVuZGVyVGhlbWVDb2NvYS5oIgog CisjaWYgVVNFKFNZU1RFTV9QUkVWSUVXKQogI2luY2x1ZGUgPHd0Zi9SZXRhaW5QdHIuaD4KKyNp bmNsdWRlICJJT1N1cmZhY2UuaCIKKyNlbmRpZgogCiBPQkpDX0NMQVNTIENJQ29udGV4dDsKIApA QCAtMTU0LDYgKzE1Nyw4IEBAIHByaXZhdGU6CiAKICNpZiBVU0UoU1lTVEVNX1BSRVZJRVcpCiAg ICAgUmV0YWluUHRyPENJQ29udGV4dD4gbV9jaUNvbnRleHQ7CisgICAgc3RkOjp1bmlxdWVfcHRy PElPU3VyZmFjZT4gbV9sYXJnZUJhZGdlU3VyZmFjZTsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8SU9T dXJmYWNlPiBtX3NtYWxsQmFkZ2VTdXJmYWNlOwogI2VuZGlmCiAKICAgICBib29sIG1fc2hvdWxk TW9ja0JvbGRTeXN0ZW1Gb250Rm9yQWNjZXNzaWJpbGl0eSB7IGZhbHNlIH07CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVJT1MubW0gYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVJT1MubW0KaW5kZXggZDgxOWIwMDIyYzhiNDU0MDdh ODZjZTAyYjJjZTFjZGIwOTA0YjJkMC4uOTdhMzg4ZDNjZWViMjJkYWY0YmRmNjQ2YzkwYTdjOWYz ZWFjOGJiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1l SU9TLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUlPUy5tbQpA QCAtNDksNiArNDksNyBAQAogI2ltcG9ydCAiSFRNTElucHV0RWxlbWVudC5oIgogI2ltcG9ydCAi SFRNTE5hbWVzLmgiCiAjaW1wb3J0ICJIVE1MU2VsZWN0RWxlbWVudC5oIgorI2ltcG9ydCAiSU9T dXJmYWNlLmgiCiAjaW1wb3J0ICJJY29uLmgiCiAjaW1wb3J0ICJMb2NhbGl6ZWREYXRlQ2FjaGUu aCIKICNpbXBvcnQgIk5vZGVSZW5kZXJTdHlsZS5oIgpAQCAtMTgyNiwxOSArMTgyNywxOSBAQCBT dHJpbmcgUmVuZGVyVGhlbWVJT1M6OmV4dHJhRGVmYXVsdFN0eWxlU2hlZXQoKQogI2lmIFVTRShT WVNURU1fUFJFVklFVykKIHZvaWQgUmVuZGVyVGhlbWVJT1M6OnBhaW50U3lzdGVtUHJldmlld0Jh ZGdlKEltYWdlJiBpbWFnZSwgY29uc3QgUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IEZsb2F0 UmVjdCYgcmVjdCkKIHsKLSAgICBzdGF0aWMgY29uc3QgZmxvYXQgbGFyZ2VCYWRnZURpbWVuc2lv biA9IDcwOwotICAgIHN0YXRpYyBjb25zdCBmbG9hdCBsYXJnZUJhZGdlT2Zmc2V0ID0gMjA7Cisg ICAgc3RhdGljIGNvbnN0IGludCBsYXJnZUJhZGdlRGltZW5zaW9uID0gNzA7CisgICAgc3RhdGlj IGNvbnN0IGludCBsYXJnZUJhZGdlT2Zmc2V0ID0gMjA7CiAKLSAgICBzdGF0aWMgY29uc3QgZmxv YXQgc21hbGxCYWRnZURpbWVuc2lvbiA9IDM1OwotICAgIHN0YXRpYyBjb25zdCBmbG9hdCBzbWFs bEJhZGdlT2Zmc2V0ID0gODsKKyAgICBzdGF0aWMgY29uc3QgaW50IHNtYWxsQmFkZ2VEaW1lbnNp b24gPSAzNTsKKyAgICBzdGF0aWMgY29uc3QgaW50IHNtYWxsQmFkZ2VPZmZzZXQgPSA4OwogCi0g ICAgc3RhdGljIGNvbnN0IGZsb2F0IG1pbmltdW1TaXplRm9yTGFyZ2VCYWRnZSA9IDI0MDsKKyAg ICBzdGF0aWMgY29uc3QgaW50IG1pbmltdW1TaXplRm9yTGFyZ2VCYWRnZSA9IDI0MDsKIAogICAg IGJvb2wgdXNlU21hbGxCYWRnZSA9IHJlY3Qud2lkdGgoKSA8IG1pbmltdW1TaXplRm9yTGFyZ2VC YWRnZSB8fCByZWN0LmhlaWdodCgpIDwgbWluaW11bVNpemVGb3JMYXJnZUJhZGdlOwotICAgIGZs b2F0IGJhZGdlT2Zmc2V0ID0gdXNlU21hbGxCYWRnZSA/IHNtYWxsQmFkZ2VPZmZzZXQgOiBsYXJn ZUJhZGdlT2Zmc2V0OwotICAgIGZsb2F0IGJhZGdlRGltZW5zaW9uID0gdXNlU21hbGxCYWRnZSA/ IHNtYWxsQmFkZ2VEaW1lbnNpb24gOiBsYXJnZUJhZGdlRGltZW5zaW9uOworICAgIGludCBiYWRn ZU9mZnNldCA9IHVzZVNtYWxsQmFkZ2UgPyBzbWFsbEJhZGdlT2Zmc2V0IDogbGFyZ2VCYWRnZU9m ZnNldDsKKyAgICBpbnQgYmFkZ2VEaW1lbnNpb24gPSB1c2VTbWFsbEJhZGdlID8gc21hbGxCYWRn ZURpbWVuc2lvbiA6IGxhcmdlQmFkZ2VEaW1lbnNpb247CiAKLSAgICBmbG9hdCBtaW5pbXVtRGlt ZW5zaW9uID0gYmFkZ2VEaW1lbnNpb24gKyAyICogYmFkZ2VPZmZzZXQ7CisgICAgaW50IG1pbmlt dW1EaW1lbnNpb24gPSBiYWRnZURpbWVuc2lvbiArIDIgKiBiYWRnZU9mZnNldDsKICAgICBpZiAo cmVjdC53aWR0aCgpIDwgbWluaW11bURpbWVuc2lvbiB8fCByZWN0LmhlaWdodCgpIDwgbWluaW11 bURpbWVuc2lvbikKICAgICAgICAgcmV0dXJuOwogCkBAIC0xODYwLDE0ICsxODYxLDExIEBAIHZv aWQgUmVuZGVyVGhlbWVJT1M6OnBhaW50U3lzdGVtUHJldmlld0JhZGdlKEltYWdlJiBpbWFnZSwg Y29uc3QgUGFpbnRJbmZvJiBwYWluCiAgICAgQ0lJbWFnZSAqY2xhbXBlZEltYWdlID0gW3NjYWxl ZEltYWdlIGltYWdlQnlDbGFtcGluZ1RvUmVjdDpmbGlwcGVkSW5zZXRCYWRnZVJlY3RdOwogCiAg ICAgLy8gQmx1ci4KLSAgICBDSUZpbHRlciAqYmx1ckZpbHRlciA9IFtDSUZpbHRlciBmaWx0ZXJX aXRoTmFtZTpAIkNJR2F1c3NpYW5CbHVyIl07Ci0gICAgW2JsdXJGaWx0ZXIgc2V0RGVmYXVsdHNd OwotICAgIFtibHVyRmlsdGVyIHNldFZhbHVlOkAoMTApIGZvcktleTprQ0lJbnB1dFJhZGl1c0tl eV07Ci0gICAgW2JsdXJGaWx0ZXIgc2V0VmFsdWU6Y2xhbXBlZEltYWdlIGZvcktleTprQ0lJbnB1 dEltYWdlS2V5XTsKKyAgICBDSUltYWdlICpibHVycmVkSW1hZ2UgPSBbY2xhbXBlZEltYWdlIGlt YWdlQnlBcHBseWluZ0dhdXNzaWFuQmx1cldpdGhTaWdtYToxMF07CiAKICAgICAvLyBTYXR1cmF0 ZS4KICAgICBDSUZpbHRlciAqc2F0dXJhdGlvbkZpbHRlciA9IFtDSUZpbHRlciBmaWx0ZXJXaXRo TmFtZTpAIkNJQ29sb3JDb250cm9scyJdOwotICAgIFtzYXR1cmF0aW9uRmlsdGVyIHNldFZhbHVl OmJsdXJGaWx0ZXIub3V0cHV0SW1hZ2UgZm9yS2V5OmtDSUlucHV0SW1hZ2VLZXldOworICAgIFtz YXR1cmF0aW9uRmlsdGVyIHNldFZhbHVlOmJsdXJyZWRJbWFnZSBmb3JLZXk6a0NJSW5wdXRJbWFn ZUtleV07CiAgICAgW3NhdHVyYXRpb25GaWx0ZXIgc2V0VmFsdWU6QDEuOCBmb3JLZXk6a0NJSW5w dXRTYXR1cmF0aW9uS2V5XTsKIAogICAgIC8vIFRpbnQuCkBAIC0xODkyLDcgKzE4OTAsMjcgQEAg dm9pZCBSZW5kZXJUaGVtZUlPUzo6cGFpbnRTeXN0ZW1QcmV2aWV3QmFkZ2UoSW1hZ2UmIGltYWdl LCBjb25zdCBQYWludEluZm8mIHBhaW4KIAogICAgIGlmICghbV9jaUNvbnRleHQpCiAgICAgICAg IG1fY2lDb250ZXh0ID0gW0NJQ29udGV4dCBjb250ZXh0XTsKLSAgICBSZXRhaW5QdHI8Q0dJbWFn ZVJlZj4gY2dJbWFnZSA9IGFkb3B0Q0YoW21fY2lDb250ZXh0LmdldCgpIGNyZWF0ZUNHSW1hZ2U6 c291cmNlT3ZlckZpbHRlci5vdXRwdXRJbWFnZSBmcm9tUmVjdDpmbGlwcGVkSW5zZXRCYWRnZVJl Y3RdKTsKKworICAgIFJldGFpblB0cjxDR0ltYWdlUmVmPiBjZ0ltYWdlOworI2lmIEhBVkUoSU9T VVJGQUNFKQorICAgIC8vIENyb3AgdGhlIHJlc3VsdCB0byB0aGUgYmFkZ2UgbG9jYXRpb24uCisg ICAgQ0lJbWFnZSAqY3JvcHBlZEltYWdlID0gW3NvdXJjZU92ZXJGaWx0ZXIub3V0cHV0SW1hZ2Ug aW1hZ2VCeUNyb3BwaW5nVG9SZWN0OmZsaXBwZWRJbnNldEJhZGdlUmVjdF07CisgICAgQ0lJbWFn ZSAqdHJhbnNsYXRlZEltYWdlID0gW2Nyb3BwZWRJbWFnZSBpbWFnZUJ5QXBwbHlpbmdUcmFuc2Zv cm06Q0dBZmZpbmVUcmFuc2Zvcm1NYWtlVHJhbnNsYXRpb24oLWZsaXBwZWRJbnNldEJhZGdlUmVj dC5vcmlnaW4ueCwgLWZsaXBwZWRJbnNldEJhZGdlUmVjdC5vcmlnaW4ueSldOworICAgIElPU3Vy ZmFjZVJlZiBzdXJmYWNlOworICAgIGlmICh1c2VTbWFsbEJhZGdlKSB7CisgICAgICAgIGlmICgh bV9zbWFsbEJhZGdlU3VyZmFjZSkKKyAgICAgICAgICAgIG1fc21hbGxCYWRnZVN1cmZhY2UgPSBJ T1N1cmZhY2U6OmNyZWF0ZSh7IHNtYWxsQmFkZ2VEaW1lbnNpb24sIHNtYWxsQmFkZ2VEaW1lbnNp b24gfSwgc1JHQkNvbG9yU3BhY2VSZWYoKSk7CisgICAgICAgIHN1cmZhY2UgPSBtX3NtYWxsQmFk Z2VTdXJmYWNlLT5zdXJmYWNlKCk7CisgICAgfSBlbHNlIHsKKyAgICAgICAgaWYgKCFtX2xhcmdl QmFkZ2VTdXJmYWNlKQorICAgICAgICAgICAgbV9sYXJnZUJhZGdlU3VyZmFjZSA9IElPU3VyZmFj ZTo6Y3JlYXRlKHsgbGFyZ2VCYWRnZURpbWVuc2lvbiwgbGFyZ2VCYWRnZURpbWVuc2lvbiB9LCBz UkdCQ29sb3JTcGFjZVJlZigpKTsKKyAgICAgICAgc3VyZmFjZSA9IG1fbGFyZ2VCYWRnZVN1cmZh Y2UtPnN1cmZhY2UoKTsKKyAgICB9CisgICAgW21fY2lDb250ZXh0LmdldCgpIHJlbmRlcjp0cmFu c2xhdGVkSW1hZ2UgdG9JT1N1cmZhY2U6c3VyZmFjZSBib3VuZHM6YmFkZ2VSZWN0IGNvbG9yU3Bh Y2U6c1JHQkNvbG9yU3BhY2VSZWYoKV07CisgICAgY2dJbWFnZSA9IHVzZVNtYWxsQmFkZ2UgPyBt X3NtYWxsQmFkZ2VTdXJmYWNlLT5jcmVhdGVJbWFnZSgpIDogbV9sYXJnZUJhZGdlU3VyZmFjZS0+ Y3JlYXRlSW1hZ2UoKTsKKyNlbHNlCisgICAgY2dJbWFnZSA9IGFkb3B0Q0YoW21fY2lDb250ZXh0 LmdldCgpIGNyZWF0ZUNHSW1hZ2U6c291cmNlT3ZlckZpbHRlci5vdXRwdXRJbWFnZSBmcm9tUmVj dDpmbGlwcGVkSW5zZXRCYWRnZVJlY3RdKTsKKyNlbmRpZgogCiAgICAgQ0dDb250ZXh0U2F2ZUdT dGF0ZShjdHgpOwogICAgIENHQ29udGV4dFRyYW5zbGF0ZUNUTShjdHgsIGFic29sdXRlQmFkZ2VS ZWN0Lm9yaWdpbi54LCBhYnNvbHV0ZUJhZGdlUmVjdC5vcmlnaW4ueSk7CkBAIC0xOTEzLDYgKzE5 MzEsNyBAQCB2b2lkIFJlbmRlclRoZW1lSU9TOjpwYWludFN5c3RlbVByZXZpZXdCYWRnZShJbWFn ZSYgaW1hZ2UsIGNvbnN0IFBhaW50SW5mbyYgcGFpbgogICAgIH0KICNlbmRpZgogCisgICAgQ0dD b250ZXh0Rmx1c2goY3R4KTsKICAgICBDR0NvbnRleHRSZXN0b3JlR1N0YXRlKGN0eCk7CiB9CiAj ZW5kaWYK 339614 2018-05-04 16:59:10 -0700 2018-05-04 17:13:16 -0700 Patch bug-185230-20180504165909.patch text/plain 6335 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMjMxMzEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTg0Mjg5M2Q4NjJmZjVh ZGNkNzdhMTZjZGYxMDgxNmQ5YzU4MWIzZC4uNzg5OTIzZjU3NmUxOGQ5YzI2MzkwOGI5MTZiMzc4 MjZjOGY4MmFmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE4LTA1LTAyICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgSU9TdXJmYWNlcyBmb3Ig Q29yZUltYWdlIG9wZXJhdGlvbnMgd2hlcmUgcG9zc2libGUKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NTIzMAorICAgICAgICA8cmRhcjovL3Byb2Js ZW0vMzk5MjY5Mjk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgT24gaU9TIGhhcmR3YXJlLCB3ZSBjYW4gdXNlIElPU3VyZmFjZXMgYXMgYSByZW5kZXJp bmcgZGVzdGluYXRpb24KKyAgICAgICAgZm9yIENvcmVJbWFnZSwgd2hpY2ggbWVhbnMgd2UncmUg a2VlcGluZyBkYXRhIG9uIHRoZSBHUFUKKyAgICAgICAgZm9yIHJlbmRlcmluZy4KKworICAgICAg ICBBcyBhIGRyaXZlLWJ5IGZpeCwgSSB1c2VkIGEgY29udmVuaWVuY2UgbWV0aG9kIGZvciBHYXVz c2lhbiBibHVycy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZUlPUy5tbToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lSU9TOjpwYWludFN5c3RlbVByZXZpZXdCYWRnZSk6 CisKIDIwMTgtMDUtMDMgIENvbW1pdCBRdWV1ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJraXQub3JnPgog CiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIyMzEyMjMgYW5kIHIyMzEyODguCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVJT1MuaCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUlPUy5oCmluZGV4IGFhYTc3ZmQwMjFm MTI5NmIwMmIzNjlkOTExNjI1YmUwMDI5OTMzYzEuLjdiN2NlZWY3NDQ4ZTkyMDViZDE4NzBhNDRj MzBmYTk4NGU0MWRkMWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJUaGVtZUlPUy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUlP Uy5oCkBAIC0yOSw3ICsyOSwxMiBAQAogCiAjaW5jbHVkZSAiUmVuZGVyVGhlbWVDb2NvYS5oIgog CisjaWYgVVNFKFNZU1RFTV9QUkVWSUVXKQorI2lmIEhBVkUoSU9TVVJGQUNFKQorI2luY2x1ZGUg IklPU3VyZmFjZS5oIgorI2VuZGlmCiAjaW5jbHVkZSA8d3RmL1JldGFpblB0ci5oPgorI2VuZGlm CiAKIE9CSkNfQ0xBU1MgQ0lDb250ZXh0OwogCkBAIC0xNTQsNiArMTU5LDEwIEBAIHByaXZhdGU6 CiAKICNpZiBVU0UoU1lTVEVNX1BSRVZJRVcpCiAgICAgUmV0YWluUHRyPENJQ29udGV4dD4gbV9j aUNvbnRleHQ7CisjaWYgSEFWRShJT1NVUkZBQ0UpCisgICAgc3RkOjp1bmlxdWVfcHRyPElPU3Vy ZmFjZT4gbV9sYXJnZUJhZGdlU3VyZmFjZTsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8SU9TdXJmYWNl PiBtX3NtYWxsQmFkZ2VTdXJmYWNlOworI2VuZGlmCiAjZW5kaWYKIAogICAgIGJvb2wgbV9zaG91 bGRNb2NrQm9sZFN5c3RlbUZvbnRGb3JBY2Nlc3NpYmlsaXR5IHsgZmFsc2UgfTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUlPUy5tbSBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUlPUy5tbQppbmRleCBkODE5YjAwMjJjOGI0NTQw N2E4NmNlMDJiMmNlMWNkYjA5MDRiMmQwLi45N2EzODhkM2NlZWIyMmRhZjRiZGY2NDZjOTBhN2M5 ZjNlYWM4YmI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhl bWVJT1MubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lSU9TLm1t CkBAIC00OSw2ICs0OSw3IEBACiAjaW1wb3J0ICJIVE1MSW5wdXRFbGVtZW50LmgiCiAjaW1wb3J0 ICJIVE1MTmFtZXMuaCIKICNpbXBvcnQgIkhUTUxTZWxlY3RFbGVtZW50LmgiCisjaW1wb3J0ICJJ T1N1cmZhY2UuaCIKICNpbXBvcnQgIkljb24uaCIKICNpbXBvcnQgIkxvY2FsaXplZERhdGVDYWNo ZS5oIgogI2ltcG9ydCAiTm9kZVJlbmRlclN0eWxlLmgiCkBAIC0xODI2LDE5ICsxODI3LDE5IEBA IFN0cmluZyBSZW5kZXJUaGVtZUlPUzo6ZXh0cmFEZWZhdWx0U3R5bGVTaGVldCgpCiAjaWYgVVNF KFNZU1RFTV9QUkVWSUVXKQogdm9pZCBSZW5kZXJUaGVtZUlPUzo6cGFpbnRTeXN0ZW1QcmV2aWV3 QmFkZ2UoSW1hZ2UmIGltYWdlLCBjb25zdCBQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgRmxv YXRSZWN0JiByZWN0KQogewotICAgIHN0YXRpYyBjb25zdCBmbG9hdCBsYXJnZUJhZGdlRGltZW5z aW9uID0gNzA7Ci0gICAgc3RhdGljIGNvbnN0IGZsb2F0IGxhcmdlQmFkZ2VPZmZzZXQgPSAyMDsK KyAgICBzdGF0aWMgY29uc3QgaW50IGxhcmdlQmFkZ2VEaW1lbnNpb24gPSA3MDsKKyAgICBzdGF0 aWMgY29uc3QgaW50IGxhcmdlQmFkZ2VPZmZzZXQgPSAyMDsKIAotICAgIHN0YXRpYyBjb25zdCBm bG9hdCBzbWFsbEJhZGdlRGltZW5zaW9uID0gMzU7Ci0gICAgc3RhdGljIGNvbnN0IGZsb2F0IHNt YWxsQmFkZ2VPZmZzZXQgPSA4OworICAgIHN0YXRpYyBjb25zdCBpbnQgc21hbGxCYWRnZURpbWVu c2lvbiA9IDM1OworICAgIHN0YXRpYyBjb25zdCBpbnQgc21hbGxCYWRnZU9mZnNldCA9IDg7CiAK LSAgICBzdGF0aWMgY29uc3QgZmxvYXQgbWluaW11bVNpemVGb3JMYXJnZUJhZGdlID0gMjQwOwor ICAgIHN0YXRpYyBjb25zdCBpbnQgbWluaW11bVNpemVGb3JMYXJnZUJhZGdlID0gMjQwOwogCiAg ICAgYm9vbCB1c2VTbWFsbEJhZGdlID0gcmVjdC53aWR0aCgpIDwgbWluaW11bVNpemVGb3JMYXJn ZUJhZGdlIHx8IHJlY3QuaGVpZ2h0KCkgPCBtaW5pbXVtU2l6ZUZvckxhcmdlQmFkZ2U7Ci0gICAg ZmxvYXQgYmFkZ2VPZmZzZXQgPSB1c2VTbWFsbEJhZGdlID8gc21hbGxCYWRnZU9mZnNldCA6IGxh cmdlQmFkZ2VPZmZzZXQ7Ci0gICAgZmxvYXQgYmFkZ2VEaW1lbnNpb24gPSB1c2VTbWFsbEJhZGdl ID8gc21hbGxCYWRnZURpbWVuc2lvbiA6IGxhcmdlQmFkZ2VEaW1lbnNpb247CisgICAgaW50IGJh ZGdlT2Zmc2V0ID0gdXNlU21hbGxCYWRnZSA/IHNtYWxsQmFkZ2VPZmZzZXQgOiBsYXJnZUJhZGdl T2Zmc2V0OworICAgIGludCBiYWRnZURpbWVuc2lvbiA9IHVzZVNtYWxsQmFkZ2UgPyBzbWFsbEJh ZGdlRGltZW5zaW9uIDogbGFyZ2VCYWRnZURpbWVuc2lvbjsKIAotICAgIGZsb2F0IG1pbmltdW1E aW1lbnNpb24gPSBiYWRnZURpbWVuc2lvbiArIDIgKiBiYWRnZU9mZnNldDsKKyAgICBpbnQgbWlu aW11bURpbWVuc2lvbiA9IGJhZGdlRGltZW5zaW9uICsgMiAqIGJhZGdlT2Zmc2V0OwogICAgIGlm IChyZWN0LndpZHRoKCkgPCBtaW5pbXVtRGltZW5zaW9uIHx8IHJlY3QuaGVpZ2h0KCkgPCBtaW5p bXVtRGltZW5zaW9uKQogICAgICAgICByZXR1cm47CiAKQEAgLTE4NjAsMTQgKzE4NjEsMTEgQEAg dm9pZCBSZW5kZXJUaGVtZUlPUzo6cGFpbnRTeXN0ZW1QcmV2aWV3QmFkZ2UoSW1hZ2UmIGltYWdl LCBjb25zdCBQYWludEluZm8mIHBhaW4KICAgICBDSUltYWdlICpjbGFtcGVkSW1hZ2UgPSBbc2Nh bGVkSW1hZ2UgaW1hZ2VCeUNsYW1waW5nVG9SZWN0OmZsaXBwZWRJbnNldEJhZGdlUmVjdF07CiAK ICAgICAvLyBCbHVyLgotICAgIENJRmlsdGVyICpibHVyRmlsdGVyID0gW0NJRmlsdGVyIGZpbHRl cldpdGhOYW1lOkAiQ0lHYXVzc2lhbkJsdXIiXTsKLSAgICBbYmx1ckZpbHRlciBzZXREZWZhdWx0 c107Ci0gICAgW2JsdXJGaWx0ZXIgc2V0VmFsdWU6QCgxMCkgZm9yS2V5OmtDSUlucHV0UmFkaXVz S2V5XTsKLSAgICBbYmx1ckZpbHRlciBzZXRWYWx1ZTpjbGFtcGVkSW1hZ2UgZm9yS2V5OmtDSUlu cHV0SW1hZ2VLZXldOworICAgIENJSW1hZ2UgKmJsdXJyZWRJbWFnZSA9IFtjbGFtcGVkSW1hZ2Ug aW1hZ2VCeUFwcGx5aW5nR2F1c3NpYW5CbHVyV2l0aFNpZ21hOjEwXTsKIAogICAgIC8vIFNhdHVy YXRlLgogICAgIENJRmlsdGVyICpzYXR1cmF0aW9uRmlsdGVyID0gW0NJRmlsdGVyIGZpbHRlcldp dGhOYW1lOkAiQ0lDb2xvckNvbnRyb2xzIl07Ci0gICAgW3NhdHVyYXRpb25GaWx0ZXIgc2V0VmFs dWU6Ymx1ckZpbHRlci5vdXRwdXRJbWFnZSBmb3JLZXk6a0NJSW5wdXRJbWFnZUtleV07CisgICAg W3NhdHVyYXRpb25GaWx0ZXIgc2V0VmFsdWU6Ymx1cnJlZEltYWdlIGZvcktleTprQ0lJbnB1dElt YWdlS2V5XTsKICAgICBbc2F0dXJhdGlvbkZpbHRlciBzZXRWYWx1ZTpAMS44IGZvcktleTprQ0lJ bnB1dFNhdHVyYXRpb25LZXldOwogCiAgICAgLy8gVGludC4KQEAgLTE4OTIsNyArMTg5MCwyNyBA QCB2b2lkIFJlbmRlclRoZW1lSU9TOjpwYWludFN5c3RlbVByZXZpZXdCYWRnZShJbWFnZSYgaW1h Z2UsIGNvbnN0IFBhaW50SW5mbyYgcGFpbgogCiAgICAgaWYgKCFtX2NpQ29udGV4dCkKICAgICAg ICAgbV9jaUNvbnRleHQgPSBbQ0lDb250ZXh0IGNvbnRleHRdOwotICAgIFJldGFpblB0cjxDR0lt YWdlUmVmPiBjZ0ltYWdlID0gYWRvcHRDRihbbV9jaUNvbnRleHQuZ2V0KCkgY3JlYXRlQ0dJbWFn ZTpzb3VyY2VPdmVyRmlsdGVyLm91dHB1dEltYWdlIGZyb21SZWN0OmZsaXBwZWRJbnNldEJhZGdl UmVjdF0pOworCisgICAgUmV0YWluUHRyPENHSW1hZ2VSZWY+IGNnSW1hZ2U7CisjaWYgSEFWRShJ T1NVUkZBQ0UpCisgICAgLy8gQ3JvcCB0aGUgcmVzdWx0IHRvIHRoZSBiYWRnZSBsb2NhdGlvbi4K KyAgICBDSUltYWdlICpjcm9wcGVkSW1hZ2UgPSBbc291cmNlT3ZlckZpbHRlci5vdXRwdXRJbWFn ZSBpbWFnZUJ5Q3JvcHBpbmdUb1JlY3Q6ZmxpcHBlZEluc2V0QmFkZ2VSZWN0XTsKKyAgICBDSUlt YWdlICp0cmFuc2xhdGVkSW1hZ2UgPSBbY3JvcHBlZEltYWdlIGltYWdlQnlBcHBseWluZ1RyYW5z Zm9ybTpDR0FmZmluZVRyYW5zZm9ybU1ha2VUcmFuc2xhdGlvbigtZmxpcHBlZEluc2V0QmFkZ2VS ZWN0Lm9yaWdpbi54LCAtZmxpcHBlZEluc2V0QmFkZ2VSZWN0Lm9yaWdpbi55KV07CisgICAgSU9T dXJmYWNlUmVmIHN1cmZhY2U7CisgICAgaWYgKHVzZVNtYWxsQmFkZ2UpIHsKKyAgICAgICAgaWYg KCFtX3NtYWxsQmFkZ2VTdXJmYWNlKQorICAgICAgICAgICAgbV9zbWFsbEJhZGdlU3VyZmFjZSA9 IElPU3VyZmFjZTo6Y3JlYXRlKHsgc21hbGxCYWRnZURpbWVuc2lvbiwgc21hbGxCYWRnZURpbWVu c2lvbiB9LCBzUkdCQ29sb3JTcGFjZVJlZigpKTsKKyAgICAgICAgc3VyZmFjZSA9IG1fc21hbGxC YWRnZVN1cmZhY2UtPnN1cmZhY2UoKTsKKyAgICB9IGVsc2UgeworICAgICAgICBpZiAoIW1fbGFy Z2VCYWRnZVN1cmZhY2UpCisgICAgICAgICAgICBtX2xhcmdlQmFkZ2VTdXJmYWNlID0gSU9TdXJm YWNlOjpjcmVhdGUoeyBsYXJnZUJhZGdlRGltZW5zaW9uLCBsYXJnZUJhZGdlRGltZW5zaW9uIH0s IHNSR0JDb2xvclNwYWNlUmVmKCkpOworICAgICAgICBzdXJmYWNlID0gbV9sYXJnZUJhZGdlU3Vy ZmFjZS0+c3VyZmFjZSgpOworICAgIH0KKyAgICBbbV9jaUNvbnRleHQuZ2V0KCkgcmVuZGVyOnRy YW5zbGF0ZWRJbWFnZSB0b0lPU3VyZmFjZTpzdXJmYWNlIGJvdW5kczpiYWRnZVJlY3QgY29sb3JT cGFjZTpzUkdCQ29sb3JTcGFjZVJlZigpXTsKKyAgICBjZ0ltYWdlID0gdXNlU21hbGxCYWRnZSA/ IG1fc21hbGxCYWRnZVN1cmZhY2UtPmNyZWF0ZUltYWdlKCkgOiBtX2xhcmdlQmFkZ2VTdXJmYWNl LT5jcmVhdGVJbWFnZSgpOworI2Vsc2UKKyAgICBjZ0ltYWdlID0gYWRvcHRDRihbbV9jaUNvbnRl eHQuZ2V0KCkgY3JlYXRlQ0dJbWFnZTpzb3VyY2VPdmVyRmlsdGVyLm91dHB1dEltYWdlIGZyb21S ZWN0OmZsaXBwZWRJbnNldEJhZGdlUmVjdF0pOworI2VuZGlmCiAKICAgICBDR0NvbnRleHRTYXZl R1N0YXRlKGN0eCk7CiAgICAgQ0dDb250ZXh0VHJhbnNsYXRlQ1RNKGN0eCwgYWJzb2x1dGVCYWRn ZVJlY3Qub3JpZ2luLngsIGFic29sdXRlQmFkZ2VSZWN0Lm9yaWdpbi55KTsKQEAgLTE5MTMsNiAr MTkzMSw3IEBAIHZvaWQgUmVuZGVyVGhlbWVJT1M6OnBhaW50U3lzdGVtUHJldmlld0JhZGdlKElt YWdlJiBpbWFnZSwgY29uc3QgUGFpbnRJbmZvJiBwYWluCiAgICAgfQogI2VuZGlmCiAKKyAgICBD R0NvbnRleHRGbHVzaChjdHgpOwogICAgIENHQ29udGV4dFJlc3RvcmVHU3RhdGUoY3R4KTsKIH0K ICNlbmRpZgo=