113335 2013-03-26 13:19:39 -0700 [BlackBerry] Include accelerated compositing layers in screen captures. 2013-03-26 14:49:22 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mlattanzio mlattanzio mifenton rwlbuis tonikitoo webkit.review.bot oldest_to_newest 863950 0 mlattanzio 2013-03-26 13:19:39 -0700 We have only been including the root layer in screen captures. We need to include accelerated layers as well. 863956 1 195152 mlattanzio 2013-03-26 13:25:45 -0700 Created attachment 195152 Patch 863972 2 195155 mlattanzio 2013-03-26 13:48:37 -0700 Created attachment 195155 Patch 863974 3 195155 rwlbuis 2013-03-26 13:49:33 -0700 Comment on attachment 195155 Patch LGTM. 864026 4 195155 webkit.review.bot 2013-03-26 14:49:19 -0700 Comment on attachment 195155 Patch Clearing flags on attachment: 195155 Committed r146934: <http://trac.webkit.org/changeset/146934> 864027 5 webkit.review.bot 2013-03-26 14:49:22 -0700 All reviewed patches have been landed. Closing bug. 195152 2013-03-26 13:25:45 -0700 2013-03-26 13:48:34 -0700 Patch bug-113335-20130326162127.patch text/plain 4848 mlattanzio U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2Njc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCA1YzhlN2I1YTY5ZWVlNzg2MDgyMDE3OWIwNTJiZGYwYjk1MWM3YjE4Li4xZWM1MjllZWE0 YmUzZjI4OTVmNDcwODg4ODM1ZTUzMzBmZWU4ZGNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMy0wMy0yNiAgTWlrZSBMYXR0YW56aW8gIDxtbGF0 dGFuemlvQGJsYWNrYmVycnkuY29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBJbmNsdWRlIGFj Y2VsZXJhdGVkIGNvbXBvc2l0aW5nIGxheWVycyBpbiBzY3JlZW4gY2FwdHVyZXMuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTMzMzUKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQUiMgMjgwMzc0CisgICAg ICAgIEluY2x1ZGUgYWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcgbGF5ZXJzIGluIHNjcmVlbiBjYXB0 dXJlcy4KKyAgICAgICAgUmV2aWV3ZWQgSW50ZXJuYWxseSBCeTogSmFrb2IgUGV0c292aXRzCisK KyAgICAgICAgKiBBcGkvQmFja2luZ1N0b3JlLmNwcDoKKyAgICAgICAgKEJsYWNrQmVycnk6Oldl YktpdDo6QmFja2luZ1N0b3JlUHJpdmF0ZTo6cmVuZGVyKToKKyAgICAgICAgKEJsYWNrQmVycnk6 OldlYktpdDo6QmFja2luZ1N0b3JlUHJpdmF0ZTo6cmVuZGVyQ29udGVudHMpOgorICAgICAgICAo QmxhY2tCZXJyeTo6V2ViS2l0OjpCYWNraW5nU3RvcmU6OmRyYXdDb250ZW50cyk6CisgICAgICAg ICogQXBpL0JhY2tpbmdTdG9yZV9wLmg6CisKIDIwMTMtMDMtMjIgIE5pbWEgR2hhbmF2YXRpYW4g IDxuZ2hhbmF2YXRpYW5AYmxhY2tiZXJyeS5jb20+CiAKICAgICAgICAgW0JsYWNrQmVycnldIEJ1 aWxkIGZpeCBpbiBJbnB1dEhhbmRsZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2ti ZXJyeS9BcGkvQmFja2luZ1N0b3JlLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkv QmFja2luZ1N0b3JlLmNwcAppbmRleCBlZmJhNmFjY2M4MzM3ODBjNDFhNjNiYjc0YzMzOTBhZDZk OTBlZGQ0Li5kZDk3MzMyZmJjN2ZhMjE2YmE5M2IwYTUzZmYwYmIzYjIxNzU4NzRlIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0JhY2tpbmdTdG9yZS5jcHAKKysrIGIv U291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9CYWNraW5nU3RvcmUuY3BwCkBAIC0xMDc1LDcg KzEwNzUsNyBAQCBUaWxlSW5kZXhMaXN0IEJhY2tpbmdTdG9yZVByaXZhdGU6OnJlbmRlcihjb25z dCBUaWxlSW5kZXhMaXN0JiB0aWxlSW5kZXhMaXN0KQogICAgICAgICBjb25zdCBQbGF0Zm9ybTo6 RmxvYXRQb2ludCBkb2N1bWVudERpcnR5UmVjdE9yaWdpbiA9IHZpZXdwb3J0QWNjZXNzb3ItPnRv RG9jdW1lbnRDb250ZW50cyhkaXJ0eVJlY3QubG9jYXRpb24oKSwgY3VycmVudFNjYWxlKTsKICAg ICAgICAgY29uc3QgUGxhdGZvcm06OkludFJlY3QgZHN0UmVjdChkaXJ0eVJlY3QubG9jYXRpb24o KSAtIHRpbGVPcmlnaW4sIGRpcnR5UmVjdC5zaXplKCkpOwogCi0gICAgICAgIGlmICghcmVuZGVy Q29udGVudHMobmF0aXZlQnVmZmVyLCBkc3RSZWN0LCBjdXJyZW50U2NhbGUsIGRvY3VtZW50RGly dHlSZWN0T3JpZ2luKSkKKyAgICAgICAgaWYgKCFyZW5kZXJDb250ZW50cyhuYXRpdmVCdWZmZXIs IGRzdFJlY3QsIGN1cnJlbnRTY2FsZSwgZG9jdW1lbnREaXJ0eVJlY3RPcmlnaW4sIFJlbmRlclJv b3RMYXllcikpCiAgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICAvLyBBZGQgdGhlIG5l d2x5IHJlbmRlcmVkIHJlZ2lvbiB0byB0aGUgdGlsZSBzbyBpdCBjYW4ga2VlcCB0cmFjayBmb3Ig YmxpdHMuCkBAIC0xODE0LDcgKzE4MTQsNyBAQCBQbGF0Zm9ybTo6SW50U2l6ZSBCYWNraW5nU3Rv cmVQcml2YXRlOjp0aWxlU2l6ZSgpCiAgICAgcmV0dXJuIHRpbGVTaXplOwogfQogCi1ib29sIEJh Y2tpbmdTdG9yZVByaXZhdGU6OnJlbmRlckNvbnRlbnRzKEJsYWNrQmVycnk6OlBsYXRmb3JtOjpH cmFwaGljczo6QnVmZmVyKiB0YXJnZXRCdWZmZXIsIGNvbnN0IFBsYXRmb3JtOjpJbnRSZWN0JiBk c3RSZWN0LCBkb3VibGUgc2NhbGUsIGNvbnN0IFBsYXRmb3JtOjpGbG9hdFBvaW50JiBkb2N1bWVu dFJlbmRlck9yaWdpbikgY29uc3QKK2Jvb2wgQmFja2luZ1N0b3JlUHJpdmF0ZTo6cmVuZGVyQ29u dGVudHMoQmxhY2tCZXJyeTo6UGxhdGZvcm06OkdyYXBoaWNzOjpCdWZmZXIqIHRhcmdldEJ1ZmZl ciwgY29uc3QgUGxhdGZvcm06OkludFJlY3QmIGRzdFJlY3QsIGRvdWJsZSBzY2FsZSwgY29uc3Qg UGxhdGZvcm06OkZsb2F0UG9pbnQmIGRvY3VtZW50UmVuZGVyT3JpZ2luLCBjb25zdCBSZW5kZXJT Y29wZSBzY29wZSkgY29uc3QKIHsKICNpZiBERUJVR19CQUNLSU5HU1RPUkUKICAgICBQbGF0Zm9y bTo6bG9nQWx3YXlzKFBsYXRmb3JtOjpMb2dMZXZlbENyaXRpY2FsLApAQCAtMTg5NCw3ICsxODk0 LDEwIEBAIGJvb2wgQmFja2luZ1N0b3JlUHJpdmF0ZTo6cmVuZGVyQ29udGVudHMoQmxhY2tCZXJy eTo6UGxhdGZvcm06OkdyYXBoaWNzOjpCdWZmZXIqCiAgICAgICAgIH0KIAogICAgICAgICAvLyBM ZXQgV2ViQ29yZSByZW5kZXIgdGhlIHBhZ2UgY29udGVudHMgaW50byB0aGUgZHJhd2luZyBzdXJm YWNlLgotICAgICAgICBtX2NsaWVudC0+ZnJhbWUoKS0+dmlldygpLT5wYWludENvbnRlbnRzKCZn cmFwaGljc0NvbnRleHQsIHJlbmRlcmVkUmVjdCk7CisgICAgICAgIGlmIChzY29wZSA9PSBSZW5k ZXJSb290TGF5ZXIpCisgICAgICAgICAgICBtX2NsaWVudC0+ZnJhbWUoKS0+dmlldygpLT5wYWlu dENvbnRlbnRzKCZncmFwaGljc0NvbnRleHQsIHJlbmRlcmVkUmVjdCk7CisgICAgICAgIGVsc2UK KyAgICAgICAgICAgIG1fY2xpZW50LT5mcmFtZSgpLT52aWV3KCktPnBhaW50Q29udGVudHNGb3JT bmFwc2hvdCgmZ3JhcGhpY3NDb250ZXh0LCByZW5kZXJlZFJlY3QsIEZyYW1lVmlldzo6RXhjbHVk ZVNlbGVjdGlvbiwgRnJhbWVWaWV3OjpEb2N1bWVudENvb3JkaW5hdGVzKTsKIAogICAgICAgICBn cmFwaGljc0NvbnRleHQucmVzdG9yZSgpOwogICAgIH0KQEAgLTIzMTIsNyArMjMxNSw3IEBAIGJv b2wgQmFja2luZ1N0b3JlOjpkcmF3Q29udGVudHMoUGxhdGZvcm06OkdyYXBoaWNzOjpCdWZmZXIq IGJ1ZmZlciwgY29uc3QgUGxhdGZvCiAKICAgICBkLT5yZXF1ZXN0TGF5b3V0SWZOZWVkZWQoKTsK IAotICAgIHJldHVybiBkLT5yZW5kZXJDb250ZW50cyhidWZmZXIsIGRzdFJlY3QsIHNjYWxlLCBk b2N1bWVudFNjcm9sbFBvc2l0aW9uKTsKKyAgICByZXR1cm4gZC0+cmVuZGVyQ29udGVudHMoYnVm ZmVyLCBkc3RSZWN0LCBzY2FsZSwgZG9jdW1lbnRTY3JvbGxQb3NpdGlvbiwgQmFja2luZ1N0b3Jl UHJpdmF0ZTo6UmVuZGVyQWxsTGF5ZXJzKTsKIH0KIAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9ibGFja2JlcnJ5L0FwaS9CYWNraW5nU3RvcmVfcC5oIGIvU291cmNlL1dlYktpdC9ibGFj a2JlcnJ5L0FwaS9CYWNraW5nU3RvcmVfcC5oCmluZGV4IGY0OGQ5ZGNkNzRiYjkwM2VjZmNjNTEz OGYyODlmMTU1YWRmYWFlZWYuLjFiZGU5ODU0YTBjYTg1OTEyNzM1ZTdlNjE0ZGYwYWZlMzhiYjg4 YjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvQmFja2luZ1N0b3Jl X3AuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0JhY2tpbmdTdG9yZV9wLmgK QEAgLTI3NSw3ICsyNzUsOCBAQCBwdWJsaWM6CiAgICAgc3RhdGljIFBsYXRmb3JtOjpJbnRTaXpl IHRpbGVTaXplKCk7CiAKICAgICAvLyBUaGlzIHRha2VzIHRyYW5zZm9ybWVkIGNvbnRlbnRzIGNv b3JkaW5hdGVzLgotICAgIGJvb2wgcmVuZGVyQ29udGVudHMoQmxhY2tCZXJyeTo6UGxhdGZvcm06 OkdyYXBoaWNzOjpCdWZmZXIqLCBjb25zdCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6SW50UmVjdCYg ZHN0UmVjdCwgZG91YmxlIHNjYWxlLCBjb25zdCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6RmxvYXRQ b2ludCYgZG9jdW1lbnRTY3JvbGxQb3NpdGlvbikgY29uc3Q7CisgICAgZW51bSBSZW5kZXJTY29w ZSB7IFJlbmRlclJvb3RMYXllciwgUmVuZGVyQWxsTGF5ZXJzIH07CisgICAgYm9vbCByZW5kZXJD b250ZW50cyhCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6R3JhcGhpY3M6OkJ1ZmZlciosIGNvbnN0IEJs YWNrQmVycnk6OlBsYXRmb3JtOjpJbnRSZWN0JiBkc3RSZWN0LCBkb3VibGUgc2NhbGUsIGNvbnN0 IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpGbG9hdFBvaW50JiBkb2N1bWVudFNjcm9sbFBvc2l0aW9u LCBjb25zdCBSZW5kZXJTY29wZSkgY29uc3Q7CiAKICAgICB2b2lkIGJsaXRUb1dpbmRvdyhjb25z dCBQbGF0Zm9ybTo6SW50UmVjdCYgZHN0UmVjdCwgY29uc3QgQmxhY2tCZXJyeTo6UGxhdGZvcm06 OkdyYXBoaWNzOjpCdWZmZXIqIHNyY0J1ZmZlciwgY29uc3QgUGxhdGZvcm06OkludFJlY3QmIHNy Y1JlY3QsIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpHcmFwaGljczo6QmxlbmRNb2RlLCB1bnNpZ25l ZCBjaGFyIGdsb2JhbEFscGhhKTsKICAgICB2b2lkIGZpbGxXaW5kb3coUGxhdGZvcm06OkdyYXBo aWNzOjpGaWxsUGF0dGVybiwgY29uc3QgUGxhdGZvcm06OkludFJlY3QmIGRzdFJlY3QsIGNvbnN0 IFBsYXRmb3JtOjpJbnRQb2ludCYgY29udGVudHNPcmlnaW4sIGRvdWJsZSBjb250ZW50c1NjYWxl KTsK 195155 2013-03-26 13:48:37 -0700 2013-03-26 14:49:19 -0700 Patch bug-113335-20130326164419.patch text/plain 4863 mlattanzio U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2Njc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCA1YzhlN2I1YTY5ZWVlNzg2MDgyMDE3OWIwNTJiZGYwYjk1MWM3YjE4Li4xZWM1MjllZWE0 YmUzZjI4OTVmNDcwODg4ODM1ZTUzMzBmZWU4ZGNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMy0wMy0yNiAgTWlrZSBMYXR0YW56aW8gIDxtbGF0 dGFuemlvQGJsYWNrYmVycnkuY29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBJbmNsdWRlIGFj Y2VsZXJhdGVkIGNvbXBvc2l0aW5nIGxheWVycyBpbiBzY3JlZW4gY2FwdHVyZXMuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTMzMzUKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQUiMgMjgwMzc0CisgICAg ICAgIEluY2x1ZGUgYWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcgbGF5ZXJzIGluIHNjcmVlbiBjYXB0 dXJlcy4KKyAgICAgICAgUmV2aWV3ZWQgSW50ZXJuYWxseSBCeTogSmFrb2IgUGV0c292aXRzCisK KyAgICAgICAgKiBBcGkvQmFja2luZ1N0b3JlLmNwcDoKKyAgICAgICAgKEJsYWNrQmVycnk6Oldl YktpdDo6QmFja2luZ1N0b3JlUHJpdmF0ZTo6cmVuZGVyKToKKyAgICAgICAgKEJsYWNrQmVycnk6 OldlYktpdDo6QmFja2luZ1N0b3JlUHJpdmF0ZTo6cmVuZGVyQ29udGVudHMpOgorICAgICAgICAo QmxhY2tCZXJyeTo6V2ViS2l0OjpCYWNraW5nU3RvcmU6OmRyYXdDb250ZW50cyk6CisgICAgICAg ICogQXBpL0JhY2tpbmdTdG9yZV9wLmg6CisKIDIwMTMtMDMtMjIgIE5pbWEgR2hhbmF2YXRpYW4g IDxuZ2hhbmF2YXRpYW5AYmxhY2tiZXJyeS5jb20+CiAKICAgICAgICAgW0JsYWNrQmVycnldIEJ1 aWxkIGZpeCBpbiBJbnB1dEhhbmRsZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2ti ZXJyeS9BcGkvQmFja2luZ1N0b3JlLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkv QmFja2luZ1N0b3JlLmNwcAppbmRleCBlZmJhNmFjY2M4MzM3ODBjNDFhNjNiYjc0YzMzOTBhZDZk OTBlZGQ0Li4yNTMxNGUyMWRiNjZkMGUwMzRiMjkyMjY1NDUxZTViNDdlNzZlZWZhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0JhY2tpbmdTdG9yZS5jcHAKKysrIGIv U291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9CYWNraW5nU3RvcmUuY3BwCkBAIC0xMDc1LDcg KzEwNzUsNyBAQCBUaWxlSW5kZXhMaXN0IEJhY2tpbmdTdG9yZVByaXZhdGU6OnJlbmRlcihjb25z dCBUaWxlSW5kZXhMaXN0JiB0aWxlSW5kZXhMaXN0KQogICAgICAgICBjb25zdCBQbGF0Zm9ybTo6 RmxvYXRQb2ludCBkb2N1bWVudERpcnR5UmVjdE9yaWdpbiA9IHZpZXdwb3J0QWNjZXNzb3ItPnRv RG9jdW1lbnRDb250ZW50cyhkaXJ0eVJlY3QubG9jYXRpb24oKSwgY3VycmVudFNjYWxlKTsKICAg ICAgICAgY29uc3QgUGxhdGZvcm06OkludFJlY3QgZHN0UmVjdChkaXJ0eVJlY3QubG9jYXRpb24o KSAtIHRpbGVPcmlnaW4sIGRpcnR5UmVjdC5zaXplKCkpOwogCi0gICAgICAgIGlmICghcmVuZGVy Q29udGVudHMobmF0aXZlQnVmZmVyLCBkc3RSZWN0LCBjdXJyZW50U2NhbGUsIGRvY3VtZW50RGly dHlSZWN0T3JpZ2luKSkKKyAgICAgICAgaWYgKCFyZW5kZXJDb250ZW50cyhuYXRpdmVCdWZmZXIs IGRzdFJlY3QsIGN1cnJlbnRTY2FsZSwgZG9jdW1lbnREaXJ0eVJlY3RPcmlnaW4sIFJlbmRlclJv b3RMYXllcikpCiAgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICAvLyBBZGQgdGhlIG5l d2x5IHJlbmRlcmVkIHJlZ2lvbiB0byB0aGUgdGlsZSBzbyBpdCBjYW4ga2VlcCB0cmFjayBmb3Ig YmxpdHMuCkBAIC0xODE0LDcgKzE4MTQsNyBAQCBQbGF0Zm9ybTo6SW50U2l6ZSBCYWNraW5nU3Rv cmVQcml2YXRlOjp0aWxlU2l6ZSgpCiAgICAgcmV0dXJuIHRpbGVTaXplOwogfQogCi1ib29sIEJh Y2tpbmdTdG9yZVByaXZhdGU6OnJlbmRlckNvbnRlbnRzKEJsYWNrQmVycnk6OlBsYXRmb3JtOjpH cmFwaGljczo6QnVmZmVyKiB0YXJnZXRCdWZmZXIsIGNvbnN0IFBsYXRmb3JtOjpJbnRSZWN0JiBk c3RSZWN0LCBkb3VibGUgc2NhbGUsIGNvbnN0IFBsYXRmb3JtOjpGbG9hdFBvaW50JiBkb2N1bWVu dFJlbmRlck9yaWdpbikgY29uc3QKK2Jvb2wgQmFja2luZ1N0b3JlUHJpdmF0ZTo6cmVuZGVyQ29u dGVudHMoQmxhY2tCZXJyeTo6UGxhdGZvcm06OkdyYXBoaWNzOjpCdWZmZXIqIHRhcmdldEJ1ZmZl ciwgY29uc3QgUGxhdGZvcm06OkludFJlY3QmIGRzdFJlY3QsIGRvdWJsZSBzY2FsZSwgY29uc3Qg UGxhdGZvcm06OkZsb2F0UG9pbnQmIGRvY3VtZW50UmVuZGVyT3JpZ2luLCBMYXllcnNUb1JlbmRl ciBsYXllcnNUb1JlbmRlcikgY29uc3QKIHsKICNpZiBERUJVR19CQUNLSU5HU1RPUkUKICAgICBQ bGF0Zm9ybTo6bG9nQWx3YXlzKFBsYXRmb3JtOjpMb2dMZXZlbENyaXRpY2FsLApAQCAtMTg5NCw3 ICsxODk0LDEwIEBAIGJvb2wgQmFja2luZ1N0b3JlUHJpdmF0ZTo6cmVuZGVyQ29udGVudHMoQmxh Y2tCZXJyeTo6UGxhdGZvcm06OkdyYXBoaWNzOjpCdWZmZXIqCiAgICAgICAgIH0KIAogICAgICAg ICAvLyBMZXQgV2ViQ29yZSByZW5kZXIgdGhlIHBhZ2UgY29udGVudHMgaW50byB0aGUgZHJhd2lu ZyBzdXJmYWNlLgotICAgICAgICBtX2NsaWVudC0+ZnJhbWUoKS0+dmlldygpLT5wYWludENvbnRl bnRzKCZncmFwaGljc0NvbnRleHQsIHJlbmRlcmVkUmVjdCk7CisgICAgICAgIGlmIChsYXllcnNU b1JlbmRlciA9PSBSZW5kZXJSb290TGF5ZXIpCisgICAgICAgICAgICBtX2NsaWVudC0+ZnJhbWUo KS0+dmlldygpLT5wYWludENvbnRlbnRzKCZncmFwaGljc0NvbnRleHQsIHJlbmRlcmVkUmVjdCk7 CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIG1fY2xpZW50LT5mcmFtZSgpLT52aWV3KCktPnBh aW50Q29udGVudHNGb3JTbmFwc2hvdCgmZ3JhcGhpY3NDb250ZXh0LCByZW5kZXJlZFJlY3QsIEZy YW1lVmlldzo6RXhjbHVkZVNlbGVjdGlvbiwgRnJhbWVWaWV3OjpEb2N1bWVudENvb3JkaW5hdGVz KTsKIAogICAgICAgICBncmFwaGljc0NvbnRleHQucmVzdG9yZSgpOwogICAgIH0KQEAgLTIzMTIs NyArMjMxNSw3IEBAIGJvb2wgQmFja2luZ1N0b3JlOjpkcmF3Q29udGVudHMoUGxhdGZvcm06Okdy YXBoaWNzOjpCdWZmZXIqIGJ1ZmZlciwgY29uc3QgUGxhdGZvCiAKICAgICBkLT5yZXF1ZXN0TGF5 b3V0SWZOZWVkZWQoKTsKIAotICAgIHJldHVybiBkLT5yZW5kZXJDb250ZW50cyhidWZmZXIsIGRz dFJlY3QsIHNjYWxlLCBkb2N1bWVudFNjcm9sbFBvc2l0aW9uKTsKKyAgICByZXR1cm4gZC0+cmVu ZGVyQ29udGVudHMoYnVmZmVyLCBkc3RSZWN0LCBzY2FsZSwgZG9jdW1lbnRTY3JvbGxQb3NpdGlv biwgQmFja2luZ1N0b3JlUHJpdmF0ZTo6UmVuZGVyQWxsTGF5ZXJzKTsKIH0KIAogfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9CYWNraW5nU3RvcmVfcC5oIGIvU291 cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9CYWNraW5nU3RvcmVfcC5oCmluZGV4IGY0OGQ5ZGNk NzRiYjkwM2VjZmNjNTEzOGYyODlmMTU1YWRmYWFlZWYuLmE2MjI0YTk0ZjM1YWIwZDkzZWI1YTRm ZTNmODU0NWI4ZDIyZDA3NjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9B cGkvQmFja2luZ1N0b3JlX3AuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0Jh Y2tpbmdTdG9yZV9wLmgKQEAgLTI3NSw3ICsyNzUsOCBAQCBwdWJsaWM6CiAgICAgc3RhdGljIFBs YXRmb3JtOjpJbnRTaXplIHRpbGVTaXplKCk7CiAKICAgICAvLyBUaGlzIHRha2VzIHRyYW5zZm9y bWVkIGNvbnRlbnRzIGNvb3JkaW5hdGVzLgotICAgIGJvb2wgcmVuZGVyQ29udGVudHMoQmxhY2tC ZXJyeTo6UGxhdGZvcm06OkdyYXBoaWNzOjpCdWZmZXIqLCBjb25zdCBCbGFja0JlcnJ5OjpQbGF0 Zm9ybTo6SW50UmVjdCYgZHN0UmVjdCwgZG91YmxlIHNjYWxlLCBjb25zdCBCbGFja0JlcnJ5OjpQ bGF0Zm9ybTo6RmxvYXRQb2ludCYgZG9jdW1lbnRTY3JvbGxQb3NpdGlvbikgY29uc3Q7CisgICAg ZW51bSBMYXllcnNUb1JlbmRlciB7IFJlbmRlclJvb3RMYXllciwgUmVuZGVyQWxsTGF5ZXJzIH07 CisgICAgYm9vbCByZW5kZXJDb250ZW50cyhCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6R3JhcGhpY3M6 OkJ1ZmZlciosIGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpJbnRSZWN0JiBkc3RSZWN0LCBk b3VibGUgc2NhbGUsIGNvbnN0IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpGbG9hdFBvaW50JiBkb2N1 bWVudFNjcm9sbFBvc2l0aW9uLCBMYXllcnNUb1JlbmRlcikgY29uc3Q7CiAKICAgICB2b2lkIGJs aXRUb1dpbmRvdyhjb25zdCBQbGF0Zm9ybTo6SW50UmVjdCYgZHN0UmVjdCwgY29uc3QgQmxhY2tC ZXJyeTo6UGxhdGZvcm06OkdyYXBoaWNzOjpCdWZmZXIqIHNyY0J1ZmZlciwgY29uc3QgUGxhdGZv cm06OkludFJlY3QmIHNyY1JlY3QsIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpHcmFwaGljczo6Qmxl bmRNb2RlLCB1bnNpZ25lZCBjaGFyIGdsb2JhbEFscGhhKTsKICAgICB2b2lkIGZpbGxXaW5kb3co UGxhdGZvcm06OkdyYXBoaWNzOjpGaWxsUGF0dGVybiwgY29uc3QgUGxhdGZvcm06OkludFJlY3Qm IGRzdFJlY3QsIGNvbnN0IFBsYXRmb3JtOjpJbnRQb2ludCYgY29udGVudHNPcmlnaW4sIGRvdWJs ZSBjb250ZW50c1NjYWxlKTsK