91180 2012-07-12 18:44:03 -0700 [BlackBerry] Use fillBuffer() instead of a user-defined background image 2012-07-13 08:53:49 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jpetsovits jpetsovits manyoso mifenton rwlbuis staikos tonikitoo webkit.review.bot oldest_to_newest 668489 0 jpetsovits 2012-07-12 18:44:03 -0700 We want to save memory and make the background into anything the platform specifies, for instance a GL shader or a smart tiling implementation. For that purpose, the platform API is changing to make the existing checkerBuffer() into a more versatile fillBuffer(). In turn, we want to get rid of the existing customizable background image setting and just use whatever the system is providing. And also fix consistency for the overscroll color API. Patch below. 668493 1 152128 jpetsovits 2012-07-12 18:49:36 -0700 Created attachment 152128 Patch 669031 2 152128 rwlbuis 2012-07-13 07:50:19 -0700 Comment on attachment 152128 Patch LGTM. 669087 3 152128 webkit.review.bot 2012-07-13 08:53:39 -0700 Comment on attachment 152128 Patch Clearing flags on attachment: 152128 Committed r122587: <http://trac.webkit.org/changeset/122587> 669089 4 webkit.review.bot 2012-07-13 08:53:49 -0700 All reviewed patches have been landed. Closing bug. 152128 2012-07-12 18:49:36 -0700 2012-07-13 08:53:39 -0700 Patch bug-91180-20120712214852.patch text/plain 15342 jpetsovits U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3MjAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCAyYjQ0MDk2OWUxYzY3NDRkODQxMmY1MzI1OGE4ODEwMTRiYTdiNWUwLi4xYjA3MjNkM2Qx YTExZDcxYTEyYWU5ODkzYTJlYTdkODhiNzExNjM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwzOSBAQAorMjAxMi0wNy0xMiAgSmFrb2IgUGV0c292aXRzICA8anBl dHNvdml0c0ByaW0uY29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBVc2UgZmlsbEJ1ZmZlcigp IGluc3RlYWQgb2YgYSB1c2VyLWRlZmluZWQgYmFja2dyb3VuZCBpbWFnZS4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkxMTgwCisgICAgICAgIFJJTSBQ UiAxNzE0NTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAg SW50ZXJuYWxseSByZXZpZXdlZCBieSBBbmRyZXcgTG8uCisKKyAgICAgICAgQnkgdXNpbmcgUGxh dGZvcm06OkdyYXBoaWNzOjpmaWxsQnVmZmVyKCkgdG8gZmlsbCB0aGUKKyAgICAgICAgb3ZlcnNj cm9sbCBhcmVhLCB3ZSBzYXZlIGdyYXBoaWNzIG1lbW9yeSBmb3IgdGhlIGJ1ZmZlcgorICAgICAg ICB0aGF0IHRoZSBiYWNrZ3JvdW5kIGltYWdlIHdhcyBvY2N1cHlpbmcuCisKKyAgICAgICAgQWxz byBhZGFwdCBjaGVja2VyYm9hcmQgZHJhd2luZyBhcyBpdCBpcyBub3cgZG9uZSB1c2luZworICAg ICAgICBmaWxsQnVmZmVyKCkgd2hpY2ggcmVwbGFjZXMgY2hlY2tlckJ1ZmZlcigpLgorCisgICAg ICAgIEluIHRoZSBzYW1lIGdvLCB1c2UgdGhlIG9wcG9ydHVuaXR5IG9mIHRoZSBXZWJTZXR0aW5n cworICAgICAgICBBUEkgY2hhbmdlIHRvIG1ha2UgaXQgbW9yZSBjb25zaXN0ZW50LCByZW5hbWlu ZyB0aGUKKyAgICAgICAgT3Zlclpvb21Db2xvciBzZXR0aW5nIHRvIE92ZXJTY3JvbGxDb2xvci4K KworICAgICAgICAqIEFwaS9CYWNraW5nU3RvcmUuY3BwOgorICAgICAgICAoV2ViS2l0KToKKyAg ICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6QmFja2luZ1N0b3JlUHJpdmF0ZTo6cGFpbnREZWZh dWx0QmFja2dyb3VuZCk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OkJhY2tpbmdTdG9y ZVByaXZhdGU6OmJsaXRDb250ZW50cyk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OkJh Y2tpbmdTdG9yZVByaXZhdGU6OmZpbGxXaW5kb3cpOgorICAgICAgICAqIEFwaS9CYWNraW5nU3Rv cmVfcC5oOgorICAgICAgICAoQmFja2luZ1N0b3JlUHJpdmF0ZSk6CisgICAgICAgICogQXBpL1dl YlNldHRpbmdzLmNwcDoKKyAgICAgICAgKFdlYktpdCk6CisgICAgICAgIChCbGFja0JlcnJ5OjpX ZWJLaXQ6OldlYlNldHRpbmdzOjpzdGFuZGFyZFNldHRpbmdzKToKKyAgICAgICAgKEJsYWNrQmVy cnk6OldlYktpdDo6V2ViU2V0dGluZ3M6Om92ZXJTY3JvbGxDb2xvcik6CisgICAgICAgIChCbGFj a0JlcnJ5OjpXZWJLaXQ6OldlYlNldHRpbmdzOjpzZXRPdmVyU2Nyb2xsQ29sb3IpOgorICAgICAg ICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJTZXR0aW5nczo6aXNFbmFibGVEZWZhdWx0T3ZlclNj cm9sbEJhY2tncm91bmQpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJTZXR0aW5n czo6c2V0RW5hYmxlRGVmYXVsdE92ZXJTY3JvbGxCYWNrZ3JvdW5kKToKKyAgICAgICAgKiBBcGkv V2ViU2V0dGluZ3MuaDoKKwogMjAxMi0wNy0xMiAgSm9uYXRoYW4gRG9uZyAgPGpvbmF0aGFuLmRv bmdAdG9yY2htb2JpbGUuY29tLmNuPgogCiAgICAgICAgIFtCbGFja0JlcnJ5XSBDYW5ub3QgdXNl IGRpZ2VzdCBwcm94eSBhdXRoIGFuZCBOVExNIGF1dGggYXQgdGhlIHNhbWUgdGltZQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9CYWNraW5nU3RvcmUuY3BwIGIvU291 cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9CYWNraW5nU3RvcmUuY3BwCmluZGV4IDYxNzg5OWI5 NTZmMjcyYzRkMjIyMjdkZTE0N2M2ZjNiNjYyNDZmMDMuLmZmMTBmYjczNDE5M2JlNTY2ODI2NDU1 Zjc4YzcwMTYxYzFmNWRlNDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9B cGkvQmFja2luZ1N0b3JlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0Jh Y2tpbmdTdG9yZS5jcHAKQEAgLTc3LDkgKzc3LDYgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAKIGNv bnN0IGludCBzX3JlbmRlclRpbWVyVGltZW91dCA9IDEuMDsKIFdlYlBhZ2UqIEJhY2tpbmdTdG9y ZVByaXZhdGU6OnNfY3VycmVudEJhY2tpbmdTdG9yZU93bmVyID0gMDsKLVBsYXRmb3JtOjpHcmFw aGljczo6QnVmZmVyKiBCYWNraW5nU3RvcmVQcml2YXRlOjpzX292ZXJTY3JvbGxJbWFnZSA9IDA7 Ci1zdGQ6OnN0cmluZyBCYWNraW5nU3RvcmVQcml2YXRlOjpzX292ZXJTY3JvbGxJbWFnZVBhdGg7 Ci1QbGF0Zm9ybTo6SW50U2l6ZSBCYWNraW5nU3RvcmVQcml2YXRlOjpzX292ZXJTY3JvbGxJbWFn ZVNpemU7CiAKIHR5cGVkZWYgc3RkOjpwYWlyPGludCwgaW50PiBEaXZpc29yOwogdHlwZWRlZiBW ZWN0b3I8RGl2aXNvcj4gRGl2aXNvckxpc3Q7CkBAIC0xMjIwLDUyICsxMjE3LDYgQEAgdm9pZCBC YWNraW5nU3RvcmVQcml2YXRlOjpjb3B5UHJldmlvdXNDb250ZW50c1RvQmFja1N1cmZhY2VPZlRp bGUoY29uc3QgUGxhdGZvcm0KICAgICB9CiB9CiAKLWJvb2wgQmFja2luZ1N0b3JlUHJpdmF0ZTo6 ZW5zdXJlT3ZlclNjcm9sbEltYWdlKCkKLXsKLSAgICBzdGQ6OnN0cmluZyBwYXRoID0gbV93ZWJQ YWdlLT5zZXR0aW5ncygpLT5vdmVyU2Nyb2xsSW1hZ2VQYXRoKCkudXRmOCgpOwotICAgIGlmIChw YXRoID09ICIiKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBpZiAoc19vdmVyU2Nyb2xs SW1hZ2UgJiYgcGF0aCA9PSBzX292ZXJTY3JvbGxJbWFnZVBhdGgpCi0gICAgICAgIHJldHVybiB0 cnVlOwotCi0gICAgc3RkOjpzdHJpbmcgaW1hZ2VQYXRoID0gUGxhdGZvcm06OkNsaWVudDo6Z2V0 KCktPmdldEFwcGxpY2F0aW9uTG9jYWxEaXJlY3RvcnkoKSArIHBhdGg7Ci0KLSAgICBTa0JpdG1h cCBiaXRtYXA7Ci0gICAgaWYgKCFTa0ltYWdlRGVjb2Rlcjo6RGVjb2RlRmlsZShpbWFnZVBhdGgu Y19zdHIoKSwgJmJpdG1hcCkpIHsKLSAgICAgICAgQmxhY2tCZXJyeTo6UGxhdGZvcm06OmxvZyhC bGFja0JlcnJ5OjpQbGF0Zm9ybTo6TG9nTGV2ZWxDcml0aWNhbCwKLSAgICAgICAgICAgICAgICAg ICAgIkJhY2tpbmdTdG9yZVByaXZhdGU6OmVuc3VyZU92ZXJTY3JvbGxJbWFnZSBjb3VsZCBub3Qg ZGVjb2RlIG92ZXJzY3JvbGwgaW1hZ2U6ICVzIiwgaW1hZ2VQYXRoLmNfc3RyKCkpOwotICAgICAg ICByZXR1cm4gZmFsc2U7Ci0gICAgfQotCi0gICAgZGVzdHJveUJ1ZmZlcihzX292ZXJTY3JvbGxJ bWFnZSk7Ci0gICAgc19vdmVyU2Nyb2xsSW1hZ2UgPSBjcmVhdGVCdWZmZXIoUGxhdGZvcm06Oklu dFNpemUoYml0bWFwLndpZHRoKCksIGJpdG1hcC5oZWlnaHQoKSksIFBsYXRmb3JtOjpHcmFwaGlj czo6VGVtcG9yYXJ5QnVmZmVyKTsKLQotICAgIFNrQ2FudmFzKiBjYW52YXMgPSBQbGF0Zm9ybTo6 R3JhcGhpY3M6OmxvY2tCdWZmZXJEcmF3YWJsZShzX292ZXJTY3JvbGxJbWFnZSk7Ci0gICAgaWYg KCFjYW52YXMpIHsKLSAgICAgICAgZGVzdHJveUJ1ZmZlcihzX292ZXJTY3JvbGxJbWFnZSk7Ci0g ICAgICAgIHNfb3ZlclNjcm9sbEltYWdlID0gMDsKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAg IH0KLQotICAgIFNrUGFpbnQgcGFpbnQ7Ci0gICAgcGFpbnQuc2V0WGZlcm1vZGVNb2RlKFNrWGZl cm1vZGU6OmtTcmNfTW9kZSk7Ci0gICAgcGFpbnQuc2V0RmxhZ3MoU2tQYWludDo6a0FudGlBbGlh c19GbGFnKTsKLSAgICBwYWludC5zZXRGaWx0ZXJCaXRtYXAodHJ1ZSk7Ci0KLSAgICBTa1JlY3Qg cmVjdCA9IFNrUmVjdDo6TWFrZVhZV0goMCwgMCwgYml0bWFwLndpZHRoKCksIGJpdG1hcC5oZWln aHQoKSk7Ci0gICAgY2FudmFzLT5zYXZlKCk7Ci0gICAgY2FudmFzLT5kcmF3Qml0bWFwUmVjdChi aXRtYXAsIDAsIHJlY3QsICZwYWludCk7Ci0gICAgY2FudmFzLT5yZXN0b3JlKCk7Ci0KLSAgICBQ bGF0Zm9ybTo6R3JhcGhpY3M6OnJlbGVhc2VCdWZmZXJEcmF3YWJsZShzX292ZXJTY3JvbGxJbWFn ZSk7Ci0KLSAgICBzX292ZXJTY3JvbGxJbWFnZVNpemUgPSBQbGF0Zm9ybTo6SW50U2l6ZShiaXRt YXAud2lkdGgoKSwgYml0bWFwLmhlaWdodCgpKTsKLSAgICBzX292ZXJTY3JvbGxJbWFnZVBhdGgg PSBwYXRoOwotCi0gICAgcmV0dXJuIHRydWU7Ci19Ci0KIHZvaWQgQmFja2luZ1N0b3JlUHJpdmF0 ZTo6cGFpbnREZWZhdWx0QmFja2dyb3VuZChjb25zdCBQbGF0Zm9ybTo6SW50UmVjdCYgY29udGVu dHMsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29u c3QgV2ViQ29yZTo6VHJhbnNmb3JtYXRpb25NYXRyaXgmIHRyYW5zZm9ybWF0aW9uLAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgZmx1c2gpCkBA IC0xMjc0LDExICsxMjI1LDggQEAgdm9pZCBCYWNraW5nU3RvcmVQcml2YXRlOjpwYWludERlZmF1 bHRCYWNrZ3JvdW5kKGNvbnN0IFBsYXRmb3JtOjpJbnRSZWN0JiBjb250ZW4KICAgICBQbGF0Zm9y bTo6SW50UG9pbnQgb3JpZ2luID0gY29udGVudHMubG9jYXRpb24oKTsKICAgICBQbGF0Zm9ybTo6 SW50UmVjdCBjb250ZW50c0NsaXBwZWQgPSBjb250ZW50czsKIAotCiAgICAgLy8gV2UgaGF2ZSB0 byBwYWludCB0aGUgZGVmYXVsdCBiYWNrZ3JvdW5kIGluIHRoZSBjYXNlIG9mIG92ZXJ6b29tIGFu ZAogICAgIC8vIG1ha2Ugc3VyZSBpdCBpcyBpbnZhbGlkYXRlZC4KLSAgICBDb2xvciBjb2xvciht X3dlYlBhZ2UtPnNldHRpbmdzKCktPm92ZXJab29tQ29sb3IoKSk7Ci0KICAgICBQbGF0Zm9ybTo6 SW50UmVjdFJlZ2lvbiBvdmVyU2Nyb2xsUmVnaW9uCiAgICAgICAgICAgICA9IFBsYXRmb3JtOjpJ bnRSZWN0UmVnaW9uOjpzdWJ0cmFjdFJlZ2lvbnMoUGxhdGZvcm06OkludFJlY3QoY29udGVudHND bGlwcGVkKSwgY29udGVudHNSZWN0KTsKIApAQCAtMTI5NSwyMSArMTI0MywxMyBAQCB2b2lkIEJh Y2tpbmdTdG9yZVByaXZhdGU6OnBhaW50RGVmYXVsdEJhY2tncm91bmQoY29uc3QgUGxhdGZvcm06 OkludFJlY3QmIGNvbnRlbgogICAgICAgICAgICAgb3ZlclNjcm9sbFJlY3QuaW50ZXJzZWN0KFBs YXRmb3JtOjpJbnRSZWN0KFBsYXRmb3JtOjpJbnRQb2ludCgwLCAwKSwgc3VyZmFjZVNpemUoKSkp OwogICAgICAgICB9CiAKLSAgICAgICAgaWYgKGVuc3VyZU92ZXJTY3JvbGxJbWFnZSgpKSB7Ci0g ICAgICAgICAgICAvLyBUaWxlIHRoZSBpbWFnZSBvbiB0aGUgd2luZG93IHJlZ2lvbi4KLSAgICAg ICAgICAgIFBsYXRmb3JtOjpJbnRSZWN0IGRzdFJlY3Q7Ci0gICAgICAgICAgICBmb3IgKGludCB5 ID0gb3ZlclNjcm9sbFJlY3QueSgpOyB5IDwgb3ZlclNjcm9sbFJlY3QueSgpICsgb3ZlclNjcm9s bFJlY3QuaGVpZ2h0KCk7IHkgKz0gZHN0UmVjdC5oZWlnaHQoKSkgewotICAgICAgICAgICAgICAg IGZvciAoaW50IHggPSBvdmVyU2Nyb2xsUmVjdC54KCk7IHggPCBvdmVyU2Nyb2xsUmVjdC54KCkg KyBvdmVyU2Nyb2xsUmVjdC53aWR0aCgpOyB4ICs9IGRzdFJlY3Qud2lkdGgoKSkgewotICAgICAg ICAgICAgICAgICAgICBQbGF0Zm9ybTo6SW50UmVjdCBpbWFnZVJlY3QgPSBQbGF0Zm9ybTo6SW50 UmVjdChQbGF0Zm9ybTo6SW50UG9pbnQoeCAtICh4ICUgc19vdmVyU2Nyb2xsSW1hZ2VTaXplLndp ZHRoKCkpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHkgLSAoeSAlIHNfb3ZlclNjcm9s bEltYWdlU2l6ZS5oZWlnaHQoKSkpLCBzX292ZXJTY3JvbGxJbWFnZVNpemUpOwotICAgICAgICAg ICAgICAgICAgICBkc3RSZWN0ID0gaW1hZ2VSZWN0OwotICAgICAgICAgICAgICAgICAgICBkc3RS ZWN0LmludGVyc2VjdChvdmVyU2Nyb2xsUmVjdCk7Ci0gICAgICAgICAgICAgICAgICAgIFBsYXRm b3JtOjpJbnRSZWN0IHNyY1JlY3QgPSBQbGF0Zm9ybTo6SW50UmVjdCh4IC0gaW1hZ2VSZWN0Lngo KSwgeSAtIGltYWdlUmVjdC55KCksIGRzdFJlY3Qud2lkdGgoKSwgZHN0UmVjdC5oZWlnaHQoKSk7 Ci0gICAgICAgICAgICAgICAgICAgIGJsaXRUb1dpbmRvdyhkc3RSZWN0LCBzX292ZXJTY3JvbGxJ bWFnZSwgc3JjUmVjdCwgZmFsc2UsIDI1NSk7Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAg ICAgfQotICAgICAgICB9IGVsc2UKKyAgICAgICAgaWYgKG1fd2ViUGFnZS0+c2V0dGluZ3MoKS0+ aXNFbmFibGVEZWZhdWx0T3ZlclNjcm9sbEJhY2tncm91bmQoKSkgeworICAgICAgICAgICAgZmls bFdpbmRvdyhCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6R3JhcGhpY3M6OkRlZmF1bHRCYWNrZ3JvdW5k UGF0dGVybiwKKyAgICAgICAgICAgICAgICBvdmVyU2Nyb2xsUmVjdCwgb3ZlclNjcm9sbFJlY3Qu bG9jYXRpb24oKSwgMS4wIC8qY29udGVudHNTY2FsZSovKTsKKyAgICAgICAgfSBlbHNlIHsKKyAg ICAgICAgICAgIENvbG9yIGNvbG9yKG1fd2ViUGFnZS0+c2V0dGluZ3MoKS0+b3ZlclNjcm9sbENv bG9yKCkpOwogICAgICAgICAgICAgY2xlYXJXaW5kb3cob3ZlclNjcm9sbFJlY3QsIGNvbG9yLnJl ZCgpLCBjb2xvci5ncmVlbigpLCBjb2xvci5ibHVlKCksIGNvbG9yLmFscGhhKCkpOworICAgICAg ICB9CiAgICAgfQogfQogCkBAIC0xNDI3LDcgKzEzNjcsOCBAQCB2b2lkIEJhY2tpbmdTdG9yZVBy aXZhdGU6OmJsaXRDb250ZW50cyhjb25zdCBQbGF0Zm9ybTo6SW50UmVjdCYgZHN0UmVjdCwKICNp ZiBERUJVR19DSEVDS0VSQk9BUkQKICAgICAgICAgICAgICAgICBibGl0Q2hlY2tlcmVkID0gdHJ1 ZTsKICNlbmRpZgotICAgICAgICAgICAgICAgIGNoZWNrZXJXaW5kb3coZHN0UmVjdCwgY2hlY2tl cmVkUmVjdHMuYXQoaSkubG9jYXRpb24oKSwgdHJhbnNmb3JtYXRpb24uYSgpKTsKKyAgICAgICAg ICAgICAgICBmaWxsV2luZG93KEJsYWNrQmVycnk6OlBsYXRmb3JtOjpHcmFwaGljczo6Q2hlY2tl cmJvYXJkUGF0dGVybiwKKyAgICAgICAgICAgICAgICAgICAgZHN0UmVjdCwgY2hlY2tlcmVkUmVj dHMuYXQoaSkubG9jYXRpb24oKSwgdHJhbnNmb3JtYXRpb24uYSgpKTsKICAgICAgICAgICAgIH0K ICAgICAgICAgfQogCkBAIC0xNDg2LDcgKzE0MjcsOCBAQCB2b2lkIEJhY2tpbmdTdG9yZVByaXZh dGU6OmJsaXRDb250ZW50cyhjb25zdCBQbGF0Zm9ybTo6SW50UmVjdCYgZHN0UmVjdCwKICNpZiBE RUJVR19DSEVDS0VSQk9BUkQKICAgICAgICAgICAgICAgICBibGl0Q2hlY2tlcmVkID0gdHJ1ZTsK ICNlbmRpZgotICAgICAgICAgICAgICAgIGNoZWNrZXJXaW5kb3coZGlydHlSZWN0VCwgY29udGVu dHNPcmlnaW4sIHRyYW5zZm9ybWF0aW9uLmEoKSk7CisgICAgICAgICAgICAgICAgZmlsbFdpbmRv dyhCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6R3JhcGhpY3M6OkNoZWNrZXJib2FyZFBhdHRlcm4sCisg ICAgICAgICAgICAgICAgICAgIGRpcnR5UmVjdFQsIGNvbnRlbnRzT3JpZ2luLCB0cmFuc2Zvcm1h dGlvbi5hKCkpOwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICAvLyBCbGl0IHRoZSB2aXNp YmxlIGJ1ZmZlciBoZXJlIGlmIHdlIGhhdmUgdmlzaWJsZSB6b29tIGpvYnMuCkBAIC0yNTA5LDkg KzI0NTEsMTAgQEAgdm9pZCBCYWNraW5nU3RvcmVQcml2YXRlOjpibGl0VG9XaW5kb3coY29uc3Qg UGxhdGZvcm06OkludFJlY3QmIGRzdFJlY3QsCiAKIH0KIAotdm9pZCBCYWNraW5nU3RvcmVQcml2 YXRlOjpjaGVja2VyV2luZG93KGNvbnN0IFBsYXRmb3JtOjpJbnRSZWN0JiBkc3RSZWN0LAotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IFBsYXRmb3JtOjpJbnRQ b2ludCYgY29udGVudHNPcmlnaW4sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgZG91YmxlIGNvbnRlbnRzU2NhbGUpCit2b2lkIEJhY2tpbmdTdG9yZVByaXZhdGU6OmZp bGxXaW5kb3coUGxhdGZvcm06OkdyYXBoaWNzOjpGaWxsUGF0dGVybiBwYXR0ZXJuLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IFBsYXRmb3JtOjpJbnRSZWN0JiBk c3RSZWN0LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IFBsYXRm b3JtOjpJbnRQb2ludCYgY29udGVudHNPcmlnaW4sCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgZG91YmxlIGNvbnRlbnRzU2NhbGUpCiB7CiAgICAgQVNTRVJUKEJsYWNrQmVy cnk6OlBsYXRmb3JtOjp1c2VySW50ZXJmYWNlVGhyZWFkTWVzc2FnZUNsaWVudCgpLT5pc0N1cnJl bnRUaHJlYWQoKSk7CiAKQEAgLTI1MjEsMTEgKzI0NjQsOSBAQCB2b2lkIEJhY2tpbmdTdG9yZVBy aXZhdGU6OmNoZWNrZXJXaW5kb3coY29uc3QgUGxhdGZvcm06OkludFJlY3QmIGRzdFJlY3QsCiAg ICAgQmxhY2tCZXJyeTo6UGxhdGZvcm06OkdyYXBoaWNzOjpCdWZmZXIqIGRzdEJ1ZmZlciA9IGJ1 ZmZlcigpOwogICAgIEFTU0VSVChkc3RCdWZmZXIpOwogICAgIGlmICghZHN0QnVmZmVyKQotICAg ICAgICBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6bG9nKEJsYWNrQmVycnk6OlBsYXRmb3JtOjpMb2dM ZXZlbFdhcm4sICJFbXB0eSB3aW5kb3cgYnVmZmVyLCBjb3VsZG4ndCBjaGVja2VyV2luZG93Iik7 CisgICAgICAgIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpsb2coQmxhY2tCZXJyeTo6UGxhdGZvcm06 OkxvZ0xldmVsV2FybiwgIkVtcHR5IHdpbmRvdyBidWZmZXIsIGNvdWxkbid0IGZpbGxXaW5kb3ci KTsKIAotICAgIENvbG9yIGNvbG9yKG1fd2ViUGFnZS0+c2V0dGluZ3MoKS0+YmFja2dyb3VuZENv bG9yKCkpOwotICAgIHVuc2lnbmVkIGNoYXIgYWxwaGEgPSBjb2xvci5hbHBoYSgpOwotICAgIEJs YWNrQmVycnk6OlBsYXRmb3JtOjpHcmFwaGljczo6Y2hlY2tlckJ1ZmZlcihkc3RCdWZmZXIsIGRz dFJlY3QsIGNvbnRlbnRzT3JpZ2luLCBjb250ZW50c1NjYWxlLCBhbHBoYSk7CisgICAgQmxhY2tC ZXJyeTo6UGxhdGZvcm06OkdyYXBoaWNzOjpmaWxsQnVmZmVyKGRzdEJ1ZmZlciwgcGF0dGVybiwg ZHN0UmVjdCwgY29udGVudHNPcmlnaW4sIGNvbnRlbnRzU2NhbGUpOwogfQogCiB2b2lkIEJhY2tp bmdTdG9yZVByaXZhdGU6OmludmFsaWRhdGVXaW5kb3coKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9ibGFja2JlcnJ5L0FwaS9CYWNraW5nU3RvcmVfcC5oIGIvU291cmNlL1dlYktpdC9ibGFj a2JlcnJ5L0FwaS9CYWNraW5nU3RvcmVfcC5oCmluZGV4IDUyZTQ2MmQ2ZDFhYmYzYzdmODY2NzQ2 MTJhYTU1ZTI3ZjE4NjRjZjQuLjNjYWEyZGRhYTgxZjBmNDhhYzI0YTcyZjJhNzIzOGZmNjgyOGE1 NTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvQmFja2luZ1N0b3Jl X3AuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0JhY2tpbmdTdG9yZV9wLmgK QEAgLTMwNiw3ICszMDYsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCByZW5kZXJDb250ZW50cyhQbGF0 Zm9ybTo6R3JhcGhpY3M6OkRyYXdhYmxlKiAvKmRyYXdhYmxlKi8sIGNvbnN0IFBsYXRmb3JtOjpJ bnRSZWN0JiAvKmNvbnRlbnRzUmVjdCovLCBjb25zdCBQbGF0Zm9ybTo6SW50U2l6ZSYgLypkZXN0 aW5hdGlvblNpemUqLykgY29uc3Q7CiAKICAgICB2b2lkIGJsaXRUb1dpbmRvdyhjb25zdCBQbGF0 Zm9ybTo6SW50UmVjdCYgZHN0UmVjdCwgY29uc3QgQmxhY2tCZXJyeTo6UGxhdGZvcm06OkdyYXBo aWNzOjpCdWZmZXIqIHNyY0J1ZmZlciwgY29uc3QgUGxhdGZvcm06OkludFJlY3QmIHNyY1JlY3Qs IGJvb2wgYmxlbmQsIHVuc2lnbmVkIGNoYXIgZ2xvYmFsQWxwaGEpOwotICAgIHZvaWQgY2hlY2tl cldpbmRvdyhjb25zdCBQbGF0Zm9ybTo6SW50UmVjdCYgZHN0UmVjdCwgY29uc3QgUGxhdGZvcm06 OkludFBvaW50JiBjb250ZW50c09yaWdpbiwgZG91YmxlIGNvbnRlbnRzU2NhbGUpOworICAgIHZv aWQgZmlsbFdpbmRvdyhQbGF0Zm9ybTo6R3JhcGhpY3M6OkZpbGxQYXR0ZXJuLCBjb25zdCBQbGF0 Zm9ybTo6SW50UmVjdCYgZHN0UmVjdCwgY29uc3QgUGxhdGZvcm06OkludFBvaW50JiBjb250ZW50 c09yaWdpbiwgZG91YmxlIGNvbnRlbnRzU2NhbGUpOwogCiAgICAgdm9pZCBpbnZhbGlkYXRlV2lu ZG93KCk7CiAgICAgdm9pZCBpbnZhbGlkYXRlV2luZG93KGNvbnN0IFBsYXRmb3JtOjpJbnRSZWN0 JiBkc3QpOwpAQCAtMzM0LDggKzMzNCw2IEBAIHB1YmxpYzoKICAgICBCbGFja0JlcnJ5OjpQbGF0 Zm9ybTo6SW50U2l6ZSBzdXJmYWNlU2l6ZSgpIGNvbnN0OwogICAgIEJsYWNrQmVycnk6OlBsYXRm b3JtOjpHcmFwaGljczo6QnVmZmVyKiBidWZmZXIoKSBjb25zdDsKIAotICAgIGJvb2wgZW5zdXJl T3ZlclNjcm9sbEltYWdlKCk7Ci0KICAgICBzdGF0aWMgV2ViUGFnZSogc19jdXJyZW50QmFja2lu Z1N0b3JlT3duZXI7CiAKICAgICBib29sIG1fc3VzcGVuZFNjcmVlblVwZGF0ZXM7CkBAIC0zNzcs MTAgKzM3NSw2IEBAIHB1YmxpYzoKICAgICBib29sIG1faXNEaXJlY3RSZW5kZXJpbmdBbmltYXRp b25NZXNzYWdlU2NoZWR1bGVkOwogI2VuZGlmCiAKLSAgICBzdGF0aWMgUGxhdGZvcm06OkdyYXBo aWNzOjpCdWZmZXIqIHNfb3ZlclNjcm9sbEltYWdlOwotICAgIHN0YXRpYyBzdGQ6OnN0cmluZyBz X292ZXJTY3JvbGxJbWFnZVBhdGg7Ci0gICAgc3RhdGljIFBsYXRmb3JtOjpJbnRTaXplIHNfb3Zl clNjcm9sbEltYWdlU2l6ZTsKLQogcHJvdGVjdGVkOgogICAgIHZpcnR1YWwgfkJhY2tpbmdTdG9y ZVByaXZhdGUoKTsKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBp L1dlYlNldHRpbmdzLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViU2V0dGlu Z3MuY3BwCmluZGV4IGI4ZmYyMjlkYTBlNjg2Mzc1NmVmNGMxZGViYWJlOTg2MmUxYmNlMTUuLjIz YjIzOWNkM2U5MTE1OGM3NWIxZDVjMzA3ZTkwOWZlNTIzM2EwMjYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViU2V0dGluZ3MuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvYmxhY2tiZXJyeS9BcGkvV2ViU2V0dGluZ3MuY3BwCkBAIC00OCw4ICs0OCw4IEBAIERFRklO RV9TVEFUSUNfTE9DQUwoU3RyaW5nLCBCbGFja0JlcnJ5SGFuZGxlUGF0dGVyblVSTHMsICgiQmxh Y2tCZXJyeUhhbmRsZVBhdHRlCiBERUZJTkVfU1RBVElDX0xPQ0FMKFN0cmluZywgQmxhY2tCZXJy eUluaXRpYWxTY2FsZSwgKCJCbGFja0JlcnJ5SW5pdGlhbFNjYWxlIikpOwogREVGSU5FX1NUQVRJ Q19MT0NBTChTdHJpbmcsIEJsYWNrQmVycnlMaW5rc0hhbmRsZWRFeHRlcm5hbGx5RW5hYmxlZCwg KCJCbGFja0JlcnJ5TGlua3NIYW5kbGVkRXh0ZXJuYWxseUVuYWJsZWQiKSk7CiBERUZJTkVfU1RB VElDX0xPQ0FMKFN0cmluZywgQmxhY2tCZXJyeU1heFBsdWdpbkluc3RhbmNlcywgKCJCbGFja0Jl cnJ5TWF4UGx1Z2luSW5zdGFuY2VzIikpOwotREVGSU5FX1NUQVRJQ19MT0NBTChTdHJpbmcsIEJs YWNrQmVycnlPdmVyWm9vbUNvbG9yLCAoIkJsYWNrQmVycnlPdmVyWm9vbUNvbG9yIikpOwotREVG SU5FX1NUQVRJQ19MT0NBTChTdHJpbmcsIEJsYWNrQmVycnlPdmVyU2Nyb2xsSW1hZ2VQYXRoLCAo IkJsYWNrQmVycnlPdmVyU2Nyb2xsSW1hZ2VQYXRoIikpOworREVGSU5FX1NUQVRJQ19MT0NBTChT dHJpbmcsIEJsYWNrQmVycnlPdmVyU2Nyb2xsQ29sb3IsICgiQmxhY2tCZXJyeU92ZXJTY3JvbGxD b2xvciIpKTsKK0RFRklORV9TVEFUSUNfTE9DQUwoU3RyaW5nLCBCbGFja0JlcnJ5RW5hYmxlRGVm YXVsdE92ZXJTY3JvbGxCYWNrZ3JvdW5kLCAoIkJsYWNrQmVycnlFbmFibGVEZWZhdWx0T3ZlclNj cm9sbEJhY2tncm91bmQiKSk7CiBERUZJTkVfU1RBVElDX0xPQ0FMKFN0cmluZywgQmxhY2tCZXJy eVJlbmRlckFuaW1hdGlvbnNPblNjcm9sbE9yWm9vbUVuYWJsZWQsICgiQmxhY2tCZXJyeVJlbmRl ckFuaW1hdGlvbnNPblNjcm9sbE9yWm9vbUVuYWJsZWQiKSk7CiBERUZJTkVfU1RBVElDX0xPQ0FM KFN0cmluZywgQmxhY2tCZXJyeVNjcm9sbGJhcnNFbmFibGVkLCAoIkJsYWNrQmVycnlTY3JvbGxi YXJzRW5hYmxlZCIpKTsKIERFRklORV9TVEFUSUNfTE9DQUwoU3RyaW5nLCBCbGFja0JlcnJ5VGV4 dFJlZmxvd01vZGUsICgiQmxhY2tCZXJyeVRleHRSZWZsb3dNb2RlIikpOwpAQCAtMTY1LDggKzE2 NSw4IEBAIFdlYlNldHRpbmdzKiBXZWJTZXR0aW5nczo6c3RhbmRhcmRTZXR0aW5ncygpCiAgICAg c2V0dGluZ3MtPm1fcHJpdmF0ZS0+c2V0Qm9vbGVhbihCbGFja0JlcnJ5Q29va2llc0VuYWJsZWQs IHRydWUpOwogICAgIHNldHRpbmdzLT5tX3ByaXZhdGUtPnNldERvdWJsZShCbGFja0JlcnJ5SW5p dGlhbFNjYWxlLCAtMSk7CiAgICAgc2V0dGluZ3MtPm1fcHJpdmF0ZS0+c2V0VW5zaWduZWQoQmxh Y2tCZXJyeU1heFBsdWdpbkluc3RhbmNlcywgMSk7Ci0gICAgc2V0dGluZ3MtPm1fcHJpdmF0ZS0+ c2V0VW5zaWduZWQoQmxhY2tCZXJyeU92ZXJab29tQ29sb3IsIFdlYkNvcmU6OkNvbG9yOjp3aGl0 ZSk7Ci0gICAgc2V0dGluZ3MtPm1fcHJpdmF0ZS0+c2V0U3RyaW5nKEJsYWNrQmVycnlPdmVyU2Ny b2xsSW1hZ2VQYXRoLCAiIik7CisgICAgc2V0dGluZ3MtPm1fcHJpdmF0ZS0+c2V0VW5zaWduZWQo QmxhY2tCZXJyeU92ZXJTY3JvbGxDb2xvciwgV2ViQ29yZTo6Q29sb3I6OndoaXRlKTsKKyAgICBz ZXR0aW5ncy0+bV9wcml2YXRlLT5zZXRCb29sZWFuKEJsYWNrQmVycnlFbmFibGVEZWZhdWx0T3Zl clNjcm9sbEJhY2tncm91bmQsIHRydWUpOwogICAgIHNldHRpbmdzLT5tX3ByaXZhdGUtPnNldEJv b2xlYW4oQmxhY2tCZXJyeVNjcm9sbGJhcnNFbmFibGVkLCB0cnVlKTsKIAogICAgIC8vIEZJWE1F OiBXZSBzaG91bGQgZGV0ZWN0IHdoZXRoZXIgd2UgYXJlIGVtYmVkZGVkIGluIGEgYnJvd3NlciBv ciBhbiBlbWFpbCBjbGllbnQgYW5kIGRlZmF1bHQgdG8gVGV4dFJlZmxvd0VuYWJsZWRPbmx5Rm9y QmxvY2tab29tIGFuZCBUZXh0UmVmbG93RW5hYmxlZCwgcmVzcGVjdGl2ZWx5LgpAQCAtNzA5LDI0 ICs3MDksMjQgQEAgdm9pZCBXZWJTZXR0aW5nczo6c2V0U2hvdWxkUmVuZGVyQW5pbWF0aW9uc09u U2Nyb2xsT3Jab29tKGJvb2wgZW5hYmxlKQogICAgIG1fcHJpdmF0ZS0+c2V0Qm9vbGVhbihCbGFj a0JlcnJ5UmVuZGVyQW5pbWF0aW9uc09uU2Nyb2xsT3Jab29tRW5hYmxlZCwgZW5hYmxlKTsKIH0K IAotdW5zaWduZWQgV2ViU2V0dGluZ3M6Om92ZXJab29tQ29sb3IoKSBjb25zdAordW5zaWduZWQg V2ViU2V0dGluZ3M6Om92ZXJTY3JvbGxDb2xvcigpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1fcHJp dmF0ZS0+Z2V0VW5zaWduZWQoQmxhY2tCZXJyeU92ZXJab29tQ29sb3IpOworICAgIHJldHVybiBt X3ByaXZhdGUtPmdldFVuc2lnbmVkKEJsYWNrQmVycnlPdmVyU2Nyb2xsQ29sb3IpOwogfQogCi12 b2lkIFdlYlNldHRpbmdzOjpzZXRPdmVyWm9vbUNvbG9yKHVuc2lnbmVkIGNvbG9yKQordm9pZCBX ZWJTZXR0aW5nczo6c2V0T3ZlclNjcm9sbENvbG9yKHVuc2lnbmVkIGNvbG9yKQogewotICAgIG1f cHJpdmF0ZS0+c2V0VW5zaWduZWQoQmxhY2tCZXJyeU92ZXJab29tQ29sb3IsIGNvbG9yKTsKKyAg ICBtX3ByaXZhdGUtPnNldFVuc2lnbmVkKEJsYWNrQmVycnlPdmVyU2Nyb2xsQ29sb3IsIGNvbG9y KTsKIH0KIAotV2ViU3RyaW5nIFdlYlNldHRpbmdzOjpvdmVyU2Nyb2xsSW1hZ2VQYXRoKCkgY29u c3QKK2Jvb2wgV2ViU2V0dGluZ3M6OmlzRW5hYmxlRGVmYXVsdE92ZXJTY3JvbGxCYWNrZ3JvdW5k KCkgY29uc3QKIHsKLSAgICByZXR1cm4gbV9wcml2YXRlLT5nZXRTdHJpbmcoQmxhY2tCZXJyeU92 ZXJTY3JvbGxJbWFnZVBhdGgpOworICAgIHJldHVybiBtX3ByaXZhdGUtPmdldEJvb2xlYW4oQmxh Y2tCZXJyeUVuYWJsZURlZmF1bHRPdmVyU2Nyb2xsQmFja2dyb3VuZCk7CiB9CiAKLXZvaWQgV2Vi U2V0dGluZ3M6OnNldE92ZXJTY3JvbGxJbWFnZVBhdGgoY29uc3QgY2hhciogcGF0aCkKK3ZvaWQg V2ViU2V0dGluZ3M6OnNldEVuYWJsZURlZmF1bHRPdmVyU2Nyb2xsQmFja2dyb3VuZChib29sIGVu YWJsZWQpCiB7Ci0gICAgbV9wcml2YXRlLT5zZXRTdHJpbmcoQmxhY2tCZXJyeU92ZXJTY3JvbGxJ bWFnZVBhdGgsIHBhdGgpOworICAgIG1fcHJpdmF0ZS0+c2V0Qm9vbGVhbihCbGFja0JlcnJ5RW5h YmxlRGVmYXVsdE92ZXJTY3JvbGxCYWNrZ3JvdW5kLCBlbmFibGVkKTsKIH0KIAogdW5zaWduZWQg V2ViU2V0dGluZ3M6OmJhY2tncm91bmRDb2xvcigpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlNldHRpbmdzLmggYi9Tb3VyY2UvV2ViS2l0L2JsYWNr YmVycnkvQXBpL1dlYlNldHRpbmdzLmgKaW5kZXggNGRlMzBlNWE2MDk4ZWE3OTM1NGExMTgwYzYw YWEzYmE0ODY3ZWNhZC4uNzc1NWY4MzM2NDA2Y2E1ZDgzOGZjZmZiYzM2OGM2NjJiMzQ0OWFjMSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJTZXR0aW5ncy5oCisr KyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViU2V0dGluZ3MuaApAQCAtMTk4LDEx ICsxOTgsMTEgQEAgcHVibGljOgogICAgIGJvb2wgc2hvdWxkUmVuZGVyQW5pbWF0aW9uc09uU2Ny b2xsT3Jab29tKCkgY29uc3Q7CiAgICAgdm9pZCBzZXRTaG91bGRSZW5kZXJBbmltYXRpb25zT25T Y3JvbGxPclpvb20oYm9vbCBlbmFibGUpOwogCi0gICAgdW5zaWduZWQgb3Zlclpvb21Db2xvcigp IGNvbnN0OwotICAgIHZvaWQgc2V0T3Zlclpvb21Db2xvcih1bnNpZ25lZCk7CisgICAgdW5zaWdu ZWQgb3ZlclNjcm9sbENvbG9yKCkgY29uc3Q7CisgICAgdm9pZCBzZXRPdmVyU2Nyb2xsQ29sb3Io dW5zaWduZWQpOwogCi0gICAgV2ViU3RyaW5nIG92ZXJTY3JvbGxJbWFnZVBhdGgoKSBjb25zdDsK LSAgICB2b2lkIHNldE92ZXJTY3JvbGxJbWFnZVBhdGgoY29uc3QgY2hhciopOworICAgIGJvb2wg aXNFbmFibGVEZWZhdWx0T3ZlclNjcm9sbEJhY2tncm91bmQoKSBjb25zdDsKKyAgICB2b2lkIHNl dEVuYWJsZURlZmF1bHRPdmVyU2Nyb2xsQmFja2dyb3VuZChib29sKTsKIAogICAgIHVuc2lnbmVk IGJhY2tncm91bmRDb2xvcigpIGNvbnN0OwogICAgIHZvaWQgc2V0QmFja2dyb3VuZENvbG9yKHVu c2lnbmVkKTsK