100323 2012-10-24 20:39:32 -0700 r132427 changed the tiling behavior of tiled layer TileCaches as well as the page tile cache 2012-10-25 12:01:14 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser bdakin eric simon.fraser webkit.review.bot oldest_to_newest 750330 0 simon.fraser 2012-10-24 20:39:32 -0700 It should not have done. 750356 1 bdakin 2012-10-24 22:02:00 -0700 Oops! How do you tell the two types of layers apart? 750359 2 170549 simon.fraser 2012-10-24 22:05:18 -0700 Created attachment 170549 Patch 750361 3 simon.fraser 2012-10-24 22:08:05 -0700 See patch :) 751032 4 simon.fraser 2012-10-25 11:08:44 -0700 http://trac.webkit.org/changeset/132504 751087 5 bdakin 2012-10-25 12:01:14 -0700 (In reply to comment #3) > See patch :) Nice! 170549 2012-10-24 22:05:18 -0700 2012-10-25 10:11:07 -0700 Patch bug-100323-20121024220352.patch text/plain 13384 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyNDQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGUwN2E5YmUwY2UzYzJk M2M3MjBjMjkxZjZkYzZkOTA0MDcyOGEyZi4uN2I1OWViOWU3N2FiOWQzNGIwZDEzODA2NmFiYmUy MjNhZTcwNzI2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUxIEBACisyMDEyLTEwLTI0ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIHIxMzI0MjcgY2hh bmdlZCB0aGUgdGlsaW5nIGJlaGF2aW9yIG9mIHRpbGVkIGxheWVyIFRpbGVDYWNoZXMgYXMgd2Vs bCBhcyB0aGUgcGFnZSB0aWxlIGNhY2hlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMDAzMjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICByMTMyNDI3IGFzc3VtZWQgdGhhdCBUaWxlQ2FjaGVzIHdlcmUgb25s eSB1c2VkIGZvciB0aGUgcGFnZSwgYW5kIGNoYW5nZWQgdGhlIHRpbGUKKyAgICAgICAgc2l6ZSBi ZWhhdmlvciBvZiBhbGwgbm9uLXBhZ2UgVGlsZUNhY2hlcy4KKyAgICAgICAgCisgICAgICAgIEZp eCBieSBnaXZpbmcgVGlsZWRCYWNraW5nIGEgbmV3ICdDb3ZlcmFnZUZvclNsb3dTY3JvbGxpbmcn IGZsYWcgd2hpY2gKKyAgICAgICAgYWZmZWN0cyB0aGUgdGlsZSBzaXplIGJlaGF2aW9yLgorICAg ICAgICAKKyAgICAgICAgQ29uc29saWRhdGVkIHRoZSB0d28gcGxhY2VzIHRoYXQgc2V0IFRpbGVD b3ZlcmFnZSBpbnRvIG9uZSwgYW5kIGluIHRoZSBwcm9jZXNzCisgICAgICAgIHJlZHVjZWQgRnJh bWVWaWV3J3MgZGlyZWN0IGNvbW11bmljYXRpb24gd2l0aCBUaWxlZEJhY2tpbmcuCisKKyAgICAg ICAgTm8gbmV3IHRlc3RzIGJlY2F1c2Ugd2UgY2FuJ3QgdGVzdCB0aWxlIHNpemUgdmlhIHRlc3Rz LgorCisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJh bWVWaWV3OjpkaWRNb3ZlT25zY3JlZW4pOiBSZWx5IG9uIFJlbmRlckxheWVyQ29tcG9zaXRvciB0 bworICAgICAgICBjYWxsIHNldElzSW5XaW5kb3coKSBvbiB0aGUgbWFpbiBwYWdlIHRpbGUgY2Fj aGUuCisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OndpbGxNb3ZlT2Zmc2NyZWVuKTogRGl0 dG8uCisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OnBlcmZvcm1Qb3N0TGF5b3V0VGFza3Mp OiBSYXRoZXIgdGhhbiBleHBsaWNpdGx5IHRlbGwKKyAgICAgICAgdGhlIFRpbGVkQmFja2luZyB0 aGF0IGl0IHNob3VsZCBkbyBzdHVmZiwganVzdCB0ZWxsIHRoZSBjb21wb3NpdG9yIHRoYXQKKyAg ICAgICAgbGF5b3V0IGhhcHBlbmVkLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL1RpbGVk QmFja2luZy5oOiBOZXcgQ292ZXJhZ2VGb3JTbG93U2Nyb2xsaW5nIGZsYWcuCisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvY2EvbWFjL1RpbGVDYWNoZS5tbToKKyAgICAgICAgKFdlYkNvcmU6 OlRpbGVDYWNoZTo6dGlsZVNpemVGb3JDb3ZlcmFnZVJlY3QpOiBPbmx5IHVzZSBvbmUgYmlnIHRp bGUKKyAgICAgICAgaWYgdGhlIENvdmVyYWdlRm9yU2xvd1Njcm9sbGluZyBmbGFnIGlzIHNldC4K KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckxheWVyQmFja2luZzo6UmVuZGVyTGF5ZXJCYWNraW5nKTogbGF5ZXItPmlz Um9vdExheWVyKCkKKyAgICAgICAgaXMgZXF1aXZhbGVudCB0byByZW5kZXJlcigpLT5pc1JlbmRl clZpZXcoKSBhbmQgY2xlYXJlci4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQmFja2lu Zzo6dGlsZWRCYWNraW5nKTogQ2FsbCBhZGp1c3RUaWxlQ2FjaGVDb3ZlcmFnZSgpLgorICAgICAg ICBJdCB3b3VsZCBiZSBuaWNlIHRvIG1vdmUgdGhlIHJlc3Qgb2YgdGhpcyBUaWxlZEJhY2tpbmcg Y29kZSBmcm9tIGhlcmUgc29tZWhvdy4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQmFj a2luZzo6YWRqdXN0VGlsZUNhY2hlQ292ZXJhZ2UpOiBVcGRhdGUgdGhlIFRpbGVDb3ZlcmFnZQor ICAgICAgICBmbGFncywgdGFraW5nIGludG8gYWNjb3VudCBob3Jpem9udGFsIGFuZCB2ZXJ0aWNh bCBzY3JvbGxhYmlsaXR5IGluZGVwZW5kZW50bHksCisgICAgICAgIGFuZCB3aGV0aGVyIHdlJ3Jl IGluIHNsb3cgc2Nyb2xsaW5nIG1vZGUuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVy QmFja2luZy5oOgorICAgICAgICAoUmVuZGVyTGF5ZXJCYWNraW5nKToKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckxheWVyQ29tcG9zaXRvcjo6ZnJhbWVWaWV3RGlkTGF5b3V0KTogSGF2ZSB0aGUgcGFnZQorICAg ICAgICB0aWxlZCBiYWNraW5nIHVwZGF0ZSBpdCdzIGNvdmVyYWdlIGZsYWdzLgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpwYWdlVGlsZWRCYWNraW5nKTogVXRpbGl0 eSBmdW5jdGlvbi4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6ZGlk TW92ZU9uc2NyZWVuKTogTW92ZWQgZnJvbSBGcmFtZVZpZXcuCisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJMYXllckNvbXBvc2l0b3I6OndpbGxNb3ZlT2Zmc2NyZWVuKTogRGl0dG8uCisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oOgorICAgICAgICAoUmVuZGVyTGF5 ZXJDb21wb3NpdG9yKToKKwogMjAxMi0xMC0yNCAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQu b3JnPgogCiAgICAgICAgIFtWOF0gQWJzdHJhY3RXZWFrUmVmZXJlbmNlTWFwIGlzIHVubmVjZXNz YXJpbHkgZ2VuZXJhbCBhbmQgY29tcGxleApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFn ZS9GcmFtZVZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCmluZGV4 IDk4MTgwYzZmNGM3YjdjOTcxODM0MTI5MWNhMDcwYzE3Mzg1YzZhMGYuLjY5NTlhOGM1YzBhMTMx OWQ2MzMwNjc2NGEyNGVlNjJjMDdjN2NlM2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRnJhbWVWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAK QEAgLTkzMSwxMSArOTMxLDYgQEAgYm9vbCBGcmFtZVZpZXc6OmlzU29mdHdhcmVSZW5kZXJhYmxl KCkgY29uc3QKIAogdm9pZCBGcmFtZVZpZXc6OmRpZE1vdmVPbnNjcmVlbigpCiB7Ci0jaWYgVVNF KEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQotICAgIGlmIChUaWxlZEJhY2tpbmcqIHRpbGVkQmFj a2luZyA9IHRoaXMtPnRpbGVkQmFja2luZygpKQotICAgICAgICB0aWxlZEJhY2tpbmctPnNldElz SW5XaW5kb3codHJ1ZSk7Ci0jZW5kaWYKLQogICAgIGlmIChSZW5kZXJWaWV3KiByb290ID0gcm9v dFJlbmRlcmVyKHRoaXMpKQogICAgICAgICByb290LT5kaWRNb3ZlT25zY3JlZW4oKTsKICAgICBj b250ZW50QXJlYURpZFNob3coKTsKQEAgLTk0MywxMSArOTM4LDYgQEAgdm9pZCBGcmFtZVZpZXc6 OmRpZE1vdmVPbnNjcmVlbigpCiAKIHZvaWQgRnJhbWVWaWV3Ojp3aWxsTW92ZU9mZnNjcmVlbigp CiB7Ci0jaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQotICAgIGlmIChUaWxlZEJhY2tp bmcqIHRpbGVkQmFja2luZyA9IHRoaXMtPnRpbGVkQmFja2luZygpKQotICAgICAgICB0aWxlZEJh Y2tpbmctPnNldElzSW5XaW5kb3coZmFsc2UpOwotI2VuZGlmCi0KICAgICBpZiAoUmVuZGVyVmll dyogcm9vdCA9IHJvb3RSZW5kZXJlcih0aGlzKSkKICAgICAgICAgcm9vdC0+d2lsbE1vdmVPZmZz Y3JlZW4oKTsKICAgICBjb250ZW50QXJlYURpZEhpZGUoKTsKQEAgLTI1MDAsMTMgKzI0OTAsOSBA QCB2b2lkIEZyYW1lVmlldzo6cGVyZm9ybVBvc3RMYXlvdXRUYXNrcygpCiAgICAgfQogCiAjaWYg VVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQotICAgIGlmIChUaWxlZEJhY2tpbmcqIHRpbGVk QmFja2luZyA9IHRoaXMtPnRpbGVkQmFja2luZygpKSB7Ci0gICAgICAgIGlmIChwYWdlKSB7Ci0g ICAgICAgICAgICBpZiAoU2Nyb2xsaW5nQ29vcmRpbmF0b3IqIHNjcm9sbGluZ0Nvb3JkaW5hdG9y ID0gcGFnZS0+c2Nyb2xsaW5nQ29vcmRpbmF0b3IoKSkgewotICAgICAgICAgICAgICAgIGJvb2wg c2hvdWxkTGltaXRUaWxlQ292ZXJhZ2UgPSAhY2FuSGF2ZVNjcm9sbGJhcnMoKSB8fCBzY3JvbGxp bmdDb29yZGluYXRvci0+c2hvdWxkVXBkYXRlU2Nyb2xsTGF5ZXJQb3NpdGlvbk9uTWFpblRocmVh ZCgpOwotICAgICAgICAgICAgICAgIHRpbGVkQmFja2luZy0+c2V0VGlsZUNvdmVyYWdlKHNob3Vs ZExpbWl0VGlsZUNvdmVyYWdlID8gVGlsZWRCYWNraW5nOjpDb3ZlcmFnZUZvclZpc2libGVBcmVh IDogVGlsZWRCYWNraW5nOjpDb3ZlcmFnZUZvclNjcm9sbGluZyk7Ci0gICAgICAgICAgICB9Ci0g ICAgICAgIH0KKyAgICBpZiAoUmVuZGVyVmlldyogcm9vdCA9IHJvb3RSZW5kZXJlcih0aGlzKSkg eworICAgICAgICBpZiAocm9vdC0+dXNlc0NvbXBvc2l0aW5nKCkpCisgICAgICAgICAgICByb290 LT5jb21wb3NpdG9yKCktPmZyYW1lVmlld0RpZExheW91dCgpOwogICAgIH0KICNlbmRpZgogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9UaWxlZEJhY2tpbmcu aCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1RpbGVkQmFja2luZy5oCmluZGV4 IDhjODFjYzlmOTIyN2VmMDk5ZWFkYTRjMTk5YzViNjQzNzdhZTBlMDQuLmY5MDU0YzY1ZjU3YmU4 MDk2YTYxNDlhMDNiZmVjMDBiZWY4MjE3NjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL1RpbGVkQmFja2luZy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL1RpbGVkQmFja2luZy5oCkBAIC00Myw2ICs0Myw3IEBAIHB1YmxpYzoKICAg ICAgICAgQ292ZXJhZ2VGb3JWaXNpYmxlQXJlYSA9IDAsCiAgICAgICAgIENvdmVyYWdlRm9yVmVy dGljYWxTY3JvbGxpbmcgPSAxIDw8IDAsCiAgICAgICAgIENvdmVyYWdlRm9ySG9yaXpvbnRhbFNj cm9sbGluZyA9IDEgPDwgMSwKKyAgICAgICAgQ292ZXJhZ2VGb3JTbG93U2Nyb2xsaW5nID0gMSA8 PCAyLCAvLyBJbmRpY2F0ZXMgdGhhdCB3ZSBleHBlY3QgdG8gcGFpbnQgYSBsb3Qgb24gc2Nyb2xs aW5nLgogICAgICAgICBDb3ZlcmFnZUZvclNjcm9sbGluZyA9IENvdmVyYWdlRm9yVmVydGljYWxT Y3JvbGxpbmcgfCBDb3ZlcmFnZUZvckhvcml6b250YWxTY3JvbGxpbmcKICAgICB9OwogICAgIHR5 cGVkZWYgdW5zaWduZWQgVGlsZUNvdmVyYWdlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2EvbWFjL1RpbGVDYWNoZS5tbSBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2NhL21hYy9UaWxlQ2FjaGUubW0KaW5kZXggNWMyODBmMmVhYzVhY2U4 YmQzZWI5Njg1YTIwMmM2ZGMyMjY1N2JmNy4uYWFjMjI0YWExZTQxNTI4NmQwMjcyMDUyMGUyNWY2 NjQ5NjgxOWUyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2EvbWFjL1RpbGVDYWNoZS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jYS9tYWMvVGlsZUNhY2hlLm1tCkBAIC0zMzQsNyArMzM0LDcgQEAgSW50UmVjdCBUaWxlQ2Fj aGU6OmNvbXB1dGVUaWxlQ292ZXJhZ2VSZWN0KCkgY29uc3QKIAogSW50U2l6ZSBUaWxlQ2FjaGU6 OnRpbGVTaXplRm9yQ292ZXJhZ2VSZWN0KGNvbnN0IEludFJlY3QmIGNvdmVyYWdlUmVjdCkgY29u c3QKIHsKLSAgICBpZiAobV90aWxlQ292ZXJhZ2UgPT0gQ292ZXJhZ2VGb3JWaXNpYmxlQXJlYSkK KyAgICBpZiAobV90aWxlQ292ZXJhZ2UgJiBDb3ZlcmFnZUZvclNsb3dTY3JvbGxpbmcpCiAgICAg ICAgIHJldHVybiBjb3ZlcmFnZVJlY3Quc2l6ZSgpOwogICAgIHJldHVybiBJbnRTaXplKGRlZmF1 bHRUaWxlQ2FjaGVXaWR0aCwgZGVmYXVsdFRpbGVDYWNoZUhlaWdodCk7CiB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCmluZGV4IDQyZWI0MTc0 YzJhMTRhZGQ4MmExZTk0ODhmMWM4OGM3NTU3NjJjNTQuLmZhYjgwOTJlMjU0MmM4MmRkN2I0MTAz NmYxZjgzMmQwNDcyOTgxMTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJMYXllckJhY2tpbmcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllckJhY2tpbmcuY3BwCkBAIC0xMDcsNyArMTA3LDcgQEAgUmVuZGVyTGF5ZXJCYWNraW5n OjpSZW5kZXJMYXllckJhY2tpbmcoUmVuZGVyTGF5ZXIqIGxheWVyKQogICAgICwgbV9jYW5Db21w b3NpdGVGaWx0ZXJzKGZhbHNlKQogI2VuZGlmCiB7Ci0gICAgaWYgKHJlbmRlcmVyKCktPmlzUmVu ZGVyVmlldygpKSB7CisgICAgaWYgKGxheWVyLT5pc1Jvb3RMYXllcigpKSB7CiAgICAgICAgIEZy YW1lKiBmcmFtZSA9IHRvUmVuZGVyVmlldyhyZW5kZXJlcigpKS0+ZnJhbWVWaWV3KCktPmZyYW1l KCk7CiAgICAgICAgIFBhZ2UqIHBhZ2UgPSBmcmFtZSA/IGZyYW1lLT5wYWdlKCkgOiAwOwogICAg ICAgICBpZiAocGFnZSAmJiBmcmFtZSAmJiBwYWdlLT5tYWluRnJhbWUoKSA9PSBmcmFtZSkgewpA QCAtMTI0LDE2ICsxMjQsMTIgQEAgUmVuZGVyTGF5ZXJCYWNraW5nOjpSZW5kZXJMYXllckJhY2tp bmcoUmVuZGVyTGF5ZXIqIGxheWVyKQogICAgIGNyZWF0ZVByaW1hcnlHcmFwaGljc0xheWVyKCk7 CiAKICAgICBpZiAobV91c2luZ1RpbGVkQ2FjaGVMYXllcikgeworICAgICAgICBUaWxlZEJhY2tp bmcqIHRpbGVkQmFja2luZyA9IHRoaXMtPnRpbGVkQmFja2luZygpOwogICAgICAgICBpZiAoUGFn ZSogcGFnZSA9IHJlbmRlcmVyKCktPmZyYW1lKCktPnBhZ2UoKSkgewotICAgICAgICAgICAgaWYg KFRpbGVkQmFja2luZyogdGlsZWRCYWNraW5nID0gbV9ncmFwaGljc0xheWVyLT50aWxlZEJhY2tp bmcoKSkgewotICAgICAgICAgICAgICAgIEZyYW1lKiBmcmFtZSA9IHJlbmRlcmVyKCktPmZyYW1l KCk7Ci0gICAgICAgICAgICAgICAgdGlsZWRCYWNraW5nLT5zZXRJc0luV2luZG93KHBhZ2UtPmlz T25zY3JlZW4oKSk7Ci0gICAgICAgICAgICAgICAgaWYgKFNjcm9sbGluZ0Nvb3JkaW5hdG9yKiBz Y3JvbGxpbmdDb29yZGluYXRvciA9IHBhZ2UtPnNjcm9sbGluZ0Nvb3JkaW5hdG9yKCkpIHsKLSAg ICAgICAgICAgICAgICAgICAgYm9vbCBzaG91bGRMaW1pdFRpbGVDb3ZlcmFnZSA9ICFmcmFtZS0+ dmlldygpLT5jYW5IYXZlU2Nyb2xsYmFycygpIHx8IHNjcm9sbGluZ0Nvb3JkaW5hdG9yLT5zaG91 bGRVcGRhdGVTY3JvbGxMYXllclBvc2l0aW9uT25NYWluVGhyZWFkKCk7Ci0gICAgICAgICAgICAg ICAgICAgIHRpbGVkQmFja2luZy0+c2V0VGlsZUNvdmVyYWdlKHNob3VsZExpbWl0VGlsZUNvdmVy YWdlID8gVGlsZWRCYWNraW5nOjpDb3ZlcmFnZUZvclZpc2libGVBcmVhIDogVGlsZWRCYWNraW5n OjpDb3ZlcmFnZUZvclNjcm9sbGluZyk7Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAg ICAgIHRpbGVkQmFja2luZy0+c2V0U2Nyb2xsaW5nUGVyZm9ybWFuY2VMb2dnaW5nRW5hYmxlZChm cmFtZS0+c2V0dGluZ3MoKSAmJiBmcmFtZS0+c2V0dGluZ3MoKS0+c2Nyb2xsaW5nUGVyZm9ybWFu Y2VMb2dnaW5nRW5hYmxlZCgpKTsKLSAgICAgICAgICAgIH0KKyAgICAgICAgICAgIEZyYW1lKiBm cmFtZSA9IHJlbmRlcmVyKCktPmZyYW1lKCk7CisgICAgICAgICAgICB0aWxlZEJhY2tpbmctPnNl dElzSW5XaW5kb3cocGFnZS0+aXNPbnNjcmVlbigpKTsKKyAgICAgICAgICAgIHRpbGVkQmFja2lu Zy0+c2V0U2Nyb2xsaW5nUGVyZm9ybWFuY2VMb2dnaW5nRW5hYmxlZChmcmFtZS0+c2V0dGluZ3Mo KSAmJiBmcmFtZS0+c2V0dGluZ3MoKS0+c2Nyb2xsaW5nUGVyZm9ybWFuY2VMb2dnaW5nRW5hYmxl ZCgpKTsKKyAgICAgICAgICAgIGFkanVzdFRpbGVDYWNoZUNvdmVyYWdlKCk7CiAgICAgICAgIH0K ICAgICB9CiB9CkBAIC0xNzYsNiArMTcyLDM3IEBAIGJvb2wgUmVuZGVyTGF5ZXJCYWNraW5nOjpz aG91bGRVc2VUaWxlQ2FjaGUoY29uc3QgR3JhcGhpY3NMYXllciopIGNvbnN0CiAgICAgcmV0dXJu IG1fdXNpbmdUaWxlZENhY2hlTGF5ZXIgJiYgbV9jcmVhdGluZ1ByaW1hcnlHcmFwaGljc0xheWVy OwogfQogCitUaWxlZEJhY2tpbmcqIFJlbmRlckxheWVyQmFja2luZzo6dGlsZWRCYWNraW5nKCkg Y29uc3QKK3sKKyAgICByZXR1cm4gbV9ncmFwaGljc0xheWVyLT50aWxlZEJhY2tpbmcoKTsKK30K Kwordm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OmFkanVzdFRpbGVDYWNoZUNvdmVyYWdlKCkKK3sK KyAgICBpZiAoIW1fdXNpbmdUaWxlZENhY2hlTGF5ZXIpCisgICAgICAgIHJldHVybjsKKworICAg IFRpbGVkQmFja2luZzo6VGlsZUNvdmVyYWdlIHRpbGVDb3ZlcmFnZSA9IFRpbGVkQmFja2luZzo6 Q292ZXJhZ2VGb3JWaXNpYmxlQXJlYTsKKworICAgIC8vIEZJWE1FOiBXaGVuIHdlIHVzZSBUaWxl ZEJhY2tpbmcgZm9yIG92ZXJmbG93LCB0aGlzIHNob3VsZCBsb29rIGF0IFJlbmRlclZpZXcgc2Ny b2xsYWJpbGl0eS4KKyAgICBGcmFtZSogZnJhbWUgPSByZW5kZXJlcigpLT5mcmFtZSgpOworICAg IGlmIChmcmFtZSkgeworICAgICAgICBGcmFtZVZpZXcqIGZyYW1lVmlldyA9IGZyYW1lLT52aWV3 KCk7CisgICAgICAgIGlmIChmcmFtZVZpZXctPmhvcml6b250YWxTY3JvbGxiYXJNb2RlKCkgIT0g U2Nyb2xsYmFyQWx3YXlzT2ZmKQorICAgICAgICAgICAgdGlsZUNvdmVyYWdlIHw9IFRpbGVkQmFj a2luZzo6Q292ZXJhZ2VGb3JIb3Jpem9udGFsU2Nyb2xsaW5nOworCisgICAgICAgIGlmIChmcmFt ZVZpZXctPnZlcnRpY2FsU2Nyb2xsYmFyTW9kZSgpICE9IFNjcm9sbGJhckFsd2F5c09mZikKKyAg ICAgICAgICAgIHRpbGVDb3ZlcmFnZSB8PSBUaWxlZEJhY2tpbmc6OkNvdmVyYWdlRm9yVmVydGlj YWxTY3JvbGxpbmc7CisKKyAgICAgICAgaWYgKFNjcm9sbGluZ0Nvb3JkaW5hdG9yKiBzY3JvbGxp bmdDb29yZGluYXRvciA9IGZyYW1lLT5wYWdlKCktPnNjcm9sbGluZ0Nvb3JkaW5hdG9yKCkpIHsK KyAgICAgICAgICAgIGlmIChzY3JvbGxpbmdDb29yZGluYXRvci0+c2hvdWxkVXBkYXRlU2Nyb2xs TGF5ZXJQb3NpdGlvbk9uTWFpblRocmVhZCgpKQorICAgICAgICAgICAgICAgIHRpbGVDb3ZlcmFn ZSB8PSBUaWxlZEJhY2tpbmc6OkNvdmVyYWdlRm9yU2xvd1Njcm9sbGluZzsKKyAgICAgICAgfQor ICAgIH0KKworICAgIHRpbGVkQmFja2luZygpLT5zZXRUaWxlQ292ZXJhZ2UodGlsZUNvdmVyYWdl KTsKK30KKwogdm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OmNyZWF0ZVByaW1hcnlHcmFwaGljc0xh eWVyKCkKIHsKICAgICBTdHJpbmcgbGF5ZXJOYW1lOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyQmFja2luZy5oCmluZGV4IDk0NjhmZTlkMzAwMjczM2Y2MjU0OTc3ZmZi NmYxOWVjZjlmOTI0OTAuLjU0MDJmYzRkYzBiOWI3NzQ1MmE2ODhjODExOGE3ZmVjMDEwZjZlYTMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmgKQEAg LTM5LDYgKzM5LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBjbGFzcyBLZXlmcmFtZUxpc3Q7 CiBjbGFzcyBSZW5kZXJMYXllckNvbXBvc2l0b3I7CitjbGFzcyBUaWxlZEJhY2tpbmc7CiAKIGVu dW0gQ29tcG9zaXRpbmdMYXllclR5cGUgewogICAgIE5vcm1hbENvbXBvc2l0aW5nTGF5ZXIsIC8v IG5vbi10aWxlZCBsYXllciB3aXRoIGJhY2tpbmcgc3RvcmUKQEAgLTEzNyw3ICsxMzgsOSBAQCBw dWJsaWM6CiAgICAgdm9pZCBwb3NpdGlvbk92ZXJmbG93Q29udHJvbHNMYXllcnMoY29uc3QgSW50 U2l6ZSYgb2Zmc2V0RnJvbVJvb3QpOwogCiAgICAgYm9vbCB1c2luZ1RpbGVDYWNoZSgpIGNvbnN0 IHsgcmV0dXJuIG1fdXNpbmdUaWxlZENhY2hlTGF5ZXI7IH0KLQorICAgIFRpbGVkQmFja2luZyog dGlsZWRCYWNraW5nKCkgY29uc3Q7CisgICAgdm9pZCBhZGp1c3RUaWxlQ2FjaGVDb3ZlcmFnZSgp OworICAgIAogICAgIC8vIEdyYXBoaWNzTGF5ZXJDbGllbnQgaW50ZXJmYWNlCiAgICAgdmlydHVh bCBib29sIHNob3VsZFVzZVRpbGVDYWNoZShjb25zdCBHcmFwaGljc0xheWVyKikgY29uc3QgT1ZF UlJJREU7CiAgICAgdmlydHVhbCB2b2lkIG5vdGlmeUFuaW1hdGlvblN0YXJ0ZWQoY29uc3QgR3Jh cGhpY3NMYXllciosIGRvdWJsZSBzdGFydFRpbWUpIE9WRVJSSURFOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAppbmRleCBkMzhlNzM4 ZGVjMmM1MTQxZDcyYWNjYjhhMmY1ODhmMmYxOTYyMWIzLi45NmRhYTA0Njk1MGFlNGI0ZTg0Njk5 ZGFiNzIyMmIxZjY4YTkwOTEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcApAQCAtMTExOSw2ICsxMTE5LDEzIEBAIHZvaWQgUmVu ZGVyTGF5ZXJDb21wb3NpdG9yOjpmcmFtZVZpZXdEaWRTY3JvbGwoKQogICAgIG1fc2Nyb2xsTGF5 ZXItPnNldFBvc2l0aW9uKEZsb2F0UG9pbnQoLXNjcm9sbFBvc2l0aW9uLngoKSwgLXNjcm9sbFBv c2l0aW9uLnkoKSkpOwogfQogCit2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6ZnJhbWVWaWV3 RGlkTGF5b3V0KCkKK3sKKyAgICBSZW5kZXJMYXllckJhY2tpbmcqIHJlbmRlclZpZXdCYWNraW5n ID0gbV9yZW5kZXJWaWV3LT5sYXllcigpLT5iYWNraW5nKCk7CisgICAgaWYgKHJlbmRlclZpZXdC YWNraW5nKQorICAgICAgICByZW5kZXJWaWV3QmFja2luZy0+YWRqdXN0VGlsZUNhY2hlQ292ZXJh Z2UoKTsKK30KKwogdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnNjcm9sbGluZ0xheWVyRGlk Q2hhbmdlKFJlbmRlckxheWVyKiBsYXllcikKIHsKICAgICBSZW5kZXJMYXllckJhY2tpbmcqIGJh Y2tpbmcgPSBsYXllci0+YmFja2luZygpOwpAQCAtMTM1MCw4ICsxMzU3LDE3IEBAIEdyYXBoaWNz TGF5ZXIqIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6c2Nyb2xsTGF5ZXIoKSBjb25zdAogICAgIHJl dHVybiBtX3Njcm9sbExheWVyLmdldCgpOwogfQogCitUaWxlZEJhY2tpbmcqIFJlbmRlckxheWVy Q29tcG9zaXRvcjo6cGFnZVRpbGVkQmFja2luZygpIGNvbnN0Cit7CisgICAgUmVuZGVyTGF5ZXJC YWNraW5nKiByZW5kZXJWaWV3QmFja2luZyA9IG1fcmVuZGVyVmlldy0+bGF5ZXIoKS0+YmFja2lu ZygpOworICAgIHJldHVybiByZW5kZXJWaWV3QmFja2luZyA/IHJlbmRlclZpZXdCYWNraW5nLT50 aWxlZEJhY2tpbmcoKSA6IDA7Cit9CisKIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpkaWRN b3ZlT25zY3JlZW4oKQogeworICAgIGlmIChUaWxlZEJhY2tpbmcqIHRpbGVkQmFja2luZyA9IHBh Z2VUaWxlZEJhY2tpbmcoKSkKKyAgICAgICAgdGlsZWRCYWNraW5nLT5zZXRJc0luV2luZG93KHRy dWUpOworCiAgICAgaWYgKCFpbkNvbXBvc2l0aW5nTW9kZSgpIHx8IG1fcm9vdExheWVyQXR0YWNo bWVudCAhPSBSb290TGF5ZXJVbmF0dGFjaGVkKQogICAgICAgICByZXR1cm47CiAKQEAgLTEzNjEs NiArMTM3Nyw5IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpkaWRNb3ZlT25zY3JlZW4o KQogCiB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6d2lsbE1vdmVPZmZzY3JlZW4oKQogewor ICAgIGlmIChUaWxlZEJhY2tpbmcqIHRpbGVkQmFja2luZyA9IHBhZ2VUaWxlZEJhY2tpbmcoKSkK KyAgICAgICAgdGlsZWRCYWNraW5nLT5zZXRJc0luV2luZG93KGZhbHNlKTsKKwogICAgIGlmICgh aW5Db21wb3NpdGluZ01vZGUoKSB8fCBtX3Jvb3RMYXllckF0dGFjaG1lbnQgPT0gUm9vdExheWVy VW5hdHRhY2hlZCkKICAgICAgICAgcmV0dXJuOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgKaW5kZXggOGFkMWQ5OTI0NzllY2I3YzYwYzEy NDJlZDJmNGQwNzVkOTI4YjZhZC4uODI2ZGY5OTE0ZGZkMWE1NDg1MWY3MGFkYmFiODg5YjE2MDkx ODk1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29t cG9zaXRvci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBv c2l0b3IuaApAQCAtNDIsNiArNDIsNyBAQCBjbGFzcyBTY3JvbGxpbmdDb29yZGluYXRvcjsKICNp ZiBFTkFCTEUoVklERU8pCiBjbGFzcyBSZW5kZXJWaWRlbzsKICNlbmRpZgorY2xhc3MgVGlsZWRC YWNraW5nOwogCiBlbnVtIENvbXBvc2l0aW5nVXBkYXRlVHlwZSB7CiAgICAgQ29tcG9zaXRpbmdV cGRhdGVBZnRlclN0eWxlQ2hhbmdlLApAQCAtMTk1LDYgKzE5Niw3IEBAIHB1YmxpYzoKICAgICB2 b2lkIGZyYW1lVmlld0RpZENoYW5nZUxvY2F0aW9uKGNvbnN0IEludFBvaW50JiBjb250ZW50c09m ZnNldCk7CiAgICAgdm9pZCBmcmFtZVZpZXdEaWRDaGFuZ2VTaXplKCk7CiAgICAgdm9pZCBmcmFt ZVZpZXdEaWRTY3JvbGwoKTsKKyAgICB2b2lkIGZyYW1lVmlld0RpZExheW91dCgpOwogCiAgICAg dm9pZCBzY3JvbGxpbmdMYXllckRpZENoYW5nZShSZW5kZXJMYXllciopOwogCkBAIC0yOTMsNiAr Mjk1LDcgQEAgcHJpdmF0ZToKICAgICBib29sIGlzRmx1c2hpbmdMYXllcnMoKSBjb25zdCB7IHJl dHVybiBtX2ZsdXNoaW5nTGF5ZXJzOyB9CiAgICAgCiAgICAgUGFnZSogcGFnZSgpIGNvbnN0Owor ICAgIFRpbGVkQmFja2luZyogcGFnZVRpbGVkQmFja2luZygpIGNvbnN0OwogCiAgICAgR3JhcGhp Y3NMYXllckZhY3RvcnkqIGdyYXBoaWNzTGF5ZXJGYWN0b3J5KCkgY29uc3Q7CiAgICAgU2Nyb2xs aW5nQ29vcmRpbmF0b3IqIHNjcm9sbGluZ0Nvb3JkaW5hdG9yKCkgY29uc3Q7Cg==