35815 2010-03-05 15:11:25 -0800 Animation fill mode breaks windows tests 2010-03-05 16:21:56 -0800 1 1 1 Unclassified WebKit Evangelism 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 26869 1 dino dino simon.fraser webkit.review.bot oldest_to_newest 196718 0 dino 2010-03-05 15:11:25 -0800 The bitfield for fill mode is too small. Make it unsigned, larger, and move the enum to RenderStyleConstants.h. 196762 1 50137 dino 2010-03-05 16:08:13 -0800 Created attachment 50137 windows patch and test updates 196770 2 webkit.review.bot 2010-03-05 16:11:50 -0800 Attachment 50137 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebCore/platform/animation/Animation.h:101: More than one command on the same line [whitespace/newline] [4] Total errors found: 1 in 11 files If any of these errors are false positives, please file a bug against check-webkit-style. 196775 3 50137 simon.fraser 2010-03-05 16:15:59 -0800 Comment on attachment 50137 windows patch and test updates > diff --git a/WebCore/platform/animation/Animation.h b/WebCore/platform/animation/Animation.h > - AnimationFillMode m_fillMode : 2; > + unsigned m_fillMode : 3; I'm pretty sure you only need 2 bits here. r=me 196776 4 dino 2010-03-05 16:21:56 -0800 changed :3 to :2 Committing to http://svn.webkit.org/repository/webkit/trunk ... M LayoutTests/ChangeLog M LayoutTests/animations/fill-mode-transform-expected.txt M LayoutTests/animations/fill-mode-transform.html M LayoutTests/platform/mac-leopard/Skipped M LayoutTests/platform/mac-snowleopard/Skipped M WebCore/ChangeLog M WebCore/css/CSSComputedStyleDeclaration.cpp M WebCore/css/CSSStyleSelector.cpp M WebCore/platform/animation/Animation.h M WebCore/platform/graphics/mac/GraphicsLayerCA.mm M WebCore/rendering/style/RenderStyleConstants.h Committed r55601 50137 2010-03-05 16:08:13 -0800 2010-03-05 16:15:59 -0800 windows patch and test updates windows-fix.patch text/plain 11617 dino ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA2Njk0MzIzLi5jYzlkYzgwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjQgQEAKIDIwMTAtMDMt MDUgIERlYW4gSmFja3NvbiAgPGRpbm9AYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0zNTgxNQorICAgICAgICBBbmltYXRpb24gZmlsbCBtb2RlIHRlc3RzIGJyZWFr IG9uIFdpbmRvd3MKKworICAgICAgICAqIGFuaW1hdGlvbnMvZmlsbC1tb2RlLXRyYW5zZm9ybS1l eHBlY3RlZC50eHQ6CisgICAgICAgICogYW5pbWF0aW9ucy9maWxsLW1vZGUtdHJhbnNmb3JtLmh0 bWw6CisgICAgICAgICAgICAtIHVzZSB0aGUgcmVhbCBleHBlY3RlZCB2YWx1ZXMsIHJhdGhlciB0 aGFuCisgICAgICAgICAgICAgIHRyeSB0byBnZXQgdGhlIHRlc3QgdG8gcGFzcyBvbiBTbm93IExl b3BhcmQuCisgICAgICAgICogcGxhdGZvcm0vbWFjLWxlb3BhcmQvU2tpcHBlZDoKKyAgICAgICAg ICAgIC0gcmVtb3ZlIHRoZSBza2lwIGVudHJ5IGZvciB0aGUgdGVzdCBhYm92ZQorICAgICAgICAq IHBsYXRmb3JtL21hYy1zbm93bGVvcGFyZC9Ta2lwcGVkOgorICAgICAgICAgICAgLSBza2lwIHRo aXMgdGVzdCBvbiBTbm93IExlb3BhcmQgd2hpbGUKKyAgICAgICAgICAgICAgaGFyZHdhcmUgYWNj ZWxlcmF0aW9uIGdpdmVzIHRoZSB3cm9uZworICAgICAgICAgICAgICB2YWx1ZSBmb3IgY29tcHV0 ZWQgc3R5bGUuCisgICAgICAgICAgICAgIFNlZSBidWcgMzU3MTQuCisKKzIwMTAtMDMtMDUgIERl YW4gSmFja3NvbiAgPGRpbm9AYXBwbGUuY29tPgorCiAgICAgICAgIE5vIHJldmlldy4KIAogICAg ICAgICBEaXNhYmxpbmcgYW5pbWF0aW9ucy9maWxsLW1vZGUtdHJhbnNmb3JtLmh0bWwgb24gTGVv cGFyZApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvYW5pbWF0aW9ucy9maWxsLW1vZGUtdHJhbnNm b3JtLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2FuaW1hdGlvbnMvZmlsbC1tb2RlLXRyYW5z Zm9ybS1leHBlY3RlZC50eHQKaW5kZXggYTg4ZGE1Zi4uNjMwZWRmMyAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvYW5pbWF0aW9ucy9maWxsLW1vZGUtdHJhbnNmb3JtLWV4cGVjdGVkLnR4dAorKysg Yi9MYXlvdXRUZXN0cy9hbmltYXRpb25zL2ZpbGwtbW9kZS10cmFuc2Zvcm0tZXhwZWN0ZWQudHh0 CkBAIC00LDExICs0LDkgQEAgQmFja3dhcmRzCiBGb3J3YXJkcwogQm90aAogQm90aCBJdGVyYXRl Ci1Ob3RlIHRoYXQgZHVlIHRvIEJ1ZyAzNTcxNCB0aGUgZXhwZWN0ZWQgdmFsdWVzIGZvciB0aGUg c3RhcnQgb2YgdGhlIGFuaW1hdGlvbiBvbiBlbGVtZW50cyAiYSIgYW5kICJjIiBhcmUgaW50ZW50 aW9uYWxseSBpbmNvcnJlY3QuIFRoZSBleHBlY3RlZCB2YWx1ZXMgc2hvdWxkIGJlIDEwMCwgbm90 IDIwMC4gSWYgdGhpcyB0ZXN0IGZhaWxzLCB0aGVuIGl0J3MgbGlrZWx5IHRoYXQgYnVnIGhhcyBi ZWVuIGZpeGVkIGFuZCB0aGUgZXhwZWN0ZWQgdmFsdWVzIGhlcmUgc2hvdWxkIGJlIHVwZGF0ZWQu Ci0KLVBBU1MgLSBzdGFydCBvZiBhbmltYXRpb24gLSBpZDogYSBleHBlY3RlZDogMjAwIGFjdHVh bDogMjAwCitQQVNTIC0gc3RhcnQgb2YgYW5pbWF0aW9uIC0gaWQ6IGEgZXhwZWN0ZWQ6IDEwMCBh Y3R1YWw6IDEwMAogUEFTUyAtIHN0YXJ0IG9mIGFuaW1hdGlvbiAtIGlkOiBiIGV4cGVjdGVkOiAy MDAgYWN0dWFsOiAyMDAKLVBBU1MgLSBzdGFydCBvZiBhbmltYXRpb24gLSBpZDogYyBleHBlY3Rl ZDogMjAwIGFjdHVhbDogMjAwCitQQVNTIC0gc3RhcnQgb2YgYW5pbWF0aW9uIC0gaWQ6IGMgZXhw ZWN0ZWQ6IDEwMCBhY3R1YWw6IDEwMAogUEFTUyAtIHN0YXJ0IG9mIGFuaW1hdGlvbiAtIGlkOiBk IGV4cGVjdGVkOiAyMDAgYWN0dWFsOiAyMDAKIFBBU1MgLSBzdGFydCBvZiBhbmltYXRpb24gLSBp ZDogZSBleHBlY3RlZDogMjAwIGFjdHVhbDogMjAwCiBQQVNTIC0gZW5kIG9mIGFuaW1hdGlvbiAt IGlkOiBhIGV4cGVjdGVkOiAxMDAgYWN0dWFsOiAxMDAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2FuaW1hdGlvbnMvZmlsbC1tb2RlLXRyYW5zZm9ybS5odG1sIGIvTGF5b3V0VGVzdHMvYW5pbWF0 aW9ucy9maWxsLW1vZGUtdHJhbnNmb3JtLmh0bWwKaW5kZXggNzFjNWM2OC4uMWFmODFlMCAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvYW5pbWF0aW9ucy9maWxsLW1vZGUtdHJhbnNmb3JtLmh0bWwK KysrIGIvTGF5b3V0VGVzdHMvYW5pbWF0aW9ucy9maWxsLW1vZGUtdHJhbnNmb3JtLmh0bWwKQEAg LTUwLDkgKzUwLDkgQEAKICAgICB2YXIgYW5pbXNGaW5pc2hlZCA9IDA7CiAgICAgY29uc3QgYWxs b3dhbmNlID0gNTsKICAgICBjb25zdCBleHBlY3RlZFZhbHVlcyA9IFsKLSAgICAgIHtpZDogImEi LCBzdGFydDogMjAwLCBlbmQ6IDEwMH0sCisgICAgICB7aWQ6ICJhIiwgc3RhcnQ6IDEwMCwgZW5k OiAxMDB9LAogICAgICAge2lkOiAiYiIsIHN0YXJ0OiAyMDAsIGVuZDogMTAwfSwKLSAgICAgIHtp ZDogImMiLCBzdGFydDogMjAwLCBlbmQ6IDMwMH0sCisgICAgICB7aWQ6ICJjIiwgc3RhcnQ6IDEw MCwgZW5kOiAzMDB9LAogICAgICAge2lkOiAiZCIsIHN0YXJ0OiAyMDAsIGVuZDogMzAwfSwKICAg ICAgIHtpZDogImUiLCBzdGFydDogMjAwLCBlbmQ6IDIwMH0KICAgICBdOwpAQCAtMTI3LDEzICsx MjcsNiBAQCBJdCB0YWtlcyBzbmFwc2hvdHMgYXQgZG9jdW1lbnQgbG9hZCBhbmQgdGhlIGVuZCBv ZiB0aGUgYW5pbWF0aW9ucy4KIDxkaXYgaWQ9ImUiIGNsYXNzPSJib3giPgogICBCb3RoIEl0ZXJh dGUKIDwvZGl2PgotPHA+Ci0gIE5vdGUgdGhhdCBkdWUgdG8gPGEgaHJlZj0iaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM1NzE0Ij5CdWcgMzU3MTQ8L2E+Ci0gIHRoZSBl eHBlY3RlZCB2YWx1ZXMgZm9yIHRoZSBzdGFydCBvZiB0aGUgYW5pbWF0aW9uIG9uIGVsZW1lbnRz ICJhIiBhbmQgImMiIGFyZQotICBpbnRlbnRpb25hbGx5IGluY29ycmVjdC4gVGhlIGV4cGVjdGVk IHZhbHVlcyBzaG91bGQgYmUgMTAwLCBub3QgMjAwLiBJZiB0aGlzCi0gIHRlc3QgZmFpbHMsIHRo ZW4gaXQncyBsaWtlbHkgdGhhdCBidWcgaGFzIGJlZW4gZml4ZWQgYW5kIHRoZSBleHBlY3RlZCB2 YWx1ZXMgaGVyZQotICBzaG91bGQgYmUgdXBkYXRlZC4KLTwvcD4KIDxkaXYgaWQ9InJlc3VsdCI+ CiA8L2Rpdj4KIDwvYm9keT4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy1s ZW9wYXJkL1NraXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtbGVvcGFyZC9Ta2lwcGVk CmluZGV4IGQ0ZTg2NzMuLjM3MTk5NTYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3Jt L21hYy1sZW9wYXJkL1NraXBwZWQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLWxlb3Bh cmQvU2tpcHBlZApAQCAtNDgsOCArNDgsMyBAQCBmYXN0L2NhbnZhcy93ZWJnbC90ZXhJbWFnZTJE SW1hZ2VEYXRhVGVzdC5odG1sCiAjIEZhaWxzIG9uIE1hYwogIyBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzQzMzEKIGh0dHAvdGVzdHMvbWVkaWEvdmlkZW8tcmVmZXJl ci5odG1sCi0KLSMgVGhhbmtzIHRvIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0zNTcxNAotIyBjb21wdXRlZCBzdHlsZSBvbiBIVyB0cmFuc2Zvcm1zIGFyZSB3cm9uZyBp biBTTCwgYnV0Ci0jIGNvcnJlY3QgaW4gTGVvcGFyZC4KLWFuaW1hdGlvbnMvZmlsbC1tb2RlLXRy YW5zZm9ybS5odG1sCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtc25vd2xl b3BhcmQvU2tpcHBlZCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy1zbm93bGVvcGFyZC9Ta2lw cGVkCmluZGV4IDg2NWVlZDguLmVkNGEzYjkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRm b3JtL21hYy1zbm93bGVvcGFyZC9Ta2lwcGVkCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21h Yy1zbm93bGVvcGFyZC9Ta2lwcGVkCkBAIC0xMDMsMyArMTAzLDggQEAgbWVkaWEvdmlkZW8tZGlz cGxheS1hc3BlY3QtcmF0aW8uaHRtbAogIyBGbGFrZXkgb24gU25vdyBMZW9wYXJkIERlYnVnIGJ1 aWxkcywgc2tpcCBpdCB1bnRpbCBpdCBjYW4gYmUgbWFkZSBub24tZmxha2V5OgogIyBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzM1NDMKIGZhc3QvZm9ybXMvc2VhcmNo LWV2ZW50LWRlbGF5Lmh0bWwKKworIyBUaGFua3MgdG8gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTM1NzE0CisjIGNvbXB1dGVkIHN0eWxlIG9uIEhXIHRyYW5zZm9ybXMg YXJlIHdyb25nIGluIFNMLCBidXQKKyMgY29ycmVjdCBvbiBvdGhlciBwbGF0Zm9ybXMuCithbmlt YXRpb25zL2ZpbGwtbW9kZS10cmFuc2Zvcm0uaHRtbApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFu Z2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBjNDE2ZjI4Li5kMTcwYTU0IDEwMDY0NAot LS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE5IEBACisyMDEwLTAzLTA1ICBEZWFuIEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzU4MTUKKyAgICAgICAgQW5pbWF0aW9uIEZpbGwg TW9kZXMgZmFpbCBvbiBXaW5kb3dzCisKKyAgICAgICAgKiBjc3MvQ1NTQ29tcHV0ZWRTdHlsZURl Y2xhcmF0aW9uLmNwcDoKKyAgICAgICAgKiBjc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHA6CisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0dyYXBoaWNzTGF5ZXJDQS5tbToKKyAgICAgICAg ICAgIC0gdXNlIG5ldyBlbnVtIHZhbHVlCisgICAgICAgICogcGxhdGZvcm0vYW5pbWF0aW9uL0Fu aW1hdGlvbi5oOgorICAgICAgICAgICAgLSBjaGFuZ2UgYml0ZmllbGQgdHlwZSBhbmQgd2lkdGgK KyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGVDb25zdGFudHMuaDoKKyAgICAg ICAgICAgIC0gYWRkIG5ldyBlbnVtIGZvciBmaWxsIG1vZGUKKwogMjAxMC0wMy0wNSAgU2ltb24g RnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBE YW4gQmVybnN0ZWluLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURl Y2xhcmF0aW9uLmNwcCBiL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5j cHAKaW5kZXggZjdjNWRjNC4uNjQzY2NlNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9jc3MvQ1NTQ29t cHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcAorKysgYi9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0 eWxlRGVjbGFyYXRpb24uY3BwCkBAIC0xMjA1LDE2ICsxMjA1LDE2IEBAIFBhc3NSZWZQdHI8Q1NT VmFsdWU+IENTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbjo6Z2V0UHJvcGVydHlDU1NWYWx1ZShp bnQgcHJvcGVyCiAgICAgICAgICAgICBpZiAodCkgewogICAgICAgICAgICAgICAgIGZvciAoc2l6 ZV90IGkgPSAwOyBpIDwgdC0+c2l6ZSgpOyArK2kpIHsKICAgICAgICAgICAgICAgICAgICAgc3dp dGNoICh0LT5hbmltYXRpb24oaSktPmZpbGxNb2RlKCkpIHsKLSAgICAgICAgICAgICAgICAgICAg Y2FzZSBBbmltYXRpb246OkFuaW1hdGlvbkZpbGxNb2RlTm9uZToKKyAgICAgICAgICAgICAgICAg ICAgY2FzZSBBbmltYXRpb25GaWxsTW9kZU5vbmU6CiAgICAgICAgICAgICAgICAgICAgICAgICBs aXN0LT5hcHBlbmQoQ1NTUHJpbWl0aXZlVmFsdWU6OmNyZWF0ZUlkZW50aWZpZXIoQ1NTVmFsdWVO b25lKSk7CiAgICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgICAgICAg ICAgY2FzZSBBbmltYXRpb246OkFuaW1hdGlvbkZpbGxNb2RlRm9yd2FyZHM6CisgICAgICAgICAg ICAgICAgICAgIGNhc2UgQW5pbWF0aW9uRmlsbE1vZGVGb3J3YXJkczoKICAgICAgICAgICAgICAg ICAgICAgICAgIGxpc3QtPmFwcGVuZChDU1NQcmltaXRpdmVWYWx1ZTo6Y3JlYXRlSWRlbnRpZmll cihDU1NWYWx1ZUZvcndhcmRzKSk7CiAgICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKLSAg ICAgICAgICAgICAgICAgICAgY2FzZSBBbmltYXRpb246OkFuaW1hdGlvbkZpbGxNb2RlQmFja3dh cmRzOgorICAgICAgICAgICAgICAgICAgICBjYXNlIEFuaW1hdGlvbkZpbGxNb2RlQmFja3dhcmRz OgogICAgICAgICAgICAgICAgICAgICAgICAgbGlzdC0+YXBwZW5kKENTU1ByaW1pdGl2ZVZhbHVl OjpjcmVhdGVJZGVudGlmaWVyKENTU1ZhbHVlQmFja3dhcmRzKSk7CiAgICAgICAgICAgICAgICAg ICAgICAgICBicmVhazsKLSAgICAgICAgICAgICAgICAgICAgY2FzZSBBbmltYXRpb246OkFuaW1h dGlvbkZpbGxNb2RlQm90aDoKKyAgICAgICAgICAgICAgICAgICAgY2FzZSBBbmltYXRpb25GaWxs TW9kZUJvdGg6CiAgICAgICAgICAgICAgICAgICAgICAgICBsaXN0LT5hcHBlbmQoQ1NTUHJpbWl0 aXZlVmFsdWU6OmNyZWF0ZUlkZW50aWZpZXIoQ1NTVmFsdWVCb3RoKSk7CiAgICAgICAgICAgICAg ICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAgYi9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVj dG9yLmNwcAppbmRleCA4MTY4ZWNiLi4xMDk3NjExIDEwMDY0NAotLS0gYS9XZWJDb3JlL2Nzcy9D U1NTdHlsZVNlbGVjdG9yLmNwcAorKysgYi9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNw cApAQCAtNTY2MywxNiArNTY2MywxNiBAQCB2b2lkIENTU1N0eWxlU2VsZWN0b3I6Om1hcEFuaW1h dGlvbkZpbGxNb2RlKEFuaW1hdGlvbiogbGF5ZXIsIENTU1ZhbHVlKiB2YWx1ZSkKICAgICBDU1NQ cmltaXRpdmVWYWx1ZSogcHJpbWl0aXZlVmFsdWUgPSBzdGF0aWNfY2FzdDxDU1NQcmltaXRpdmVW YWx1ZSo+KHZhbHVlKTsKICAgICBzd2l0Y2ggKHByaW1pdGl2ZVZhbHVlLT5nZXRJZGVudCgpKSB7 CiAgICAgY2FzZSBDU1NWYWx1ZU5vbmU6Ci0gICAgICAgIGxheWVyLT5zZXRGaWxsTW9kZShBbmlt YXRpb246OkFuaW1hdGlvbkZpbGxNb2RlTm9uZSk7CisgICAgICAgIGxheWVyLT5zZXRGaWxsTW9k ZShBbmltYXRpb25GaWxsTW9kZU5vbmUpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIENTU1Zh bHVlRm9yd2FyZHM6Ci0gICAgICAgIGxheWVyLT5zZXRGaWxsTW9kZShBbmltYXRpb246OkFuaW1h dGlvbkZpbGxNb2RlRm9yd2FyZHMpOworICAgICAgICBsYXllci0+c2V0RmlsbE1vZGUoQW5pbWF0 aW9uRmlsbE1vZGVGb3J3YXJkcyk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgQ1NTVmFsdWVC YWNrd2FyZHM6Ci0gICAgICAgIGxheWVyLT5zZXRGaWxsTW9kZShBbmltYXRpb246OkFuaW1hdGlv bkZpbGxNb2RlQmFja3dhcmRzKTsKKyAgICAgICAgbGF5ZXItPnNldEZpbGxNb2RlKEFuaW1hdGlv bkZpbGxNb2RlQmFja3dhcmRzKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBDU1NWYWx1ZUJv dGg6Ci0gICAgICAgIGxheWVyLT5zZXRGaWxsTW9kZShBbmltYXRpb246OkFuaW1hdGlvbkZpbGxN b2RlQm90aCk7CisgICAgICAgIGxheWVyLT5zZXRGaWxsTW9kZShBbmltYXRpb25GaWxsTW9kZUJv dGgpOwogICAgICAgICBicmVhazsKICAgICB9CiB9CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRm b3JtL2FuaW1hdGlvbi9BbmltYXRpb24uaCBiL1dlYkNvcmUvcGxhdGZvcm0vYW5pbWF0aW9uL0Fu aW1hdGlvbi5oCmluZGV4IDMyNjI4ZTEuLjQ3ZWZjNGEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxh dGZvcm0vYW5pbWF0aW9uL0FuaW1hdGlvbi5oCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vYW5pbWF0 aW9uL0FuaW1hdGlvbi5oCkBAIC04NCw4ICs4NCw3IEBAIHB1YmxpYzoKICAgICBlbnVtIEFuaW1h dGlvbkRpcmVjdGlvbiB7IEFuaW1hdGlvbkRpcmVjdGlvbk5vcm1hbCwgQW5pbWF0aW9uRGlyZWN0 aW9uQWx0ZXJuYXRlIH07CiAgICAgQW5pbWF0aW9uRGlyZWN0aW9uIGRpcmVjdGlvbigpIGNvbnN0 IHsgcmV0dXJuIG1fZGlyZWN0aW9uOyB9CiAKLSAgICBlbnVtIEFuaW1hdGlvbkZpbGxNb2RlIHsg QW5pbWF0aW9uRmlsbE1vZGVOb25lLCBBbmltYXRpb25GaWxsTW9kZUZvcndhcmRzLCBBbmltYXRp b25GaWxsTW9kZUJhY2t3YXJkcywgQW5pbWF0aW9uRmlsbE1vZGVCb3RoIH07Ci0gICAgQW5pbWF0 aW9uRmlsbE1vZGUgZmlsbE1vZGUoKSBjb25zdCB7IHJldHVybiBtX2ZpbGxNb2RlOyB9CisgICAg dW5zaWduZWQgZmlsbE1vZGUoKSBjb25zdCB7IHJldHVybiBtX2ZpbGxNb2RlOyB9CiAKICAgICBk b3VibGUgZHVyYXRpb24oKSBjb25zdCB7IHJldHVybiBtX2R1cmF0aW9uOyB9CiAKQEAgLTk5LDcg Kzk4LDcgQEAgcHVibGljOgogICAgIHZvaWQgc2V0RGVsYXkoZG91YmxlIGMpIHsgbV9kZWxheSA9 IGM7IG1fZGVsYXlTZXQgPSB0cnVlOyB9CiAgICAgdm9pZCBzZXREaXJlY3Rpb24oQW5pbWF0aW9u RGlyZWN0aW9uIGQpIHsgbV9kaXJlY3Rpb24gPSBkOyBtX2RpcmVjdGlvblNldCA9IHRydWU7IH0K ICAgICB2b2lkIHNldER1cmF0aW9uKGRvdWJsZSBkKSB7IEFTU0VSVChkID49IDApOyBtX2R1cmF0 aW9uID0gZDsgbV9kdXJhdGlvblNldCA9IHRydWU7IH0KLSAgICB2b2lkIHNldEZpbGxNb2RlKEFu aW1hdGlvbkZpbGxNb2RlIGYpIHsgbV9maWxsTW9kZSA9IGY7IG1fZmlsbE1vZGVTZXQgPSB0cnVl OyB9CisgICAgdm9pZCBzZXRGaWxsTW9kZSh1bnNpZ25lZCBmKSB7IG1fZmlsbE1vZGUgPSBmOyBt X2ZpbGxNb2RlU2V0ID0gdHJ1ZTsgfQogICAgIHZvaWQgc2V0SXRlcmF0aW9uQ291bnQoaW50IGMp IHsgbV9pdGVyYXRpb25Db3VudCA9IGM7IG1faXRlcmF0aW9uQ291bnRTZXQgPSB0cnVlOyB9CiAg ICAgdm9pZCBzZXROYW1lKGNvbnN0IFN0cmluZyYgbikgeyBtX25hbWUgPSBuOyBtX25hbWVTZXQg PSB0cnVlOyB9CiAgICAgdm9pZCBzZXRQbGF5U3RhdGUodW5zaWduZWQgZCkgeyBtX3BsYXlTdGF0 ZSA9IGQ7IG1fcGxheVN0YXRlU2V0ID0gdHJ1ZTsgfQpAQCAtMTMxLDcgKzEzMCw3IEBAIHByaXZh dGU6CiAgICAgZG91YmxlIG1fZHVyYXRpb247CiAgICAgVGltaW5nRnVuY3Rpb24gbV90aW1pbmdG dW5jdGlvbjsKICAgICBBbmltYXRpb25EaXJlY3Rpb24gbV9kaXJlY3Rpb24gOiAxOwotICAgIEFu aW1hdGlvbkZpbGxNb2RlIG1fZmlsbE1vZGUgOiAyOworICAgIHVuc2lnbmVkIG1fZmlsbE1vZGUg OiAzOwogCiAgICAgdW5zaWduZWQgbV9wbGF5U3RhdGUgICAgIDogMjsKIApAQCAtMTUxLDcgKzE1 MCw3IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgZmxvYXQgaW5pdGlhbEFuaW1hdGlvbkRlbGF5KCkg eyByZXR1cm4gMDsgfQogICAgIHN0YXRpYyBBbmltYXRpb25EaXJlY3Rpb24gaW5pdGlhbEFuaW1h dGlvbkRpcmVjdGlvbigpIHsgcmV0dXJuIEFuaW1hdGlvbkRpcmVjdGlvbk5vcm1hbDsgfQogICAg IHN0YXRpYyBkb3VibGUgaW5pdGlhbEFuaW1hdGlvbkR1cmF0aW9uKCkgeyByZXR1cm4gMDsgfQot ICAgIHN0YXRpYyBBbmltYXRpb25GaWxsTW9kZSBpbml0aWFsQW5pbWF0aW9uRmlsbE1vZGUoKSB7 IHJldHVybiBBbmltYXRpb25GaWxsTW9kZU5vbmU7IH0KKyAgICBzdGF0aWMgdW5zaWduZWQgaW5p dGlhbEFuaW1hdGlvbkZpbGxNb2RlKCkgeyByZXR1cm4gQW5pbWF0aW9uRmlsbE1vZGVOb25lOyB9 CiAgICAgc3RhdGljIGludCBpbml0aWFsQW5pbWF0aW9uSXRlcmF0aW9uQ291bnQoKSB7IHJldHVy biAxOyB9CiAgICAgc3RhdGljIFN0cmluZyBpbml0aWFsQW5pbWF0aW9uTmFtZSgpIHsgcmV0dXJu IFN0cmluZygibm9uZSIpOyB9CiAgICAgc3RhdGljIHVuc2lnbmVkIGluaXRpYWxBbmltYXRpb25Q bGF5U3RhdGUoKSB7IHJldHVybiBBbmltUGxheVN0YXRlUGxheWluZzsgfQpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvR3JhcGhpY3NMYXllckNBLm1tIGIvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvR3JhcGhpY3NMYXllckNBLm1tCmluZGV4IGQ5ZWYxMDUu LmNhZjI2MjIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0dyYXBo aWNzTGF5ZXJDQS5tbQorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9HcmFwaGlj c0xheWVyQ0EubW0KQEAgLTE4NjEsMTYgKzE4NjEsMTYgQEAgdm9pZCBHcmFwaGljc0xheWVyQ0E6 OnNldHVwQW5pbWF0aW9uKENBUHJvcGVydHlBbmltYXRpb24qIHByb3BlcnR5QW5pbSwgY29uc3Qg QW4KIAogICAgIE5TU3RyaW5nKiBmaWxsTW9kZSA9IDA7CiAgICAgc3dpdGNoIChhbmltLT5maWxs TW9kZSgpKSB7Ci0gICAgY2FzZSBBbmltYXRpb246OkFuaW1hdGlvbkZpbGxNb2RlTm9uZToKKyAg ICBjYXNlIEFuaW1hdGlvbkZpbGxNb2RlTm9uZToKICAgICAgICAgZmlsbE1vZGUgPSBrQ0FGaWxs TW9kZVJlbW92ZWQ7CiAgICAgICAgIGJyZWFrOwotICAgIGNhc2UgQW5pbWF0aW9uOjpBbmltYXRp b25GaWxsTW9kZUJhY2t3YXJkczoKKyAgICBjYXNlIEFuaW1hdGlvbkZpbGxNb2RlQmFja3dhcmRz OgogICAgICAgICBmaWxsTW9kZSA9IGtDQUZpbGxNb2RlQmFja3dhcmRzOwogICAgICAgICBicmVh azsKLSAgICBjYXNlIEFuaW1hdGlvbjo6QW5pbWF0aW9uRmlsbE1vZGVGb3J3YXJkczoKKyAgICBj YXNlIEFuaW1hdGlvbkZpbGxNb2RlRm9yd2FyZHM6CiAgICAgICAgZmlsbE1vZGUgPSBrQ0FGaWxs TW9kZUZvcndhcmRzOwogICAgICAgIGJyZWFrOwotICAgIGNhc2UgQW5pbWF0aW9uOjpBbmltYXRp b25GaWxsTW9kZUJvdGg6CisgICAgY2FzZSBBbmltYXRpb25GaWxsTW9kZUJvdGg6CiAgICAgICAg ZmlsbE1vZGUgPSBrQ0FGaWxsTW9kZUJvdGg7CiAgICAgICAgYnJlYWs7CiAgICAgfQpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGVDb25zdGFudHMuaCBiL1dl YkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlQ29uc3RhbnRzLmgKaW5kZXggNGFiYmMx Yy4uMjk0MTJjNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5 bGVDb25zdGFudHMuaAorKysgYi9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZUNv bnN0YW50cy5oCkBAIC0yOTMsNiArMjkzLDggQEAgZW51bSBTdHlsZUNvbnRlbnRUeXBlIHsKIAog ZW51bSBFQm9yZGVyRml0IHsgQm9yZGVyRml0Qm9yZGVyLCBCb3JkZXJGaXRMaW5lcyB9OwogCitl bnVtIEVBbmltYXRpb25GaWxsTW9kZSB7IEFuaW1hdGlvbkZpbGxNb2RlTm9uZSwgQW5pbWF0aW9u RmlsbE1vZGVGb3J3YXJkcywgQW5pbWF0aW9uRmlsbE1vZGVCYWNrd2FyZHMsIEFuaW1hdGlvbkZp bGxNb2RlQm90aCB9OworCiBlbnVtIEVBbmltUGxheVN0YXRlIHsKICAgICBBbmltUGxheVN0YXRl UGxheWluZyA9IDB4MCwKICAgICBBbmltUGxheVN0YXRlUGF1c2VkID0gMHgxCg==