36566 2010-03-24 17:31:33 -0700 Fix a couple of places where fill-mode needs adding to the list of shorthand properties 2010-05-14 02:58:35 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) All OS X 10.5 RESOLVED FIXED P2 Normal --- 1 simon.fraser dino dino oldest_to_newest 203700 0 simon.fraser 2010-03-24 17:31:33 -0700 Need to add CSSPropertyWebkitAnimationFillMode in CSSMutableStyleDeclaration::getPropertyValue() and initShorthandMap() 204310 1 51692 dino 2010-03-25 16:55:02 -0700 Created attachment 51692 patch for shorthand Adds the longhand property into the places where the shorthand is configured. 204457 2 51692 eric 2010-03-26 00:58:05 -0700 Comment on attachment 51692 patch for shorthand We can make a CSS parsing test for this pretty easily no? Just check what getComputedStyle returns after parsing the fill mode text, no? Or just set cssText on some CSS value and see what actually gets set? 222946 3 dino 2010-05-08 16:04:55 -0700 > We can make a CSS parsing test for this pretty easily no? > Just check what getComputedStyle returns after parsing the fill mode text, no? > Or just set cssText on some CSS value and see what actually gets set? That's not quite what this code does. It is only executed in two places: 1. When animating shorthand properties. Since fill-mode is an animation property itself we can't animate it, so this doesn't apply here. 2. In removeProperty(), when called on a shorthand. I've attached a test case for that. 222947 4 55487 dino 2010-05-08 16:05:42 -0700 Created attachment 55487 updated patch with testcase 225733 5 dino 2010-05-14 02:58:35 -0700 Landed in 59111 51692 2010-03-25 16:55:02 -0700 2010-05-08 16:05:42 -0700 patch for shorthand shorthand.patch text/plain 2635 dino ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZWE5YWVlMy4uOWUwOGMxZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMC0wMy0yNSAgRGVhbiBKYWNrc29u ICA8ZGlub0BhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2NTY2 CisgICAgICAgIFRoZSBhbmltYXRpb24tZmlsbC1tb2RlIHByb3BlcnR5IHdhcyBtaXNzaW5nIGZy b20KKyAgICAgICAgYSBmZXcgcGxhY2VzIHdoZXJlIHRoZSBhbmltYXRpb24gc2hvcnRoYW5kIGlz IHNldCB1cC4KKworICAgICAgICAqIGNzcy9DU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbi5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbjo6Z2V0UHJvcGVy dHlWYWx1ZSk6CisgICAgICAgICogY3NzL0NTU1Byb3BlcnR5TG9uZ2hhbmQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6aW5pdFNob3J0aGFuZE1hcCk6CisKIDIwMTAtMDMtMjQgIER1bWl0cnUgRGFu aWxpdWMgIDxkdW1pQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEaW1pdHJp IEdsYXprb3YuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2Nzcy9DU1NNdXRhYmxlU3R5bGVEZWNsYXJh dGlvbi5jcHAgYi9XZWJDb3JlL2Nzcy9DU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbi5jcHAKaW5k ZXggMzFjNzUwNy4uNGJkZTFlYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9jc3MvQ1NTTXV0YWJsZVN0 eWxlRGVjbGFyYXRpb24uY3BwCisrKyBiL1dlYkNvcmUvY3NzL0NTU011dGFibGVTdHlsZURlY2xh cmF0aW9uLmNwcApAQCAtMjQwLDEwICsyNDAsMTEgQEAgU3RyaW5nIENTU011dGFibGVTdHlsZURl Y2xhcmF0aW9uOjpnZXRQcm9wZXJ0eVZhbHVlKGludCBwcm9wZXJ0eUlEKSBjb25zdAogICAgICAg ICAgICAgcmV0dXJuIGdldExheWVyZWRTaG9ydGhhbmRWYWx1ZShwcm9wZXJ0aWVzLCA0KTsKICAg ICAgICAgfQogICAgICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0QW5pbWF0aW9uOiB7Ci0gICAg ICAgICAgICBjb25zdCBpbnQgcHJvcGVydGllc1s2XSA9IHsgQ1NTUHJvcGVydHlXZWJraXRBbmlt YXRpb25OYW1lLCBDU1NQcm9wZXJ0eVdlYmtpdEFuaW1hdGlvbkR1cmF0aW9uLAorICAgICAgICAg ICAgY29uc3QgaW50IHByb3BlcnRpZXNbN10gPSB7IENTU1Byb3BlcnR5V2Via2l0QW5pbWF0aW9u TmFtZSwgQ1NTUHJvcGVydHlXZWJraXRBbmltYXRpb25EdXJhdGlvbiwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBDU1NQcm9wZXJ0eVdlYmtpdEFuaW1hdGlvblRpbWlu Z0Z1bmN0aW9uLCBDU1NQcm9wZXJ0eVdlYmtpdEFuaW1hdGlvbkRlbGF5LAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIENTU1Byb3BlcnR5V2Via2l0QW5pbWF0aW9uSXRl cmF0aW9uQ291bnQsIENTU1Byb3BlcnR5V2Via2l0QW5pbWF0aW9uRGlyZWN0aW9uIH07Ci0gICAg ICAgICAgICByZXR1cm4gZ2V0TGF5ZXJlZFNob3J0aGFuZFZhbHVlKHByb3BlcnRpZXMsIDYpOwor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIENTU1Byb3BlcnR5V2Via2l0 QW5pbWF0aW9uSXRlcmF0aW9uQ291bnQsIENTU1Byb3BlcnR5V2Via2l0QW5pbWF0aW9uRGlyZWN0 aW9uLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIENTU1Byb3BlcnR5 V2Via2l0QW5pbWF0aW9uRmlsbE1vZGUgfTsKKyAgICAgICAgICAgIHJldHVybiBnZXRMYXllcmVk U2hvcnRoYW5kVmFsdWUocHJvcGVydGllcywgNyk7CiAgICAgICAgIH0KICNpZiBFTkFCTEUoU1ZH KQogICAgICAgICBjYXNlIENTU1Byb3BlcnR5TWFya2VyOiB7CmRpZmYgLS1naXQgYS9XZWJDb3Jl L2Nzcy9DU1NQcm9wZXJ0eUxvbmdoYW5kLmNwcCBiL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5TG9u Z2hhbmQuY3BwCmluZGV4IGI0NWZhMGQuLmE0YjMzMjUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvY3Nz L0NTU1Byb3BlcnR5TG9uZ2hhbmQuY3BwCisrKyBiL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5TG9u Z2hhbmQuY3BwCkBAIC0xODgsNyArMTg4LDggQEAgc3RhdGljIHZvaWQgaW5pdFNob3J0aGFuZE1h cChTaG9ydGhhbmRNYXAmIHNob3J0aGFuZE1hcCkKICAgICAgICAgQ1NTUHJvcGVydHlXZWJraXRB bmltYXRpb25UaW1pbmdGdW5jdGlvbiwKICAgICAgICAgQ1NTUHJvcGVydHlXZWJraXRBbmltYXRp b25EZWxheSwKICAgICAgICAgQ1NTUHJvcGVydHlXZWJraXRBbmltYXRpb25JdGVyYXRpb25Db3Vu dCwKLSAgICAgICAgQ1NTUHJvcGVydHlXZWJraXRBbmltYXRpb25EaXJlY3Rpb24KKyAgICAgICAg Q1NTUHJvcGVydHlXZWJraXRBbmltYXRpb25EaXJlY3Rpb24sCisgICAgICAgIENTU1Byb3BlcnR5 V2Via2l0QW5pbWF0aW9uRmlsbE1vZGUKICAgICB9OwogICAgIFNFVF9TSE9SVEhBTkRfTUFQX0VO VFJZKHNob3J0aGFuZE1hcCwgQ1NTUHJvcGVydHlXZWJraXRBbmltYXRpb24sIGFuaW1hdGlvblBy b3BlcnRpZXMpOwogCg== 55487 2010-05-08 16:05:42 -0700 2010-05-08 16:28:08 -0700 updated patch with testcase fillmode-remove.patch text/plain 9792 dino ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAyMDg0YzI0Li4zMDk0MzdhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMDUt MDggIERlYW4gSmFja3NvbiAgPGRpbm9AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0zNjU2NgorICAgICAgICBUaGUgYW5pbWF0aW9uLWZpbGwtbW9kZSBwcm9wZXJ0 eSB3YXMgbWlzc2luZyBmcm9tCisgICAgICAgIGEgZmV3IHBsYWNlcyB3aGVyZSB0aGUgYW5pbWF0 aW9uIHNob3J0aGFuZCBpcyBzZXQgdXAuCisKKyAgICAgICAgKiBhbmltYXRpb25zL2FuaW1hdGlv bi1zaG9ydGhhbmQtcmVtb3ZlZC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGFuaW1h dGlvbnMvYW5pbWF0aW9uLXNob3J0aGFuZC1yZW1vdmVkLmh0bWw6IEFkZGVkLgorCiAyMDEwLTA1 LTA4ICBSb2JlcnQgSG9nYW4gIDxyb2JlcnRAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmll d2VkIFF0IGJvdCBmaXg6IHRlc3QgdW5za2lwcGVkIGFjY2lkZW50YWxseSBpbiByNTkwMjAuCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9hbmltYXRpb25zL2FuaW1hdGlvbi1zaG9ydGhhbmQtcmVt b3ZlZC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9hbmltYXRpb25zL2FuaW1hdGlvbi1zaG9y dGhhbmQtcmVtb3ZlZC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMC4uYzNlMGUyNQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2FuaW1hdGlvbnMv YW5pbWF0aW9uLXNob3J0aGFuZC1yZW1vdmVkLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDU3IEBA CitUZXN0aW5nIHdlYmtpdEFuaW1hdGlvbk5hbWUgb24gYTogUEFTUworVGVzdGluZyB3ZWJraXRB bmltYXRpb25EdXJhdGlvbiBvbiBhOiBQQVNTCitUZXN0aW5nIHdlYmtpdEFuaW1hdGlvblRpbWlu Z0Z1bmN0aW9uIG9uIGE6IFBBU1MKK1Rlc3Rpbmcgd2Via2l0QW5pbWF0aW9uRGVsYXkgb24gYTog UEFTUworVGVzdGluZyB3ZWJraXRBbmltYXRpb25JdGVyYXRpb25Db3VudCBvbiBhOiBQQVNTCitU ZXN0aW5nIHdlYmtpdEFuaW1hdGlvbkRpcmVjdGlvbiBvbiBhOiBQQVNTCitUZXN0aW5nIHdlYmtp dEFuaW1hdGlvbkZpbGxNb2RlIG9uIGE6IFBBU1MKK1Rlc3Rpbmcgd2Via2l0QW5pbWF0aW9uTmFt ZSBvbiBiOiBQQVNTCitUZXN0aW5nIHdlYmtpdEFuaW1hdGlvbkR1cmF0aW9uIG9uIGI6IFBBU1MK K1Rlc3Rpbmcgd2Via2l0QW5pbWF0aW9uVGltaW5nRnVuY3Rpb24gb24gYjogUEFTUworVGVzdGlu ZyB3ZWJraXRBbmltYXRpb25EZWxheSBvbiBiOiBQQVNTCitUZXN0aW5nIHdlYmtpdEFuaW1hdGlv bkl0ZXJhdGlvbkNvdW50IG9uIGI6IFBBU1MKK1Rlc3Rpbmcgd2Via2l0QW5pbWF0aW9uRGlyZWN0 aW9uIG9uIGI6IFBBU1MKK1Rlc3Rpbmcgd2Via2l0QW5pbWF0aW9uRmlsbE1vZGUgb24gYjogUEFT UworVGVzdGluZyB3ZWJraXRBbmltYXRpb25OYW1lIG9uIGM6IFBBU1MKK1Rlc3Rpbmcgd2Via2l0 QW5pbWF0aW9uRHVyYXRpb24gb24gYzogUEFTUworVGVzdGluZyB3ZWJraXRBbmltYXRpb25UaW1p bmdGdW5jdGlvbiBvbiBjOiBQQVNTCitUZXN0aW5nIHdlYmtpdEFuaW1hdGlvbkRlbGF5IG9uIGM6 IFBBU1MKK1Rlc3Rpbmcgd2Via2l0QW5pbWF0aW9uSXRlcmF0aW9uQ291bnQgb24gYzogUEFTUwor VGVzdGluZyB3ZWJraXRBbmltYXRpb25EaXJlY3Rpb24gb24gYzogUEFTUworVGVzdGluZyB3ZWJr aXRBbmltYXRpb25GaWxsTW9kZSBvbiBjOiBQQVNTCitUZXN0aW5nIHdlYmtpdEFuaW1hdGlvbk5h bWUgb24gZDogUEFTUworVGVzdGluZyB3ZWJraXRBbmltYXRpb25EdXJhdGlvbiBvbiBkOiBQQVNT CitUZXN0aW5nIHdlYmtpdEFuaW1hdGlvblRpbWluZ0Z1bmN0aW9uIG9uIGQ6IFBBU1MKK1Rlc3Rp bmcgd2Via2l0QW5pbWF0aW9uRGVsYXkgb24gZDogUEFTUworVGVzdGluZyB3ZWJraXRBbmltYXRp b25JdGVyYXRpb25Db3VudCBvbiBkOiBQQVNTCitUZXN0aW5nIHdlYmtpdEFuaW1hdGlvbkRpcmVj dGlvbiBvbiBkOiBQQVNTCitUZXN0aW5nIHdlYmtpdEFuaW1hdGlvbkZpbGxNb2RlIG9uIGQ6IFBB U1MKK1Rlc3Rpbmcgd2Via2l0QW5pbWF0aW9uTmFtZSBvbiBlOiBQQVNTCitUZXN0aW5nIHdlYmtp dEFuaW1hdGlvbkR1cmF0aW9uIG9uIGU6IFBBU1MKK1Rlc3Rpbmcgd2Via2l0QW5pbWF0aW9uVGlt aW5nRnVuY3Rpb24gb24gZTogUEFTUworVGVzdGluZyB3ZWJraXRBbmltYXRpb25EZWxheSBvbiBl OiBQQVNTCitUZXN0aW5nIHdlYmtpdEFuaW1hdGlvbkl0ZXJhdGlvbkNvdW50IG9uIGU6IFBBU1MK K1Rlc3Rpbmcgd2Via2l0QW5pbWF0aW9uRGlyZWN0aW9uIG9uIGU6IFBBU1MKK1Rlc3Rpbmcgd2Vi a2l0QW5pbWF0aW9uRmlsbE1vZGUgb24gZTogUEFTUworVGVzdGluZyB3ZWJraXRBbmltYXRpb25O YW1lIG9uIGY6IFBBU1MKK1Rlc3Rpbmcgd2Via2l0QW5pbWF0aW9uRHVyYXRpb24gb24gZjogUEFT UworVGVzdGluZyB3ZWJraXRBbmltYXRpb25UaW1pbmdGdW5jdGlvbiBvbiBmOiBQQVNTCitUZXN0 aW5nIHdlYmtpdEFuaW1hdGlvbkRlbGF5IG9uIGY6IFBBU1MKK1Rlc3Rpbmcgd2Via2l0QW5pbWF0 aW9uSXRlcmF0aW9uQ291bnQgb24gZjogUEFTUworVGVzdGluZyB3ZWJraXRBbmltYXRpb25EaXJl Y3Rpb24gb24gZjogUEFTUworVGVzdGluZyB3ZWJraXRBbmltYXRpb25GaWxsTW9kZSBvbiBmOiBQ QVNTCitUZXN0aW5nIHdlYmtpdEFuaW1hdGlvbk5hbWUgb24gZzogUEFTUworVGVzdGluZyB3ZWJr aXRBbmltYXRpb25EdXJhdGlvbiBvbiBnOiBQQVNTCitUZXN0aW5nIHdlYmtpdEFuaW1hdGlvblRp bWluZ0Z1bmN0aW9uIG9uIGc6IFBBU1MKK1Rlc3Rpbmcgd2Via2l0QW5pbWF0aW9uRGVsYXkgb24g ZzogUEFTUworVGVzdGluZyB3ZWJraXRBbmltYXRpb25JdGVyYXRpb25Db3VudCBvbiBnOiBQQVNT CitUZXN0aW5nIHdlYmtpdEFuaW1hdGlvbkRpcmVjdGlvbiBvbiBnOiBQQVNTCitUZXN0aW5nIHdl YmtpdEFuaW1hdGlvbkZpbGxNb2RlIG9uIGc6IFBBU1MKK1Rlc3Rpbmcgd2Via2l0QW5pbWF0aW9u TmFtZSBvbiBoOiBQQVNTCitUZXN0aW5nIHdlYmtpdEFuaW1hdGlvbkR1cmF0aW9uIG9uIGg6IFBB U1MKK1Rlc3Rpbmcgd2Via2l0QW5pbWF0aW9uVGltaW5nRnVuY3Rpb24gb24gaDogUEFTUworVGVz dGluZyB3ZWJraXRBbmltYXRpb25EZWxheSBvbiBoOiBQQVNTCitUZXN0aW5nIHdlYmtpdEFuaW1h dGlvbkl0ZXJhdGlvbkNvdW50IG9uIGg6IFBBU1MKK1Rlc3Rpbmcgd2Via2l0QW5pbWF0aW9uRGly ZWN0aW9uIG9uIGg6IFBBU1MKK1Rlc3Rpbmcgd2Via2l0QW5pbWF0aW9uRmlsbE1vZGUgb24gaDog UEFTUworCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9hbmltYXRpb25zL2FuaW1hdGlvbi1zaG9y dGhhbmQtcmVtb3ZlZC5odG1sIGIvTGF5b3V0VGVzdHMvYW5pbWF0aW9ucy9hbmltYXRpb24tc2hv cnRoYW5kLXJlbW92ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4x NWJmOTY4Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvYW5pbWF0aW9ucy9hbmltYXRp b24tc2hvcnRoYW5kLXJlbW92ZWQuaHRtbApAQCAtMCwwICsxLDExMiBAQAorPGh0bWw+Cis8aGVh ZD4KKzx0aXRsZT5UZXN0IHJlbW92YWwgb2YgYW5pbWF0aW9uIHNob3J0aGFuZCBwcm9wZXJ0eTwv dGl0bGU+Cis8c3R5bGUgdHlwZT0idGV4dC9jc3MiIG1lZGlhPSJzY3JlZW4iPgorLmJveCB7Cisg IGhlaWdodDogMTBweDsKKyAgd2lkdGg6IDEwcHg7CisgIGJhY2tncm91bmQtY29sb3I6IGJsdWU7 Cit9CisKK0Atd2Via2l0LWtleWZyYW1lcyBhbmltMSB7IH0KKzwvc3R5bGU+CisgIDxzY3JpcHQg dHlwZT0idGV4dC9qYXZhc2NyaXB0IiBjaGFyc2V0PSJ1dGYtOCI+CisgICAgaWYgKHdpbmRvdy5s YXlvdXRUZXN0Q29udHJvbGxlcikgeworICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1w QXNUZXh0KCk7CisgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLndhaXRVbnRpbERvbmUoKTsK KyAgICB9CisKKyAgICBjb25zdCBrUHJvcGVydGllcyA9IFsKKyAgICAgICJ3ZWJraXRBbmltYXRp b25OYW1lIiwKKyAgICAgICJ3ZWJraXRBbmltYXRpb25EdXJhdGlvbiIsCisgICAgICAid2Via2l0 QW5pbWF0aW9uVGltaW5nRnVuY3Rpb24iLAorICAgICAgIndlYmtpdEFuaW1hdGlvbkRlbGF5IiwK KyAgICAgICJ3ZWJraXRBbmltYXRpb25JdGVyYXRpb25Db3VudCIsCisgICAgICAid2Via2l0QW5p bWF0aW9uRGlyZWN0aW9uIiwKKyAgICAgICJ3ZWJraXRBbmltYXRpb25GaWxsTW9kZSIKKyAgICBd OworICAgIGNvbnN0IGtFbGVtZW50cyA9IFsKKyAgICAgIHsgaWQ6ICJhIiwKKyAgICAgICAgdmFs dWVzOiBbIF0KKyAgICAgIH0sCisgICAgICB7IGlkOiAiYiIsCisgICAgICAgIHZhbHVlczogWyAi bm9uZSIsICIwcyIsICJlYXNlIiwgIjBzIiwgIjEiLCAibm9ybWFsIiwgIm5vbmUiIF0KKyAgICAg IH0sCisgICAgICB7IGlkOiAiYyIsCisgICAgICAgIHZhbHVlczogWyAiYW5pbTEiLCAiMTBzIiBd CisgICAgICB9LAorICAgICAgeyBpZDogImQiLAorICAgICAgICB2YWx1ZXM6IFsgImFuaW0xIiwg IjEwcyIsICJsaW5lYXIiIF0KKyAgICAgIH0sCisgICAgICB7IGlkOiAiZSIsCisgICAgICAgIHZh bHVlczogWyAiYW5pbTEiLCAiMTBzIiwgImxpbmVhciIsICI1cyIgXQorICAgICAgfSwKKyAgICAg IHsgaWQ6ICJmIiwKKyAgICAgICAgdmFsdWVzOiBbICJhbmltMSIsICIxMHMiLCAibGluZWFyIiwg IjVzIiwgIjMiIF0KKyAgICAgIH0sCisgICAgICB7IGlkOiAiZyIsCisgICAgICAgIHZhbHVlczog WyAiYW5pbTEiLCAiMTBzIiwgImxpbmVhciIsICI1cyIsICJpbmZpbml0ZSIsICJhbHRlcm5hdGUi IF0KKyAgICAgIH0sCisgICAgICB7IGlkOiAiaCIsCisgICAgICAgIHZhbHVlczogWyAiYW5pbTEi LCAiMTBzIiwgImxpbmVhciIsICI1cyIsICJpbmZpbml0ZSIsICJhbHRlcm5hdGUiLCAiZm9yd2Fy ZHMiIF0KKyAgICAgIH0KKyAgICBdOworICAgIGNvbnN0IGtFeHBlY3RlZFJlc3VsdHMgPSBbICJu b25lIiwgIjBzIiwgImN1YmljLWJlemllcigwLjI1LCAwLjEsIDAuMjUsIDEpIiwgIjBzIiwgIjEi LCAibm9ybWFsIiwgIm5vbmUiIF07CisKKyAgICBmdW5jdGlvbiBzdGFydCgpIHsKKyAgICAgIGtF bGVtZW50cy5mb3JFYWNoKGZ1bmN0aW9uKGN1ckVsKSB7CisgICAgICAgIHZhciBlbCA9IGRvY3Vt ZW50LmdldEVsZW1lbnRCeUlkKGN1ckVsLmlkKTsKKyAgICAgICAgZm9yICh2YXIgaT0wOyBpIDwg Y3VyRWwudmFsdWVzLmxlbmd0aDsgaSsrKSB7CisgICAgICAgICAgZWwuc3R5bGVba1Byb3BlcnRp ZXNbaV1dID0gY3VyRWwudmFsdWVzW2ldOworICAgICAgICB9CisgICAgICB9KTsKKyAgICAgIHNl dFRpbWVvdXQocmVtb3ZlLCAwKTsKKyAgICB9CisKKyAgICBmdW5jdGlvbiByZW1vdmUoKSB7Cisg ICAgICBrRWxlbWVudHMuZm9yRWFjaChmdW5jdGlvbihjdXJFbCkgeworICAgICAgICB2YXIgZWwg PSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZChjdXJFbC5pZCk7CisgICAgICAgIGVsLnN0eWxlLnJl bW92ZVByb3BlcnR5KCItd2Via2l0LWFuaW1hdGlvbiIpOworICAgICAgfSk7CisgICAgICBzZXRU aW1lb3V0KHRlc3QsIDApOworICAgIH0KKworICAgIGZ1bmN0aW9uIHRlc3QoKSB7CisgICAgICB2 YXIgcmVzdWx0c1N0cmluZyA9ICIiOworICAgICAga0VsZW1lbnRzLmZvckVhY2goZnVuY3Rpb24o Y3VyRWwpIHsKKyAgICAgICAgdmFyIGVsID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoY3VyRWwu aWQpOworICAgICAgICB2YXIgZWxTdHlsZSA9IHdpbmRvdy5nZXRDb21wdXRlZFN0eWxlKGVsKTsK KworICAgICAgICBmb3IgKHZhciBpPTA7IGkgPCBrUHJvcGVydGllcy5sZW5ndGg7IGkrKykgewor ICAgICAgICAgIHZhciBjb21wdXRlZFZhbHVlID0gZWxTdHlsZVtrUHJvcGVydGllc1tpXV07Cisg ICAgICAgICAgdmFyIGV4cGVjdGVkVmFsdWUgPSBrRXhwZWN0ZWRSZXN1bHRzW2ldOworICAgICAg ICAgIGlmIChjb21wdXRlZFZhbHVlID09IGV4cGVjdGVkVmFsdWUpCisgICAgICAgICAgICByZXN1 bHRzU3RyaW5nICs9ICJUZXN0aW5nICIgKyBrUHJvcGVydGllc1tpXSArICIgb24gIiArIGN1ckVs LmlkICsgIjogUEFTUyIgKyAiPGJyPiI7CisgICAgICAgICAgZWxzZQorICAgICAgICAgICAgcmVz dWx0c1N0cmluZyArPSAiVGVzdGluZyAiICsga1Byb3BlcnRpZXNbaV0gKyAiIG9uICIgKyBjdXJF bC5pZCArICIgZXhwZWN0ZWQgPGNvZGU+IiArIGV4cGVjdGVkVmFsdWUgKyAiPC9jb2RlPiBnb3Qg PGNvZGU+IiArIGNvbXB1dGVkVmFsdWUgKyAiPC9jb2RlPjogRkFJTCIgKyAiPGJyPiI7CisKKyAg ICAgICAgfQorICAgICAgfSk7CisKKyAgICAgIHZhciByZXN1bHRzID0gZG9jdW1lbnQuZ2V0RWxl bWVudEJ5SWQoJ3Jlc3VsdCcpOworICAgICAgcmVzdWx0cy5pbm5lckhUTUwgPSByZXN1bHRzU3Ry aW5nOworICAgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKKyAgICAgICAgICBs YXlvdXRUZXN0Q29udHJvbGxlci5ub3RpZnlEb25lKCk7CisgICAgfQorCisgICAgd2luZG93LmFk ZEV2ZW50TGlzdGVuZXIoJ2xvYWQnLCBzdGFydCwgZmFsc2UpOworICA8L3NjcmlwdD4KKzwvaGVh ZD4KKzxib2R5PgorPGRpdiBpZD0iYSIgY2xhc3M9ImJveCI+PC9kaXY+Cis8ZGl2IGlkPSJiIiBj bGFzcz0iYm94Ij48L2Rpdj4KKzxkaXYgaWQ9ImMiIGNsYXNzPSJib3giPjwvZGl2PgorPGRpdiBp ZD0iZCIgY2xhc3M9ImJveCI+PC9kaXY+Cis8ZGl2IGlkPSJlIiBjbGFzcz0iYm94Ij48L2Rpdj4K KzxkaXYgaWQ9ImYiIGNsYXNzPSJib3giPjwvZGl2PgorPGRpdiBpZD0iZyIgY2xhc3M9ImJveCI+ PC9kaXY+Cis8ZGl2IGlkPSJoIiBjbGFzcz0iYm94Ij48L2Rpdj4KKzxkaXYgaWQ9InJlc3VsdCI+ Cis8L2Rpdj4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9n IGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWQ4OGUxMC4uNDU0ZjVmZCAxMDA2NDQKLS0tIGEv V2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBA QAorMjAxMC0wNS0wOCAgRGVhbiBKYWNrc29uICA8ZGlub0BhcHBsZS5jb20+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTM2NTY2CisgICAgICAgIFRoZSBhbmltYXRpb24tZmlsbC1t b2RlIHByb3BlcnR5IHdhcyBtaXNzaW5nIGZyb20KKyAgICAgICAgYSBmZXcgcGxhY2VzIHdoZXJl IHRoZSBhbmltYXRpb24gc2hvcnRoYW5kIGlzIHNldCB1cC4KKworICAgICAgICBUZXN0OiBhbmlt YXRpb25zL2FuaW1hdGlvbi1zaG9ydGhhbmQtcmVtb3ZlZC5odG1sCisKKyAgICAgICAgKiBjc3Mv Q1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTTXV0 YWJsZVN0eWxlRGVjbGFyYXRpb246OmdldFByb3BlcnR5VmFsdWUpOgorICAgICAgICAqIGNzcy9D U1NQcm9wZXJ0eUxvbmdoYW5kLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmluaXRTaG9ydGhhbmRN YXApOgorCiAyMDEwLTA1LTA4ICBTdHVhcnQgTW9yZ2FuICA8c3R1YXJ0bW9yZ2FuQGNocm9taXVt Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KZGlmZiAtLWdpdCBhL1dl YkNvcmUvY3NzL0NTU011dGFibGVTdHlsZURlY2xhcmF0aW9uLmNwcCBiL1dlYkNvcmUvY3NzL0NT U011dGFibGVTdHlsZURlY2xhcmF0aW9uLmNwcAppbmRleCAzMjdmMzk4Li43YzA5ZjkxIDEwMDY0 NAotLS0gYS9XZWJDb3JlL2Nzcy9DU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbi5jcHAKKysrIGIv V2ViQ29yZS9jc3MvQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24uY3BwCkBAIC0yNDAsMTAgKzI0 MCwxMSBAQCBTdHJpbmcgQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb246OmdldFByb3BlcnR5VmFs dWUoaW50IHByb3BlcnR5SUQpIGNvbnN0CiAgICAgICAgICAgICByZXR1cm4gZ2V0TGF5ZXJlZFNo b3J0aGFuZFZhbHVlKHByb3BlcnRpZXMsIDQpOwogICAgICAgICB9CiAgICAgICAgIGNhc2UgQ1NT UHJvcGVydHlXZWJraXRBbmltYXRpb246IHsKLSAgICAgICAgICAgIGNvbnN0IGludCBwcm9wZXJ0 aWVzWzZdID0geyBDU1NQcm9wZXJ0eVdlYmtpdEFuaW1hdGlvbk5hbWUsIENTU1Byb3BlcnR5V2Vi a2l0QW5pbWF0aW9uRHVyYXRpb24sCisgICAgICAgICAgICBjb25zdCBpbnQgcHJvcGVydGllc1s3 XSA9IHsgQ1NTUHJvcGVydHlXZWJraXRBbmltYXRpb25OYW1lLCBDU1NQcm9wZXJ0eVdlYmtpdEFu aW1hdGlvbkR1cmF0aW9uLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IENTU1Byb3BlcnR5V2Via2l0QW5pbWF0aW9uVGltaW5nRnVuY3Rpb24sIENTU1Byb3BlcnR5V2Vi a2l0QW5pbWF0aW9uRGVsYXksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgQ1NTUHJvcGVydHlXZWJraXRBbmltYXRpb25JdGVyYXRpb25Db3VudCwgQ1NTUHJvcGVydHlX ZWJraXRBbmltYXRpb25EaXJlY3Rpb24gfTsKLSAgICAgICAgICAgIHJldHVybiBnZXRMYXllcmVk U2hvcnRoYW5kVmFsdWUocHJvcGVydGllcywgNik7CisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgQ1NTUHJvcGVydHlXZWJraXRBbmltYXRpb25JdGVyYXRpb25Db3VudCwg Q1NTUHJvcGVydHlXZWJraXRBbmltYXRpb25EaXJlY3Rpb24sCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgQ1NTUHJvcGVydHlXZWJraXRBbmltYXRpb25GaWxsTW9kZSB9 OworICAgICAgICAgICAgcmV0dXJuIGdldExheWVyZWRTaG9ydGhhbmRWYWx1ZShwcm9wZXJ0aWVz LCA3KTsKICAgICAgICAgfQogI2lmIEVOQUJMRShTVkcpCiAgICAgICAgIGNhc2UgQ1NTUHJvcGVy dHlNYXJrZXI6IHsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5TG9uZ2hhbmQu Y3BwIGIvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHlMb25naGFuZC5jcHAKaW5kZXggYjQ1ZmEwZC4u YTRiMzMyNSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHlMb25naGFuZC5jcHAK KysrIGIvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHlMb25naGFuZC5jcHAKQEAgLTE4OCw3ICsxODgs OCBAQCBzdGF0aWMgdm9pZCBpbml0U2hvcnRoYW5kTWFwKFNob3J0aGFuZE1hcCYgc2hvcnRoYW5k TWFwKQogICAgICAgICBDU1NQcm9wZXJ0eVdlYmtpdEFuaW1hdGlvblRpbWluZ0Z1bmN0aW9uLAog ICAgICAgICBDU1NQcm9wZXJ0eVdlYmtpdEFuaW1hdGlvbkRlbGF5LAogICAgICAgICBDU1NQcm9w ZXJ0eVdlYmtpdEFuaW1hdGlvbkl0ZXJhdGlvbkNvdW50LAotICAgICAgICBDU1NQcm9wZXJ0eVdl YmtpdEFuaW1hdGlvbkRpcmVjdGlvbgorICAgICAgICBDU1NQcm9wZXJ0eVdlYmtpdEFuaW1hdGlv bkRpcmVjdGlvbiwKKyAgICAgICAgQ1NTUHJvcGVydHlXZWJraXRBbmltYXRpb25GaWxsTW9kZQog ICAgIH07CiAgICAgU0VUX1NIT1JUSEFORF9NQVBfRU5UUlkoc2hvcnRoYW5kTWFwLCBDU1NQcm9w ZXJ0eVdlYmtpdEFuaW1hdGlvbiwgYW5pbWF0aW9uUHJvcGVydGllcyk7CiAK