139250 2014-12-03 20:40:21 -0800 Move 'webkit-aspect-ratio' CSS property to the new StyleBuilder 2014-12-04 13:48:09 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 137910 1 cdumez cdumez commit-queue kling koivisto sam oldest_to_newest 1052405 0 cdumez 2014-12-03 20:40:21 -0800 Move 'aspect-ratio' CSS property to the new StyleBuilder 1052413 1 242554 cdumez 2014-12-03 23:16:12 -0800 Created attachment 242554 Patch 1052553 2 242554 commit-queue 2014-12-04 13:48:05 -0800 Comment on attachment 242554 Patch Clearing flags on attachment: 242554 Committed r176813: <http://trac.webkit.org/changeset/176813> 1052554 3 commit-queue 2014-12-04 13:48:09 -0800 All reviewed patches have been landed. Closing bug. 242554 2014-12-03 23:16:12 -0800 2014-12-04 13:48:05 -0800 Patch bug-139250-20141203231644.patch text/plain 10110 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2NzgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTllNDgzMjIzNzc5Mzdi NWU4YzI3ZmZlNDY2YzExNzE4MDhjNmI0ZS4uZWExYjI4ZWMzYWQ5OWI1Zjg3ZWE2OTNkZjM3ZGZh MDk4NWIxNjc2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE0LTEyLTAzICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTW92ZSAnd2Via2l0LWFzcGVj dC1yYXRpbycgQ1NTIHByb3BlcnR5IHRvIHRoZSBuZXcgU3R5bGVCdWlsZGVyCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzkyNTAKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlICdhc3BlY3QtcmF0aW8n IENTUyBwcm9wZXJ0eSB0byB0aGUgbmV3IFN0eWxlQnVpbGRlciBieQorICAgICAgICB1c2luZyBj dXN0b20gY29kZS4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGJlaGF2aW9yIGNoYW5nZS4K KworICAgICAgICAqIGNzcy9DU1NQcm9wZXJ0eU5hbWVzLmluOgorICAgICAgICAqIGNzcy9EZXBy ZWNhdGVkU3R5bGVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRlcHJlY2F0ZWRTdHls ZUJ1aWxkZXI6OkRlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIpOgorICAgICAgICAoV2ViQ29yZTo6QXBw bHlQcm9wZXJ0eUFzcGVjdFJhdGlvOjphcHBseUluaGVyaXRWYWx1ZSk6IERlbGV0ZWQuCisgICAg ICAgIChXZWJDb3JlOjpBcHBseVByb3BlcnR5QXNwZWN0UmF0aW86OmFwcGx5SW5pdGlhbFZhbHVl KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5UHJvcGVydHlBc3BlY3RSYXRpbzo6 YXBwbHlWYWx1ZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpBcHBseVByb3BlcnR5QXNw ZWN0UmF0aW86OmNyZWF0ZUhhbmRsZXIpOiBEZWxldGVkLgorICAgICAgICAqIGNzcy9TdHlsZUJ1 aWxkZXJDdXN0b20uaDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlQnVpbGRlckN1c3RvbTo6YXBw bHlJbml0aWFsV2Via2l0QXNwZWN0UmF0aW8pOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVCdWls ZGVyQ3VzdG9tOjphcHBseUluaGVyaXRXZWJraXRBc3BlY3RSYXRpbyk6CisgICAgICAgIChXZWJD b3JlOjpTdHlsZUJ1aWxkZXJDdXN0b206OmFwcGx5VmFsdWVXZWJraXRBc3BlY3RSYXRpbyk6CisK IDIwMTQtMTItMDMgIEpvb25naHVuIFBhcmsgIDxqaDcxOC5wYXJrQHNhbXN1bmcuY29tPgogCiAg ICAgICAgIFVzZSBzdGQ6OnVuaXF1ZV9wdHIgaW5zdGVhZCBvZiBQYXNzT3duUHRyfE93blB0ciBm b3IgUGFzdGVib2FyZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5 TmFtZXMuaW4gYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHlOYW1lcy5pbgppbmRleCA3 MDE5NzYyODJkM2RjODBjYjUyOTE2YWQzOWY5ODdkYmJkNTM3YWE4Li5hYWY5ZGNlZWVlZGIyYjVm ZGM3OGUxZDM1ODA5NzcwNGNhNDljNWM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTUHJvcGVydHlOYW1lcy5pbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHlO YW1lcy5pbgpAQCAtMjg2LDcgKzI4Niw3IEBAIGFsdCBbTGVnYWN5U3R5bGVCdWlsZGVyXQogLXdl YmtpdC1hbmltYXRpb24tcGxheS1zdGF0ZSBbTGVnYWN5U3R5bGVCdWlsZGVyXQogLXdlYmtpdC1h bmltYXRpb24tdGltaW5nLWZ1bmN0aW9uIFtMZWdhY3lTdHlsZUJ1aWxkZXJdCiAtd2Via2l0LWFw cGVhcmFuY2UgW1R5cGVOYW1lPUNvbnRyb2xQYXJ0XQotLXdlYmtpdC1hc3BlY3QtcmF0aW8gW0lu aGVyaXRlZCwgTGVnYWN5U3R5bGVCdWlsZGVyXQorLXdlYmtpdC1hc3BlY3QtcmF0aW8gW0luaGVy aXRlZCwgQ3VzdG9tPUFsbF0KIC13ZWJraXQtYmFja2ZhY2UtdmlzaWJpbGl0eQogLXdlYmtpdC1i YWNrZ3JvdW5kLWNsaXAgW0xlZ2FjeVN0eWxlQnVpbGRlcl0KIC13ZWJraXQtYmFja2dyb3VuZC1j b21wb3NpdGUgW0xlZ2FjeVN0eWxlQnVpbGRlcl0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2Nzcy9EZXByZWNhdGVkU3R5bGVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9EZXBy ZWNhdGVkU3R5bGVCdWlsZGVyLmNwcAppbmRleCAwNTRmNTJkOWJhZWEwNzAyY2UxNjUyMDAyZmEz YTJiN2FiYjRkNmNjLi40ZTQ2YWExODBiODg4MzBjNmYxMTJkMDQwMGIzMmJmYTNjYzQ5NjA2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvRGVwcmVjYXRlZFN0eWxlQnVpbGRlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0RlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIuY3BwCkBAIC05 MTksNTQgKzkxOSw2IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgUHJvcGVydHlIYW5kbGVyIGNyZWF0 ZUhhbmRsZXIoKSB7IHJldHVybiBQcm9wZXJ0eUhhbmRsZXIoJmFwcGx5SW5oZXJpdFZhbHVlLCAm YXBwbHlJbml0aWFsVmFsdWUsICZhcHBseVZhbHVlKTsgfQogfTsKIAotY2xhc3MgQXBwbHlQcm9w ZXJ0eUFzcGVjdFJhdGlvIHsKLXB1YmxpYzoKLSAgICBzdGF0aWMgdm9pZCBhcHBseUluaGVyaXRW YWx1ZShDU1NQcm9wZXJ0eUlELCBTdHlsZVJlc29sdmVyKiBzdHlsZVJlc29sdmVyKQotICAgIHsK LSAgICAgICAgaWYgKHN0eWxlUmVzb2x2ZXItPnBhcmVudFN0eWxlKCktPmFzcGVjdFJhdGlvVHlw ZSgpID09IEFzcGVjdFJhdGlvQXV0bykKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgc3R5 bGVSZXNvbHZlci0+c3R5bGUoKS0+c2V0QXNwZWN0UmF0aW9UeXBlKHN0eWxlUmVzb2x2ZXItPnBh cmVudFN0eWxlKCktPmFzcGVjdFJhdGlvVHlwZSgpKTsKLSAgICAgICAgc3R5bGVSZXNvbHZlci0+ c3R5bGUoKS0+c2V0QXNwZWN0UmF0aW9EZW5vbWluYXRvcihzdHlsZVJlc29sdmVyLT5wYXJlbnRT dHlsZSgpLT5hc3BlY3RSYXRpb0Rlbm9taW5hdG9yKCkpOwotICAgICAgICBzdHlsZVJlc29sdmVy LT5zdHlsZSgpLT5zZXRBc3BlY3RSYXRpb051bWVyYXRvcihzdHlsZVJlc29sdmVyLT5wYXJlbnRT dHlsZSgpLT5hc3BlY3RSYXRpb051bWVyYXRvcigpKTsKLSAgICB9Ci0KLSAgICBzdGF0aWMgdm9p ZCBhcHBseUluaXRpYWxWYWx1ZShDU1NQcm9wZXJ0eUlELCBTdHlsZVJlc29sdmVyKiBzdHlsZVJl c29sdmVyKQotICAgIHsKLSAgICAgICAgc3R5bGVSZXNvbHZlci0+c3R5bGUoKS0+c2V0QXNwZWN0 UmF0aW9UeXBlKFJlbmRlclN0eWxlOjppbml0aWFsQXNwZWN0UmF0aW9UeXBlKCkpOwotICAgICAg ICBzdHlsZVJlc29sdmVyLT5zdHlsZSgpLT5zZXRBc3BlY3RSYXRpb0Rlbm9taW5hdG9yKFJlbmRl clN0eWxlOjppbml0aWFsQXNwZWN0UmF0aW9EZW5vbWluYXRvcigpKTsKLSAgICAgICAgc3R5bGVS ZXNvbHZlci0+c3R5bGUoKS0+c2V0QXNwZWN0UmF0aW9OdW1lcmF0b3IoUmVuZGVyU3R5bGU6Omlu aXRpYWxBc3BlY3RSYXRpb051bWVyYXRvcigpKTsKLSAgICB9Ci0KLSAgICBzdGF0aWMgdm9pZCBh cHBseVZhbHVlKENTU1Byb3BlcnR5SUQsIFN0eWxlUmVzb2x2ZXIqIHN0eWxlUmVzb2x2ZXIsIENT U1ZhbHVlKiB2YWx1ZSkKLSAgICB7Ci0gICAgICAgIGlmIChpczxDU1NQcmltaXRpdmVWYWx1ZT4o KnZhbHVlKSkgewotICAgICAgICAgICAgQ1NTUHJpbWl0aXZlVmFsdWUmIHByaW1pdGl2ZVZhbHVl ID0gZG93bmNhc3Q8Q1NTUHJpbWl0aXZlVmFsdWU+KCp2YWx1ZSk7Ci0KLSAgICAgICAgICAgIGlm IChwcmltaXRpdmVWYWx1ZS5nZXRWYWx1ZUlEKCkgPT0gQ1NTVmFsdWVBdXRvKQotICAgICAgICAg ICAgICAgIHJldHVybiBzdHlsZVJlc29sdmVyLT5zdHlsZSgpLT5zZXRBc3BlY3RSYXRpb1R5cGUo QXNwZWN0UmF0aW9BdXRvKTsKLSAgICAgICAgICAgIGlmIChwcmltaXRpdmVWYWx1ZS5nZXRWYWx1 ZUlEKCkgPT0gQ1NTVmFsdWVGcm9tRGltZW5zaW9ucykKLSAgICAgICAgICAgICAgICByZXR1cm4g c3R5bGVSZXNvbHZlci0+c3R5bGUoKS0+c2V0QXNwZWN0UmF0aW9UeXBlKEFzcGVjdFJhdGlvRnJv bURpbWVuc2lvbnMpOwotICAgICAgICAgICAgaWYgKHByaW1pdGl2ZVZhbHVlLmdldFZhbHVlSUQo KSA9PSBDU1NWYWx1ZUZyb21JbnRyaW5zaWMpCi0gICAgICAgICAgICAgICAgcmV0dXJuIHN0eWxl UmVzb2x2ZXItPnN0eWxlKCktPnNldEFzcGVjdFJhdGlvVHlwZShBc3BlY3RSYXRpb0Zyb21JbnRy aW5zaWMpOwotICAgICAgICB9Ci0KLSAgICAgICAgaWYgKCFpczxDU1NBc3BlY3RSYXRpb1ZhbHVl PigqdmFsdWUpKSB7Ci0gICAgICAgICAgICBzdHlsZVJlc29sdmVyLT5zdHlsZSgpLT5zZXRBc3Bl Y3RSYXRpb1R5cGUoQXNwZWN0UmF0aW9BdXRvKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAg ICAgfQotCi0gICAgICAgIENTU0FzcGVjdFJhdGlvVmFsdWUmIGFzcGVjdFJhdGlvVmFsdWUgPSBk b3duY2FzdDxDU1NBc3BlY3RSYXRpb1ZhbHVlPigqdmFsdWUpOwotICAgICAgICBzdHlsZVJlc29s dmVyLT5zdHlsZSgpLT5zZXRBc3BlY3RSYXRpb1R5cGUoQXNwZWN0UmF0aW9TcGVjaWZpZWQpOwot ICAgICAgICBzdHlsZVJlc29sdmVyLT5zdHlsZSgpLT5zZXRBc3BlY3RSYXRpb0Rlbm9taW5hdG9y KGFzcGVjdFJhdGlvVmFsdWUuZGVub21pbmF0b3JWYWx1ZSgpKTsKLSAgICAgICAgc3R5bGVSZXNv bHZlci0+c3R5bGUoKS0+c2V0QXNwZWN0UmF0aW9OdW1lcmF0b3IoYXNwZWN0UmF0aW9WYWx1ZS5u dW1lcmF0b3JWYWx1ZSgpKTsKLSAgICB9Ci0KLSAgICBzdGF0aWMgUHJvcGVydHlIYW5kbGVyIGNy ZWF0ZUhhbmRsZXIoKQotICAgIHsKLSAgICAgICAgcmV0dXJuIFByb3BlcnR5SGFuZGxlcigmYXBw bHlJbmhlcml0VmFsdWUsICZhcHBseUluaXRpYWxWYWx1ZSwgJmFwcGx5VmFsdWUpOwotICAgIH0K LX07Ci0KIGNvbnN0IERlcHJlY2F0ZWRTdHlsZUJ1aWxkZXImIERlcHJlY2F0ZWRTdHlsZUJ1aWxk ZXI6OnNoYXJlZFN0eWxlQnVpbGRlcigpCiB7CiAgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPERl cHJlY2F0ZWRTdHlsZUJ1aWxkZXI+IHN0eWxlQnVpbGRlckluc3RhbmNlOwpAQCAtMTAyNiw3ICs5 NzgsNiBAQCBEZXByZWNhdGVkU3R5bGVCdWlsZGVyOjpEZXByZWNhdGVkU3R5bGVCdWlsZGVyKCkK ICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRBbmltYXRpb25OYW1lLCBB cHBseVByb3BlcnR5QW5pbWF0aW9uPGNvbnN0IFN0cmluZyYsICZBbmltYXRpb246Om5hbWUsICZB bmltYXRpb246OnNldE5hbWUsICZBbmltYXRpb246OmlzTmFtZVNldCwgJkFuaW1hdGlvbjo6Y2xl YXJOYW1lLCAmQW5pbWF0aW9uOjppbml0aWFsQW5pbWF0aW9uTmFtZSwgJkNTU1RvU3R5bGVNYXA6 Om1hcEFuaW1hdGlvbk5hbWUsICZSZW5kZXJTdHlsZTo6YWNjZXNzQW5pbWF0aW9ucywgJlJlbmRl clN0eWxlOjphbmltYXRpb25zPjo6Y3JlYXRlSGFuZGxlcigpKTsKICAgICBzZXRQcm9wZXJ0eUhh bmRsZXIoQ1NTUHJvcGVydHlXZWJraXRBbmltYXRpb25QbGF5U3RhdGUsIEFwcGx5UHJvcGVydHlB bmltYXRpb248RUFuaW1QbGF5U3RhdGUsICZBbmltYXRpb246OnBsYXlTdGF0ZSwgJkFuaW1hdGlv bjo6c2V0UGxheVN0YXRlLCAmQW5pbWF0aW9uOjppc1BsYXlTdGF0ZVNldCwgJkFuaW1hdGlvbjo6 Y2xlYXJQbGF5U3RhdGUsICZBbmltYXRpb246OmluaXRpYWxBbmltYXRpb25QbGF5U3RhdGUsICZD U1NUb1N0eWxlTWFwOjptYXBBbmltYXRpb25QbGF5U3RhdGUsICZSZW5kZXJTdHlsZTo6YWNjZXNz QW5pbWF0aW9ucywgJlJlbmRlclN0eWxlOjphbmltYXRpb25zPjo6Y3JlYXRlSGFuZGxlcigpKTsK ICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRBbmltYXRpb25UaW1pbmdG dW5jdGlvbiwgQXBwbHlQcm9wZXJ0eUFuaW1hdGlvbjxjb25zdCBQYXNzUmVmUHRyPFRpbWluZ0Z1 bmN0aW9uPiwgJkFuaW1hdGlvbjo6dGltaW5nRnVuY3Rpb24sICZBbmltYXRpb246OnNldFRpbWlu Z0Z1bmN0aW9uLCAmQW5pbWF0aW9uOjppc1RpbWluZ0Z1bmN0aW9uU2V0LCAmQW5pbWF0aW9uOjpj bGVhclRpbWluZ0Z1bmN0aW9uLCAmQW5pbWF0aW9uOjppbml0aWFsQW5pbWF0aW9uVGltaW5nRnVu Y3Rpb24sICZDU1NUb1N0eWxlTWFwOjptYXBBbmltYXRpb25UaW1pbmdGdW5jdGlvbiwgJlJlbmRl clN0eWxlOjphY2Nlc3NBbmltYXRpb25zLCAmUmVuZGVyU3R5bGU6OmFuaW1hdGlvbnM+OjpjcmVh dGVIYW5kbGVyKCkpOwotICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtpdEFz cGVjdFJhdGlvLCBBcHBseVByb3BlcnR5QXNwZWN0UmF0aW86OmNyZWF0ZUhhbmRsZXIoKSk7CiAg ICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0QmFja2dyb3VuZENsaXAsIENT U1Byb3BlcnR5QmFja2dyb3VuZENsaXApOwogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9w ZXJ0eVdlYmtpdEJhY2tncm91bmRDb21wb3NpdGUsIEFwcGx5UHJvcGVydHlGaWxsTGF5ZXI8Q29t cG9zaXRlT3BlcmF0b3IsIENTU1Byb3BlcnR5V2Via2l0QmFja2dyb3VuZENvbXBvc2l0ZSwgQmFj a2dyb3VuZEZpbGxMYXllciwgJlJlbmRlclN0eWxlOjphY2Nlc3NCYWNrZ3JvdW5kTGF5ZXJzLCAm UmVuZGVyU3R5bGU6OmJhY2tncm91bmRMYXllcnMsICZGaWxsTGF5ZXI6OmlzQ29tcG9zaXRlU2V0 LCAmRmlsbExheWVyOjpjb21wb3NpdGUsICZGaWxsTGF5ZXI6OnNldENvbXBvc2l0ZSwgJkZpbGxM YXllcjo6Y2xlYXJDb21wb3NpdGUsICZGaWxsTGF5ZXI6OmluaXRpYWxGaWxsQ29tcG9zaXRlLCAm Q1NTVG9TdHlsZU1hcDo6bWFwRmlsbENvbXBvc2l0ZT46OmNyZWF0ZUhhbmRsZXIoKSk7CiAgICAg c2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0QmFja2dyb3VuZE9yaWdpbiwgQ1NT UHJvcGVydHlCYWNrZ3JvdW5kT3JpZ2luKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nz cy9TdHlsZUJ1aWxkZXJDdXN0b20uaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJD dXN0b20uaAppbmRleCAzMDk5ZGNkZjJiZjViZTZiZDMxYzgyZmU4MzI0MTEzNmVkYjg1MjQyLi41 NzAxZTc5NmY1ZGVjNWUzZjkyMDc3N2RhMzg1ZWEyYzc0MzE0YTAwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyQ3VzdG9tLmgKKysrIGIvU291cmNlL1dlYkNvcmUv Y3NzL1N0eWxlQnVpbGRlckN1c3RvbS5oCkBAIC0yOCw2ICsyOCw3IEBACiAjZGVmaW5lIFN0eWxl QnVpbGRlckN1c3RvbV9oCiAKICNpbmNsdWRlICJCYXNpY1NoYXBlRnVuY3Rpb25zLmgiCisjaW5j bHVkZSAiQ1NTQXNwZWN0UmF0aW9WYWx1ZS5oIgogI2luY2x1ZGUgIkNTU0ltYWdlR2VuZXJhdG9y VmFsdWUuaCIKICNpbmNsdWRlICJDU1NJbWFnZVNldFZhbHVlLmgiCiAjaW5jbHVkZSAiQ1NTSW1h Z2VWYWx1ZS5oIgpAQCAtMTI1LDYgKzEyNiwxMCBAQCBwdWJsaWM6CiAgICAgc3RhdGljIHZvaWQg YXBwbHlJbmhlcml0RGlzcGxheShTdHlsZVJlc29sdmVyJik7CiAgICAgc3RhdGljIHZvaWQgYXBw bHlWYWx1ZURpc3BsYXkoU3R5bGVSZXNvbHZlciYsIENTU1ZhbHVlJik7CiAKKyAgICBzdGF0aWMg dm9pZCBhcHBseUluaXRpYWxXZWJraXRBc3BlY3RSYXRpbyhTdHlsZVJlc29sdmVyJik7CisgICAg c3RhdGljIHZvaWQgYXBwbHlJbmhlcml0V2Via2l0QXNwZWN0UmF0aW8oU3R5bGVSZXNvbHZlciYp OworICAgIHN0YXRpYyB2b2lkIGFwcGx5VmFsdWVXZWJraXRBc3BlY3RSYXRpbyhTdHlsZVJlc29s dmVyJiwgQ1NTVmFsdWUmKTsKKwogcHJpdmF0ZToKICAgICBzdGF0aWMgdm9pZCByZXNldEVmZmVj dGl2ZVpvb20oU3R5bGVSZXNvbHZlciYpOwogICAgIHN0YXRpYyBDU1NUb0xlbmd0aENvbnZlcnNp b25EYXRhIGNzc3RvTGVuZ3RoQ29udmVyc2lvbkRhdGFXaXRoVGV4dFpvb21GYWN0b3IoU3R5bGVS ZXNvbHZlciYpOwpAQCAtMTAwNSw2ICsxMDEwLDQyIEBAIGlubGluZSB2b2lkIFN0eWxlQnVpbGRl ckN1c3RvbTo6YXBwbHlWYWx1ZURpc3BsYXkoU3R5bGVSZXNvbHZlciYgc3R5bGVSZXNvbHZlciwK ICAgICAgICAgc3R5bGVSZXNvbHZlci5zdHlsZSgpLT5zZXREaXNwbGF5KGRpc3BsYXkpOwogfQog CitpbmxpbmUgdm9pZCBTdHlsZUJ1aWxkZXJDdXN0b206OmFwcGx5SW5pdGlhbFdlYmtpdEFzcGVj dFJhdGlvKFN0eWxlUmVzb2x2ZXImIHN0eWxlUmVzb2x2ZXIpCit7CisgICAgc3R5bGVSZXNvbHZl ci5zdHlsZSgpLT5zZXRBc3BlY3RSYXRpb1R5cGUoUmVuZGVyU3R5bGU6OmluaXRpYWxBc3BlY3RS YXRpb1R5cGUoKSk7CisgICAgc3R5bGVSZXNvbHZlci5zdHlsZSgpLT5zZXRBc3BlY3RSYXRpb0Rl bm9taW5hdG9yKFJlbmRlclN0eWxlOjppbml0aWFsQXNwZWN0UmF0aW9EZW5vbWluYXRvcigpKTsK KyAgICBzdHlsZVJlc29sdmVyLnN0eWxlKCktPnNldEFzcGVjdFJhdGlvTnVtZXJhdG9yKFJlbmRl clN0eWxlOjppbml0aWFsQXNwZWN0UmF0aW9OdW1lcmF0b3IoKSk7Cit9CisKK2lubGluZSB2b2lk IFN0eWxlQnVpbGRlckN1c3RvbTo6YXBwbHlJbmhlcml0V2Via2l0QXNwZWN0UmF0aW8oU3R5bGVS ZXNvbHZlciYgc3R5bGVSZXNvbHZlcikKK3sKKyAgICBpZiAoc3R5bGVSZXNvbHZlci5wYXJlbnRT dHlsZSgpLT5hc3BlY3RSYXRpb1R5cGUoKSA9PSBBc3BlY3RSYXRpb0F1dG8pCisgICAgICAgIHJl dHVybjsKKyAgICBzdHlsZVJlc29sdmVyLnN0eWxlKCktPnNldEFzcGVjdFJhdGlvVHlwZShzdHls ZVJlc29sdmVyLnBhcmVudFN0eWxlKCktPmFzcGVjdFJhdGlvVHlwZSgpKTsKKyAgICBzdHlsZVJl c29sdmVyLnN0eWxlKCktPnNldEFzcGVjdFJhdGlvRGVub21pbmF0b3Ioc3R5bGVSZXNvbHZlci5w YXJlbnRTdHlsZSgpLT5hc3BlY3RSYXRpb0Rlbm9taW5hdG9yKCkpOworICAgIHN0eWxlUmVzb2x2 ZXIuc3R5bGUoKS0+c2V0QXNwZWN0UmF0aW9OdW1lcmF0b3Ioc3R5bGVSZXNvbHZlci5wYXJlbnRT dHlsZSgpLT5hc3BlY3RSYXRpb051bWVyYXRvcigpKTsKK30KKworaW5saW5lIHZvaWQgU3R5bGVC dWlsZGVyQ3VzdG9tOjphcHBseVZhbHVlV2Via2l0QXNwZWN0UmF0aW8oU3R5bGVSZXNvbHZlciYg c3R5bGVSZXNvbHZlciwgQ1NTVmFsdWUmIHZhbHVlKQoreworICAgIGlmIChpczxDU1NQcmltaXRp dmVWYWx1ZT4odmFsdWUpKSB7CisgICAgICAgIGF1dG8mIHByaW1pdGl2ZVZhbHVlID0gZG93bmNh c3Q8Q1NTUHJpbWl0aXZlVmFsdWU+KHZhbHVlKTsKKworICAgICAgICBpZiAocHJpbWl0aXZlVmFs dWUuZ2V0VmFsdWVJRCgpID09IENTU1ZhbHVlRnJvbURpbWVuc2lvbnMpCisgICAgICAgICAgICBy ZXR1cm4gc3R5bGVSZXNvbHZlci5zdHlsZSgpLT5zZXRBc3BlY3RSYXRpb1R5cGUoQXNwZWN0UmF0 aW9Gcm9tRGltZW5zaW9ucyk7CisgICAgICAgIGlmIChwcmltaXRpdmVWYWx1ZS5nZXRWYWx1ZUlE KCkgPT0gQ1NTVmFsdWVGcm9tSW50cmluc2ljKQorICAgICAgICAgICAgcmV0dXJuIHN0eWxlUmVz b2x2ZXIuc3R5bGUoKS0+c2V0QXNwZWN0UmF0aW9UeXBlKEFzcGVjdFJhdGlvRnJvbUludHJpbnNp Yyk7CisKKyAgICAgICAgQVNTRVJUKHByaW1pdGl2ZVZhbHVlLmdldFZhbHVlSUQoKSA9PSBDU1NW YWx1ZUF1dG8pOworICAgICAgICByZXR1cm4gc3R5bGVSZXNvbHZlci5zdHlsZSgpLT5zZXRBc3Bl Y3RSYXRpb1R5cGUoQXNwZWN0UmF0aW9BdXRvKTsKKyAgICB9CisKKyAgICBhdXRvJiBhc3BlY3RS YXRpb1ZhbHVlID0gZG93bmNhc3Q8Q1NTQXNwZWN0UmF0aW9WYWx1ZT4odmFsdWUpOworICAgIHN0 eWxlUmVzb2x2ZXIuc3R5bGUoKS0+c2V0QXNwZWN0UmF0aW9UeXBlKEFzcGVjdFJhdGlvU3BlY2lm aWVkKTsKKyAgICBzdHlsZVJlc29sdmVyLnN0eWxlKCktPnNldEFzcGVjdFJhdGlvRGVub21pbmF0 b3IoYXNwZWN0UmF0aW9WYWx1ZS5kZW5vbWluYXRvclZhbHVlKCkpOworICAgIHN0eWxlUmVzb2x2 ZXIuc3R5bGUoKS0+c2V0QXNwZWN0UmF0aW9OdW1lcmF0b3IoYXNwZWN0UmF0aW9WYWx1ZS5udW1l cmF0b3JWYWx1ZSgpKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCiAjZW5kaWYgLy8g U3R5bGVCdWlsZGVyQ3VzdG9tX2gK