57142 2011-03-25 23:29:01 -0700 [Qt] Change TextureMapperVideoLayer to TextureMapperMediaLayer 2011-03-28 23:32:57 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED Qt, QtTriaged P4 Normal --- 1 skyul webkit-unassigned benjamin commit-queue noam oldest_to_newest 373863 0 skyul 2011-03-25 23:29:01 -0700 [Qt] Build fix: Add ENABLE(VIDEO) guards around texture mapper. 373864 1 87012 skyul 2011-03-25 23:32:11 -0700 Created attachment 87012 Patch 373954 2 87012 benjamin 2011-03-26 12:38:54 -0700 Comment on attachment 87012 Patch Stricto sensu, the media content type is video or composited plugin. For me, it looks like the real fix is to change TextureMapperVideoLayer to a TextureMapperMediaLayer where plugins are supported. Alternatively, add a new type for Plugin. No'am, any comment? 374367 3 87119 skyul 2011-03-28 02:39:27 -0700 Created attachment 87119 Patch 374399 4 87119 benjamin 2011-03-28 04:37:18 -0700 Comment on attachment 87119 Patch The changes in /texmap/ look correct to me. The change in the Qt implementation does not because of this: class TextureMapperVideoLayerQt : public virtual TextureMapperMediaLayer -> the Qt layer is limited to video. I still r+ because this is improving texture mapper and fixing the Qt layer is a separate problem. But please open a new bug for having a correct implementation of TextureMapperMediaLayer for Qt. 375052 5 commit-queue 2011-03-28 23:30:51 -0700 The commit-queue encountered the following flaky tests while processing attachment 87119: fast/workers/storage/use-same-database-in-page-and-workers.html bug 50995 (author: dumi@chromium.org) The commit-queue is continuing to process your patch. 375053 6 87119 commit-queue 2011-03-28 23:32:52 -0700 Comment on attachment 87119 Patch Clearing flags on attachment: 87119 Committed r82199: <http://trac.webkit.org/changeset/82199> 375054 7 commit-queue 2011-03-28 23:32:57 -0700 All reviewed patches have been landed. Closing bug. 87012 2011-03-25 23:32:11 -0700 2011-03-28 02:39:23 -0700 Patch bug-57142-20110326153139.patch text/plain 4653 skyul U3VidmVyc2lvbiBSZXZpc2lvbjogODIwMjEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA5YjYyOWY1MTRkMTRlNmRm MTBlMWUzMjJjOTE3MTczNjRlYjJmOGQzLi45ZTAyYjg5YTZiYWZhMzBjMWRhYWEyNTJmMmJlZjcx MDIzZWU3YWRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDMtMjUgIEt3YW5n IFl1bCBTZW8gIDxza3l1bEBjb21wYW55MTAwLm5ldD4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIEJ1aWxkIGZpeDogQWRkIEVOQUJMRShWSURF TykgZ3VhcmRzIGFyb3VuZCB0ZXh0dXJlIG1hcHBlci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3MTQyCisKKyAgICAgICAgVGV4dHVyZU1hcHBlclZp ZGVvTGF5ZXIgaXMgYWxyZWFkeSBndWFyZGVkIHdpdGggRU5BQkxFKFZJREVPKS4KKyAgICAgICAg V2UgbmVlZCB0byBhZGQgbW9yZSBFTkFCTEUoVklERU8pIGd1YXJkcyB0byBmaXggUXQgYnVpbGQg d2hlbiB0ZXhtYXAgaXMgdXNlZC4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1h cC9HcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFw aGljc0xheWVyVGV4dHVyZU1hcHBlcjo6c2V0Q29udGVudHNUb01lZGlhKToKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlck5vZGUuY3BwOgorICAgICAgICAo V2ViQ29yZTo6VGV4dHVyZU1hcHBlck5vZGU6OnVwbG9hZFRleHR1cmVGcm9tQ29udGVudCk6Cisg ICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyTm9kZTo6c3luY0NvbXBvc2l0aW5nU3RhdGVT ZWxmKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlck5v ZGUuaDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJOb2RlOjpDb250ZW50RGF0YTo6 Q29udGVudERhdGEpOgorCiAyMDExLTAzLTI1ICBLZXZpbiBPbGxpdmllciAgPGtldmlub0B0aGVv bGxpdmllcnMuY29tPgogCiAgICAgICAgIFt3eF0gQnVpbGQgZml4LCBkb24ndCB1c2UgdGhlIG5l dyBGUEQgaW1wbGVtZW50YXRpb24geWV0LCB1bnRpbCB3ZSBjYW4gbWVyZ2Ugb3VycyB3aXRoIGl0 LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dy YXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL3RleG1hcC9HcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlci5jcHAKaW5kZXggNDY5ODIz OTBjYTNhMzczZmZiN2UzNjY1YmEzYjZlMzFiZWQxMjUxYS4uMjg4ZmI0MGRhMWM0ZTE2YzE2NTk2 MTQ1YzFlZjUyYjk2ZGEyZGM1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVN YXBwZXIuY3BwCkBAIC0zMzIsNiArMzMyLDcgQEAgdm9pZCBHcmFwaGljc0xheWVyVGV4dHVyZU1h cHBlcjo6c2V0Q29udGVudHNCYWNrZ3JvdW5kQ29sb3IoY29uc3QgQ29sb3ImIGNvbG9yKQogCiB2 b2lkIEdyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyOjpzZXRDb250ZW50c1RvTWVkaWEoUGxhdGZv cm1MYXllciogbWVkaWEpCiB7CisjaWYgUExBVEZPUk0oVklERU8pCiAgICAgR3JhcGhpY3NMYXll cjo6c2V0Q29udGVudHNUb01lZGlhKG1lZGlhKTsKICAgICBub3RpZnlDaGFuZ2UoVGV4dHVyZU1h cHBlck5vZGU6OkNvbnRlbnRDaGFuZ2UpOwogICAgIG1fcGVuZGluZ0NvbnRlbnQuY29udGVudFR5 cGUgPSBtZWRpYSA/IFRleHR1cmVNYXBwZXJOb2RlOjpNZWRpYUNvbnRlbnRUeXBlIDogVGV4dHVy ZU1hcHBlck5vZGU6OkhUTUxDb250ZW50VHlwZTsKQEAgLTMzOSw2ICszNDAsNyBAQCB2b2lkIEdy YXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyOjpzZXRDb250ZW50c1RvTWVkaWEoUGxhdGZvcm1MYXll ciogbWVkaWEpCiAgICAgICAgIG1fcGVuZGluZ0NvbnRlbnQubWVkaWEgPSBzdGF0aWNfY2FzdDxU ZXh0dXJlTWFwcGVyVmlkZW9MYXllcio+KG1lZGlhKTsKICAgICBlbHNlCiAgICAgICAgIG1fcGVu ZGluZ0NvbnRlbnQubWVkaWEgPSAwOworI2VuZGlmCiB9CiAKIC8qIFxyZWltcCAoR3JhcGhpY3NM YXllci5oKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4 bWFwL1RleHR1cmVNYXBwZXJOb2RlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTm9kZS5jcHAKaW5kZXggYmY1M2U2MTIzNTU1ZjIxMTM5 YWM4Y2IzMmEwYzVhOTViMWMwZTkwOS4uOTgyOWQzMjM1MjJkMThiOGY3NjNkN2FkYjJiN2JmMTky ZThkMGI1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4 bWFwL1RleHR1cmVNYXBwZXJOb2RlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlck5vZGUuY3BwCkBAIC00MjcsNiArNDI3LDcgQEAg dm9pZCBUZXh0dXJlTWFwcGVyTm9kZTo6dXBsb2FkVGV4dHVyZUZyb21Db250ZW50KFRleHR1cmVN YXBwZXIqIHRleHR1cmVNYXBwZXIsIGMKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAorI2lmIFBM QVRGT1JNKFZJREVPKQogICAgIGlmIChtX2N1cnJlbnRDb250ZW50LmNvbnRlbnRUeXBlID09IE1l ZGlhQ29udGVudFR5cGUpIHsKICAgICAgICAgaWYgKCFtX2N1cnJlbnRDb250ZW50Lm1lZGlhKQog ICAgICAgICAgICAgcmV0dXJuOwpAQCAtNDM3LDYgKzQzOCw3IEBAIHZvaWQgVGV4dHVyZU1hcHBl ck5vZGU6OnVwbG9hZFRleHR1cmVGcm9tQ29udGVudChUZXh0dXJlTWFwcGVyKiB0ZXh0dXJlTWFw cGVyLCBjCiAgICAgICAgIG1fdGV4dHVyZS0+ZW5kUGFpbnQoKTsKICAgICAgICAgcmV0dXJuOwog ICAgIH0KKyNlbmRpZgogCiAgICAgY29uc3QgYm9vbCBuZWVkc1Jlc2V0ID0gKG1fdGV4dHVyZS0+ Y29udGVudFNpemUoKSAhPSBtX3NpemUpIHx8ICFtX3RleHR1cmUtPmlzVmFsaWQoKTsKICAgICBp ZiAoKG1fY3VycmVudENvbnRlbnQuY29udGVudFR5cGUgIT0gSFRNTENvbnRlbnRUeXBlKQpAQCAt ODM0LDcgKzgzNiw5IEBAIHZvaWQgVGV4dHVyZU1hcHBlck5vZGU6OnN5bmNDb21wb3NpdGluZ1N0 YXRlU2VsZihHcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlciogZ3JhCiAgICAgbV9zdGF0ZS5jaGls ZHJlblRyYW5zZm9ybSA9IGdyYXBoaWNzTGF5ZXItPmNoaWxkcmVuVHJhbnNmb3JtKCk7CiAgICAg bV9jdXJyZW50Q29udGVudC5jb250ZW50VHlwZSA9IHBlbmRpbmdDb250ZW50LmNvbnRlbnRUeXBl OwogICAgIG1fY3VycmVudENvbnRlbnQuaW1hZ2UgPSBwZW5kaW5nQ29udGVudC5pbWFnZTsKKyNp ZiBQTEFURk9STShWSURFTykKICAgICBtX2N1cnJlbnRDb250ZW50Lm1lZGlhID0gcGVuZGluZ0Nv bnRlbnQubWVkaWE7CisjZW5kaWYKICAgICBtX2N1cnJlbnRDb250ZW50LmJhY2tncm91bmRDb2xv ciA9IHBlbmRpbmdDb250ZW50LmJhY2tncm91bmRDb2xvcjsKICAgICBtX2N1cnJlbnRDb250ZW50 Lm5lZWRzRGlzcGxheSA9IG1fY3VycmVudENvbnRlbnQubmVlZHNEaXNwbGF5IHx8IHBlbmRpbmdD b250ZW50Lm5lZWRzRGlzcGxheTsKICAgICBtX2N1cnJlbnRDb250ZW50Lm5lZWRzRGlzcGxheVJl Y3QudW5pdGUocGVuZGluZ0NvbnRlbnQubmVlZHNEaXNwbGF5UmVjdCk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlck5vZGUu aCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVy Tm9kZS5oCmluZGV4IDg2ZGU1MzI1OTgzYTk5MDIyY2Y1ZmUxMTE2MDFmMjBjYzNkM2VlZTEuLmJl YWJjODE2Mzc2ZjVmYmRlMGZkZDQ4ODBlMzAzM2ZiN2QzMjFlYmMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTm9kZS5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVy Tm9kZS5oCkBAIC05NCwxMyArOTQsMTcgQEAgcHVibGljOgogCiAgICAgICAgIENvbnRlbnRUeXBl IGNvbnRlbnRUeXBlOwogICAgICAgICBSZWZQdHI8SW1hZ2U+IGltYWdlOworI2lmIEVOQUJMRShW SURFTykKICAgICAgICAgVGV4dHVyZU1hcHBlclZpZGVvTGF5ZXIqIG1lZGlhOworI2VuZGlmCiAK ICAgICAgICAgQ29udGVudERhdGEoKQogICAgICAgICAgICAgOiBuZWVkc0Rpc3BsYXkoZmFsc2Up CiAgICAgICAgICAgICAsIGNvbnRlbnRUeXBlKEhUTUxDb250ZW50VHlwZSkKICAgICAgICAgICAg ICwgaW1hZ2UoMCkKKyNpZiBFTkFCTEUoVklERU8pCiAgICAgICAgICAgICAsIG1lZGlhKDApCisj ZW5kaWYKICAgICAgICAgewogICAgICAgICB9CiAgICAgfTsK 87119 2011-03-28 02:39:27 -0700 2011-03-28 23:32:52 -0700 Patch bug-57142-20110328183835.patch text/plain 5322 skyul U3VidmVyc2lvbiBSZXZpc2lvbjogODIwOTMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA4MGZkMGFiNzM3ZjUxNDhh MTE5MTU0ZGQ5ZTRjOTQ5MWYxMTQzNjMwLi42MjJiODc5Yjg5NzY4MDMxZThlOGU4ZDkyODAxY2I2 NmVjMjY2Y2MwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDMtMjggIEt3YW5n IFl1bCBTZW8gIDxza3l1bEBjb21wYW55MTAwLm5ldD4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIENoYW5nZSBUZXh0dXJlTWFwcGVyVmlkZW9M YXllciB0byBUZXh0dXJlTWFwcGVyTWVkaWFMYXllcgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTcxNDIKKworICAgICAgICBUZXh0dXJlTWFwcGVyTWVk aWFMYXllciBpcyBhIGJldHRlciBuYW1lIGhlcmUgYmVjYXVzZSBib3RoIHZpZGVvIGFuZCBwbHVn aW5zIHVzZSB0aGlzIGxheWVyLgorICAgICAgICBSZW1vdmUgRU5BQkxFKFZJREVPKSBndWFyZC4K KworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3F0L01lZGlhUGxheWVyUHJpdmF0ZVF0LmNw cDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBsYXllclByaXZhdGVRdC5o OgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9HcmFwaGljc0xheWVyVGV4dHVy ZU1hcHBlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyVGV4dHVyZU1hcHBl cjo6c2V0Q29udGVudHNUb01lZGlhKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXht YXAvVGV4dHVyZU1hcHBlck5vZGUuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXht YXAvVGV4dHVyZU1hcHBlclBsYXRmb3JtTGF5ZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1 cmVNYXBwZXJNZWRpYUxheWVyOjpsYXllclR5cGUpOgorCiAyMDExLTAzLTI4ICBNYWNpZWogU3Rh Y2hvd2lhayAgPG1qc0BhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJlcm5z dGVpbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L01l ZGlhUGxheWVyUHJpdmF0ZVF0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3F0L01lZGlhUGxheWVyUHJpdmF0ZVF0LmNwcAppbmRleCAwMWUyNjFmMmY4MDM0ZjY5NTBmYjM3 Y2Q2Nzc0ZjNiZmQ1YWU2OWViLi45NDRmNDU1N2I4ZjE3MjBlYWE1ZTgzYjk2YTA1MDY4MDcyYTRh NzQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRp YVBsYXllclByaXZhdGVRdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQuY3BwCkBAIC01OTcsNyArNTk3LDcgQEAgdm9pZCBN ZWRpYVBsYXllclByaXZhdGVRdDo6cmVwYWludCgpCiAKICNpZiBVU0UoQUNDRUxFUkFURURfQ09N UE9TSVRJTkcpICYmIFVTRShURVhUVVJFX01BUFBFUikKIAotY2xhc3MgVGV4dHVyZU1hcHBlclZp ZGVvTGF5ZXJRdCA6IHB1YmxpYyB2aXJ0dWFsIFRleHR1cmVNYXBwZXJWaWRlb0xheWVyIHsKK2Ns YXNzIFRleHR1cmVNYXBwZXJWaWRlb0xheWVyUXQgOiBwdWJsaWMgdmlydHVhbCBUZXh0dXJlTWFw cGVyTWVkaWFMYXllciB7CiBwdWJsaWM6CiAgICAgVGV4dHVyZU1hcHBlclZpZGVvTGF5ZXJRdChR R3JhcGhpY3NWaWRlb0l0ZW0qIHZpZGVvSXRlbSkKICAgICAgICAgOiBtX3ZpZGVvSXRlbSh2aWRl b0l0ZW0pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9N ZWRpYVBsYXllclByaXZhdGVRdC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv cXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQuaAppbmRleCA3YThlMWRhODQ3ZWY3NzM3ZTM1M2Q2NDA1 NWNlYTRiMGY1ZmNmZWUwLi5jNjM5OGM5OWM0NzQxMGFlMjU2YTE5MTMyMzU0ZDA2MTk4NTQyZGRk IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBs YXllclByaXZhdGVRdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0 L01lZGlhUGxheWVyUHJpdmF0ZVF0LmgKQEAgLTMzLDcgKzMzLDcgQEAgUVRfRU5EX05BTUVTUEFD RQogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLWNsYXNzIFRleHR1cmVNYXBwZXJWaWRlb0xheWVy OworY2xhc3MgVGV4dHVyZU1hcHBlck1lZGlhTGF5ZXI7CiAKIGNsYXNzIE1lZGlhUGxheWVyUHJp dmF0ZVF0IDogcHVibGljIFFPYmplY3QsIHB1YmxpYyBNZWRpYVBsYXllclByaXZhdGVJbnRlcmZh Y2UgewogCkBAIC0xMzksNyArMTM5LDcgQEAgcHJpdmF0ZToKICAgICBRR3JhcGhpY3NWaWRlb0l0 ZW0qIG1fdmlkZW9JdGVtOwogICAgIFFHcmFwaGljc1NjZW5lKiBtX3ZpZGVvU2NlbmU7CiAjaWYg VVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKSAmJiBVU0UoVEVYVFVSRV9NQVBQRVIpCi0gICAg T3duUHRyPFRleHR1cmVNYXBwZXJWaWRlb0xheWVyPiBtX3BsYXRmb3JtTGF5ZXI7CisgICAgT3du UHRyPFRleHR1cmVNYXBwZXJNZWRpYUxheWVyPiBtX3BsYXRmb3JtTGF5ZXI7CiAjZW5kaWYKIAog ICAgIG11dGFibGUgTWVkaWFQbGF5ZXI6Ok5ldHdvcmtTdGF0ZSBtX25ldHdvcmtTdGF0ZTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9HcmFwaGlj c0xheWVyVGV4dHVyZU1hcHBlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIuY3BwCmluZGV4IGFjMTVkOTIzNGIy OWMzOTM3N2RlZjQ5NzgxZmY1YzkzN2U3OTZkMTYuLjc2MGJhNmMwYmE0MGU0YzIyZTQyZmY5M2Zk YjFhMTNjNWFhYWU4NWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3RleG1hcC9HcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVy LmNwcApAQCAtMzM2LDcgKzMzNiw3IEBAIHZvaWQgR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXI6 OnNldENvbnRlbnRzVG9NZWRpYShQbGF0Zm9ybUxheWVyKiBtZWRpYSkKICAgICBub3RpZnlDaGFu Z2UoVGV4dHVyZU1hcHBlck5vZGU6OkNvbnRlbnRDaGFuZ2UpOwogICAgIG1fcGVuZGluZ0NvbnRl bnQuY29udGVudFR5cGUgPSBtZWRpYSA/IFRleHR1cmVNYXBwZXJOb2RlOjpNZWRpYUNvbnRlbnRU eXBlIDogVGV4dHVyZU1hcHBlck5vZGU6OkhUTUxDb250ZW50VHlwZTsKICAgICBpZiAobWVkaWEp Ci0gICAgICAgIG1fcGVuZGluZ0NvbnRlbnQubWVkaWEgPSBzdGF0aWNfY2FzdDxUZXh0dXJlTWFw cGVyVmlkZW9MYXllcio+KG1lZGlhKTsKKyAgICAgICAgbV9wZW5kaW5nQ29udGVudC5tZWRpYSA9 IHN0YXRpY19jYXN0PFRleHR1cmVNYXBwZXJNZWRpYUxheWVyKj4obWVkaWEpOwogICAgIGVsc2UK ICAgICAgICAgbV9wZW5kaW5nQ29udGVudC5tZWRpYSA9IDA7CiB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlck5vZGUuaCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTm9k ZS5oCmluZGV4IDg2ZGU1MzI1OTgzYTk5MDIyY2Y1ZmUxMTE2MDFmMjBjYzNkM2VlZTEuLmM1ZGVj YzExZTkzYTI4ODg3YjU0MGQ5NTg0MjlkZWVjNjNhOTJlMjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTm9kZS5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTm9k ZS5oCkBAIC05NCw3ICs5NCw3IEBAIHB1YmxpYzoKIAogICAgICAgICBDb250ZW50VHlwZSBjb250 ZW50VHlwZTsKICAgICAgICAgUmVmUHRyPEltYWdlPiBpbWFnZTsKLSAgICAgICAgVGV4dHVyZU1h cHBlclZpZGVvTGF5ZXIqIG1lZGlhOworICAgICAgICBUZXh0dXJlTWFwcGVyTWVkaWFMYXllciog bWVkaWE7CiAKICAgICAgICAgQ29udGVudERhdGEoKQogICAgICAgICAgICAgOiBuZWVkc0Rpc3Bs YXkoZmFsc2UpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90 ZXhtYXAvVGV4dHVyZU1hcHBlclBsYXRmb3JtTGF5ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyUGxhdGZvcm1MYXllci5oCmluZGV4IDJh MzhiOTBjMzY5ZGE1NTMxMmQ5ODVkOTAxNWNhYTI4MzU4YmQxZDcuLmQyZDY0NmEwZjdmZjRjOTc4 ZjFmNWVkMGFlYjdlNzljM2UzMmFmOGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyUGxhdGZvcm1MYXllci5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyUGxhdGZv cm1MYXllci5oCkBAIC00Myw3ICs0Myw3IEBAIGNsYXNzIFRleHR1cmVNYXBwZXJQbGF0Zm9ybUxh eWVyIHsKIHB1YmxpYzoKICAgICBlbnVtIFR5cGUgewogICAgICAgICBDb250ZW50TGF5ZXIsCi0g ICAgICAgIFZpZGVvTGF5ZXIKKyAgICAgICAgTWVkaWFMYXllcgogICAgIH07CiAKICAgICB2aXJ0 dWFsIFR5cGUgbGF5ZXJUeXBlKCkgY29uc3QgPSAwOwpAQCAtNjYsMTMgKzY2LDExIEBAIHB1Ymxp YzoKICAgICB2aXJ0dWFsIFR5cGUgbGF5ZXJUeXBlKCkgY29uc3QgeyByZXR1cm4gQ29udGVudExh eWVyOyB9CiB9OwogCi0jaWYgRU5BQkxFKFZJREVPKQotY2xhc3MgVGV4dHVyZU1hcHBlclZpZGVv TGF5ZXIgOiBwdWJsaWMgVGV4dHVyZU1hcHBlclBsYXRmb3JtTGF5ZXIgeworY2xhc3MgVGV4dHVy ZU1hcHBlck1lZGlhTGF5ZXIgOiBwdWJsaWMgVGV4dHVyZU1hcHBlclBsYXRmb3JtTGF5ZXIgewog cHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBwYWludChHcmFwaGljc0NvbnRleHQqKSA9IDA7Ci0g ICAgdmlydHVhbCBUeXBlIGxheWVyVHlwZSgpIGNvbnN0IHsgcmV0dXJuIFZpZGVvTGF5ZXI7IH0K KyAgICB2aXJ0dWFsIFR5cGUgbGF5ZXJUeXBlKCkgY29uc3QgeyByZXR1cm4gTWVkaWFMYXllcjsg fQogfTsKLSNlbmRpZgogCiB9CiAK