50639 2010-12-07 11:53:52 -0800 Fix pauseAnimation API to work with shorthand properties 2010-12-08 09:38:18 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser cmarrin simon.fraser oldest_to_newest 318367 0 simon.fraser 2010-12-07 11:53:52 -0800 The pauseAnimation API used by DRT doesn't work with CSS shorthand properties, forcing us to use flakey time-based tests. 318666 1 75876 simon.fraser 2010-12-07 23:10:42 -0800 Created attachment 75876 Patch 318827 2 75876 mitz 2010-12-08 09:31:36 -0800 Comment on attachment 75876 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=75876&action=review > WebCore/page/animation/CompositeAnimation.cpp:526 > if (!implAnim || !implAnim->running()) No need to test for !implAnim here anymore. 318832 3 simon.fraser 2010-12-08 09:38:18 -0800 http://trac.webkit.org/changeset/73526 75876 2010-12-07 23:10:42 -0800 2010-12-08 09:31:36 -0800 Patch bug-50639-20101207231040.patch text/plain 10056 simon.fraser ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA1OWI2Mzc4NGJkMWIzN2UxYzdkNWI2YzI4MzViM2E4NDY1OGM0NDhlLi4zZjg0MDcx OGI1YThmMjEwYjM5MjdkYjBiMDhiMmZiY2JhM2NhZjlmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjEgQEAK IDIwMTAtMTItMDcgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4IHBhdXNlQW5p bWF0aW9uIEFQSSB0byB3b3JrIHdpdGggc2hvcnRoYW5kIHByb3BlcnRpZXMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUwNjM5CisgICAgICAgIAorICAg ICAgICAqIHRyYW5zaXRpb25zL2JvcmRlci1yYWRpdXMtdHJhbnNpdGlvbi5odG1sOgorICAgICAg ICAqIHRyYW5zaXRpb25zL3Nob3J0aGFuZC1ib3JkZXItdHJhbnNpdGlvbnMuaHRtbDoKKyAgICAg ICAgKiB0cmFuc2l0aW9ucy9zaG9ydGhhbmQtdHJhbnNpdGlvbnMuaHRtbDoKKyAgICAgICAgV2Ug Y2FuIG5vdyB1c2UgdGhlIHBhdXNlIEFQSSBmb3IgdGhlc2UgdGVzdHMuCisgICAgICAgIAorICAg ICAgICAqIHRyYW5zaXRpb25zL3RyYW5zaXRpb24tdGVzdC1oZWxwZXJzLmpzOgorICAgICAgICBG aXggaXNzdWUgd2hlcmUgIi13ZWJraXQtdHJhbnNmb3JtLW9yaWdpbiIgd291bGQgbWF0Y2ggd2hl cmUKKyAgICAgICAgd2UgYXJlIHJlYWxseSBsb29raW5nIGZvciAiLXdlYmtpdC10cmFuc2Zvcm0u Ii4KKworMjAxMC0xMi0wNyAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4K KwogICAgICAgICBSZWxheCB0aGUgbWF0Y2hpbmcgdG9sZXJhbmNlIHRvIHJlZHVjZSBmbGFraW5l c3MuCiAKICAgICAgICAgKiB0cmFuc2l0aW9ucy9ib3JkZXItcmFkaXVzLXRyYW5zaXRpb24uaHRt bDoKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3RyYW5zaXRpb25zL2JvcmRlci1yYWRpdXMtdHJh bnNpdGlvbi5odG1sIGIvTGF5b3V0VGVzdHMvdHJhbnNpdGlvbnMvYm9yZGVyLXJhZGl1cy10cmFu c2l0aW9uLmh0bWwKaW5kZXggYjQ0MzRmY2JiNTUyODRkNTM5Mzg0NDYzYjZkNjk1MjIwOTg5OTk0 Yy4uOTg3MzRkZTZhZWQ4ODI2OTI4ZTUwNDg5NTM3MmUyN2M1ODQ2NDJmOCAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvdHJhbnNpdGlvbnMvYm9yZGVyLXJhZGl1cy10cmFuc2l0aW9uLmh0bWwKKysr IGIvTGF5b3V0VGVzdHMvdHJhbnNpdGlvbnMvYm9yZGVyLXJhZGl1cy10cmFuc2l0aW9uLmh0bWwK QEAgLTQ0LDcgKzQ0LDcgQEAKICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdib3gyJyku Y2xhc3NOYW1lID0gJ2JveCBmaW5hbCc7CiAgICAgfQogICAKLSAgICBydW5UcmFuc2l0aW9uVGVz dChleHBlY3RlZFZhbHVlcywgc2V0dXBUZXN0LCBkb250VXNlUGF1c2VBUEkpOyAvLyB0aGUgcGF1 c2UgQVBJIGRvZXMgbm90IHdvcmsgd2l0aCBzaG9ydGhhbmRzLgorICAgIHJ1blRyYW5zaXRpb25U ZXN0KGV4cGVjdGVkVmFsdWVzLCBzZXR1cFRlc3QsIHVzZVBhdXNlQVBJKTsKICAgPC9zY3JpcHQ+ CiA8L2hlYWQ+CiA8Ym9keT4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3RyYW5zaXRpb25zL3No b3J0aGFuZC1ib3JkZXItdHJhbnNpdGlvbnMuaHRtbCBiL0xheW91dFRlc3RzL3RyYW5zaXRpb25z L3Nob3J0aGFuZC1ib3JkZXItdHJhbnNpdGlvbnMuaHRtbAppbmRleCAzNjJlYWIxOTgwOTAwYmY1 ZGM3ZWZlMGNmNTE2YTc4YjIyNzc4NjcxLi40ODgwNTk4YTE4YjJhZGRhMDdkYWI5NzA4MWMyNzA1 Mjg3MDQ5MWYwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy90cmFuc2l0aW9ucy9zaG9ydGhhbmQt Ym9yZGVyLXRyYW5zaXRpb25zLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvdHJhbnNpdGlvbnMvc2hv cnRoYW5kLWJvcmRlci10cmFuc2l0aW9ucy5odG1sCkBAIC01MCw3ICs1MCw3IEBACiAgIDxzY3Jp cHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBjaGFyc2V0PSJ1dGYtOCI+CiAgICAgCiAgICAgY29u c3QgZXhwZWN0ZWRWYWx1ZXMgPSBbCi0gICAgICAvLyBbdGltZSwgZWxlbWVudC1pZCwgcHJvcGVy dHksIGV4cGVjdGVkLXZhbHVlLCB0b2xlcmFuY2VdCisgICAgICAvLyBbdGltZSwgZWxlbWVudC1p ZCwgcHJvcGVydHksIGV4cGVjdGVkLXZhbHVlLCB0b2xlcmFuY2UsIGNhbGxiYWNrLCBzaG91bGQt YmUtdHJhbnNpdGlvbmluZ10KICAgICAgIC8vIGNvbG9yIGFuZCB3aWR0aCBvZiBlYWNoIHNpZGUg c2hvdWxkIGJlIGFuaW1hdGluZwogICAgICAgWzAuNSwgJ2JveCcsICdib3JkZXItdG9wLWNvbG9y JywgWzEyOCwgMCwgMTI4XSwgMzBdLAogICAgICAgWzAuNSwgJ2JveCcsICdib3JkZXItcmlnaHQt Y29sb3InLCBbMTI4LCAwLCAxMjhdLCAzMF0sCkBAIC02Myw3ICs2Myw3IEBACiAKICAgICAgIC8v IG9ubHkgYm9yZGVyLXdpZHRoIHNob3VsZCBiZSBhbmltYXRpbmcKICAgICAgIFswLjUsICdib3gx JywgJ2JvcmRlci10b3Atd2lkdGgnLCAxMCwgMl0sCi0gICAgICBbMC41LCAnYm94MScsICdib3Jk ZXItdG9wLWNvbG9yJywgWzI1NSwgMCwgMjU1XSwgMF0sICAvLyBpbml0aWFsIHZhbHVlCisgICAg ICBbMC41LCAnYm94MScsICdib3JkZXItdG9wLWNvbG9yJywgWzI1NSwgMCwgMjU1XSwgMCwgbnVs bCwgc2hvdWxkTm90QmVUcmFuc2l0aW9uaW5nXSwKIAogICAgICAgLy8gYm9yZGVyLXdpZHRoIHNo b3VsZCBiZSBhbmltYXRpbmcKICAgICAgIFswLjUsICdib3gyJywgJ2JvcmRlci10b3Atd2lkdGgn LCAxMCwgMl0sCkBAIC04Miw3ICs4Miw3IEBACiAgICAgICBib3gyLmNsYXNzTmFtZSA9ICdmaW5h bCc7CiAgICAgfQogICAgIAotICAgIHJ1blRyYW5zaXRpb25UZXN0KGV4cGVjdGVkVmFsdWVzLCBz ZXR1cFRlc3QsIGZhbHNlKTsKKyAgICBydW5UcmFuc2l0aW9uVGVzdChleHBlY3RlZFZhbHVlcywg c2V0dXBUZXN0LCB1c2VQYXVzZUFQSSk7CiAgIDwvc2NyaXB0PgogPC9oZWFkPgogPGJvZHk+CmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy90cmFuc2l0aW9ucy9zaG9ydGhhbmQtdHJhbnNpdGlvbnMu aHRtbCBiL0xheW91dFRlc3RzL3RyYW5zaXRpb25zL3Nob3J0aGFuZC10cmFuc2l0aW9ucy5odG1s CmluZGV4IDEzNTkxMjg2ZWMyZDEwNDJhNDNhYjg2NTFmYTBlYTM4YjZkYzMxMzYuLjhiOTcyMjc1 OWVjYTZlOGVhNTk3OWIzMDlhNGQzNDM3N2JlODE2YjUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L3RyYW5zaXRpb25zL3Nob3J0aGFuZC10cmFuc2l0aW9ucy5odG1sCisrKyBiL0xheW91dFRlc3Rz L3RyYW5zaXRpb25zL3Nob3J0aGFuZC10cmFuc2l0aW9ucy5odG1sCkBAIC00OSw5ICs0OSw3IEBA CiAgICAgICBib3guY2xhc3NOYW1lID0gJ2ZpbmFsJzsKICAgICB9CiAgICAgCi0gICAgLy8gV2Ug Y2FuJ3QgdXNlIHRoZSBwYXVzZSBBUEkgYmVjYXVzZSBpdCBvbmx5IHdvcmtzIGZvciBpbmRpdmlk dWFsIHByb3BlcnRpZXMsIGFuZAotICAgIC8vIC13ZWJraXQtdHJhbnNmb3JtLW9yaWdpbiBpcyBh IGNvbXBvdW5kIHByb3BlcnR5LgotICAgIHJ1blRyYW5zaXRpb25UZXN0KGV4cGVjdGVkVmFsdWVz LCBzZXR1cFRlc3QsIGZhbHNlKTsKKyAgICBydW5UcmFuc2l0aW9uVGVzdChleHBlY3RlZFZhbHVl cywgc2V0dXBUZXN0LCB1c2VQYXVzZUFQSSk7CiAgIDwvc2NyaXB0PgogPC9oZWFkPgogPGJvZHk+ CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy90cmFuc2l0aW9ucy90cmFuc2l0aW9uLXRlc3QtaGVs cGVycy5qcyBiL0xheW91dFRlc3RzL3RyYW5zaXRpb25zL3RyYW5zaXRpb24tdGVzdC1oZWxwZXJz LmpzCmluZGV4IGFkOWY4MDRjZGEyODgyZTZlYzdhMjBlZjVjZmMyYjMyODc2OGRhMGIuLmY0OTRk YTQyMjZjODA3Y2YyMmEyMTk1YTNkZWZhMWNhZmRlZjBmZGYgMTAwNjQ0Ci0tLSBhL0xheW91dFRl c3RzL3RyYW5zaXRpb25zL3RyYW5zaXRpb24tdGVzdC1oZWxwZXJzLmpzCisrKyBiL0xheW91dFRl c3RzL3RyYW5zaXRpb25zL3RyYW5zaXRpb24tdGVzdC1oZWxwZXJzLmpzCkBAIC0xNjksNyArMTY5 LDcgQEAgZnVuY3Rpb24gcnVuVGVzdChleHBlY3RlZCwgdXNlUGF1c2VBUEkpCiAgICAgICAgIHZh ciB0aW1lID0gZXhwZWN0ZWRbaV1bMF07CiAgICAgICAgIHZhciBlbGVtZW50SWQgPSBleHBlY3Rl ZFtpXVsxXTsKICAgICAgICAgdmFyIHByb3BlcnR5ID0gZXhwZWN0ZWRbaV1bMl07Ci0gICAgICAg IGlmICghcHJvcGVydHkuaW5kZXhPZigiLXdlYmtpdC10cmFuc2Zvcm0iKSkKKyAgICAgICAgaWYg KCFwcm9wZXJ0eS5pbmRleE9mKCItd2Via2l0LXRyYW5zZm9ybS4iKSkKICAgICAgICAgICAgIHBy b3BlcnR5ID0gIi13ZWJraXQtdHJhbnNmb3JtIjsKIAogICAgICAgICB2YXIgdHJ5VG9QYXVzZVRy YW5zaXRpb24gPSBleHBlY3RlZFtpXVs2XTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9n IGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDg5OTViYjMxMWQ0MTM3MTI2ZGZlZjEzYzliNWJl ZTk3NTkzYzdkMi4uNmIxYWFmZDU4NTQyNDk3MmJlMTI0MWZmNWU5ZjJhZDRiYzg2MWRiYSAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyOSBAQAorMjAxMC0xMi0wNyAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxl LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBG aXggcGF1c2VBbmltYXRpb24gQVBJIHRvIHdvcmsgd2l0aCBzaG9ydGhhbmQgcHJvcGVydGllcwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTA2MzkKKyAg ICAgICAgCisgICAgICAgIFRoZSBwYXVzZSBBUEkgaXMgYWx3YXlzIGNhbGxlZCB3aXRoIGEgbG9u Zy1oYW5kIHByb3BlcnR5LCBidXQgdGhhdAorICAgICAgICBwcm9wZXJ0eSBtYXkgYmUgYW5pbWF0 aW5nIHZpYSBhIHNob3J0aGFuZC4gRGV0ZWN0IHRoaXMsIGFuZCBwYXVzZQorICAgICAgICBzdWNo IHNob3J0aGFuZCBhbmltYXRpb25zLgorCisgICAgICAgICogcGFnZS9hbmltYXRpb24vQW5pbWF0 aW9uQmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTaG9ydGhhbmRQcm9wZXJ0eVdyYXBwZXI6 OnByb3BlcnR5V3JhcHBlcnMpOiBFeHBvc2UgdGhlIHZlY3RvcgorICAgICAgICBvZiB3cmFwcGVy cyB1c2VkIGJ5IGEgc2hvcnRoYW5kIHdyYXBwZXIuCisKKyAgICAgICAgKFdlYkNvcmU6OmdhdGhl ckVuY2xvc2luZ1Nob3J0aGFuZFByb3BlcnRpZXMpOiBVdGlsaXR5IGZ1bmN0aW9uIHRoYXQgd2Fs a3MKKyAgICAgICAgdGhyb3VnaCB0aGUgc2hvcnRoYW5kIHdyYXBwZXJzLCBrZWVwaW5nIHRyYWNr IG9mIHdoaWNoIGNhbiBhZmZlY3QgdGhlIGdpdmVuCisgICAgICAgIHByb3BlcnR5LgorICAgICAg ICAoV2ViQ29yZTo6QW5pbWF0aW9uQmFzZTo6YW5pbWF0YWJsZVNob3J0aGFuZHNBZmZlY3RpbmdQ cm9wZXJ0eSk6IFJldHVybiBhIHNldAorICAgICAgICBvZiBzaG9ydGhhbmQgcHJvcGVydGllcyB0 aGF0IGNhbiBhZmZlY3QgdGhlIGdpdmVuIHByb3BlcnR5LgorCisgICAgICAgICogcGFnZS9hbmlt YXRpb24vQW5pbWF0aW9uQmFzZS5oOiBOZXcgbWV0aG9kLgorICAgICAgICAqIHBhZ2UvYW5pbWF0 aW9uL0NvbXBvc2l0ZUFuaW1hdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb21wb3NpdGVB bmltYXRpb246OnBhdXNlVHJhbnNpdGlvbkF0VGltZSk6IElmIHdlIGRvbid0IGZpbmQgdGhlCisg ICAgICAgIHByb3BlcnR5IGl0c2VsZiwgY2hlY2sgd2hldGhlciBpdCdzIGJlaW5nIGFuaW1hdGVk IHZpYSBzaG9ydGhhbmRzLgorCiAyMDEwLTExLTI5ICBNaWhhaSBQYXJwYXJpdGEgIDxtaWhhaXBA Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gQmFydGguCmRpZmYgLS1n aXQgYS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0FuaW1hdGlvbkJhc2UuY3BwIGIvV2ViQ29yZS9w YWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmNwcAppbmRleCA5MTNmZTlmNzliNGYwN2Y0ZDJl ZTI3ODAyMTcxM2U2ZTA1MTFjNWIzLi4xYmEzOWQ5OTU5MTE1ZDI5MTVkMzE0YzA0OTkzODcyNjBm Y2JkNjAxIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0FuaW1hdGlvbkJhc2Uu Y3BwCisrKyBiL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vQW5pbWF0aW9uQmFzZS5jcHAKQEAgLTU3 OCw2ICs1NzgsOCBAQCBwdWJsaWM6CiAgICAgICAgICAgICAoKml0KS0+YmxlbmQoYW5pbSwgZHN0 LCBhLCBiLCBwcm9ncmVzcyk7CiAgICAgfQogCisgICAgY29uc3QgVmVjdG9yPFByb3BlcnR5V3Jh cHBlckJhc2UqPiBwcm9wZXJ0eVdyYXBwZXJzKCkgY29uc3QgeyByZXR1cm4gbV9wcm9wZXJ0eVdy YXBwZXJzOyB9CisKIHByaXZhdGU6CiAgICAgVmVjdG9yPFByb3BlcnR5V3JhcHBlckJhc2UqPiBt X3Byb3BlcnR5V3JhcHBlcnM7CiB9OwpAQCAtODY3LDYgKzg2OSwzOSBAQCBib29sIEFuaW1hdGlv bkJhc2U6OmFuaW1hdGlvbk9mUHJvcGVydHlJc0FjY2VsZXJhdGVkKGludCBwcm9wKQogfQogI2Vu ZGlmCiAKK3N0YXRpYyBib29sIGdhdGhlckVuY2xvc2luZ1Nob3J0aGFuZFByb3BlcnRpZXMoaW50 IHByb3BlcnR5LCBQcm9wZXJ0eVdyYXBwZXJCYXNlKiB3cmFwcGVyLCBIYXNoU2V0PGludD4mIHBy b3BlcnR5U2V0KQoreworICAgIGlmICghd3JhcHBlci0+aXNTaG9ydGhhbmRXcmFwcGVyKCkpCisg ICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIFNob3J0aGFuZFByb3BlcnR5V3JhcHBlciogc2hv cnRoYW5kV3JhcHBlciA9IHN0YXRpY19jYXN0PFNob3J0aGFuZFByb3BlcnR5V3JhcHBlcio+KHdy YXBwZXIpOworICAgIAorICAgIGJvb2wgY29udGFpbmVkID0gZmFsc2U7CisgICAgZm9yIChzaXpl X3QgaSA9IDA7IGkgPCBzaG9ydGhhbmRXcmFwcGVyLT5wcm9wZXJ0eVdyYXBwZXJzKCkuc2l6ZSgp OyArK2kpIHsKKyAgICAgICAgUHJvcGVydHlXcmFwcGVyQmFzZSogY3VycldyYXBwZXIgPSBzaG9y dGhhbmRXcmFwcGVyLT5wcm9wZXJ0eVdyYXBwZXJzKClbaV07CisKKyAgICAgICAgaWYgKGdhdGhl ckVuY2xvc2luZ1Nob3J0aGFuZFByb3BlcnRpZXMocHJvcGVydHksIGN1cnJXcmFwcGVyLCBwcm9w ZXJ0eVNldCkgfHwgY3VycldyYXBwZXItPnByb3BlcnR5KCkgPT0gcHJvcGVydHkpCisgICAgICAg ICAgICBjb250YWluZWQgPSB0cnVlOworICAgIH0KKyAgICAKKyAgICBpZiAoY29udGFpbmVkKQor ICAgICAgICBwcm9wZXJ0eVNldC5hZGQod3JhcHBlci0+cHJvcGVydHkoKSk7CisKKyAgICByZXR1 cm4gY29udGFpbmVkOworfQorCisvLyBOb3RlOiB0aGlzIGlzIGluZWZmaWNpZW50LiBJdCdzIG9u bHkgY2FsbGVkIGZyb20gcGF1c2VUcmFuc2l0aW9uQXRUaW1lKCkuCitIYXNoU2V0PGludD4gQW5p bWF0aW9uQmFzZTo6YW5pbWF0YWJsZVNob3J0aGFuZHNBZmZlY3RpbmdQcm9wZXJ0eShpbnQgcHJv cGVydHkpCit7CisgICAgZW5zdXJlUHJvcGVydHlNYXAoKTsKKworICAgIEhhc2hTZXQ8aW50PiBm b3VuZFByb3BlcnRpZXM7CisgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBnZXROdW1Qcm9wZXJ0aWVz KCk7ICsraSkKKyAgICAgICAgZ2F0aGVyRW5jbG9zaW5nU2hvcnRoYW5kUHJvcGVydGllcyhwcm9w ZXJ0eSwgKCpnUHJvcGVydHlXcmFwcGVycylbaV0sIGZvdW5kUHJvcGVydGllcyk7CisKKyAgICBy ZXR1cm4gZm91bmRQcm9wZXJ0aWVzOworfQorCiB2b2lkIEFuaW1hdGlvbkJhc2U6OnNldE5lZWRz U3R5bGVSZWNhbGMoTm9kZSogbm9kZSkKIHsKICAgICBBU1NFUlQoIW5vZGUgfHwgKG5vZGUtPmRv Y3VtZW50KCkgJiYgIW5vZGUtPmRvY3VtZW50KCktPmluUGFnZUNhY2hlKCkpKTsKZGlmZiAtLWdp dCBhL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vQW5pbWF0aW9uQmFzZS5oIGIvV2ViQ29yZS9wYWdl L2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmgKaW5kZXggZWI5YmQxMjYyYmNhYzUxYmEzZjFlNjIx ZDI0OWRkMmJkNTE1NGJkYy4uODc3ZDY0OWE2YjJkYjQ4ZjZiYTNjMGFlN2EwOGJhZGEyYWQ1NzRk YyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmgKKysr IGIvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmgKQEAgLTMxLDYgKzMxLDcg QEAKIAogI2luY2x1ZGUgIlJlbmRlclN0eWxlQ29uc3RhbnRzLmgiCiAjaW5jbHVkZSA8d3RmL0hh c2hNYXAuaD4KKyNpbmNsdWRlIDx3dGYvSGFzaFNldC5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0F0 b21pY1N0cmluZy5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC0xODAsNiArMTgxLDggQEAg cHVibGljOgogICAgIHN0YXRpYyBib29sIGFuaW1hdGlvbk9mUHJvcGVydHlJc0FjY2VsZXJhdGVk KGludCBwcm9wKTsKICNlbmRpZgogCisgICAgc3RhdGljIEhhc2hTZXQ8aW50PiBhbmltYXRhYmxl U2hvcnRoYW5kc0FmZmVjdGluZ1Byb3BlcnR5KGludCBwcm9wZXJ0eSk7CisgICAgCiBwcm90ZWN0 ZWQ6CiAgICAgdmlydHVhbCB2b2lkIG92ZXJyaWRlQW5pbWF0aW9ucygpIHsgfQogICAgIHZpcnR1 YWwgdm9pZCByZXN1bWVPdmVycmlkZGVuQW5pbWF0aW9ucygpIHsgfQpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9wYWdlL2FuaW1hdGlvbi9Db21wb3NpdGVBbmltYXRpb24uY3BwIGIvV2ViQ29yZS9wYWdl L2FuaW1hdGlvbi9Db21wb3NpdGVBbmltYXRpb24uY3BwCmluZGV4IDlkMDIxYjQ3MmMyYzFlNzgz NzRmZWM4MTZkY2FhY2MwZTdjOTZjODQuLjA0MTNhZTM4MjhmZjg4Y2IyOWY0MWUwY2M2YTc0NGE3 NGJkODc0NDUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vQ29tcG9zaXRlQW5p bWF0aW9uLmNwcAorKysgYi9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0NvbXBvc2l0ZUFuaW1hdGlv bi5jcHAKQEAgLTMwLDYgKzMwLDcgQEAKICNpbmNsdWRlICJDb21wb3NpdGVBbmltYXRpb24uaCIK IAogI2luY2x1ZGUgIkFuaW1hdGlvbkNvbnRyb2xsZXJQcml2YXRlLmgiCisjaW5jbHVkZSAiQ1NT UHJvcGVydHlMb25naGFuZC5oIgogI2luY2x1ZGUgIkNTU1Byb3BlcnR5TmFtZXMuaCIKICNpbmNs dWRlICJJbXBsaWNpdEFuaW1hdGlvbi5oIgogI2luY2x1ZGUgIktleWZyYW1lQW5pbWF0aW9uLmgi CkBAIC01MDksNiArNTEwLDE5IEBAIGJvb2wgQ29tcG9zaXRlQW5pbWF0aW9uOjpwYXVzZVRyYW5z aXRpb25BdFRpbWUoaW50IHByb3BlcnR5LCBkb3VibGUgdCkKICAgICAgICAgcmV0dXJuIGZhbHNl OwogCiAgICAgSW1wbGljaXRBbmltYXRpb24qIGltcGxBbmltID0gbV90cmFuc2l0aW9ucy5nZXQo cHJvcGVydHkpLmdldCgpOworICAgIGlmICghaW1wbEFuaW0pIHsKKyAgICAgICAgLy8gQ2hlY2sg dG8gc2VlIGlmIHRoaXMgcHJvcGVydHkgaXMgYmVpbmcgYW5pbWF0ZWQgdmlhIGEgc2hvcnRoYW5k LgorICAgICAgICAvLyBUaGlzIGNvZGUgaXMgb25seSB1c2VkIGZvciB0ZXN0aW5nLCBzbyBwZXJm b3JtYW5jZSBpcyBub3QgY3JpdGljYWwgaGVyZS4KKyAgICAgICAgSGFzaFNldDxpbnQ+IHNob3J0 aGFuZFByb3BlcnRpZXMgPSBBbmltYXRpb25CYXNlOjphbmltYXRhYmxlU2hvcnRoYW5kc0FmZmVj dGluZ1Byb3BlcnR5KHByb3BlcnR5KTsKKyAgICAgICAgYm9vbCBhbnlQYXVzZWQgPSBmYWxzZTsK KyAgICAgICAgSGFzaFNldDxpbnQ+Ojpjb25zdF9pdGVyYXRvciBlbmQgPSBzaG9ydGhhbmRQcm9w ZXJ0aWVzLmVuZCgpOworICAgICAgICBmb3IgKEhhc2hTZXQ8aW50Pjo6Y29uc3RfaXRlcmF0b3Ig aXQgPSBzaG9ydGhhbmRQcm9wZXJ0aWVzLmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkgeworICAg ICAgICAgICAgaWYgKHBhdXNlVHJhbnNpdGlvbkF0VGltZSgqaXQsIHQpKQorICAgICAgICAgICAg ICAgIGFueVBhdXNlZCA9IHRydWU7CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuIGFueVBhdXNl ZDsKKyAgICB9CisKICAgICBpZiAoIWltcGxBbmltIHx8ICFpbXBsQW5pbS0+cnVubmluZygpKQog ICAgICAgICByZXR1cm4gZmFsc2U7CiAK