49960 2010-11-22 22:34:07 -0800 Web Inspector: [STYLES] invalid color values are not marked as such. 2010-11-23 10:32:06 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman apavlov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 312704 0 pfeldman 2010-11-22 22:34:07 -0800 Edit any color: in style and set its value to "red foo bar": color: red foo bar Expected: color value is committed, bogus value is not used when rendering, there is a warning icon next to property Actual: color value is committed, bogus value is not used when rendering, but there is no warning icon is there 312742 1 74638 apavlov 2010-11-23 03:39:01 -0800 Created attachment 74638 [PATCH] Suggested fix 312751 2 74638 pfeldman 2010-11-23 04:17:21 -0800 Comment on attachment 74638 [PATCH] Suggested fix As you noted offline, overrides will make invalid property look parsedOk. 312888 3 74676 apavlov 2010-11-23 09:17:21 -0800 Created attachment 74676 [PATCH] Corrected solution 312901 4 74676 pfeldman 2010-11-23 10:00:06 -0800 Comment on attachment 74676 [PATCH] Corrected solution View in context: https://bugs.webkit.org/attachment.cgi?id=74676&action=review > WebCore/inspector/InspectorStyleSheet.cpp:448 > + bool shouldInactivate = false; Please add following comment here: Parsed property overrides any property with the same name. Non-parsed property overrides previous non-parsed property with the same name. 312913 5 apavlov 2010-11-23 10:31:52 -0800 Committing to http://svn.webkit.org/repository/webkit/trunk ... M LayoutTests/ChangeLog M LayoutTests/inspector/resources/styles-new-API.css M LayoutTests/inspector/styles-new-API-expected.txt M LayoutTests/inspector/styles-source-offsets-expected.txt M WebCore/ChangeLog M WebCore/css/CSSGrammar.y M WebCore/inspector/InspectorStyleSheet.cpp Committed r72615 74638 2010-11-23 03:39:01 -0800 2010-11-23 09:17:21 -0800 [PATCH] Suggested fix badcolor.patch text/plain 4474 apavlov Y29tbWl0IDQxNDI4NmRlZmVkNjQwYjI4YzgxOTU0YzAzMjVmOWZmN2RkNmE0OGUKQXV0aG9yOiBB bGV4YW5kZXIgUGF2bG92IDxhcGF2bG92QGNocm9taXVtLm9yZz4KRGF0ZTogICBUdWUgTm92IDIz IDE0OjA3OjA1IDIwMTAgKzAzMDAKCiAgICBJbnZhbGlkUHJvcGVydHlWYWx1ZXMKCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXgg MThiZmE0MS4uOWFiODc5NyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBi L0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDEwLTExLTIzICBBbGV4 YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogW1NUWUxFU10gaW52 YWxpZCBjb2xvciB2YWx1ZXMgYXJlIG5vdCBtYXJrZWQgYXMgc3VjaC4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ5OTYwCisKKyAgICAgICAgKiBpbnNw ZWN0b3Ivc3R5bGVzLW5ldy1BUEktZXhwZWN0ZWQudHh0OgorCiAyMDEwLTExLTIyICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmlu IEFkbGVyLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy1uZXctQVBJ LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMtbmV3LUFQSS1leHBl Y3RlZC50eHQKaW5kZXggZDY0MjJjYi4uMjgwNzkxMiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv aW5zcGVjdG9yL3N0eWxlcy1uZXctQVBJLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9p bnNwZWN0b3Ivc3R5bGVzLW5ldy1BUEktZXhwZWN0ZWQudHh0CkBAIC0yOSw3ICsyOSw3IEBAIGJv ZHk6IFtdCiBbJ2hlaWdodCc6JzEwMCUgIWltcG9ydGFudCcgaXMtaW1wb3J0YW50XSBAWzEwOS0x MzNdIGFjdGl2ZQogWydjb2xvcnonOiciIWltcG9ydGFudCInIG5vbi1wYXJzZWRdIEBbMTM4LTE1 OV0gYWN0aXZlCiBbJ2ltcG9ydGFudCc6JyFpbXBvcnRhbnQnIG5vbi1wYXJzZWRdIEBbMTY0LTE4 NV0gYWN0aXZlCi1bJ2NvbG9yJzonImJhZGNvbG9yIiAhIGltcG9ydGFudCAvKiBnb29kIHByb3Bl cnR5IHdpdGggc3RyYW5nZSB2YWx1ZSAqLycgaXMtaW1wb3J0YW50XSBAWzE5MC0yNTldIGFjdGl2 ZQorWydjb2xvcic6JyJiYWRjb2xvciIgISBpbXBvcnRhbnQgLyogZ29vZCBwcm9wZXJ0eSB3aXRo IHN0cmFuZ2UgdmFsdWUgKi8nIGlzLWltcG9ydGFudCBub24tcGFyc2VkXSBAWzE5MC0yNTldIGFj dGl2ZQogCiBydWxlCiBib2R5Lm1haW4xOiBbXQpAQCAtMTMzLDcgKzEzMyw3IEBAIGJvZHk6IFtd CiBbJ2hlaWdodCc6JzEwMCUgIWltcG9ydGFudCcgaXMtaW1wb3J0YW50XSBAWzEwOS0xMzNdIGFj dGl2ZQogWydjb2xvcnonOiciIWltcG9ydGFudCInIG5vbi1wYXJzZWRdIEBbMTM4LTE1OV0gYWN0 aXZlCiBbJ2ltcG9ydGFudCc6JyFpbXBvcnRhbnQnIG5vbi1wYXJzZWRdIEBbMTY0LTE4NV0gYWN0 aXZlCi1bJ2NvbG9yJzonImJhZGNvbG9yIiAhIGltcG9ydGFudCAvKiBnb29kIHByb3BlcnR5IHdp dGggc3RyYW5nZSB2YWx1ZSAqLycgaXMtaW1wb3J0YW50XSBAWzE5MC0yNTldIGFjdGl2ZQorWydj b2xvcic6JyJiYWRjb2xvciIgISBpbXBvcnRhbnQgLyogZ29vZCBwcm9wZXJ0eSB3aXRoIHN0cmFu Z2UgdmFsdWUgKi8nIGlzLWltcG9ydGFudCBub24tcGFyc2VkXSBAWzE5MC0yNTldIGFjdGl2ZQog CiBydWxlCiBib2R5Lm1haW4xOiBbXQpAQCAtMTk4LDcgKzE5OCw3IEBAIFN0eWxlU2hlZXQ6ICdi b2R5Lm1haW5wYWdlIHsgICAgdGV4dC1kZWNvcmF0aW9uOiBzdHJpa2V0aHJvdWdoOyAgICBiYWRw cm9wZXJ0eToKIAogcnVsZQogYm9keS5tYWlucGFnZTogW10KLVsndGV4dC1kZWNvcmF0aW9uJzon c3RyaWtldGhyb3VnaCddIEBbNC0zNV0gYWN0aXZlCitbJ3RleHQtZGVjb3JhdGlvbic6J3N0cmlr ZXRocm91Z2gnIG5vbi1wYXJzZWRdIEBbNC0zNV0gYWN0aXZlCiBbJ2JhZHByb3BlcnR5JzonMmJh ZHZhbHVlMicgbm9uLXBhcnNlZF0gQFszOS02M10gYWN0aXZlCiAKIHJ1bGUKQEAgLTIxMSw3ICsy MTEsNyBAQCBTdHlsZVNoZWV0OiAnaHRtbCAqLCBib2R5W2Zvbz0iYmFyIl0geyAgICB0ZXh0LWRl Y29yYXRpb246IHN0cmlrZXRocm91Z2g7ICAgIGJhZAogCiBydWxlCiBodG1sICosIGJvZHlbZm9v PSJiYXIiXTogW10KLVsndGV4dC1kZWNvcmF0aW9uJzonc3RyaWtldGhyb3VnaCddIEBbNC0zNV0g YWN0aXZlCitbJ3RleHQtZGVjb3JhdGlvbic6J3N0cmlrZXRocm91Z2gnIG5vbi1wYXJzZWRdIEBb NC0zNV0gYWN0aXZlCiBbJ2JhZHByb3BlcnR5JzonMmJhZHZhbHVlMicgbm9uLXBhcnNlZF0gQFsz OS02M10gYWN0aXZlCiAKIHJ1bGUKQEAgLTI2Myw3ICsyNjMsNyBAQCBib2R5OiBbXQogWydoZWln aHQnOicxMDAlICFpbXBvcnRhbnQnIGlzLWltcG9ydGFudF0gQFsxMDktMTMzXSBhY3RpdmUKIFsn Y29sb3J6JzonIiFpbXBvcnRhbnQiJyBub24tcGFyc2VkXSBAWzEzOC0xNTldIGFjdGl2ZQogWydp bXBvcnRhbnQnOichaW1wb3J0YW50JyBub24tcGFyc2VkXSBAWzE2NC0xODVdIGFjdGl2ZQotWydj b2xvcic6JyJiYWRjb2xvciIgISBpbXBvcnRhbnQgLyogZ29vZCBwcm9wZXJ0eSB3aXRoIHN0cmFu Z2UgdmFsdWUgKi8nIGlzLWltcG9ydGFudF0gQFsxOTAtMjU5XSBhY3RpdmUKK1snY29sb3InOici YmFkY29sb3IiICEgaW1wb3J0YW50IC8qIGdvb2QgcHJvcGVydHkgd2l0aCBzdHJhbmdlIHZhbHVl ICovJyBpcy1pbXBvcnRhbnQgbm9uLXBhcnNlZF0gQFsxOTAtMjU5XSBhY3RpdmUKIAogcnVsZQog aHRtbCAqLCBib2R5W2Zvbz0iYmFyIl06IFtdCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxv ZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDYxMjE2YWMuLjU4YmVhZmEgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTAtMTEtMjMgIEFsZXhhbmRlciBQYXZsb3YgIDxhcGF2bG92QGNocm9taXVtLm9yZz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5z cGVjdG9yOiBbU1RZTEVTXSBpbnZhbGlkIGNvbG9yIHZhbHVlcyBhcmUgbm90IG1hcmtlZCBhcyBz dWNoLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDk5 NjAKKworICAgICAgICBQcm9wZXJ0aWVzIGhhdmluZyBhIHZhbGlkIHN0cnVjdHVyZSBidXQgaW52 YWxpZCB2YWx1ZXMgd2lsbCBhbHNvCisgICAgICAgIGJlIG1hcmtlZCBhcyBub24tcGFyc2VkT2sg aW4gdGhlIFN0eWxlcyBwYW5lLgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclN0eWxl U2hlZXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yU3R5bGU6OnBvcHVsYXRlQWxs UHJvcGVydGllcyk6CisKIDIwMTAtMTEtMjIgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBs ZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCmRpZmYgLS1naXQgYS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JTdHlsZVNoZWV0LmNwcCBiL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvclN0eWxlU2hlZXQuY3BwCmluZGV4IDlmNGNhMzcuLjY3NTdlMGMgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0eWxlU2hlZXQuY3BwCisrKyBiL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0eWxlU2hlZXQuY3BwCkBAIC0zOTMsNiArMzkzLDkg QEAgYm9vbCBJbnNwZWN0b3JTdHlsZTo6cG9wdWxhdGVBbGxQcm9wZXJ0aWVzKFZlY3RvcjxJbnNw ZWN0b3JTdHlsZVByb3BlcnR5PiogcmVzdWwKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIElu c3BlY3RvclN0eWxlUHJvcGVydHkgcCgqaXQsIHRydWUsIGZhbHNlKTsKICAgICAgICAgICAgIHAu c2V0UmF3VGV4dEZyb21TdHlsZURlY2xhcmF0aW9uKHN0eWxlRGVjbGFyYXRpb24pOworICAgICAg ICAgICAgLy8gQ2hlY2sgaWYgYSBwYXJzZWQtb2sgcHJvcGVydHkgaGFzIGEgdmFsaWQgdmFsdWUg KGkuZS4gaXMgcHJlc2VudCBpbiB0aGUgV2ViQ29yZSBDU1MgbW9kZWwpLgorICAgICAgICAgICAg aWYgKHAuc291cmNlRGF0YS5wYXJzZWRPayAmJiAhcC5zb3VyY2VEYXRhLm5hbWUuaXNFbXB0eSgp ICYmIG1fc3R5bGUtPmdldFByb3BlcnR5VmFsdWUocC5zb3VyY2VEYXRhLm5hbWUpLmlzRW1wdHko KSkKKyAgICAgICAgICAgICAgICBwLnNvdXJjZURhdGEucGFyc2VkT2sgPSBmYWxzZTsKICAgICAg ICAgICAgIHJlc3VsdC0+YXBwZW5kKHApOwogICAgICAgICAgICAgc291cmNlUHJvcGVydHlOYW1l cy5hZGQoaXQtPm5hbWUpOwogICAgICAgICB9Cg== 74676 2010-11-23 09:17:21 -0800 2010-11-23 10:00:06 -0800 [PATCH] Corrected solution badcolor.patch text/plain 8043 apavlov Y29tbWl0IGJlYzMxOGJjZjA0YWFjZTIyNzQ3OWY5MzJlNDU1NGNjNGI1YjEwMGEKQXV0aG9yOiBB bGV4YW5kZXIgUGF2bG92IDxhcGF2bG92QGNocm9taXVtLm9yZz4KRGF0ZTogICBUdWUgTm92IDIz IDE0OjA3OjA1IDIwMTAgKzAzMDAKCiAgICBJbnZhbGlkUHJvcGVydHlWYWx1ZXMKCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXgg MDBmODhmNy4uNGQ3MTVhNSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBi L0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEwLTExLTIzICBBbGV4 YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogW1NUWUxFU10gaW52 YWxpZCBjb2xvciB2YWx1ZXMgYXJlIG5vdCBtYXJrZWQgYXMgc3VjaC4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ5OTYwCisKKyAgICAgICAgKiBpbnNw ZWN0b3IvcmVzb3VyY2VzL3N0eWxlcy1uZXctQVBJLmNzczoKKyAgICAgICAgKGJvZHkpOgorICAg ICAgICAqIGluc3BlY3Rvci9zdHlsZXMtbmV3LUFQSS1leHBlY3RlZC50eHQ6CisgICAgICAgICog aW5zcGVjdG9yL3N0eWxlcy1zb3VyY2Utb2Zmc2V0cy1leHBlY3RlZC50eHQ6CisKIDIwMTAtMTEt MjMgIElseWEgVGlraG9ub3Zza3kgIDxsbzp3cWlzbG9AY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFVucmV2aWV3ZWQgcm9sbG91dCByNzI1MzQgYW5kIHI3MjUzMyBiZWNhdXNlICByNzI1NDQsIHI3 MjUzMCBhbmQgcjcyNTI3IHdlcmUgcmV2ZXJ0ZWQuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9p bnNwZWN0b3IvcmVzb3VyY2VzL3N0eWxlcy1uZXctQVBJLmNzcyBiL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9yZXNvdXJjZXMvc3R5bGVzLW5ldy1BUEkuY3NzCmluZGV4IGY0YWYwM2MuLjc5OTNiMDMg MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9yZXNvdXJjZXMvc3R5bGVzLW5ldy1B UEkuY3NzCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9yZXNvdXJjZXMvc3R5bGVzLW5ldy1B UEkuY3NzCkBAIC0xMyw2ICsxMyw3IEBAIGJvZHkgewogICAgIGhlaWdodDogMTAwJSAhaW1wb3J0 YW50OwogICAgIGNvbG9yejogIiFpbXBvcnRhbnQiOwogICAgIGltcG9ydGFudDohaW1wb3J0YW50 OworICAgIGNvbG9yOiB5ZWxsb3c7CiAgICAgY29sb3I6ICJiYWRjb2xvciIgISBpbXBvcnRhbnQg LyogZ29vZCBwcm9wZXJ0eSB3aXRoIHN0cmFuZ2UgdmFsdWUgKi87CiB9CiAKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMtbmV3LUFQSS1leHBlY3RlZC50eHQgYi9MYXlv dXRUZXN0cy9pbnNwZWN0b3Ivc3R5bGVzLW5ldy1BUEktZXhwZWN0ZWQudHh0CmluZGV4IGQ2NDIy Y2IuLjdlYzM2ZTMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMtbmV3 LUFQSS1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy1uZXct QVBJLWV4cGVjdGVkLnR4dApAQCAtMjksNyArMjksOCBAQCBib2R5OiBbXQogWydoZWlnaHQnOicx MDAlICFpbXBvcnRhbnQnIGlzLWltcG9ydGFudF0gQFsxMDktMTMzXSBhY3RpdmUKIFsnY29sb3J6 JzonIiFpbXBvcnRhbnQiJyBub24tcGFyc2VkXSBAWzEzOC0xNTldIGFjdGl2ZQogWydpbXBvcnRh bnQnOichaW1wb3J0YW50JyBub24tcGFyc2VkXSBAWzE2NC0xODVdIGFjdGl2ZQotWydjb2xvcic6 JyJiYWRjb2xvciIgISBpbXBvcnRhbnQgLyogZ29vZCBwcm9wZXJ0eSB3aXRoIHN0cmFuZ2UgdmFs dWUgKi8nIGlzLWltcG9ydGFudF0gQFsxOTAtMjU5XSBhY3RpdmUKK1snY29sb3InOid5ZWxsb3cn XSBAWzE5MC0yMDRdIGFjdGl2ZQorWydjb2xvcic6JyJiYWRjb2xvciIgISBpbXBvcnRhbnQgLyog Z29vZCBwcm9wZXJ0eSB3aXRoIHN0cmFuZ2UgdmFsdWUgKi8nIGlzLWltcG9ydGFudCBub24tcGFy c2VkXSBAWzIwOS0yNzhdIGFjdGl2ZQogCiBydWxlCiBib2R5Lm1haW4xOiBbXQpAQCAtMTAzLDYg KzEwNCw3IEBAIGJvZHkgewogICAgIGhlaWdodDogMTAwJSAhaW1wb3J0YW50OwogICAgIGNvbG9y ejogIiFpbXBvcnRhbnQiOwogICAgIGltcG9ydGFudDohaW1wb3J0YW50OworICAgIGNvbG9yOiB5 ZWxsb3c7CiAgICAgY29sb3I6ICJiYWRjb2xvciIgISBpbXBvcnRhbnQgLyogZ29vZCBwcm9wZXJ0 eSB3aXRoIHN0cmFuZ2UgdmFsdWUgKi87CiB9CiAKQEAgLTEzMyw3ICsxMzUsOCBAQCBib2R5OiBb XQogWydoZWlnaHQnOicxMDAlICFpbXBvcnRhbnQnIGlzLWltcG9ydGFudF0gQFsxMDktMTMzXSBh Y3RpdmUKIFsnY29sb3J6JzonIiFpbXBvcnRhbnQiJyBub24tcGFyc2VkXSBAWzEzOC0xNTldIGFj dGl2ZQogWydpbXBvcnRhbnQnOichaW1wb3J0YW50JyBub24tcGFyc2VkXSBAWzE2NC0xODVdIGFj dGl2ZQotWydjb2xvcic6JyJiYWRjb2xvciIgISBpbXBvcnRhbnQgLyogZ29vZCBwcm9wZXJ0eSB3 aXRoIHN0cmFuZ2UgdmFsdWUgKi8nIGlzLWltcG9ydGFudF0gQFsxOTAtMjU5XSBhY3RpdmUKK1sn Y29sb3InOid5ZWxsb3cnXSBAWzE5MC0yMDRdIGFjdGl2ZQorWydjb2xvcic6JyJiYWRjb2xvciIg ISBpbXBvcnRhbnQgLyogZ29vZCBwcm9wZXJ0eSB3aXRoIHN0cmFuZ2UgdmFsdWUgKi8nIGlzLWlt cG9ydGFudCBub24tcGFyc2VkXSBAWzIwOS0yNzhdIGFjdGl2ZQogCiBydWxlCiBib2R5Lm1haW4x OiBbXQpAQCAtMTk4LDcgKzIwMSw3IEBAIFN0eWxlU2hlZXQ6ICdib2R5Lm1haW5wYWdlIHsgICAg dGV4dC1kZWNvcmF0aW9uOiBzdHJpa2V0aHJvdWdoOyAgICBiYWRwcm9wZXJ0eToKIAogcnVsZQog Ym9keS5tYWlucGFnZTogW10KLVsndGV4dC1kZWNvcmF0aW9uJzonc3RyaWtldGhyb3VnaCddIEBb NC0zNV0gYWN0aXZlCitbJ3RleHQtZGVjb3JhdGlvbic6J3N0cmlrZXRocm91Z2gnIG5vbi1wYXJz ZWRdIEBbNC0zNV0gYWN0aXZlCiBbJ2JhZHByb3BlcnR5JzonMmJhZHZhbHVlMicgbm9uLXBhcnNl ZF0gQFszOS02M10gYWN0aXZlCiAKIHJ1bGUKQEAgLTIxMSw3ICsyMTQsNyBAQCBTdHlsZVNoZWV0 OiAnaHRtbCAqLCBib2R5W2Zvbz0iYmFyIl0geyAgICB0ZXh0LWRlY29yYXRpb246IHN0cmlrZXRo cm91Z2g7ICAgIGJhZAogCiBydWxlCiBodG1sICosIGJvZHlbZm9vPSJiYXIiXTogW10KLVsndGV4 dC1kZWNvcmF0aW9uJzonc3RyaWtldGhyb3VnaCddIEBbNC0zNV0gYWN0aXZlCitbJ3RleHQtZGVj b3JhdGlvbic6J3N0cmlrZXRocm91Z2gnIG5vbi1wYXJzZWRdIEBbNC0zNV0gYWN0aXZlCiBbJ2Jh ZHByb3BlcnR5JzonMmJhZHZhbHVlMicgbm9uLXBhcnNlZF0gQFszOS02M10gYWN0aXZlCiAKIHJ1 bGUKQEAgLTI2Myw3ICsyNjYsOCBAQCBib2R5OiBbXQogWydoZWlnaHQnOicxMDAlICFpbXBvcnRh bnQnIGlzLWltcG9ydGFudF0gQFsxMDktMTMzXSBhY3RpdmUKIFsnY29sb3J6JzonIiFpbXBvcnRh bnQiJyBub24tcGFyc2VkXSBAWzEzOC0xNTldIGFjdGl2ZQogWydpbXBvcnRhbnQnOichaW1wb3J0 YW50JyBub24tcGFyc2VkXSBAWzE2NC0xODVdIGFjdGl2ZQotWydjb2xvcic6JyJiYWRjb2xvciIg ISBpbXBvcnRhbnQgLyogZ29vZCBwcm9wZXJ0eSB3aXRoIHN0cmFuZ2UgdmFsdWUgKi8nIGlzLWlt cG9ydGFudF0gQFsxOTAtMjU5XSBhY3RpdmUKK1snY29sb3InOid5ZWxsb3cnXSBAWzE5MC0yMDRd IGFjdGl2ZQorWydjb2xvcic6JyJiYWRjb2xvciIgISBpbXBvcnRhbnQgLyogZ29vZCBwcm9wZXJ0 eSB3aXRoIHN0cmFuZ2UgdmFsdWUgKi8nIGlzLWltcG9ydGFudCBub24tcGFyc2VkXSBAWzIwOS0y NzhdIGFjdGl2ZQogCiBydWxlCiBodG1sICosIGJvZHlbZm9vPSJiYXIiXTogW10KZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMtc291cmNlLW9mZnNldHMtZXhwZWN0ZWQu dHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy1zb3VyY2Utb2Zmc2V0cy1leHBlY3Rl ZC50eHQKaW5kZXggYmVlYzcyOC4uM2VkZDJjZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5z cGVjdG9yL3N0eWxlcy1zb3VyY2Utb2Zmc2V0cy1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL3N0eWxlcy1zb3VyY2Utb2Zmc2V0cy1leHBlY3RlZC50eHQKQEAgLTgsNyAr OCw3IEBAIGJvZHk6IFswLTRdIFs2LTI2Nl0KIFsnaGVpZ2h0JzonMTAwJSAhaW1wb3J0YW50JyAh aW1wb3J0YW50XSBAWzEwOS0xMzNdCiBbJ2NvbG9yeic6JyIhaW1wb3J0YW50Iicgbm9uLXBhcnNl ZF0gQFsxMzgtMTU5XQogWydpbXBvcnRhbnQnOicnIG5vbi1wYXJzZWRdIEBbMTY0LTE3NF0KLVsn Y29sb3InOiciYmFkY29sb3IiICEgaW1wb3J0YW50IC8qIGdvb2QgcHJvcGVydHkgd2l0aCBzdHJh bmdlIHZhbHVlICovJyAhaW1wb3J0YW50XSBAWzE5MC0yNTldCitbJ2NvbG9yJzonImJhZGNvbG9y IiAhIGltcG9ydGFudCAvKiBnb29kIHByb3BlcnR5IHdpdGggc3RyYW5nZSB2YWx1ZSAqLycgIWlt cG9ydGFudCBub24tcGFyc2VkXSBAWzE5MC0yNTldCiBib2R5Lm1haW4xOiBbMjk4LTMzNl0gWzMz Ny00MThdCiBbJ2NvbG9yJzonI0YwMEJBQSddIEBbMTMtMjhdCiBbJ3pvbyc6J21vbyAvKiBub3Qg YW4gIWltcG9ydGFudCB1bnJlY29nbml6ZWQgcHJvcGVydHkgKi8nIG5vbi1wYXJzZWRdIEBbMjgt ODFdCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmlu ZGV4IDM1YTFjMzEuLjk3NzdiNzEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBi L1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTkgQEAKIDIwMTAtMTEtMjMgIEFsZXhhbmRl ciBQYXZsb3YgIDxhcGF2bG92QGNocm9taXVtLm9yZz4KIAorICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBbU1RZTEVTXSBpbnZhbGlk IGNvbG9yIHZhbHVlcyBhcmUgbm90IG1hcmtlZCBhcyBzdWNoLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDk5NjAKKworICAgICAgICBQcm9wZXJ0aWVz IGhhdmluZyBhIHZhbGlkIHN0cnVjdHVyZSBidXQgaW52YWxpZCB2YWx1ZXMgd2lsbCBhbHNvCisg ICAgICAgIGJlIG1hcmtlZCBhcyBub24tcGFyc2VkT2sgaW4gdGhlIFN0eWxlcyBwYW5lLgorCisg ICAgICAgICogY3NzL0NTU0dyYW1tYXIueToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9y U3R5bGVTaGVldC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JTdHlsZTo6cG9wdWxh dGVPYmplY3RXaXRoU3R5bGVQcm9wZXJ0aWVzKToKKworMjAxMC0xMS0yMyAgQWxleGFuZGVyIFBh dmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFJldmlld2VkIGJ5IFBhdmVs IEZlbGRtYW4uCiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogW1NUWUxFU10gVXNlIHN0cmlrZSB0 aHJvdWdoIGFzIGFuICdvdmVycmlkZGVuJyBtYXJrZXIuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2Nz cy9DU1NHcmFtbWFyLnkgYi9XZWJDb3JlL2Nzcy9DU1NHcmFtbWFyLnkKaW5kZXggNWM3NzM0MC4u YzA0NTMzNSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9jc3MvQ1NTR3JhbW1hci55CisrKyBiL1dlYkNv cmUvY3NzL0NTU0dyYW1tYXIueQpAQCAtMTI5NCwxMSArMTI5NCw5IEBAIGRlY2xhcmF0aW9uOgog ICAgICAgICAgICAgcC0+bV92YWx1ZUxpc3QgPSBwLT5zaW5rRmxvYXRpbmdWYWx1ZUxpc3QoJDQp OwogICAgICAgICAgICAgaW50IG9sZFBhcnNlZFByb3BlcnRpZXMgPSBwLT5tX251bVBhcnNlZFBy b3BlcnRpZXM7CiAgICAgICAgICAgICAkJCA9IHAtPnBhcnNlVmFsdWUoJDEsICQ1KTsKLSAgICAg ICAgICAgIGlmICghJCQpIHsKLSAgICAgICAgICAgICAgICBpZiAoc3RhdGljX2Nhc3Q8aW50Pihw LT5tX251bVBhcnNlZFByb3BlcnRpZXMpID09IG9sZFBhcnNlZFByb3BlcnRpZXMpCi0gICAgICAg ICAgICAgICAgICAgIGlzUHJvcGVydHlQYXJzZWQgPSB0cnVlOworICAgICAgICAgICAgaWYgKCEk JCkKICAgICAgICAgICAgICAgICBwLT5yb2xsYmFja0xhc3RQcm9wZXJ0aWVzKHAtPm1fbnVtUGFy c2VkUHJvcGVydGllcyAtIG9sZFBhcnNlZFByb3BlcnRpZXMpOwotICAgICAgICAgICAgfSBlbHNl CisgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgaXNQcm9wZXJ0eVBhcnNlZCA9IHRy dWU7CiAgICAgICAgICAgICBkZWxldGUgcC0+bV92YWx1ZUxpc3Q7CiAgICAgICAgICAgICBwLT5t X3ZhbHVlTGlzdCA9IDA7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JT dHlsZVNoZWV0LmNwcCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0eWxlU2hlZXQuY3Bw CmluZGV4IDlmNGNhMzcuLjJlZDhjMTMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvclN0eWxlU2hlZXQuY3BwCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0 eWxlU2hlZXQuY3BwCkBAIC00NDUsMTEgKzQ0NSwyNCBAQCB2b2lkIEluc3BlY3RvclN0eWxlOjpw b3B1bGF0ZU9iamVjdFdpdGhTdHlsZVByb3BlcnRpZXMoSW5zcGVjdG9yT2JqZWN0KiByZXN1bHQp CiAgICAgICAgICAgICAgICAgcHJvcGVydHktPnNldE51bWJlcigiZW5kT2Zmc2V0IiwgcHJvcGVy dHlFbnRyeS5yYW5nZS5lbmQpOwogCiAgICAgICAgICAgICAgICAgSGFzaE1hcDxTdHJpbmcsIFJl ZlB0cjxJbnNwZWN0b3JPYmplY3Q+ID46Oml0ZXJhdG9yIGFjdGl2ZUl0ID0gcHJvcGVydHlOYW1l VG9QcmV2aW91c0FjdGl2ZVByb3BlcnR5LmZpbmQobmFtZSk7CisgICAgICAgICAgICAgICAgYm9v bCBzaG91bGRJbmFjdGl2YXRlID0gZmFsc2U7CiAgICAgICAgICAgICAgICAgaWYgKGFjdGl2ZUl0 ICE9IHByb3BlcnR5TmFtZVRvUHJldmlvdXNBY3RpdmVQcm9wZXJ0eS5lbmQoKSkgeworICAgICAg ICAgICAgICAgICAgICBpZiAocHJvcGVydHlFbnRyeS5wYXJzZWRPaykKKyAgICAgICAgICAgICAg ICAgICAgICAgIHNob3VsZEluYWN0aXZhdGUgPSB0cnVlOworICAgICAgICAgICAgICAgICAgICBl bHNlIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgcHJldmlvdXNQYXJzZWRPazsKKyAg ICAgICAgICAgICAgICAgICAgICAgIGJvb2wgc3VjY2VzcyA9IGFjdGl2ZUl0LT5zZWNvbmQtPmdl dEJvb2xlYW4oInBhcnNlZE9rIiwgJnByZXZpb3VzUGFyc2VkT2spOworICAgICAgICAgICAgICAg ICAgICAgICAgaWYgKHN1Y2Nlc3MgJiYgIXByZXZpb3VzUGFyc2VkT2spCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgc2hvdWxkSW5hY3RpdmF0ZSA9IHRydWU7CisgICAgICAgICAgICAgICAg ICAgIH0KKyAgICAgICAgICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgICAgICAgICAgcHJvcGVy dHlOYW1lVG9QcmV2aW91c0FjdGl2ZVByb3BlcnR5LnNldChuYW1lLCBwcm9wZXJ0eSk7CisKKyAg ICAgICAgICAgICAgICBpZiAoc2hvdWxkSW5hY3RpdmF0ZSkgewogICAgICAgICAgICAgICAgICAg ICBhY3RpdmVJdC0+c2Vjb25kLT5zZXRTdHJpbmcoInN0YXR1cyIsICJpbmFjdGl2ZSIpOwogICAg ICAgICAgICAgICAgICAgICBhY3RpdmVJdC0+c2Vjb25kLT5zZXRTdHJpbmcoInNob3J0aGFuZE5h bWUiLCAiIik7CisgICAgICAgICAgICAgICAgICAgIHByb3BlcnR5TmFtZVRvUHJldmlvdXNBY3Rp dmVQcm9wZXJ0eS5zZXQobmFtZSwgcHJvcGVydHkpOwogICAgICAgICAgICAgICAgIH0KLSAgICAg ICAgICAgICAgICBwcm9wZXJ0eU5hbWVUb1ByZXZpb3VzQWN0aXZlUHJvcGVydHkuc2V0KG5hbWUs IHByb3BlcnR5KTsKICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgcHJvcGVy dHktPnNldEJvb2xlYW4oImltcGxpY2l0IiwgbV9zdHlsZS0+aXNQcm9wZXJ0eUltcGxpY2l0KG5h bWUpKTsKICAgICAgICAgICAgICAgICBwcm9wZXJ0eS0+c2V0U3RyaW5nKCJzdGF0dXMiLCAic3R5 bGUiKTsK