138715 2014-11-13 15:48:41 -0800 Move 'image-resolution' CSS property to the new StyleBuilder 2014-11-13 18:16:23 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 137910 1 cdumez cdumez commit-queue oldest_to_newest 1048539 0 cdumez 2014-11-13 15:48:41 -0800 Move 'image-resolution' CSS property to the new StyleBuilder 1048546 1 241516 cdumez 2014-11-13 16:17:57 -0800 Created attachment 241516 Patch 1048548 2 241516 kling 2014-11-13 16:20:51 -0800 Comment on attachment 241516 Patch r=me 1048591 3 241516 commit-queue 2014-11-13 18:16:18 -0800 Comment on attachment 241516 Patch Clearing flags on attachment: 241516 Committed r176111: <http://trac.webkit.org/changeset/176111> 1048592 4 commit-queue 2014-11-13 18:16:23 -0800 All reviewed patches have been landed. Closing bug. 241516 2014-11-13 16:17:57 -0800 2014-11-13 18:16:18 -0800 Patch bug-138715-20141113161803.patch text/plain 9126 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2MDk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzRjMWU1YTM2OGM4ODlj NDQzOTU3NmY4YzViOTkxYTk1ODIyZDc0NS4uZDRiYWUwOWEzYjIzN2Q4MDhiNzdiMTY2M2U2MTI1 ZWVhN2Y0YTZmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE0LTExLTEzICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTW92ZSAnaW1hZ2UtcmVzb2x1 dGlvbicgQ1NTIHByb3BlcnR5IHRvIHRoZSBuZXcgU3R5bGVCdWlsZGVyCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzg3MTUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlICdpbWFnZS1yZXNvbHV0aW9u JyBDU1MgcHJvcGVydHkgZnJvbSBEZXByZWNhdGVkU3R5bGVCdWlsZGVyIHRvCisgICAgICAgIHRo ZSBuZXcgU3R5bGVCdWlsZGVyIGJ5IHVzaW5nIGN1c3RvbSBjb2RlLgorCisgICAgICAgIE5vIG5l dyB0ZXN0cywgbm8gYmVoYXZpb3IgY2hhbmdlLgorCisgICAgICAgICogY3NzL0NTU1Byb3BlcnR5 TmFtZXMuaW46CisgICAgICAgICogY3NzL0RlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6RGVwcmVjYXRlZFN0eWxlQnVpbGRlcjo6RGVwcmVjYXRlZFN0eWxlQnVp bGRlcik6CisgICAgICAgIChXZWJDb3JlOjpBcHBseVByb3BlcnR5SW1hZ2VSZXNvbHV0aW9uOjph cHBseUluaGVyaXRWYWx1ZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpBcHBseVByb3Bl cnR5SW1hZ2VSZXNvbHV0aW9uOjphcHBseUluaXRpYWxWYWx1ZSk6IERlbGV0ZWQuCisgICAgICAg IChXZWJDb3JlOjpBcHBseVByb3BlcnR5SW1hZ2VSZXNvbHV0aW9uOjphcHBseVZhbHVlKTogRGVs ZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5UHJvcGVydHlJbWFnZVJlc29sdXRpb246OmNy ZWF0ZUhhbmRsZXIpOiBEZWxldGVkLgorICAgICAgICAqIGNzcy9TdHlsZUJ1aWxkZXJDdXN0b20u aDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlQnVpbGRlckZ1bmN0aW9uczo6YXBwbHlJbmhlcml0 SW1hZ2VSZXNvbHV0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlQnVpbGRlckZ1bmN0aW9u czo6YXBwbHlJbml0aWFsSW1hZ2VSZXNvbHV0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxl QnVpbGRlckZ1bmN0aW9uczo6YXBwbHlWYWx1ZUltYWdlUmVzb2x1dGlvbik6CisKIDIwMTQtMTEt MTMgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgW1dL Ml0gRmlyZSBhIGxheW91dCBtaWxlc3RvbmUgb24gc2Vzc2lvbiByZXN0b3JlIGJhc2VkIG9uIHJl bmRlciB0cmVlIHNpemUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0 eU5hbWVzLmluIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5TmFtZXMuaW4KaW5kZXgg Y2M3NDAzYmRkOWQyZmI4ODBmNjA2OWMyMGVkMTU3MmJjMjI0M2ZjZi4uZDgzMTg2NGE2ZDg1Y2Fk YjU1YzFjMzg0YTJjNGUwNzIxMjRkZGNkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3Nz L0NTU1Byb3BlcnR5TmFtZXMuaW4KKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5 TmFtZXMuaW4KQEAgLTE3Miw3ICsxNzIsNyBAQCBpbWFnZS1vcmllbnRhdGlvbiBbSW5oZXJpdGVk LCBOZXdTdHlsZUJ1aWxkZXIsIFR5cGVOYW1lPUltYWdlT3JpZW50YXRpb25FbnVtXQogI2VuZGlm CiBpbWFnZS1yZW5kZXJpbmcgW0luaGVyaXRlZCwgTmV3U3R5bGVCdWlsZGVyXQogI2lmIGRlZmlu ZWQoRU5BQkxFX0NTU19JTUFHRV9SRVNPTFVUSU9OKSAmJiBFTkFCTEVfQ1NTX0lNQUdFX1JFU09M VVRJT04KLWltYWdlLXJlc29sdXRpb24gW0luaGVyaXRlZF0KK2ltYWdlLXJlc29sdXRpb24gW0lu aGVyaXRlZCwgTmV3U3R5bGVCdWlsZGVyLCBDdXN0b209QWxsXQogI2VuZGlmCiBsZWZ0IFtOZXdT dHlsZUJ1aWxkZXIsIEluaXRpYWw9aW5pdGlhbE9mZnNldCwgQ29udmVydGVyPUxlbmd0aE9yQXV0 b10KIGxldHRlci1zcGFjaW5nIFtJbmhlcml0ZWQsIE5ld1N0eWxlQnVpbGRlciwgQ29udmVydGVy PVNwYWNpbmddCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvRGVwcmVjYXRlZFN0eWxl QnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvRGVwcmVjYXRlZFN0eWxlQnVpbGRlci5j cHAKaW5kZXggZTQzYzcxZDBiZTNlOTM5NDY0N2JiNGE2M2Y2MWMzOTE3MzZhMTdlMi4uMzcyZWRi MWNjNWFkODQyODZmOGM3ZTdiNDIyNTIyZTYzYWQyZGQxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvY3NzL0RlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2Nzcy9EZXByZWNhdGVkU3R5bGVCdWlsZGVyLmNwcApAQCAtMTM4OCw1NSArMTM4OCw2IEBAIHB1 YmxpYzoKICAgICB9CiB9OwogCi0jaWYgRU5BQkxFKENTU19JTUFHRV9SRVNPTFVUSU9OKQotY2xh c3MgQXBwbHlQcm9wZXJ0eUltYWdlUmVzb2x1dGlvbiB7Ci1wdWJsaWM6Ci0gICAgc3RhdGljIHZv aWQgYXBwbHlJbmhlcml0VmFsdWUoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eUlELCBTdHlsZVJlc29s dmVyKiBzdHlsZVJlc29sdmVyKQotICAgIHsKLSAgICAgICAgQXBwbHlQcm9wZXJ0eURlZmF1bHRC YXNlPEltYWdlUmVzb2x1dGlvblNvdXJjZSwgJlJlbmRlclN0eWxlOjppbWFnZVJlc29sdXRpb25T b3VyY2UsIEltYWdlUmVzb2x1dGlvblNvdXJjZSwgJlJlbmRlclN0eWxlOjpzZXRJbWFnZVJlc29s dXRpb25Tb3VyY2UsIEltYWdlUmVzb2x1dGlvblNvdXJjZSwgJlJlbmRlclN0eWxlOjppbml0aWFs SW1hZ2VSZXNvbHV0aW9uU291cmNlPjo6YXBwbHlJbmhlcml0VmFsdWUocHJvcGVydHlJRCwgc3R5 bGVSZXNvbHZlcik7Ci0gICAgICAgIEFwcGx5UHJvcGVydHlEZWZhdWx0QmFzZTxJbWFnZVJlc29s dXRpb25TbmFwLCAmUmVuZGVyU3R5bGU6OmltYWdlUmVzb2x1dGlvblNuYXAsIEltYWdlUmVzb2x1 dGlvblNuYXAsICZSZW5kZXJTdHlsZTo6c2V0SW1hZ2VSZXNvbHV0aW9uU25hcCwgSW1hZ2VSZXNv bHV0aW9uU25hcCwgJlJlbmRlclN0eWxlOjppbml0aWFsSW1hZ2VSZXNvbHV0aW9uU25hcD46OmFw cGx5SW5oZXJpdFZhbHVlKHByb3BlcnR5SUQsIHN0eWxlUmVzb2x2ZXIpOwotICAgICAgICBBcHBs eVByb3BlcnR5RGVmYXVsdEJhc2U8ZmxvYXQsICZSZW5kZXJTdHlsZTo6aW1hZ2VSZXNvbHV0aW9u LCBmbG9hdCwgJlJlbmRlclN0eWxlOjpzZXRJbWFnZVJlc29sdXRpb24sIGZsb2F0LCAmUmVuZGVy U3R5bGU6OmluaXRpYWxJbWFnZVJlc29sdXRpb24+OjphcHBseUluaGVyaXRWYWx1ZShwcm9wZXJ0 eUlELCBzdHlsZVJlc29sdmVyKTsKLSAgICB9Ci0KLSAgICBzdGF0aWMgdm9pZCBhcHBseUluaXRp YWxWYWx1ZShDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SUQsIFN0eWxlUmVzb2x2ZXIqIHN0eWxlUmVz b2x2ZXIpCi0gICAgewotICAgICAgICBBcHBseVByb3BlcnR5RGVmYXVsdEJhc2U8SW1hZ2VSZXNv bHV0aW9uU291cmNlLCAmUmVuZGVyU3R5bGU6OmltYWdlUmVzb2x1dGlvblNvdXJjZSwgSW1hZ2VS ZXNvbHV0aW9uU291cmNlLCAmUmVuZGVyU3R5bGU6OnNldEltYWdlUmVzb2x1dGlvblNvdXJjZSwg SW1hZ2VSZXNvbHV0aW9uU291cmNlLCAmUmVuZGVyU3R5bGU6OmluaXRpYWxJbWFnZVJlc29sdXRp b25Tb3VyY2U+OjphcHBseUluaXRpYWxWYWx1ZShwcm9wZXJ0eUlELCBzdHlsZVJlc29sdmVyKTsK LSAgICAgICAgQXBwbHlQcm9wZXJ0eURlZmF1bHRCYXNlPEltYWdlUmVzb2x1dGlvblNuYXAsICZS ZW5kZXJTdHlsZTo6aW1hZ2VSZXNvbHV0aW9uU25hcCwgSW1hZ2VSZXNvbHV0aW9uU25hcCwgJlJl bmRlclN0eWxlOjpzZXRJbWFnZVJlc29sdXRpb25TbmFwLCBJbWFnZVJlc29sdXRpb25TbmFwLCAm UmVuZGVyU3R5bGU6OmluaXRpYWxJbWFnZVJlc29sdXRpb25TbmFwPjo6YXBwbHlJbml0aWFsVmFs dWUocHJvcGVydHlJRCwgc3R5bGVSZXNvbHZlcik7Ci0gICAgICAgIEFwcGx5UHJvcGVydHlEZWZh dWx0QmFzZTxmbG9hdCwgJlJlbmRlclN0eWxlOjppbWFnZVJlc29sdXRpb24sIGZsb2F0LCAmUmVu ZGVyU3R5bGU6OnNldEltYWdlUmVzb2x1dGlvbiwgZmxvYXQsICZSZW5kZXJTdHlsZTo6aW5pdGlh bEltYWdlUmVzb2x1dGlvbj46OmFwcGx5SW5pdGlhbFZhbHVlKHByb3BlcnR5SUQsIHN0eWxlUmVz b2x2ZXIpOwotICAgIH0KLQotICAgIHN0YXRpYyB2b2lkIGFwcGx5VmFsdWUoQ1NTUHJvcGVydHlJ RCwgU3R5bGVSZXNvbHZlciogc3R5bGVSZXNvbHZlciwgQ1NTVmFsdWUqIHZhbHVlKQotICAgIHsK LSAgICAgICAgaWYgKCFpczxDU1NWYWx1ZUxpc3Q+KCp2YWx1ZSkpCi0gICAgICAgICAgICByZXR1 cm47Ci0gICAgICAgIENTU1ZhbHVlTGlzdCYgdmFsdWVMaXN0ID0gZG93bmNhc3Q8Q1NTVmFsdWVM aXN0PigqdmFsdWUpOwotICAgICAgICBJbWFnZVJlc29sdXRpb25Tb3VyY2Ugc291cmNlID0gUmVu ZGVyU3R5bGU6OmluaXRpYWxJbWFnZVJlc29sdXRpb25Tb3VyY2UoKTsKLSAgICAgICAgSW1hZ2VS ZXNvbHV0aW9uU25hcCBzbmFwID0gUmVuZGVyU3R5bGU6OmluaXRpYWxJbWFnZVJlc29sdXRpb25T bmFwKCk7Ci0gICAgICAgIGRvdWJsZSByZXNvbHV0aW9uID0gUmVuZGVyU3R5bGU6OmluaXRpYWxJ bWFnZVJlc29sdXRpb24oKTsKLSAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCB2YWx1ZUxp c3QubGVuZ3RoKCk7ICsraSkgewotICAgICAgICAgICAgQ1NTVmFsdWUmIGl0ZW0gPSAqdmFsdWVM aXN0Lml0ZW1XaXRob3V0Qm91bmRzQ2hlY2soaSk7Ci0gICAgICAgICAgICBpZiAoIWlzPENTU1By aW1pdGl2ZVZhbHVlPihpdGVtKSkKLSAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAg ICAgIENTU1ByaW1pdGl2ZVZhbHVlJiBwcmltaXRpdmVWYWx1ZSA9IGRvd25jYXN0PENTU1ByaW1p dGl2ZVZhbHVlPihpdGVtKTsKLSAgICAgICAgICAgIGlmIChwcmltaXRpdmVWYWx1ZS5nZXRWYWx1 ZUlEKCkgPT0gQ1NTVmFsdWVGcm9tSW1hZ2UpCi0gICAgICAgICAgICAgICAgc291cmNlID0gSW1h Z2VSZXNvbHV0aW9uRnJvbUltYWdlOwotICAgICAgICAgICAgZWxzZSBpZiAocHJpbWl0aXZlVmFs dWUuZ2V0VmFsdWVJRCgpID09IENTU1ZhbHVlU25hcCkKLSAgICAgICAgICAgICAgICBzbmFwID0g SW1hZ2VSZXNvbHV0aW9uU25hcFBpeGVsczsKLSAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAg ICAgICByZXNvbHV0aW9uID0gcHJpbWl0aXZlVmFsdWUuZ2V0RG91YmxlVmFsdWUoQ1NTUHJpbWl0 aXZlVmFsdWU6OkNTU19EUFBYKTsKLSAgICAgICAgfQotICAgICAgICBzdHlsZVJlc29sdmVyLT5z dHlsZSgpLT5zZXRJbWFnZVJlc29sdXRpb25Tb3VyY2Uoc291cmNlKTsKLSAgICAgICAgc3R5bGVS ZXNvbHZlci0+c3R5bGUoKS0+c2V0SW1hZ2VSZXNvbHV0aW9uU25hcChzbmFwKTsKLSAgICAgICAg c3R5bGVSZXNvbHZlci0+c3R5bGUoKS0+c2V0SW1hZ2VSZXNvbHV0aW9uKHJlc29sdXRpb24pOwot ICAgIH0KLQotICAgIHN0YXRpYyBQcm9wZXJ0eUhhbmRsZXIgY3JlYXRlSGFuZGxlcigpCi0gICAg ewotICAgICAgICByZXR1cm4gUHJvcGVydHlIYW5kbGVyKCZhcHBseUluaGVyaXRWYWx1ZSwgJmFw cGx5SW5pdGlhbFZhbHVlLCAmYXBwbHlWYWx1ZSk7Ci0gICAgfQotfTsKLSNlbmRpZgotCiBjb25z dCBEZXByZWNhdGVkU3R5bGVCdWlsZGVyJiBEZXByZWNhdGVkU3R5bGVCdWlsZGVyOjpzaGFyZWRT dHlsZUJ1aWxkZXIoKQogewogICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxEZXByZWNhdGVkU3R5 bGVCdWlsZGVyPiBzdHlsZUJ1aWxkZXJJbnN0YW5jZTsKQEAgLTE0NzUsOSArMTQyNiw2IEBAIERl cHJlY2F0ZWRTdHlsZUJ1aWxkZXI6OkRlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIoKQogICAgIHNldFBy b3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eUZvbnRTdHlsZSwgQXBwbHlQcm9wZXJ0eUZvbnQ8Rm9u dEl0YWxpYywgJkZvbnREZXNjcmlwdGlvbjo6aXRhbGljLCAmRm9udERlc2NyaXB0aW9uOjpzZXRJ dGFsaWMsIEZvbnRJdGFsaWNPZmY+OjpjcmVhdGVIYW5kbGVyKCkpOwogICAgIHNldFByb3BlcnR5 SGFuZGxlcihDU1NQcm9wZXJ0eUZvbnRWYXJpYW50LCBBcHBseVByb3BlcnR5Rm9udDxGb250U21h bGxDYXBzLCAmRm9udERlc2NyaXB0aW9uOjpzbWFsbENhcHMsICZGb250RGVzY3JpcHRpb246OnNl dFNtYWxsQ2FwcywgRm9udFNtYWxsQ2Fwc09mZj46OmNyZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0 UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5Rm9udFdlaWdodCwgQXBwbHlQcm9wZXJ0eUZvbnRX ZWlnaHQ6OmNyZWF0ZUhhbmRsZXIoKSk7Ci0jaWYgRU5BQkxFKENTU19JTUFHRV9SRVNPTFVUSU9O KQotICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eUltYWdlUmVzb2x1dGlvbiwgQXBw bHlQcm9wZXJ0eUltYWdlUmVzb2x1dGlvbjo6Y3JlYXRlSGFuZGxlcigpKTsKLSNlbmRpZgogI2lm IEVOQUJMRShJT1NfVEVYVF9BVVRPU0laSU5HKQogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQ cm9wZXJ0eUxpbmVIZWlnaHQsIEFwcGx5UHJvcGVydHlMaW5lSGVpZ2h0Rm9ySU9TVGV4dEF1dG9z aXppbmc6OmNyZWF0ZUhhbmRsZXIoKSk7CiAjZWxzZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvY3NzL1N0eWxlQnVpbGRlckN1c3RvbS5oIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVp bGRlckN1c3RvbS5oCmluZGV4IDEzMGM0OGVjZDA0MzAzNjkzODA5ODFmMzI5MGRjZTdhNWU1NjVl YzUuLjIxMDhjMzZhYmIxNDA5OTgyZmYzYjI5MTVhZTcyYzUxMWQzNWVjOTUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJDdXN0b20uaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9jc3MvU3R5bGVCdWlsZGVyQ3VzdG9tLmgKQEAgLTIzMyw2ICsyMzMsNDEgQEAgc3RhdGlj IGJvb2wgZ2V0UGFnZVNpemVGcm9tTmFtZShDU1NQcmltaXRpdmVWYWx1ZSogcGFnZVNpemVOYW1l LCBDU1NQcmltaXRpdmVWYWwKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAorI2lmIEVOQUJMRShDU1Nf SU1BR0VfUkVTT0xVVElPTikKK2lubGluZSB2b2lkIGFwcGx5SW5oZXJpdEltYWdlUmVzb2x1dGlv bihTdHlsZVJlc29sdmVyJiBzdHlsZVJlc29sdmVyKQoreworICAgIHN0eWxlUmVzb2x2ZXIuc3R5 bGUoKS0+c2V0SW1hZ2VSZXNvbHV0aW9uU291cmNlKHN0eWxlUmVzb2x2ZXIucGFyZW50U3R5bGUo KS0+aW1hZ2VSZXNvbHV0aW9uU291cmNlKCkpOworICAgIHN0eWxlUmVzb2x2ZXIuc3R5bGUoKS0+ c2V0SW1hZ2VSZXNvbHV0aW9uU25hcChzdHlsZVJlc29sdmVyLnBhcmVudFN0eWxlKCktPmltYWdl UmVzb2x1dGlvblNuYXAoKSk7CisgICAgc3R5bGVSZXNvbHZlci5zdHlsZSgpLT5zZXRJbWFnZVJl c29sdXRpb24oc3R5bGVSZXNvbHZlci5wYXJlbnRTdHlsZSgpLT5pbWFnZVJlc29sdXRpb24oKSk7 Cit9CisKK2lubGluZSB2b2lkIGFwcGx5SW5pdGlhbEltYWdlUmVzb2x1dGlvbihTdHlsZVJlc29s dmVyJiBzdHlsZVJlc29sdmVyKQoreworICAgIHN0eWxlUmVzb2x2ZXIuc3R5bGUoKS0+c2V0SW1h Z2VSZXNvbHV0aW9uU291cmNlKFJlbmRlclN0eWxlOjppbml0aWFsSW1hZ2VSZXNvbHV0aW9uU291 cmNlKCkpOworICAgIHN0eWxlUmVzb2x2ZXIuc3R5bGUoKS0+c2V0SW1hZ2VSZXNvbHV0aW9uU25h cChSZW5kZXJTdHlsZTo6aW5pdGlhbEltYWdlUmVzb2x1dGlvblNuYXAoKSk7CisgICAgc3R5bGVS ZXNvbHZlci5zdHlsZSgpLT5zZXRJbWFnZVJlc29sdXRpb24oUmVuZGVyU3R5bGU6OmluaXRpYWxJ bWFnZVJlc29sdXRpb24oKSk7Cit9CisKK2lubGluZSB2b2lkIGFwcGx5VmFsdWVJbWFnZVJlc29s dXRpb24oU3R5bGVSZXNvbHZlciYgc3R5bGVSZXNvbHZlciwgQ1NTVmFsdWUmIHZhbHVlKQorewor ICAgIEltYWdlUmVzb2x1dGlvblNvdXJjZSBzb3VyY2UgPSBSZW5kZXJTdHlsZTo6aW5pdGlhbElt YWdlUmVzb2x1dGlvblNvdXJjZSgpOworICAgIEltYWdlUmVzb2x1dGlvblNuYXAgc25hcCA9IFJl bmRlclN0eWxlOjppbml0aWFsSW1hZ2VSZXNvbHV0aW9uU25hcCgpOworICAgIGRvdWJsZSByZXNv bHV0aW9uID0gUmVuZGVyU3R5bGU6OmluaXRpYWxJbWFnZVJlc29sdXRpb24oKTsKKyAgICBmb3Ig KGF1dG8mIGl0ZW0gOiBkb3duY2FzdDxDU1NWYWx1ZUxpc3Q+KHZhbHVlKSkgeworICAgICAgICBD U1NQcmltaXRpdmVWYWx1ZSYgcHJpbWl0aXZlVmFsdWUgPSBkb3duY2FzdDxDU1NQcmltaXRpdmVW YWx1ZT4oaXRlbS5nZXQoKSk7CisgICAgICAgIGlmIChwcmltaXRpdmVWYWx1ZS5nZXRWYWx1ZUlE KCkgPT0gQ1NTVmFsdWVGcm9tSW1hZ2UpCisgICAgICAgICAgICBzb3VyY2UgPSBJbWFnZVJlc29s dXRpb25Gcm9tSW1hZ2U7CisgICAgICAgIGVsc2UgaWYgKHByaW1pdGl2ZVZhbHVlLmdldFZhbHVl SUQoKSA9PSBDU1NWYWx1ZVNuYXApCisgICAgICAgICAgICBzbmFwID0gSW1hZ2VSZXNvbHV0aW9u U25hcFBpeGVsczsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgcmVzb2x1dGlvbiA9IHByaW1p dGl2ZVZhbHVlLmdldERvdWJsZVZhbHVlKENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfRFBQWCk7Cisg ICAgfQorICAgIHN0eWxlUmVzb2x2ZXIuc3R5bGUoKS0+c2V0SW1hZ2VSZXNvbHV0aW9uU291cmNl KHNvdXJjZSk7CisgICAgc3R5bGVSZXNvbHZlci5zdHlsZSgpLT5zZXRJbWFnZVJlc29sdXRpb25T bmFwKHNuYXApOworICAgIHN0eWxlUmVzb2x2ZXIuc3R5bGUoKS0+c2V0SW1hZ2VSZXNvbHV0aW9u KHJlc29sdXRpb24pOworfQorI2VuZGlmIC8vIEVOQUJMRShDU1NfSU1BR0VfUkVTT0xVVElPTikK KwogaW5saW5lIHZvaWQgYXBwbHlJbmhlcml0U2l6ZShTdHlsZVJlc29sdmVyJikgeyB9CiBpbmxp bmUgdm9pZCBhcHBseUluaXRpYWxTaXplKFN0eWxlUmVzb2x2ZXImKSB7IH0KIGlubGluZSB2b2lk IGFwcGx5VmFsdWVTaXplKFN0eWxlUmVzb2x2ZXImIHN0eWxlUmVzb2x2ZXIsIENTU1ZhbHVlJiB2 YWx1ZSkK