23122 2009-01-05 13:33:36 -0800 platform/animation/Animation.cpp includes RenderStyle.h: bad dependency 2009-01-07 17:38:26 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 simon.fraser cmarrin oldest_to_newest 104478 0 simon.fraser 2009-01-05 13:33:36 -0800 Animation.cpp breaks the platform abstraction by pulling in RenderStyle.h, for initialAnimationDelay() and friends. 104819 1 26514 cmarrin 2009-01-07 16:57:18 -0800 Created attachment 26514 patch 104820 2 26514 eric 2009-01-07 16:58:52 -0800 Comment on attachment 26514 patch Looks good. 104825 3 cmarrin 2009-01-07 17:38:26 -0800 Sending WebCore/ChangeLog Sending WebCore/css/CSSComputedStyleDeclaration.cpp Sending WebCore/css/CSSHelper.h Sending WebCore/css/CSSStyleSelector.cpp Sending WebCore/platform/animation/Animation.cpp Sending WebCore/platform/animation/Animation.h Sending WebCore/rendering/style/RenderStyle.h Transmitting file data ....... Committed revision 39696. 26514 2009-01-07 16:57:18 -0800 2009-01-07 16:58:52 -0800 patch 23122.patch text/plain 12462 cmarrin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzOTY5NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzkgQEAKKzIwMDktMDEtMDcgIENocmlzIE1hcnJpbiAgPGNtYXJyaW5AYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzEyMgorCisgICAgICAgIFRo aXMgY29tcGxldGVzIHRoZSByZW1vdmFsIG9mIGRlcGVuZGVuY2llcyBvbiBXZWJLaXQgZnJvbSB0 aGUgcGxhdGZvcm0gY29kZQorCisgICAgICAgICogY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJh dGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpnZXREZWxheVZhbHVlKToKKyAgICAgICAgKFdl YkNvcmU6OmdldER1cmF0aW9uVmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6Z2V0VGltaW5nRnVu Y3Rpb25WYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpDU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRp b246OmdldFByb3BlcnR5Q1NTVmFsdWUpOgorICAgICAgICAqIGNzcy9DU1NIZWxwZXIuaDoKKyAg ICAgICAgKiBjc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NT dHlsZVNlbGVjdG9yOjptYXBBbmltYXRpb25EZWxheSk6CisgICAgICAgIChXZWJDb3JlOjpDU1NT dHlsZVNlbGVjdG9yOjptYXBBbmltYXRpb25EaXJlY3Rpb24pOgorICAgICAgICAoV2ViQ29yZTo6 Q1NTU3R5bGVTZWxlY3Rvcjo6bWFwQW5pbWF0aW9uRHVyYXRpb24pOgorICAgICAgICAoV2ViQ29y ZTo6Q1NTU3R5bGVTZWxlY3Rvcjo6bWFwQW5pbWF0aW9uSXRlcmF0aW9uQ291bnQpOgorICAgICAg ICAoV2ViQ29yZTo6Q1NTU3R5bGVTZWxlY3Rvcjo6bWFwQW5pbWF0aW9uTmFtZSk6CisgICAgICAg IChXZWJDb3JlOjpDU1NTdHlsZVNlbGVjdG9yOjptYXBBbmltYXRpb25QbGF5U3RhdGUpOgorICAg ICAgICAoV2ViQ29yZTo6Q1NTU3R5bGVTZWxlY3Rvcjo6bWFwQW5pbWF0aW9uUHJvcGVydHkpOgor ICAgICAgICAoV2ViQ29yZTo6Q1NTU3R5bGVTZWxlY3Rvcjo6bWFwQW5pbWF0aW9uVGltaW5nRnVu Y3Rpb24pOgorICAgICAgICAqIHBsYXRmb3JtL2FuaW1hdGlvbi9BbmltYXRpb24uY3BwOgorICAg ICAgICAoV2ViQ29yZTo6QW5pbWF0aW9uOjpBbmltYXRpb24pOgorICAgICAgICAqIHBsYXRmb3Jt L2FuaW1hdGlvbi9BbmltYXRpb24uaDoKKyAgICAgICAgKFdlYkNvcmU6OkFuaW1hdGlvbjo6aW5p dGlhbEFuaW1hdGlvbkRlbGF5KToKKyAgICAgICAgKFdlYkNvcmU6OkFuaW1hdGlvbjo6aW5pdGlh bEFuaW1hdGlvbkRpcmVjdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpBbmltYXRpb246OmluaXRp YWxBbmltYXRpb25EdXJhdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpBbmltYXRpb246OmluaXRp YWxBbmltYXRpb25JdGVyYXRpb25Db3VudCk6CisgICAgICAgIChXZWJDb3JlOjpBbmltYXRpb246 OmluaXRpYWxBbmltYXRpb25OYW1lKToKKyAgICAgICAgKFdlYkNvcmU6OkFuaW1hdGlvbjo6aW5p dGlhbEFuaW1hdGlvblBsYXlTdGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpBbmltYXRpb246Omlu aXRpYWxBbmltYXRpb25Qcm9wZXJ0eSk6CisgICAgICAgIChXZWJDb3JlOjpBbmltYXRpb246Omlu aXRpYWxBbmltYXRpb25UaW1pbmdGdW5jdGlvbik6CisgICAgICAgICogcmVuZGVyaW5nL3N0eWxl L1JlbmRlclN0eWxlLmg6CisKIDIwMDgtMDEtMDcgIFBldGVyIEthc3RpbmcgIDxwa2FzdGluZ0Bn b29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNhbSBXZWluaWcuCkluZGV4OiBXZWJD b3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAJKHJldmlzaW9uIDM5Njgz KQorKysgV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNDMxLDcgKzQzMSw3IEBAIHN0YXRpYyBQYXNzUmVmUHRyPENTU1ZhbHVlPiBn ZXREZWxheVZhbHUKICAgICAgICAgICAgIGxpc3QtPmFwcGVuZChDU1NQcmltaXRpdmVWYWx1ZTo6 Y3JlYXRlKGFuaW1MaXN0LT5hbmltYXRpb24oaSktPmRlbGF5KCksIENTU1ByaW1pdGl2ZVZhbHVl OjpDU1NfUykpOwogICAgIH0gZWxzZSB7CiAgICAgICAgIC8vIE5vdGUgdGhhdCBpbml0aWFsQW5p bWF0aW9uRGVsYXkoKSBpcyB1c2VkIGZvciBib3RoIHRyYW5zaXRpb25zIGFuZCBhbmltYXRpb25z Ci0gICAgICAgIGxpc3QtPmFwcGVuZChDU1NQcmltaXRpdmVWYWx1ZTo6Y3JlYXRlKFJlbmRlclN0 eWxlOjppbml0aWFsQW5pbWF0aW9uRGVsYXkoKSwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19TKSk7 CisgICAgICAgIGxpc3QtPmFwcGVuZChDU1NQcmltaXRpdmVWYWx1ZTo6Y3JlYXRlKEFuaW1hdGlv bjo6aW5pdGlhbEFuaW1hdGlvbkRlbGF5KCksIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfUykpOwog ICAgIH0KICAgICByZXR1cm4gbGlzdC5yZWxlYXNlKCk7CiB9CkBAIC00NDQsNyArNDQ0LDcgQEAg c3RhdGljIFBhc3NSZWZQdHI8Q1NTVmFsdWU+IGdldER1cmF0aW9uVgogICAgICAgICAgICAgbGlz dC0+YXBwZW5kKENTU1ByaW1pdGl2ZVZhbHVlOjpjcmVhdGUoYW5pbUxpc3QtPmFuaW1hdGlvbihp KS0+ZHVyYXRpb24oKSwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19TKSk7CiAgICAgfSBlbHNlIHsK ICAgICAgICAgLy8gTm90ZSB0aGF0IGluaXRpYWxBbmltYXRpb25EdXJhdGlvbigpIGlzIHVzZWQg Zm9yIGJvdGggdHJhbnNpdGlvbnMgYW5kIGFuaW1hdGlvbnMKLSAgICAgICAgbGlzdC0+YXBwZW5k KENTU1ByaW1pdGl2ZVZhbHVlOjpjcmVhdGUoUmVuZGVyU3R5bGU6OmluaXRpYWxBbmltYXRpb25E dXJhdGlvbigpLCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1MpKTsKKyAgICAgICAgbGlzdC0+YXBw ZW5kKENTU1ByaW1pdGl2ZVZhbHVlOjpjcmVhdGUoQW5pbWF0aW9uOjppbml0aWFsQW5pbWF0aW9u RHVyYXRpb24oKSwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19TKSk7CiAgICAgfQogICAgIHJldHVy biBsaXN0LnJlbGVhc2UoKTsKIH0KQEAgLTQ1OSw3ICs0NTksNyBAQCBzdGF0aWMgUGFzc1JlZlB0 cjxDU1NWYWx1ZT4gZ2V0VGltaW5nRnVuCiAgICAgICAgIH0KICAgICB9IGVsc2UgewogICAgICAg ICAvLyBOb3RlIHRoYXQgaW5pdGlhbEFuaW1hdGlvblRpbWluZ0Z1bmN0aW9uKCkgaXMgdXNlZCBm b3IgYm90aCB0cmFuc2l0aW9ucyBhbmQgYW5pbWF0aW9ucwotICAgICAgICBjb25zdCBUaW1pbmdG dW5jdGlvbiYgdGYgPSBSZW5kZXJTdHlsZTo6aW5pdGlhbEFuaW1hdGlvblRpbWluZ0Z1bmN0aW9u KCk7CisgICAgICAgIGNvbnN0IFRpbWluZ0Z1bmN0aW9uJiB0ZiA9IEFuaW1hdGlvbjo6aW5pdGlh bEFuaW1hdGlvblRpbWluZ0Z1bmN0aW9uKCk7CiAgICAgICAgIGxpc3QtPmFwcGVuZChDU1NUaW1p bmdGdW5jdGlvblZhbHVlOjpjcmVhdGUodGYueDEoKSwgdGYueTEoKSwgdGYueDIoKSwgdGYueTIo KSkpOwogICAgIH0KICAgICByZXR1cm4gbGlzdC5yZWxlYXNlKCk7CkBAIC0xMDgxLDcgKzEwODEs NyBAQCBQYXNzUmVmUHRyPENTU1ZhbHVlPiBDU1NDb21wdXRlZFN0eWxlRGVjCiAgICAgICAgICAg ICAgICAgICAgICAgICBsaXN0LT5hcHBlbmQoQ1NTUHJpbWl0aXZlVmFsdWU6OmNyZWF0ZShpdGVy YXRpb25Db3VudCwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19OVU1CRVIpKTsKICAgICAgICAgICAg ICAgICB9CiAgICAgICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgICAgICBsaXN0LT5hcHBlbmQo Q1NTUHJpbWl0aXZlVmFsdWU6OmNyZWF0ZShSZW5kZXJTdHlsZTo6aW5pdGlhbEFuaW1hdGlvbkl0 ZXJhdGlvbkNvdW50KCksIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfTlVNQkVSKSk7CisgICAgICAg ICAgICAgICAgbGlzdC0+YXBwZW5kKENTU1ByaW1pdGl2ZVZhbHVlOjpjcmVhdGUoQW5pbWF0aW9u Ojppbml0aWFsQW5pbWF0aW9uSXRlcmF0aW9uQ291bnQoKSwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNT U19OVU1CRVIpKTsKICAgICAgICAgICAgIHJldHVybiBsaXN0LnJlbGVhc2UoKTsKICAgICAgICAg fQogICAgICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0QW5pbWF0aW9uTmFtZTogewpJbmRleDog V2ViQ29yZS9jc3MvQ1NTSGVscGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9jc3MvQ1NTSGVs cGVyLmgJKHJldmlzaW9uIDM5NjgzKQorKysgV2ViQ29yZS9jc3MvQ1NTSGVscGVyLmgJKHdvcmtp bmcgY29weSkKQEAgLTM3LDEwICszNyw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAvLyAi YWJzb2x1dGUiIENTUyBsZW5ndGggdW5pdHMgbGlrZSBpbmNoIGFuZCBwdCBpcyBhbHdheXMgZml4 ZWQgYW5kIG5ldmVyIGNoYW5nZXMuCiAgICAgY29uc3QgZmxvYXQgY3NzUGl4ZWxzUGVySW5jaCA9 IDk2LjBmOwogCi0gICAgLy8gVXNlZCBieSBhbmltYXRpb24uCi0gICAgY29uc3QgaW50IGNBbmlt YXRlTm9uZSA9IDA7Ci0gICAgY29uc3QgaW50IGNBbmltYXRlQWxsID0gLTI7Ci0KIH0gLy8gbmFt ZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmIC8vIENTU0hlbHBlcl9oCkluZGV4OiBXZWJDb3JlL2Nz cy9DU1NTdHlsZVNlbGVjdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2Nzcy9DU1NTdHls ZVNlbGVjdG9yLmNwcAkocmV2aXNpb24gMzk2ODMpCisrKyBXZWJDb3JlL2Nzcy9DU1NTdHlsZVNl bGVjdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjIyLDcgKzIyMiw3IEBAIGlmIChpc0luaGVy aXQpIHsgXAogICAgIEFuaW1hdGlvbkxpc3QqIGxpc3QgPSBtX3N0eWxlLT5hY2Nlc3NBbmltYXRp b25zKCk7IFwKICAgICBpZiAobGlzdC0+aXNFbXB0eSgpKSBcCiAgICAgICAgIGxpc3QtPmFwcGVu ZChBbmltYXRpb246OmNyZWF0ZSgpKTsgXAotICAgIGxpc3QtPmFuaW1hdGlvbigwKS0+c2V0IyNQ cm9wKFJlbmRlclN0eWxlOjppbml0aWFsQW5pbWF0aW9uIyNQcm9wKCkpOyBcCisgICAgbGlzdC0+ YW5pbWF0aW9uKDApLT5zZXQjI1Byb3AoQW5pbWF0aW9uOjppbml0aWFsQW5pbWF0aW9uIyNQcm9w KCkpOyBcCiAgICAgZm9yIChzaXplX3QgaSA9IDE7IGkgPCBsaXN0LT5zaXplKCk7ICsraSkgXAog ICAgICAgICBsaXN0LT5hbmltYXRpb24oMCktPmNsZWFyIyNQcm9wKCk7IFwKIH0KQEAgLTI3Miw3 ICsyNzIsNyBAQCBpZiAoaXNJbmhlcml0KSB7IFwKICAgICBBbmltYXRpb25MaXN0KiBsaXN0ID0g bV9zdHlsZS0+YWNjZXNzVHJhbnNpdGlvbnMoKTsgXAogICAgIGlmIChsaXN0LT5pc0VtcHR5KCkp IFwKICAgICAgICAgbGlzdC0+YXBwZW5kKEFuaW1hdGlvbjo6Y3JlYXRlKCkpOyBcCi0gICAgbGlz dC0+YW5pbWF0aW9uKDApLT5zZXQjI1Byb3AoUmVuZGVyU3R5bGU6OmluaXRpYWxBbmltYXRpb24j I1Byb3AoKSk7IFwKKyAgICBsaXN0LT5hbmltYXRpb24oMCktPnNldCMjUHJvcChBbmltYXRpb246 OmluaXRpYWxBbmltYXRpb24jI1Byb3AoKSk7IFwKICAgICBmb3IgKHNpemVfdCBpID0gMTsgaSA8 IGxpc3QtPnNpemUoKTsgKytpKSBcCiAgICAgICAgIGxpc3QtPmFuaW1hdGlvbigwKS0+Y2xlYXIj I1Byb3AoKTsgXAogfQpAQCAtNTI1MCw3ICs1MjUwLDcgQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9y OjptYXBGaWxsWVBvc2l0aW9uKAogdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjptYXBBbmltYXRpb25E ZWxheShBbmltYXRpb24qIGFuaW1hdGlvbiwgQ1NTVmFsdWUqIHZhbHVlKQogewogICAgIGlmICh2 YWx1ZS0+Y3NzVmFsdWVUeXBlKCkgPT0gQ1NTVmFsdWU6OkNTU19JTklUSUFMKSB7Ci0gICAgICAg IGFuaW1hdGlvbi0+c2V0RGVsYXkoUmVuZGVyU3R5bGU6OmluaXRpYWxBbmltYXRpb25EZWxheSgp KTsKKyAgICAgICAgYW5pbWF0aW9uLT5zZXREZWxheShBbmltYXRpb246OmluaXRpYWxBbmltYXRp b25EZWxheSgpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtNTI2NCw3ICs1MjY0LDcg QEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjptYXBBbmltYXRpb25EZWxheQogdm9pZCBDU1NTdHls ZVNlbGVjdG9yOjptYXBBbmltYXRpb25EaXJlY3Rpb24oQW5pbWF0aW9uKiBsYXllciwgQ1NTVmFs dWUqIHZhbHVlKQogewogICAgIGlmICh2YWx1ZS0+Y3NzVmFsdWVUeXBlKCkgPT0gQ1NTVmFsdWU6 OkNTU19JTklUSUFMKSB7Ci0gICAgICAgIGxheWVyLT5zZXREaXJlY3Rpb24oUmVuZGVyU3R5bGU6 OmluaXRpYWxBbmltYXRpb25EaXJlY3Rpb24oKSk7CisgICAgICAgIGxheWVyLT5zZXREaXJlY3Rp b24oQW5pbWF0aW9uOjppbml0aWFsQW5pbWF0aW9uRGlyZWN0aW9uKCkpOwogICAgICAgICByZXR1 cm47CiAgICAgfQogCkBAIC01Mjc1LDcgKzUyNzUsNyBAQCB2b2lkIENTU1N0eWxlU2VsZWN0b3I6 Om1hcEFuaW1hdGlvbkRpcmVjCiB2b2lkIENTU1N0eWxlU2VsZWN0b3I6Om1hcEFuaW1hdGlvbkR1 cmF0aW9uKEFuaW1hdGlvbiogYW5pbWF0aW9uLCBDU1NWYWx1ZSogdmFsdWUpCiB7CiAgICAgaWYg KHZhbHVlLT5jc3NWYWx1ZVR5cGUoKSA9PSBDU1NWYWx1ZTo6Q1NTX0lOSVRJQUwpIHsKLSAgICAg ICAgYW5pbWF0aW9uLT5zZXREdXJhdGlvbihSZW5kZXJTdHlsZTo6aW5pdGlhbEFuaW1hdGlvbkR1 cmF0aW9uKCkpOworICAgICAgICBhbmltYXRpb24tPnNldER1cmF0aW9uKEFuaW1hdGlvbjo6aW5p dGlhbEFuaW1hdGlvbkR1cmF0aW9uKCkpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC01 MjkyLDcgKzUyOTIsNyBAQCB2b2lkIENTU1N0eWxlU2VsZWN0b3I6Om1hcEFuaW1hdGlvbkR1cmF0 CiB2b2lkIENTU1N0eWxlU2VsZWN0b3I6Om1hcEFuaW1hdGlvbkl0ZXJhdGlvbkNvdW50KEFuaW1h dGlvbiogYW5pbWF0aW9uLCBDU1NWYWx1ZSogdmFsdWUpCiB7CiAgICAgaWYgKHZhbHVlLT5jc3NW YWx1ZVR5cGUoKSA9PSBDU1NWYWx1ZTo6Q1NTX0lOSVRJQUwpIHsKLSAgICAgICAgYW5pbWF0aW9u LT5zZXRJdGVyYXRpb25Db3VudChSZW5kZXJTdHlsZTo6aW5pdGlhbEFuaW1hdGlvbkl0ZXJhdGlv bkNvdW50KCkpOworICAgICAgICBhbmltYXRpb24tPnNldEl0ZXJhdGlvbkNvdW50KEFuaW1hdGlv bjo6aW5pdGlhbEFuaW1hdGlvbkl0ZXJhdGlvbkNvdW50KCkpOwogICAgICAgICByZXR1cm47CiAg ICAgfQogCkBAIC01MzA5LDcgKzUzMDksNyBAQCB2b2lkIENTU1N0eWxlU2VsZWN0b3I6Om1hcEFu aW1hdGlvbkl0ZXJhCiB2b2lkIENTU1N0eWxlU2VsZWN0b3I6Om1hcEFuaW1hdGlvbk5hbWUoQW5p bWF0aW9uKiBsYXllciwgQ1NTVmFsdWUqIHZhbHVlKQogewogICAgIGlmICh2YWx1ZS0+Y3NzVmFs dWVUeXBlKCkgPT0gQ1NTVmFsdWU6OkNTU19JTklUSUFMKSB7Ci0gICAgICAgIGxheWVyLT5zZXRO YW1lKFJlbmRlclN0eWxlOjppbml0aWFsQW5pbWF0aW9uTmFtZSgpKTsKKyAgICAgICAgbGF5ZXIt PnNldE5hbWUoQW5pbWF0aW9uOjppbml0aWFsQW5pbWF0aW9uTmFtZSgpKTsKICAgICAgICAgcmV0 dXJuOwogICAgIH0KIApAQCAtNTMyNCw3ICs1MzI0LDcgQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9y OjptYXBBbmltYXRpb25OYW1lKAogdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjptYXBBbmltYXRpb25Q bGF5U3RhdGUoQW5pbWF0aW9uKiBsYXllciwgQ1NTVmFsdWUqIHZhbHVlKQogewogICAgIGlmICh2 YWx1ZS0+Y3NzVmFsdWVUeXBlKCkgPT0gQ1NTVmFsdWU6OkNTU19JTklUSUFMKSB7Ci0gICAgICAg IGxheWVyLT5zZXRQbGF5U3RhdGUoUmVuZGVyU3R5bGU6OmluaXRpYWxBbmltYXRpb25QbGF5U3Rh dGUoKSk7CisgICAgICAgIGxheWVyLT5zZXRQbGF5U3RhdGUoQW5pbWF0aW9uOjppbml0aWFsQW5p bWF0aW9uUGxheVN0YXRlKCkpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC01MzM1LDcg KzUzMzUsNyBAQCB2b2lkIENTU1N0eWxlU2VsZWN0b3I6Om1hcEFuaW1hdGlvblBsYXlTCiB2b2lk IENTU1N0eWxlU2VsZWN0b3I6Om1hcEFuaW1hdGlvblByb3BlcnR5KEFuaW1hdGlvbiogYW5pbWF0 aW9uLCBDU1NWYWx1ZSogdmFsdWUpCiB7CiAgICAgaWYgKHZhbHVlLT5jc3NWYWx1ZVR5cGUoKSA9 PSBDU1NWYWx1ZTo6Q1NTX0lOSVRJQUwpIHsKLSAgICAgICAgYW5pbWF0aW9uLT5zZXRQcm9wZXJ0 eShSZW5kZXJTdHlsZTo6aW5pdGlhbEFuaW1hdGlvblByb3BlcnR5KCkpOworICAgICAgICBhbmlt YXRpb24tPnNldFByb3BlcnR5KEFuaW1hdGlvbjo6aW5pdGlhbEFuaW1hdGlvblByb3BlcnR5KCkp OwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC01MzU0LDcgKzUzNTQsNyBAQCB2b2lkIENT U1N0eWxlU2VsZWN0b3I6Om1hcEFuaW1hdGlvblByb3BlCiB2b2lkIENTU1N0eWxlU2VsZWN0b3I6 Om1hcEFuaW1hdGlvblRpbWluZ0Z1bmN0aW9uKEFuaW1hdGlvbiogYW5pbWF0aW9uLCBDU1NWYWx1 ZSogdmFsdWUpCiB7CiAgICAgaWYgKHZhbHVlLT5jc3NWYWx1ZVR5cGUoKSA9PSBDU1NWYWx1ZTo6 Q1NTX0lOSVRJQUwpIHsKLSAgICAgICAgYW5pbWF0aW9uLT5zZXRUaW1pbmdGdW5jdGlvbihSZW5k ZXJTdHlsZTo6aW5pdGlhbEFuaW1hdGlvblRpbWluZ0Z1bmN0aW9uKCkpOworICAgICAgICBhbmlt YXRpb24tPnNldFRpbWluZ0Z1bmN0aW9uKEFuaW1hdGlvbjo6aW5pdGlhbEFuaW1hdGlvblRpbWlu Z0Z1bmN0aW9uKCkpOwogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIApJbmRleDogV2ViQ29y ZS9wbGF0Zm9ybS9hbmltYXRpb24vQW5pbWF0aW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3Jl L3BsYXRmb3JtL2FuaW1hdGlvbi9BbmltYXRpb24uY3BwCShyZXZpc2lvbiAzOTY4MykKKysrIFdl YkNvcmUvcGxhdGZvcm0vYW5pbWF0aW9uL0FuaW1hdGlvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTIyLDE5ICsyMiwxNyBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIkFuaW1hdGlv bi5oIgogCi0jaW5jbHVkZSAiUmVuZGVyU3R5bGUuaCIKLQogbmFtZXNwYWNlIFdlYkNvcmUgewog CiBBbmltYXRpb246OkFuaW1hdGlvbigpCi0gICAgOiBtX2RlbGF5KFJlbmRlclN0eWxlOjppbml0 aWFsQW5pbWF0aW9uRGVsYXkoKSkKLSAgICAsIG1fZGlyZWN0aW9uKFJlbmRlclN0eWxlOjppbml0 aWFsQW5pbWF0aW9uRGlyZWN0aW9uKCkpCi0gICAgLCBtX2R1cmF0aW9uKFJlbmRlclN0eWxlOjpp bml0aWFsQW5pbWF0aW9uRHVyYXRpb24oKSkKLSAgICAsIG1faXRlcmF0aW9uQ291bnQoUmVuZGVy U3R5bGU6OmluaXRpYWxBbmltYXRpb25JdGVyYXRpb25Db3VudCgpKQotICAgICwgbV9uYW1lKFJl bmRlclN0eWxlOjppbml0aWFsQW5pbWF0aW9uTmFtZSgpKQotICAgICwgbV9wcm9wZXJ0eShSZW5k ZXJTdHlsZTo6aW5pdGlhbEFuaW1hdGlvblByb3BlcnR5KCkpCi0gICAgLCBtX3RpbWluZ0Z1bmN0 aW9uKFJlbmRlclN0eWxlOjppbml0aWFsQW5pbWF0aW9uVGltaW5nRnVuY3Rpb24oKSkKLSAgICAs IG1fcGxheVN0YXRlKFJlbmRlclN0eWxlOjppbml0aWFsQW5pbWF0aW9uUGxheVN0YXRlKCkpCisg ICAgOiBtX2RlbGF5KGluaXRpYWxBbmltYXRpb25EZWxheSgpKQorICAgICwgbV9kaXJlY3Rpb24o aW5pdGlhbEFuaW1hdGlvbkRpcmVjdGlvbigpKQorICAgICwgbV9kdXJhdGlvbihpbml0aWFsQW5p bWF0aW9uRHVyYXRpb24oKSkKKyAgICAsIG1faXRlcmF0aW9uQ291bnQoaW5pdGlhbEFuaW1hdGlv bkl0ZXJhdGlvbkNvdW50KCkpCisgICAgLCBtX25hbWUoaW5pdGlhbEFuaW1hdGlvbk5hbWUoKSkK KyAgICAsIG1fcHJvcGVydHkoaW5pdGlhbEFuaW1hdGlvblByb3BlcnR5KCkpCisgICAgLCBtX3Rp bWluZ0Z1bmN0aW9uKGluaXRpYWxBbmltYXRpb25UaW1pbmdGdW5jdGlvbigpKQorICAgICwgbV9w bGF5U3RhdGUoaW5pdGlhbEFuaW1hdGlvblBsYXlTdGF0ZSgpKQogICAgICwgbV9kZWxheVNldChm YWxzZSkKICAgICAsIG1fZGlyZWN0aW9uU2V0KGZhbHNlKQogICAgICwgbV9kdXJhdGlvblNldChm YWxzZSkKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vYW5pbWF0aW9uL0FuaW1hdGlvbi5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vYW5pbWF0aW9uL0FuaW1hdGlvbi5oCShyZXZpc2lv biAzOTY4MykKKysrIFdlYkNvcmUvcGxhdGZvcm0vYW5pbWF0aW9uL0FuaW1hdGlvbi5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0zMiw2ICszMiw5IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorY29u c3QgaW50IGNBbmltYXRlTm9uZSA9IDA7Citjb25zdCBpbnQgY0FuaW1hdGVBbGwgPSAtMjsKKwog Y2xhc3MgQW5pbWF0aW9uIDogcHVibGljIFJlZkNvdW50ZWQ8QW5pbWF0aW9uPiB7CiBwdWJsaWM6 CiAgICAgfkFuaW1hdGlvbigpOwpAQCAtMTI2LDYgKzEyOSwxNiBAQCBwcml2YXRlOgogICAgIGJv b2wgbV90aW1pbmdGdW5jdGlvblNldCA6IDE7CiAgICAgCiAgICAgYm9vbCBtX2lzTm9uZSAgICAg ICAgICAgIDogMTsKKworcHVibGljOgorICAgIHN0YXRpYyBmbG9hdCBpbml0aWFsQW5pbWF0aW9u RGVsYXkoKSB7IHJldHVybiAwOyB9CisgICAgc3RhdGljIGJvb2wgaW5pdGlhbEFuaW1hdGlvbkRp cmVjdGlvbigpIHsgcmV0dXJuIGZhbHNlOyB9CisgICAgc3RhdGljIGRvdWJsZSBpbml0aWFsQW5p bWF0aW9uRHVyYXRpb24oKSB7IHJldHVybiAwOyB9CisgICAgc3RhdGljIGludCBpbml0aWFsQW5p bWF0aW9uSXRlcmF0aW9uQ291bnQoKSB7IHJldHVybiAxOyB9CisgICAgc3RhdGljIFN0cmluZyBp bml0aWFsQW5pbWF0aW9uTmFtZSgpIHsgcmV0dXJuIFN0cmluZygibm9uZSIpOyB9CisgICAgc3Rh dGljIHVuc2lnbmVkIGluaXRpYWxBbmltYXRpb25QbGF5U3RhdGUoKSB7IHJldHVybiBBbmltUGxh eVN0YXRlUGxheWluZzsgfQorICAgIHN0YXRpYyBpbnQgaW5pdGlhbEFuaW1hdGlvblByb3BlcnR5 KCkgeyByZXR1cm4gY0FuaW1hdGVBbGw7IH0KKyAgICBzdGF0aWMgVGltaW5nRnVuY3Rpb24gaW5p dGlhbEFuaW1hdGlvblRpbWluZ0Z1bmN0aW9uKCkgeyByZXR1cm4gVGltaW5nRnVuY3Rpb24oKTsg fQogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcv c3R5bGUvUmVuZGVyU3R5bGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3JlbmRlcmluZy9zdHls ZS9SZW5kZXJTdHlsZS5oCShyZXZpc2lvbiAzOTY4MykKKysrIFdlYkNvcmUvcmVuZGVyaW5nL3N0 eWxlL1JlbmRlclN0eWxlLmgJKHdvcmtpbmcgY29weSkKQEAgLTExMTIsMTQgKzExMTIsNiBAQCBw dWJsaWM6CiAgICAgc3RhdGljIEVQb2ludGVyRXZlbnRzIGluaXRpYWxQb2ludGVyRXZlbnRzKCkg eyByZXR1cm4gUEVfQVVUTzsgfQogCiAgICAgLy8gS2VlcCB0aGVzZSBhdCB0aGUgZW5kLgotICAg IHN0YXRpYyBmbG9hdCBpbml0aWFsQW5pbWF0aW9uRGVsYXkoKSB7IHJldHVybiAwOyB9Ci0gICAg c3RhdGljIGJvb2wgaW5pdGlhbEFuaW1hdGlvbkRpcmVjdGlvbigpIHsgcmV0dXJuIGZhbHNlOyB9 Ci0gICAgc3RhdGljIGRvdWJsZSBpbml0aWFsQW5pbWF0aW9uRHVyYXRpb24oKSB7IHJldHVybiAw OyB9Ci0gICAgc3RhdGljIGludCBpbml0aWFsQW5pbWF0aW9uSXRlcmF0aW9uQ291bnQoKSB7IHJl dHVybiAxOyB9Ci0gICAgc3RhdGljIFN0cmluZyBpbml0aWFsQW5pbWF0aW9uTmFtZSgpIHsgcmV0 dXJuIFN0cmluZygibm9uZSIpOyB9Ci0gICAgc3RhdGljIHVuc2lnbmVkIGluaXRpYWxBbmltYXRp b25QbGF5U3RhdGUoKSB7IHJldHVybiBBbmltUGxheVN0YXRlUGxheWluZzsgfQotICAgIHN0YXRp YyBpbnQgaW5pdGlhbEFuaW1hdGlvblByb3BlcnR5KCkgeyByZXR1cm4gY0FuaW1hdGVBbGw7IH0K LSAgICBzdGF0aWMgVGltaW5nRnVuY3Rpb24gaW5pdGlhbEFuaW1hdGlvblRpbWluZ0Z1bmN0aW9u KCkgeyByZXR1cm4gVGltaW5nRnVuY3Rpb24oKTsgfQogICAgIHN0YXRpYyBpbnQgaW5pdGlhbExp bmVDbGFtcCgpIHsgcmV0dXJuIC0xOyB9CiAgICAgc3RhdGljIGJvb2wgaW5pdGlhbFRleHRTaXpl QWRqdXN0KCkgeyByZXR1cm4gdHJ1ZTsgfQogICAgIHN0YXRpYyBFVGV4dFNlY3VyaXR5IGluaXRp YWxUZXh0U2VjdXJpdHkoKSB7IHJldHVybiBUU05PTkU7IH0K