86424 2012-05-14 18:48:48 -0700 Make StyleResolver::applyMatchedProperties and ::applyProperties use enum template parameter instead of bool. 2012-05-15 22:28:00 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 85580 1 macpherson macpherson dglazkov kling macpherson menard webkit.review.bot oldest_to_newest 623551 0 macpherson 2012-05-14 18:48:48 -0700 Make StyleResolver::applyMatchedProperties and ::applyProperties use enum template parameter instead of bool. 623557 1 141838 macpherson 2012-05-14 18:55:44 -0700 Created attachment 141838 Patch 623691 2 141838 webkit.review.bot 2012-05-14 23:35:42 -0700 Comment on attachment 141838 Patch Clearing flags on attachment: 141838 Committed r117034: <http://trac.webkit.org/changeset/117034> 623692 3 webkit.review.bot 2012-05-14 23:35:47 -0700 All reviewed patches have been landed. Closing bug. 141838 2012-05-14 18:55:44 -0700 2012-05-14 23:35:42 -0700 Patch bug-86424-20120515115541.patch text/plain 11240 macpherson U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3MDIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGJlMzExNjkyODEzZTM0 MjEzZjdjYzgzZDYyNWRmMDQxZDdiN2JhMS4uOWYyODlkYTNlZTViMmUzNjk2NWY4NjdmYmQ5MzNk MDRhOTVjZTQwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA1LTE0ICBMdWtl IE1hY3BoZXJzb24gIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBNYWtlIFN0 eWxlUmVzb2x2ZXI6OmFwcGx5TWF0Y2hlZFByb3BlcnRpZXMgYW5kIDo6YXBwbHlQcm9wZXJ0aWVz IHVzZSBlbnVtIHRlbXBsYXRlIHBhcmFtZXRlciBpbnN0ZWFkIG9mIGJvb2wuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NjQyNAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggY2hhbmdlcyBm cm9tIHVzaW5nIGEgYm9vbGVhbiB0ZW1wbGF0ZSBwYXJhbWV0ZXIgZm9yIFN0eWxlUmVzb2x2ZXI6 OmFwcGx5TWF0Y2hlZFByb3BlcnRpZXMgYW5kCisgICAgICAgIFN0eWxlUmVzb2x2ZXI6OmFwcGx5 UHJvcGVydGllcyBmdW5jdGlvbnMuIFRoZSBtb3RpdmF0aW9uIGZvciB0aGlzIGNoYW5nZSBpcyB0 aGF0IGl0IHBhdmVzIHRoZSB3YXkgZm9yCisgICAgICAgIENTUyBWYXJpYWJsZXMgdG8gbWFrZSB0 aGUgdmFsdWUgdHJpLXN0YXRlLCB3aGljaCBpcyBhIHJlcXVpcmVtZW50IGJlY2F1c2UgdmFyaWFi bGUgZGVmaW5pdGlvbnMgbXVzdCBvY2N1cgorICAgICAgICBiZWZvcmUgaGlnaCBwcmlvcml0eSBD U1MgcHJvcGVydGllcyBzdWNoIHRoYXQgdGhleSBjYW4gYmUgcmVmZXJlbmNlZCBieSB0aGUgbGF0 dGVyLiBUaGlzIGNoYW5nZSBhZmZlY3RzCisgICAgICAgIG9ubHkgdGhlIHR5cGUgc2lnbmF0dXJl cyBvZiB0aG9zZSBmdW5jdGlvbnMsIGFuZCBub3QgdGhlaXIgYmVoYXZpb3IuCisKKyAgICAgICAg KiBjc3MvU3R5bGVSZXNvbHZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVJlc29sdmVy Ojpjb2xsZWN0TWF0Y2hpbmdSdWxlc0Zvckxpc3QpOgorICAgICAgICAqIGNzcy9TdHlsZVJlc29s dmVyLmg6CisKIDIwMTItMDUtMTQgIEFuZHkgRXN0ZXMgIDxhZXN0ZXNAYXBwbGUuY29tPgogCiAg ICAgICAgIEZpeCBSdW5Mb29wQ0YuY3BwJ3MgY29weXJpZ2h0IHN0cmluZy4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nz cy9TdHlsZVJlc29sdmVyLmNwcAppbmRleCA0NmQ4ZTVkNDVjYjA1OTZhOGQwNzY3N2E3N2Q3YjIy ODc5MDJjODdkLi44YjViZGIzZDZhNTc0OTdiNzkwMTU1ZWQ1MTc1NjBjNmIwOWRhMjFhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwCkBAIC0xNjkyLDcgKzE2OTIsNyBAQCBQYXNz UmVmUHRyPFJlbmRlclN0eWxlPiBTdHlsZVJlc29sdmVyOjpzdHlsZUZvcktleWZyYW1lKGNvbnN0 IFJlbmRlclN0eWxlKiBlbGVtZQogICAgIC8vIGRlY2wsIHRoZXJlJ3Mgbm90aGluZyB0byBvdmVy cmlkZS4gU28ganVzdCBhZGQgdGhlIGZpcnN0IHByb3BlcnRpZXMuCiAgICAgYm9vbCBpbmhlcml0 ZWRPbmx5ID0gZmFsc2U7CiAgICAgaWYgKGtleWZyYW1lLT5wcm9wZXJ0aWVzKCkpCi0gICAgICAg IGFwcGx5TWF0Y2hlZFByb3BlcnRpZXM8dHJ1ZT4ocmVzdWx0LCBmYWxzZSwgMCwgcmVzdWx0Lm1h dGNoZWRQcm9wZXJ0aWVzLnNpemUoKSAtIDEsIGluaGVyaXRlZE9ubHkpOworICAgICAgICBhcHBs eU1hdGNoZWRQcm9wZXJ0aWVzPEhpZ2hQcmlvcml0eVByb3BlcnRpZXM+KHJlc3VsdCwgZmFsc2Us IDAsIHJlc3VsdC5tYXRjaGVkUHJvcGVydGllcy5zaXplKCkgLSAxLCBpbmhlcml0ZWRPbmx5KTsK IAogICAgIC8vIElmIG91ciBmb250IGdvdCBkaXJ0aWVkLCBnbyBhaGVhZCBhbmQgdXBkYXRlIGl0 IG5vdy4KICAgICB1cGRhdGVGb250KCk7CkBAIC0xNzAzLDcgKzE3MDMsNyBAQCBQYXNzUmVmUHRy PFJlbmRlclN0eWxlPiBTdHlsZVJlc29sdmVyOjpzdHlsZUZvcktleWZyYW1lKGNvbnN0IFJlbmRl clN0eWxlKiBlbGVtZQogCiAgICAgLy8gTm93IGRvIHJlc3Qgb2YgdGhlIHByb3BlcnRpZXMuCiAg ICAgaWYgKGtleWZyYW1lLT5wcm9wZXJ0aWVzKCkpCi0gICAgICAgIGFwcGx5TWF0Y2hlZFByb3Bl cnRpZXM8ZmFsc2U+KHJlc3VsdCwgZmFsc2UsIDAsIHJlc3VsdC5tYXRjaGVkUHJvcGVydGllcy5z aXplKCkgLSAxLCBpbmhlcml0ZWRPbmx5KTsKKyAgICAgICAgYXBwbHlNYXRjaGVkUHJvcGVydGll czxMb3dQcmlvcml0eVByb3BlcnRpZXM+KHJlc3VsdCwgZmFsc2UsIDAsIHJlc3VsdC5tYXRjaGVk UHJvcGVydGllcy5zaXplKCkgLSAxLCBpbmhlcml0ZWRPbmx5KTsKIAogICAgIC8vIElmIG91ciBm b250IGdvdCBkaXJ0aWVkIGJ5IG9uZSBvZiB0aGUgbm9uLWVzc2VudGlhbCBmb250IHByb3BzLAog ICAgIC8vIGdvIGFoZWFkIGFuZCB1cGRhdGUgaXQgYSBzZWNvbmQgdGltZS4KQEAgLTE4NjAsNyAr MTg2MCw3IEBAIFBhc3NSZWZQdHI8UmVuZGVyU3R5bGU+IFN0eWxlUmVzb2x2ZXI6OnN0eWxlRm9y UGFnZShpbnQgcGFnZUluZGV4KQogICAgIG1hdGNoUGFnZVJ1bGVzKHJlc3VsdCwgbV9hdXRob3JT dHlsZS5nZXQoKSwgaXNMZWZ0LCBpc0ZpcnN0LCBwYWdlKTsKICAgICBtX2xpbmVIZWlnaHRWYWx1 ZSA9IDA7CiAgICAgYm9vbCBpbmhlcml0ZWRPbmx5ID0gZmFsc2U7Ci0gICAgYXBwbHlNYXRjaGVk UHJvcGVydGllczx0cnVlPihyZXN1bHQsIGZhbHNlLCAwLCByZXN1bHQubWF0Y2hlZFByb3BlcnRp ZXMuc2l6ZSgpIC0gMSwgaW5oZXJpdGVkT25seSk7CisgICAgYXBwbHlNYXRjaGVkUHJvcGVydGll czxIaWdoUHJpb3JpdHlQcm9wZXJ0aWVzPihyZXN1bHQsIGZhbHNlLCAwLCByZXN1bHQubWF0Y2hl ZFByb3BlcnRpZXMuc2l6ZSgpIC0gMSwgaW5oZXJpdGVkT25seSk7CiAKICAgICAvLyBJZiBvdXIg Zm9udCBnb3QgZGlydGllZCwgZ28gYWhlYWQgYW5kIHVwZGF0ZSBpdCBub3cuCiAgICAgdXBkYXRl Rm9udCgpOwpAQCAtMTg2OSw3ICsxODY5LDcgQEAgUGFzc1JlZlB0cjxSZW5kZXJTdHlsZT4gU3R5 bGVSZXNvbHZlcjo6c3R5bGVGb3JQYWdlKGludCBwYWdlSW5kZXgpCiAgICAgaWYgKG1fbGluZUhl aWdodFZhbHVlKQogICAgICAgICBhcHBseVByb3BlcnR5KENTU1Byb3BlcnR5TGluZUhlaWdodCwg bV9saW5lSGVpZ2h0VmFsdWUpOwogCi0gICAgYXBwbHlNYXRjaGVkUHJvcGVydGllczxmYWxzZT4o cmVzdWx0LCBmYWxzZSwgMCwgcmVzdWx0Lm1hdGNoZWRQcm9wZXJ0aWVzLnNpemUoKSAtIDEsIGlu aGVyaXRlZE9ubHkpOworICAgIGFwcGx5TWF0Y2hlZFByb3BlcnRpZXM8TG93UHJpb3JpdHlQcm9w ZXJ0aWVzPihyZXN1bHQsIGZhbHNlLCAwLCByZXN1bHQubWF0Y2hlZFByb3BlcnRpZXMuc2l6ZSgp IC0gMSwgaW5oZXJpdGVkT25seSk7CiAKICAgICAvLyBTdGFydCBsb2FkaW5nIGltYWdlcyByZWZl cmVuY2VkIGJ5IHRoaXMgc3R5bGUuCiAgICAgbG9hZFBlbmRpbmdJbWFnZXMoKTsKQEAgLTI2MjYs NyArMjYyNiw3IEBAIExlbmd0aCBTdHlsZVJlc29sdmVyOjpjb252ZXJ0VG9GbG9hdExlbmd0aChD U1NQcmltaXRpdmVWYWx1ZSogcHJpbWl0aXZlVmFsdWUsIFJlCiAgICAgcmV0dXJuIHByaW1pdGl2 ZVZhbHVlID8gcHJpbWl0aXZlVmFsdWUtPmNvbnZlcnRUb0xlbmd0aDxGaXhlZEZsb2F0Q29udmVy c2lvbiB8IFBlcmNlbnRDb252ZXJzaW9uIHwgRnJhY3Rpb25Db252ZXJzaW9uIHwgVmlld3BvcnRQ ZXJjZW50YWdlQ29udmVyc2lvbj4oc3R5bGUsIHJvb3RTdHlsZSwgbXVsdGlwbGllcikgOiBMZW5n dGgoVW5kZWZpbmVkKTsKIH0KIAotdGVtcGxhdGUgPGJvb2wgYXBwbHlGaXJzdD4KK3RlbXBsYXRl IDxTdHlsZVJlc29sdmVyOjpTdHlsZUFwcGxpY2F0aW9uUGFzcyBwYXNzPgogdm9pZCBTdHlsZVJl c29sdmVyOjphcHBseVByb3BlcnRpZXMoY29uc3QgU3R5bGVQcm9wZXJ0eVNldCogcHJvcGVydGll cywgU3R5bGVSdWxlKiBydWxlLCBib29sIGlzSW1wb3J0YW50LCBib29sIGluaGVyaXRlZE9ubHks IGJvb2wgZmlsdGVyUmVnaW9uUHJvcGVydGllcykKIHsKICAgICBBU1NFUlQoIWZpbHRlclJlZ2lv blByb3BlcnRpZXMgfHwgbV9yZWdpb25Gb3JTdHlsaW5nKTsKQEAgLTI2NDksNyArMjY0OSw3IEBA IHZvaWQgU3R5bGVSZXNvbHZlcjo6YXBwbHlQcm9wZXJ0aWVzKGNvbnN0IFN0eWxlUHJvcGVydHlT ZXQqIHByb3BlcnRpZXMsIFN0eWxlUnVsCiAgICAgICAgIGlmIChmaWx0ZXJSZWdpb25Qcm9wZXJ0 aWVzICYmICFTdHlsZVJlc29sdmVyOjppc1ZhbGlkUmVnaW9uU3R5bGVQcm9wZXJ0eShwcm9wZXJ0 eSkpCiAgICAgICAgICAgICBjb250aW51ZTsKIAotICAgICAgICBpZiAoYXBwbHlGaXJzdCkgewor ICAgICAgICBpZiAocGFzcyA9PSBIaWdoUHJpb3JpdHlQcm9wZXJ0aWVzKSB7CiAgICAgICAgICAg ICBDT01QSUxFX0FTU0VSVChmaXJzdENTU1Byb3BlcnR5ID09IENTU1Byb3BlcnR5Q29sb3IsIENT U19jb2xvcl9pc19maXJzdF9wcm9wZXJ0eSk7CiAgICAgICAgICAgICBDT01QSUxFX0FTU0VSVChD U1NQcm9wZXJ0eVpvb20gPT0gQ1NTUHJvcGVydHlDb2xvciArIDE4LCBDU1Nfem9vbV9pc19lbmRf b2ZfZmlyc3RfcHJvcF9yYW5nZSk7CiAgICAgICAgICAgICBDT01QSUxFX0FTU0VSVChDU1NQcm9w ZXJ0eUxpbmVIZWlnaHQgPT0gQ1NTUHJvcGVydHlab29tICsgMSwgQ1NTX2xpbmVfaGVpZ2h0X2lz X2FmdGVyX3pvb20pOwpAQCAtMjY3MCw3ICsyNjcwLDcgQEAgdm9pZCBTdHlsZVJlc29sdmVyOjph cHBseVByb3BlcnRpZXMoY29uc3QgU3R5bGVQcm9wZXJ0eVNldCogcHJvcGVydGllcywgU3R5bGVS dWwKICAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZFByb2Nlc3NSdWxlKGNvb2tpZSk7 CiB9CiAKLXRlbXBsYXRlIDxib29sIGFwcGx5Rmlyc3Q+Cit0ZW1wbGF0ZSA8U3R5bGVSZXNvbHZl cjo6U3R5bGVBcHBsaWNhdGlvblBhc3MgcGFzcz4KIHZvaWQgU3R5bGVSZXNvbHZlcjo6YXBwbHlN YXRjaGVkUHJvcGVydGllcyhjb25zdCBNYXRjaFJlc3VsdCYgbWF0Y2hSZXN1bHQsIGJvb2wgaXNJ bXBvcnRhbnQsIGludCBzdGFydEluZGV4LCBpbnQgZW5kSW5kZXgsIGJvb2wgaW5oZXJpdGVkT25s eSkKIHsKICAgICBpZiAoc3RhcnRJbmRleCA9PSAtMSkKQEAgLTI2ODQsNyArMjY4NCw3IEBAIHZv aWQgU3R5bGVSZXNvbHZlcjo6YXBwbHlNYXRjaGVkUHJvcGVydGllcyhjb25zdCBNYXRjaFJlc3Vs dCYgbWF0Y2hSZXN1bHQsIGJvb2wKICAgICAgICAgICAgIG1fYXBwbHlQcm9wZXJ0eVRvUmVndWxh clN0eWxlID0gbGlua01hdGNoVHlwZSAmIFNlbGVjdG9yQ2hlY2tlcjo6TWF0Y2hMaW5rOwogICAg ICAgICAgICAgbV9hcHBseVByb3BlcnR5VG9WaXNpdGVkTGlua1N0eWxlID0gbGlua01hdGNoVHlw ZSAmIFNlbGVjdG9yQ2hlY2tlcjo6TWF0Y2hWaXNpdGVkOwogCi0gICAgICAgICAgICBhcHBseVBy b3BlcnRpZXM8YXBwbHlGaXJzdD4obWF0Y2hlZFByb3BlcnRpZXMucHJvcGVydGllcy5nZXQoKSwg bWF0Y2hSZXN1bHQubWF0Y2hlZFJ1bGVzW2ldLCBpc0ltcG9ydGFudCwgaW5oZXJpdGVkT25seSwg bWF0Y2hlZFByb3BlcnRpZXMuaXNJblJlZ2lvblJ1bGUpOworICAgICAgICAgICAgYXBwbHlQcm9w ZXJ0aWVzPHBhc3M+KG1hdGNoZWRQcm9wZXJ0aWVzLnByb3BlcnRpZXMuZ2V0KCksIG1hdGNoUmVz dWx0Lm1hdGNoZWRSdWxlc1tpXSwgaXNJbXBvcnRhbnQsIGluaGVyaXRlZE9ubHksIG1hdGNoZWRQ cm9wZXJ0aWVzLmlzSW5SZWdpb25SdWxlKTsKICAgICAgICAgfQogICAgICAgICBtX2FwcGx5UHJv cGVydHlUb1JlZ3VsYXJTdHlsZSA9IHRydWU7CiAgICAgICAgIG1fYXBwbHlQcm9wZXJ0eVRvVmlz aXRlZExpbmtTdHlsZSA9IGZhbHNlOwpAQCAtMjY5Miw3ICsyNjkyLDcgQEAgdm9pZCBTdHlsZVJl c29sdmVyOjphcHBseU1hdGNoZWRQcm9wZXJ0aWVzKGNvbnN0IE1hdGNoUmVzdWx0JiBtYXRjaFJl c3VsdCwgYm9vbAogICAgIH0KICAgICBmb3IgKGludCBpID0gc3RhcnRJbmRleDsgaSA8PSBlbmRJ bmRleDsgKytpKSB7CiAgICAgICAgIGNvbnN0IE1hdGNoZWRQcm9wZXJ0aWVzJiBtYXRjaGVkUHJv cGVydGllcyA9IG1hdGNoUmVzdWx0Lm1hdGNoZWRQcm9wZXJ0aWVzW2ldOwotICAgICAgICBhcHBs eVByb3BlcnRpZXM8YXBwbHlGaXJzdD4obWF0Y2hlZFByb3BlcnRpZXMucHJvcGVydGllcy5nZXQo KSwgbWF0Y2hSZXN1bHQubWF0Y2hlZFJ1bGVzW2ldLCBpc0ltcG9ydGFudCwgaW5oZXJpdGVkT25s eSwgbWF0Y2hlZFByb3BlcnRpZXMuaXNJblJlZ2lvblJ1bGUpOworICAgICAgICBhcHBseVByb3Bl cnRpZXM8cGFzcz4obWF0Y2hlZFByb3BlcnRpZXMucHJvcGVydGllcy5nZXQoKSwgbWF0Y2hSZXN1 bHQubWF0Y2hlZFJ1bGVzW2ldLCBpc0ltcG9ydGFudCwgaW5oZXJpdGVkT25seSwgbWF0Y2hlZFBy b3BlcnRpZXMuaXNJblJlZ2lvblJ1bGUpOwogICAgIH0KIH0KIApAQCAtMjgxNSwxMCArMjgxNSwx MCBAQCB2b2lkIFN0eWxlUmVzb2x2ZXI6OmFwcGx5TWF0Y2hlZFByb3BlcnRpZXMoY29uc3QgTWF0 Y2hSZXN1bHQmIG1hdGNoUmVzdWx0KQogICAgIC8vIFRoZSBvcmRlciBpcyAoMSkgaGlnaC1wcmlv cml0eSBub3QgaW1wb3J0YW50LCAoMikgaGlnaC1wcmlvcml0eSBpbXBvcnRhbnQsICgzKSBub3Jt YWwgbm90IGltcG9ydGFudAogICAgIC8vIGFuZCAoNCkgbm9ybWFsIGltcG9ydGFudC4KICAgICBt X2xpbmVIZWlnaHRWYWx1ZSA9IDA7Ci0gICAgYXBwbHlNYXRjaGVkUHJvcGVydGllczx0cnVlPiht YXRjaFJlc3VsdCwgZmFsc2UsIDAsIG1hdGNoUmVzdWx0Lm1hdGNoZWRQcm9wZXJ0aWVzLnNpemUo KSAtIDEsIGFwcGx5SW5oZXJpdGVkT25seSk7Ci0gICAgYXBwbHlNYXRjaGVkUHJvcGVydGllczx0 cnVlPihtYXRjaFJlc3VsdCwgdHJ1ZSwgbWF0Y2hSZXN1bHQucmFuZ2VzLmZpcnN0QXV0aG9yUnVs ZSwgbWF0Y2hSZXN1bHQucmFuZ2VzLmxhc3RBdXRob3JSdWxlLCBhcHBseUluaGVyaXRlZE9ubHkp OwotICAgIGFwcGx5TWF0Y2hlZFByb3BlcnRpZXM8dHJ1ZT4obWF0Y2hSZXN1bHQsIHRydWUsIG1h dGNoUmVzdWx0LnJhbmdlcy5maXJzdFVzZXJSdWxlLCBtYXRjaFJlc3VsdC5yYW5nZXMubGFzdFVz ZXJSdWxlLCBhcHBseUluaGVyaXRlZE9ubHkpOwotICAgIGFwcGx5TWF0Y2hlZFByb3BlcnRpZXM8 dHJ1ZT4obWF0Y2hSZXN1bHQsIHRydWUsIG1hdGNoUmVzdWx0LnJhbmdlcy5maXJzdFVBUnVsZSwg bWF0Y2hSZXN1bHQucmFuZ2VzLmxhc3RVQVJ1bGUsIGFwcGx5SW5oZXJpdGVkT25seSk7CisgICAg YXBwbHlNYXRjaGVkUHJvcGVydGllczxIaWdoUHJpb3JpdHlQcm9wZXJ0aWVzPihtYXRjaFJlc3Vs dCwgZmFsc2UsIDAsIG1hdGNoUmVzdWx0Lm1hdGNoZWRQcm9wZXJ0aWVzLnNpemUoKSAtIDEsIGFw cGx5SW5oZXJpdGVkT25seSk7CisgICAgYXBwbHlNYXRjaGVkUHJvcGVydGllczxIaWdoUHJpb3Jp dHlQcm9wZXJ0aWVzPihtYXRjaFJlc3VsdCwgdHJ1ZSwgbWF0Y2hSZXN1bHQucmFuZ2VzLmZpcnN0 QXV0aG9yUnVsZSwgbWF0Y2hSZXN1bHQucmFuZ2VzLmxhc3RBdXRob3JSdWxlLCBhcHBseUluaGVy aXRlZE9ubHkpOworICAgIGFwcGx5TWF0Y2hlZFByb3BlcnRpZXM8SGlnaFByaW9yaXR5UHJvcGVy dGllcz4obWF0Y2hSZXN1bHQsIHRydWUsIG1hdGNoUmVzdWx0LnJhbmdlcy5maXJzdFVzZXJSdWxl LCBtYXRjaFJlc3VsdC5yYW5nZXMubGFzdFVzZXJSdWxlLCBhcHBseUluaGVyaXRlZE9ubHkpOwor ICAgIGFwcGx5TWF0Y2hlZFByb3BlcnRpZXM8SGlnaFByaW9yaXR5UHJvcGVydGllcz4obWF0Y2hS ZXN1bHQsIHRydWUsIG1hdGNoUmVzdWx0LnJhbmdlcy5maXJzdFVBUnVsZSwgbWF0Y2hSZXN1bHQu cmFuZ2VzLmxhc3RVQVJ1bGUsIGFwcGx5SW5oZXJpdGVkT25seSk7CiAKICAgICBpZiAoY2FjaGVJ dGVtICYmIGNhY2hlSXRlbS0+cmVuZGVyU3R5bGUtPmVmZmVjdGl2ZVpvb20oKSAhPSBtX3N0eWxl LT5lZmZlY3RpdmVab29tKCkpIHsKICAgICAgICAgbV9mb250RGlydHkgPSB0cnVlOwpAQCAtMjgz NywxNiArMjgzNywxNiBAQCB2b2lkIFN0eWxlUmVzb2x2ZXI6OmFwcGx5TWF0Y2hlZFByb3BlcnRp ZXMoY29uc3QgTWF0Y2hSZXN1bHQmIG1hdGNoUmVzdWx0KQogICAgICAgICBhcHBseUluaGVyaXRl ZE9ubHkgPSBmYWxzZTsKIAogICAgIC8vIE5vdyBkbyB0aGUgbm9ybWFsIHByaW9yaXR5IFVBIHBy b3BlcnRpZXMuCi0gICAgYXBwbHlNYXRjaGVkUHJvcGVydGllczxmYWxzZT4obWF0Y2hSZXN1bHQs IGZhbHNlLCBtYXRjaFJlc3VsdC5yYW5nZXMuZmlyc3RVQVJ1bGUsIG1hdGNoUmVzdWx0LnJhbmdl cy5sYXN0VUFSdWxlLCBhcHBseUluaGVyaXRlZE9ubHkpOworICAgIGFwcGx5TWF0Y2hlZFByb3Bl cnRpZXM8TG93UHJpb3JpdHlQcm9wZXJ0aWVzPihtYXRjaFJlc3VsdCwgZmFsc2UsIG1hdGNoUmVz dWx0LnJhbmdlcy5maXJzdFVBUnVsZSwgbWF0Y2hSZXN1bHQucmFuZ2VzLmxhc3RVQVJ1bGUsIGFw cGx5SW5oZXJpdGVkT25seSk7CiAgICAgCiAgICAgLy8gQ2FjaGUgb3VyIGJvcmRlciBhbmQgYmFj a2dyb3VuZCBzbyB0aGF0IHdlIGNhbiBleGFtaW5lIHRoZW0gbGF0ZXIuCiAgICAgY2FjaGVCb3Jk ZXJBbmRCYWNrZ3JvdW5kKCk7CiAgICAgCiAgICAgLy8gTm93IGRvIHRoZSBhdXRob3IgYW5kIHVz ZXIgbm9ybWFsIHByaW9yaXR5IHByb3BlcnRpZXMgYW5kIGFsbCB0aGUgIWltcG9ydGFudCBwcm9w ZXJ0aWVzLgotICAgIGFwcGx5TWF0Y2hlZFByb3BlcnRpZXM8ZmFsc2U+KG1hdGNoUmVzdWx0LCBm YWxzZSwgbWF0Y2hSZXN1bHQucmFuZ2VzLmxhc3RVQVJ1bGUgKyAxLCBtYXRjaFJlc3VsdC5tYXRj aGVkUHJvcGVydGllcy5zaXplKCkgLSAxLCBhcHBseUluaGVyaXRlZE9ubHkpOwotICAgIGFwcGx5 TWF0Y2hlZFByb3BlcnRpZXM8ZmFsc2U+KG1hdGNoUmVzdWx0LCB0cnVlLCBtYXRjaFJlc3VsdC5y YW5nZXMuZmlyc3RBdXRob3JSdWxlLCBtYXRjaFJlc3VsdC5yYW5nZXMubGFzdEF1dGhvclJ1bGUs IGFwcGx5SW5oZXJpdGVkT25seSk7Ci0gICAgYXBwbHlNYXRjaGVkUHJvcGVydGllczxmYWxzZT4o bWF0Y2hSZXN1bHQsIHRydWUsIG1hdGNoUmVzdWx0LnJhbmdlcy5maXJzdFVzZXJSdWxlLCBtYXRj aFJlc3VsdC5yYW5nZXMubGFzdFVzZXJSdWxlLCBhcHBseUluaGVyaXRlZE9ubHkpOwotICAgIGFw cGx5TWF0Y2hlZFByb3BlcnRpZXM8ZmFsc2U+KG1hdGNoUmVzdWx0LCB0cnVlLCBtYXRjaFJlc3Vs dC5yYW5nZXMuZmlyc3RVQVJ1bGUsIG1hdGNoUmVzdWx0LnJhbmdlcy5sYXN0VUFSdWxlLCBhcHBs eUluaGVyaXRlZE9ubHkpOworICAgIGFwcGx5TWF0Y2hlZFByb3BlcnRpZXM8TG93UHJpb3JpdHlQ cm9wZXJ0aWVzPihtYXRjaFJlc3VsdCwgZmFsc2UsIG1hdGNoUmVzdWx0LnJhbmdlcy5sYXN0VUFS dWxlICsgMSwgbWF0Y2hSZXN1bHQubWF0Y2hlZFByb3BlcnRpZXMuc2l6ZSgpIC0gMSwgYXBwbHlJ bmhlcml0ZWRPbmx5KTsKKyAgICBhcHBseU1hdGNoZWRQcm9wZXJ0aWVzPExvd1ByaW9yaXR5UHJv cGVydGllcz4obWF0Y2hSZXN1bHQsIHRydWUsIG1hdGNoUmVzdWx0LnJhbmdlcy5maXJzdEF1dGhv clJ1bGUsIG1hdGNoUmVzdWx0LnJhbmdlcy5sYXN0QXV0aG9yUnVsZSwgYXBwbHlJbmhlcml0ZWRP bmx5KTsKKyAgICBhcHBseU1hdGNoZWRQcm9wZXJ0aWVzPExvd1ByaW9yaXR5UHJvcGVydGllcz4o bWF0Y2hSZXN1bHQsIHRydWUsIG1hdGNoUmVzdWx0LnJhbmdlcy5maXJzdFVzZXJSdWxlLCBtYXRj aFJlc3VsdC5yYW5nZXMubGFzdFVzZXJSdWxlLCBhcHBseUluaGVyaXRlZE9ubHkpOworICAgIGFw cGx5TWF0Y2hlZFByb3BlcnRpZXM8TG93UHJpb3JpdHlQcm9wZXJ0aWVzPihtYXRjaFJlc3VsdCwg dHJ1ZSwgbWF0Y2hSZXN1bHQucmFuZ2VzLmZpcnN0VUFSdWxlLCBtYXRjaFJlc3VsdC5yYW5nZXMu bGFzdFVBUnVsZSwgYXBwbHlJbmhlcml0ZWRPbmx5KTsKICAgICAKICAgICBsb2FkUGVuZGluZ0lt YWdlcygpOwogICAgIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2 ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmgKaW5kZXggMmEyNjE0NDhk Y2ZkM2RjYjhlNDEyZWM5ODllMzVjYmRhZTJhYzJkNi4uMzc3YWRkMjliNzBmNzAyY2M5MzBiNGI2 NWU3ODIzZDYxOTExOTBmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVz b2x2ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5oCkBAIC0zNTMs OSArMzUzLDEzIEBAIHByaXZhdGU6CiAgICAgYm9vbCBjaGVja1NlbGVjdG9yKGNvbnN0IFJ1bGVE YXRhJiwgY29uc3QgQ29udGFpbmVyTm9kZSogc2NvcGUgPSAwKTsKICAgICBib29sIGNoZWNrUmVn aW9uU2VsZWN0b3IoQ1NTU2VsZWN0b3IqIHJlZ2lvblNlbGVjdG9yLCBFbGVtZW50KiByZWdpb25F bGVtZW50KTsKICAgICB2b2lkIGFwcGx5TWF0Y2hlZFByb3BlcnRpZXMoY29uc3QgTWF0Y2hSZXN1 bHQmKTsKLSAgICB0ZW1wbGF0ZSA8Ym9vbCBmaXJzdFBhc3M+CisgICAgZW51bSBTdHlsZUFwcGxp Y2F0aW9uUGFzcyB7CisgICAgICAgIEhpZ2hQcmlvcml0eVByb3BlcnRpZXMsCisgICAgICAgIExv d1ByaW9yaXR5UHJvcGVydGllcworICAgIH07CisgICAgdGVtcGxhdGUgPFN0eWxlQXBwbGljYXRp b25QYXNzIHBhc3M+CiAgICAgdm9pZCBhcHBseU1hdGNoZWRQcm9wZXJ0aWVzKGNvbnN0IE1hdGNo UmVzdWx0JiwgYm9vbCBpbXBvcnRhbnQsIGludCBzdGFydEluZGV4LCBpbnQgZW5kSW5kZXgsIGJv b2wgaW5oZXJpdGVkT25seSk7Ci0gICAgdGVtcGxhdGUgPGJvb2wgZmlyc3RQYXNzPgorICAgIHRl bXBsYXRlIDxTdHlsZUFwcGxpY2F0aW9uUGFzcyBwYXNzPgogICAgIHZvaWQgYXBwbHlQcm9wZXJ0 aWVzKGNvbnN0IFN0eWxlUHJvcGVydHlTZXQqIHByb3BlcnRpZXMsIFN0eWxlUnVsZSosIGJvb2wg aXNJbXBvcnRhbnQsIGJvb2wgaW5oZXJpdGVkT25seSwgYm9vbCBmaWx0ZXJSZWdpb25Qcm9wZXJ0 aWVzKTsKIAogICAgIHN0YXRpYyBib29sIGlzVmFsaWRSZWdpb25TdHlsZVByb3BlcnR5KENTU1By b3BlcnR5SUQpOwo=