82845 2012-04-01 11:32:34 -0700 [BlackBerry] Simplify the code that gets accelerated compositing output to screen 2012-04-01 14:22:22 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 anilsson webkit-unassigned fspacek rwlbuis tonikitoo webkit.review.bot oldest_to_newest 593059 0 anilsson 2012-04-01 11:32:34 -0700 A long time ago, in a galaxy far away, the BlackBerry port used a separate compositing window, effectively juggling two windows for every web page when AC was active. Now, we either use a compositing surface for AC output, which we blend onto the window containing the BackingStore output, or render both BackingStore and AC output directly to one OpenGL capable window surface. The two-window setup is long gone, so simplify the code now that we don't have to consider that case. 593065 1 135009 anilsson 2012-04-01 12:04:52 -0700 Created attachment 135009 Patch 593087 2 135009 rwlbuis 2012-04-01 13:36:22 -0700 Comment on attachment 135009 Patch I trust you on this one. 593089 3 135009 webkit.review.bot 2012-04-01 14:22:17 -0700 Comment on attachment 135009 Patch Clearing flags on attachment: 135009 Committed r112819: <http://trac.webkit.org/changeset/112819> 593090 4 webkit.review.bot 2012-04-01 14:22:22 -0700 All reviewed patches have been landed. Closing bug. 135009 2012-04-01 12:04:52 -0700 2012-04-01 14:22:17 -0700 Patch bug-82845-20120401210447.patch text/plain 9459 anilsson U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyODE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCBiYmU1NmQ1ZjdlYmM1NjNlZjZmZWY2ZTNiMTVkNzZjZjQzNjc5OGQ5Li40M2JhMDcwZjI3 NWU5MTRmYTYyYzQ0NWEyOTkxOGY3ZjZkNzk4MDMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSw0MCBAQAorMjAxMi0wNC0wMSAgQXJ2aWQgTmlsc3NvbiAgPGFuaWxz c29uQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnldIFNpbXBsaWZ5IHRoZSBjb2RlIHRo YXQgZ2V0cyBhY2NlbGVyYXRlZCBjb21wb3NpdGluZyBvdXRwdXQgb250byB0aGUgc2NyZWVuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04Mjg0NQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJJTSBQUjogMTM2 MzgxCisgICAgICAgIFRoZSBjb2RlIGFjY291bnRlZCBmb3IgYSBub3cgb2Jzb2xldGUgc2V0dXAg d2hlcmUgd2UgdXNlZCBvbmUgT3BlbkdMCisgICAgICAgIHdpbmRvdyBmb3IgYWNjZWxlcmF0ZWQg Y29tcG9zaXRpbmcgYW5kIG9uZSBuYXRpdmUgd2luZG93IGZvciBiYWNraW5nCisgICAgICAgIHN0 b3JlIG91dHB1dCwgYW5kIGxldCB0aGUgd2luZG93aW5nIHN5c3RlbSBjb21wb3NpdGUgdGhvc2Ug dHdvLiBJbiB0aGF0CisgICAgICAgIHNldHVwIGFuIG9wdGltaXphdGlvbiB0byB0cnkgYW5kIG9u bHkgdXBkYXRlIHRoZSB3aW5kb3cgdGhhdCBoYWQKKyAgICAgICAgY2hhbmdlZCB3YXMgdmlhYmxl LgorCisgICAgICAgIE5vd2FkYXlzLCB3ZSBlaXRoZXIgdXNlIGFuIG9mZnNjcmVlbiBzdXJmYWNl IGZvciBhY2NlbGVyYXRlZAorICAgICAgICBjb21wb3NpdGluZyBvdXRwdXQsIHdoaWNoIHdlIGJs ZW5kIG9udG8gdGhlIHdpbmRvdyBjb250YWluaW5nIHRoZQorICAgICAgICBiYWNraW5nIHN0b3Jl IG91dHB1dCwgb3IgcmVuZGVyIGJvdGggYmFja2luZyBzdG9yZSBhbmQgYWNjZWxlcmF0ZWQKKyAg ICAgICAgY29tcG9zaXRpbmcgb3V0cHV0IGRpcmVjdGx5IHRvIG9uZSBPcGVuR0wgd2luZG93LiBX ZSBhbHdheXMgaGF2ZSB0bworICAgICAgICBibGl0IHRoZSBiYWNraW5nc3RvcmUgY29udGVudHMg YW5kIGRyYXcgdGhlIGFjY2VsZXJhdGVkIGNvbXBvc2l0aW5nCisgICAgICAgIG91dHB1dCBldmVy eSBmcmFtZSB3aXRoIHRoZXNlIGNvZGUgcGF0aHMsIHNvIGRvbid0IHRyeSB0byBiZSBjbGV2ZXIK KyAgICAgICAgYWJvdXQgaXQuCisKKyAgICAgICAgRXZlbiB3aGVuIHdlIHVzZSBhbiBPcGVuR0wg d2luZG93LCB0aGUgY29tcG9zaXRpbmcgc3VyZmFjZSBjYW4gYmUgbm9uLQorICAgICAgICBudWxs LCBzbyBkb24ndCB0cnkgdG8gZ2xGaW5pc2goKSBhbmQgc3dhcCB0aGUgY29tcG9zaXRpbmcgc3Vy ZmFjZSB3aGVuCisgICAgICAgIHRoZSBHTEVTMkNvbnRleHQgaXMgdGllZCB0byBhIHdpbmRvdy4K KworICAgICAgICAqIEFwaS9CYWNraW5nU3RvcmUuY3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6 V2ViS2l0OjpCYWNraW5nU3RvcmVQcml2YXRlOjpibGl0VmlzaWJsZUNvbnRlbnRzKToKKyAgICAg ICAgKEJsYWNrQmVycnk6OldlYktpdDo6QmFja2luZ1N0b3JlUHJpdmF0ZTo6YmxpdENvbnRlbnRz KToKKyAgICAgICAgKFdlYktpdCk6CisgICAgICAgICogQXBpL0JhY2tpbmdTdG9yZV9wLmg6Cisg ICAgICAgIChCYWNraW5nU3RvcmVQcml2YXRlKToKKyAgICAgICAgKiBBcGkvV2ViUGFnZS5jcHA6 CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VQcml2YXRlOjpkcmF3TGF5ZXJz T25Db21taXQpOgorICAgICAgICAqIFdlYktpdFN1cHBvcnQvR0xFUzJDb250ZXh0LmNwcDoKKyAg ICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6R0xFUzJDb250ZXh0Ojpzd2FwQnVmZmVycyk6CisK IDIwMTItMDMtMzEgIEpvbmF0aGFuIERvbmcgIDxqb25hdGhhbi5kb25nQHRvcmNobW9iaWxlLmNv bS5jbj4KIAogICAgICAgICBbQmxhY2tCZXJyeV0gaHR0cCBhdXRoZW50aWNhdGUgZGlhbG9nIHBv cHVwIG9ubHkgb25jZSBubyBtYXR0ZXIgYXV0aGVudGljYXRpb24gcGFzcyBvciBmYWlsCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0JhY2tpbmdTdG9yZS5jcHAgYi9T b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0JhY2tpbmdTdG9yZS5jcHAKaW5kZXggOWMzMjFl ZDI2NTI4OGI3YTg0M2MzNzgxYjlkMGRmMTBlZDFiNjFiYy4uZGUzMjFiODVjN2M4OTY1ZTBjZmUy YzBkNGY1Njc1ZmI0NDBlOTA4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5 L0FwaS9CYWNraW5nU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkv QmFja2luZ1N0b3JlLmNwcApAQCAtMTEzNSw3ICsxMTM1LDcgQEAgdm9pZCBCYWNraW5nU3RvcmVQ cml2YXRlOjpibGl0VmlzaWJsZUNvbnRlbnRzKGJvb2wgZm9yY2UpCiAKICAgICBpZiAoIUJsYWNr QmVycnk6OlBsYXRmb3JtOjp1c2VySW50ZXJmYWNlVGhyZWFkTWVzc2FnZUNsaWVudCgpLT5pc0N1 cnJlbnRUaHJlYWQoKSkgewogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKLSAgICAg ICAgLy8gVGhlIGJsaXQgd2lsbCBjYWxsIGRyYXdTdWJMYXllcnMgaWYgbmVjZXNzYXJ5CisgICAg ICAgIC8vIFRoZSBibGl0IHdpbGwgZHJhdyBhY2NlbGVyYXRlZCBjb21wb3NpdGluZyBsYXllcnMg aWYgbmVjZXNzYXJ5CiAgICAgICAgIG1fbmVlZHNEcmF3TGF5ZXJzT25Db21taXQgPSBmYWxzZTsK ICNlbmRpZgogCkBAIC0xMjMxLDcgKzEyMzEsNyBAQCB2b2lkIEJhY2tpbmdTdG9yZVByaXZhdGU6 OmJsaXRDb250ZW50cyhjb25zdCBQbGF0Zm9ybTo6SW50UmVjdCYgZHN0UmVjdCwKIAogICAgIGlm ICghQmxhY2tCZXJyeTo6UGxhdGZvcm06OnVzZXJJbnRlcmZhY2VUaHJlYWRNZXNzYWdlQ2xpZW50 KCktPmlzQ3VycmVudFRocmVhZCgpKSB7CiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5H KQotICAgICAgICAvLyBUaGUgYmxpdCB3aWxsIGNhbGwgZHJhd1N1YkxheWVycyBpZiBuZWNlc3Nh cnkKKyAgICAgICAgLy8gVGhlIGJsaXQgd2lsbCBkcmF3IGFjY2VsZXJhdGVkIGNvbXBvc2l0aW5n IGxheWVycyBpZiBuZWNlc3NhcnkKICAgICAgICAgbV9uZWVkc0RyYXdMYXllcnNPbkNvbW1pdCA9 IGZhbHNlOwogI2VuZGlmCiAKQEAgLTEyODQsMTMgKzEyODQsNiBAQCB2b2lkIEJhY2tpbmdTdG9y ZVByaXZhdGU6OmJsaXRDb250ZW50cyhjb25zdCBQbGF0Zm9ybTo6SW50UmVjdCYgZHN0UmVjdCwK ICAgICAgICAgdHJhbnNmb3JtYXRpb24gPSBUcmFuc2Zvcm1hdGlvbk1hdHJpeDo6cmVjdFRvUmVj dChGbG9hdFJlY3QoRmxvYXRQb2ludCgwLjAsIDAuMCksIFdlYkNvcmU6OkludFNpemUoY29udGVu dHMuc2l6ZSgpKSksIFdlYkNvcmU6OkludFJlY3QoZHN0UmVjdCkpOwogCiAgICAgYm9vbCBibGl0 dGluZ0RpcmVjdGx5VG9Db21wb3NpdGluZ1dpbmRvdyA9IGlzT3BlbkdMQ29tcG9zaXRpbmcoKTsK LSNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCi0gICAgQmFja2luZ1N0b3JlQ29tcG9z aXRpbmdTdXJmYWNlKiBjb21wb3NpdGluZ1N1cmZhY2UgPQotICAgICAgICBTdXJmYWNlUG9vbDo6 Z2xvYmFsU3VyZmFjZVBvb2woKS0+Y29tcG9zaXRpbmdTdXJmYWNlKCk7Ci0KLSAgICBpZiAoIWJs aXR0aW5nRGlyZWN0bHlUb0NvbXBvc2l0aW5nV2luZG93KQotICAgICAgICBkcmF3U3ViTGF5ZXJz KCk7Ci0jZW5kaWYKIAogI2lmIERFQlVHX0JBQ0tJTkdTVE9SRQogICAgIEJsYWNrQmVycnk6OlBs YXRmb3JtOjpsb2coQmxhY2tCZXJyeTo6UGxhdGZvcm06OkxvZ0xldmVsQ3JpdGljYWwsCkBAIC0x NDU0LDE0ICsxNDQ3LDEzIEBAIHZvaWQgQmFja2luZ1N0b3JlUHJpdmF0ZTo6YmxpdENvbnRlbnRz KGNvbnN0IFBsYXRmb3JtOjpJbnRSZWN0JiBkc3RSZWN0LAogICAgIH0KIAogI2lmIFVTRShBQ0NF TEVSQVRFRF9DT01QT1NJVElORykKLSAgICBpZiAoYmxpdHRpbmdEaXJlY3RseVRvQ29tcG9zaXRp bmdXaW5kb3cpIHsKLSAgICAgICAgV2ViQ29yZTo6RmxvYXRSZWN0IGNvbnRlbnRzUmVjdCA9IG1f d2ViUGFnZS0+ZC0+bWFwRnJvbVRyYW5zZm9ybWVkRmxvYXRSZWN0KAotICAgICAgICAgICAgV2Vi Q29yZTo6RmxvYXRSZWN0KFdlYkNvcmU6OkludFJlY3QoY29udGVudHMpKSk7Ci0gICAgICAgIGlm IChXZWJQYWdlQ29tcG9zaXRvclByaXZhdGUqIGNvbXBvc2l0b3IgPSBtX3dlYlBhZ2UtPmQtPmNv bXBvc2l0b3IoKSkKLSAgICAgICAgICAgIGNvbXBvc2l0b3ItPmRyYXdMYXllcnMoZHN0UmVjdCwg Y29udGVudHNSZWN0KTsKLSAgICB9IGVsc2UgaWYgKGNvbXBvc2l0aW5nU3VyZmFjZSkKLSAgICAg ICAgYmxlbmRDb21wb3NpdGluZ1N1cmZhY2UoZHN0UmVjdCk7CisgICAgaWYgKFdlYlBhZ2VDb21w b3NpdG9yUHJpdmF0ZSogY29tcG9zaXRvciA9IG1fd2ViUGFnZS0+ZC0+Y29tcG9zaXRvcigpKSB7 CisgICAgICAgIFdlYkNvcmU6OkZsb2F0UmVjdCBjb250ZW50c1JlY3QgPSBtX3dlYlBhZ2UtPmQt Pm1hcEZyb21UcmFuc2Zvcm1lZEZsb2F0UmVjdChXZWJDb3JlOjpGbG9hdFJlY3QoV2ViQ29yZTo6 SW50UmVjdChjb250ZW50cykpKTsKKyAgICAgICAgY29tcG9zaXRvci0+ZHJhd0xheWVycyhkc3RS ZWN0LCBjb250ZW50c1JlY3QpOworICAgIH0KIAorICAgIGlmICghYmxpdHRpbmdEaXJlY3RseVRv Q29tcG9zaXRpbmdXaW5kb3cpCisgICAgICAgIGJsZW5kQ29tcG9zaXRpbmdTdXJmYWNlKGRzdFJl Y3QpOwogI2VuZGlmCiAKICNpZiBFTkFCTEVfU0NST0xMQkFSUwpAQCAtMjUyMywyOCArMjUxNSw2 IEBAIEJhY2tpbmdTdG9yZVdpbmRvd0J1ZmZlclN0YXRlKiBCYWNraW5nU3RvcmVQcml2YXRlOjp3 aW5kb3dCYWNrQnVmZmVyU3RhdGUoKSBjb25zCiB9CiAKICNpZiBVU0UoQUNDRUxFUkFURURfQ09N UE9TSVRJTkcpCi1ib29sIEJhY2tpbmdTdG9yZVByaXZhdGU6OmRyYXdTdWJMYXllcnMoKQotewot ICAgIEFTU0VSVChCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6dXNlckludGVyZmFjZVRocmVhZE1lc3Nh Z2VDbGllbnQoKS0+aXNDdXJyZW50VGhyZWFkKCkpOwotICAgIGlmICghQmxhY2tCZXJyeTo6UGxh dGZvcm06OnVzZXJJbnRlcmZhY2VUaHJlYWRNZXNzYWdlQ2xpZW50KCktPmlzQ3VycmVudFRocmVh ZCgpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBpZiAobV9zdXNwZW5kQmFja2luZ1N0 b3JlVXBkYXRlcyAmJiAhaXNPcGVuR0xDb21wb3NpdGluZygpKQotICAgICAgICByZXR1cm4gZmFs c2U7Ci0KLSAgICBpZiAoIW1fd2ViUGFnZS0+ZC0+Y29tcG9zaXRvcigpKQotICAgICAgICByZXR1 cm4gZmFsc2U7Ci0KLSAgICBQbGF0Zm9ybTo6SW50UmVjdCBkc3QgPSBtX3dlYlBhZ2UtPmNsaWVu dCgpLT51c2VySW50ZXJmYWNlQmxpdHRlZERlc3RpbmF0aW9uUmVjdCgpOwotICAgIGlmIChkc3Qu aXNFbXB0eSgpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBQbGF0Zm9ybTo6SW50UmVj dCBzcmMgPSBtX3dlYlBhZ2UtPmNsaWVudCgpLT51c2VySW50ZXJmYWNlQmxpdHRlZFZpc2libGVD b250ZW50c1JlY3QoKTsKLSAgICBXZWJDb3JlOjpGbG9hdFJlY3QgY29udGVudHNSZWN0ID0gbV93 ZWJQYWdlLT5kLT5tYXBGcm9tVHJhbnNmb3JtZWRGbG9hdFJlY3QoCi0gICAgICAgIFdlYkNvcmU6 OkZsb2F0UmVjdChXZWJDb3JlOjpJbnRSZWN0KHNyYykpKTsKLSAgICByZXR1cm4gbV93ZWJQYWdl LT5kLT5jb21wb3NpdG9yKCktPmRyYXdMYXllcnMoZHN0LCBjb250ZW50c1JlY3QpOwotfQotCiBi b29sIEJhY2tpbmdTdG9yZVByaXZhdGU6OmRyYXdMYXllcnNPbkNvbW1pdElmTmVlZGVkKCkKIHsK ICAgICAvLyBDaGVjayBpZiByZW5kZXJpbmcgY2F1c2VkIGEgY29tbWl0IGFuZCB3ZSBuZWVkIHRv IHJlZHJhdyB0aGUgbGF5ZXJzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkv QXBpL0JhY2tpbmdTdG9yZV9wLmggYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0JhY2tp bmdTdG9yZV9wLmgKaW5kZXggMjY5NTM2MTNkNWMyMGZiYzY0MjNjNGIxY2IzZTg5OWI0MmI0Mjcx MC4uNGExMDQ0MjllODYzZTkzZjFmOWEzZjlhM2YyOGQ3YzFkYjlhZTE2YyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9CYWNraW5nU3RvcmVfcC5oCisrKyBiL1NvdXJj ZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvQmFja2luZ1N0b3JlX3AuaApAQCAtMjAwLDcgKzIwMCw2 IEBAIHB1YmxpYzoKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAgICAgdm9pZCBi bGVuZENvbXBvc2l0aW5nU3VyZmFjZShjb25zdCBQbGF0Zm9ybTo6SW50UmVjdCYgZHN0UmVjdCk7 CiAgICAgdm9pZCBjbGVhckNvbXBvc2l0aW5nU3VyZmFjZSgpOwotICAgIGJvb2wgZHJhd1N1Ykxh eWVycygpOwogICAgIGJvb2wgZHJhd0xheWVyc09uQ29tbWl0SWZOZWVkZWQoKTsKICAgICB2b2lk IGRyYXdBbmRCbGVuZExheWVyc0ZvckRpcmVjdFJlbmRlcmluZyhjb25zdCBQbGF0Zm9ybTo6SW50 UmVjdCYgZGlydHlSZWN0KTsKICAgICAvLyBXZWJQYWdlIHdpbGwgY2FsbCB0aGlzIHdoZW4gZHJh d2luZyBsYXllcnMgdG8gdGVsbCB1cyB3ZSBkb24ndCBuZWVkIHRvCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9ibGFj a2JlcnJ5L0FwaS9XZWJQYWdlLmNwcAppbmRleCBhMDdlOGJmZTQ5Yjk5NDVmYzQ5NjUyYWE2YzYz NTViMjE3Y2Q3OTQzLi5lZGQzNGU3YmQzYjM5Njc2OGYxMDZkYzI5MTJjY2Y0YzVmZjBlNTAyIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAKQEAgLTUxODEsMjggKzUx ODEsOCBAQCB2b2lkIFdlYlBhZ2VQcml2YXRlOjpkcmF3TGF5ZXJzT25Db21taXQoKQogICAgICAg ICByZXR1cm47CiAgICAgfQogCi0gICAgaWYgKG1fYmFja2luZ1N0b3JlLT5kLT5pc09wZW5HTENv bXBvc2l0aW5nKCkpIHsKKyAgICBpZiAoIW1fYmFja2luZ1N0b3JlLT5kLT5zaG91bGREaXJlY3RS ZW5kZXJpbmdUb1dpbmRvdygpKQogICAgICAgICBtX2JhY2tpbmdTdG9yZS0+ZC0+YmxpdFZpc2li bGVDb250ZW50cygpOwotICAgICAgICByZXR1cm47IC8vIGJsaXRWaXNpYmxlQ29udGVudHMoKSBp bmNsdWRlcyBkcmF3U3ViTGF5ZXJzKCkgaW4gdGhpcyBjYXNlLgotICAgIH0KLQotICAgIGlmICgh bV9iYWNraW5nU3RvcmUtPmQtPmRyYXdTdWJMYXllcnMoKSkKLSAgICAgICAgcmV0dXJuOwotCi0g ICAgLy8gSWYgd2UgdXNlIHRoZSBjb21wb3NpdGluZyBzdXJmYWNlLCB3ZSBuZWVkIHRvIHJlLWJs aXQgdGhlCi0gICAgLy8gYmFja2luZ3N0b3JlIGFuZCBibGVuZCB0aGUgY29tcG9zaXRpbmcgc3Vy ZmFjZSBvbiB0b3Agb2YgdGhhdAotICAgIC8vIGluIG9yZGVyIHRvIGdldCB0aGUgbmV3bHkgZHJh d24gbGF5ZXJzIG9uIHNjcmVlbi4KLSAgICBpZiAoIVN1cmZhY2VQb29sOjpnbG9iYWxTdXJmYWNl UG9vbCgpLT5jb21wb3NpdGluZ1N1cmZhY2UoKSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgLy8g SWYgdGhlcmUgYXJlIG5vIHZpc2libGUgbGF5ZXJzLCByZXR1cm4gZWFybHkuCi0gICAgaWYgKGxh c3RDb21wb3NpdGluZ1Jlc3VsdHMoKS5pc0VtcHR5KCkgJiYgbGFzdENvbXBvc2l0aW5nUmVzdWx0 cygpLndhc0VtcHR5KQotICAgICAgICByZXR1cm47Ci0KLSAgICBpZiAobV9iYWNraW5nU3RvcmUt PmQtPnNob3VsZERpcmVjdFJlbmRlcmluZ1RvV2luZG93KCkpCi0gICAgICAgIHJldHVybjsKLQot ICAgIG1fYmFja2luZ1N0b3JlLT5kLT5ibGl0VmlzaWJsZUNvbnRlbnRzKCk7CiB9CiAKIHZvaWQg V2ViUGFnZVByaXZhdGU6OnNjaGVkdWxlUm9vdExheWVyQ29tbWl0KCkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0dMRVMyQ29udGV4dC5jcHAgYi9T b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9HTEVTMkNvbnRleHQuY3BwCmlu ZGV4IDc4ZjFhMjQ5NmE2MTFiZjhkNDIyZTA5ZGRlNTc2MjUwZjI4ZDM0OTguLjA2NTA3YWNhYzcy ZDM4ZDJkOTQxOTMyMThiZmJhNzk0ZWIwNDQ3ZjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv YmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0dMRVMyQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dl YktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvR0xFUzJDb250ZXh0LmNwcApAQCAtMTA4LDE0 ICsxMDgsMTkgQEAgYm9vbCBHTEVTMkNvbnRleHQ6OnN3YXBCdWZmZXJzKCkKIHsKICAgICBBU1NF UlQoZ2xHZXRFcnJvcigpID09IEdMX05PX0VSUk9SKTsKIAotI2lmIEVOQUJMRV9DT01QT1NJVElO R19TVVJGQUNFCi0gICAgLy8gQmVjYXVzZSB3ZSBhcmUgcmVuZGVyaW5nIGNvbXBvc2l0aW5nIGNv bnRlbnRzIGludG8gYW4gb2ZmLXNjcmVlbiBwaXhtYXAgYW5kCi0gICAgLy8gd2UgbmVlZCB0byBi bGVuZCB0aGUgcGl4bWFwIHdpdGggdGhlIHdlYiBwYWdlIHdpbmRvdyBzdXJmYWNlIHdlIGhhdmUg dG8gY2FsbAotICAgIC8vIGdsRmluaXNoKCkgaGVyZS4KLSAgICBnbEZpbmlzaCgpOworICAgIC8v IElmIHRoZXJlJ3MgYSB3aW5kb3cgdGhlIGJhY2tpbmcgc3RvcmUgd2lsbCBzd2FwIGl0IHdoZW4g dGhlIHRpbWUgaXMgcmlnaHQuCisgICAgLy8gUmV0dXJuIGVhcmx5IGJlY2F1c2UgdGhlcmUgbWln aHQgYmUgYW4gdW51c2VkIGJ1dCBub24tbnVsbCBjb21wb3NpdGluZyBzdXJmYWNlCisgICAgaWYg KG1fd2luZG93KQorICAgICAgICByZXR1cm4gdHJ1ZTsKIAotICAgIGlmIChCYWNraW5nU3RvcmVD b21wb3NpdGluZ1N1cmZhY2UqIHN1cmZhY2UgPSBjb21wb3NpdGluZ1N1cmZhY2UoKSkKKyNpZiBF TkFCTEVfQ09NUE9TSVRJTkdfU1VSRkFDRQorICAgIGlmIChCYWNraW5nU3RvcmVDb21wb3NpdGlu Z1N1cmZhY2UqIHN1cmZhY2UgPSBjb21wb3NpdGluZ1N1cmZhY2UoKSkgeworICAgICAgICAvLyBC ZWNhdXNlIHdlIGFyZSByZW5kZXJpbmcgY29tcG9zaXRpbmcgY29udGVudHMgaW50byBhbiBvZmYt c2NyZWVuIHBpeG1hcCBhbmQKKyAgICAgICAgLy8gd2UgbmVlZCB0byBibGVuZCB0aGUgcGl4bWFw IHdpdGggdGhlIHdlYiBwYWdlIHdpbmRvdyBzdXJmYWNlIHdlIGhhdmUgdG8gY2FsbAorICAgICAg ICAvLyBnbEZpbmlzaCgpIGhlcmUuCisgICAgICAgIGdsRmluaXNoKCk7CiAgICAgICAgIHN1cmZh Y2UtPnN3YXBCdWZmZXJzKCk7CisgICAgfQogI2VuZGlmCiAKICAgICByZXR1cm4gdHJ1ZTsK