82533 2012-03-28 14:49:06 -0700 [Qt][WK2] Remove all USE(TILED_BACKING_STORE) defines from code that contains UI_SIDE_COMPOSITING 2012-04-09 13:26:26 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 75780 1 noam noam hausmann jturcotte kenneth webkit.review.bot zalan oldest_to_newest 590468 0 noam 2012-03-28 14:49:06 -0700 [Qt][WK2] Remove all USE(TILED_BACKING_STORE) defines from code that contains UI_SIDE_COMPOSITING 590498 1 134415 noam 2012-03-28 15:10:39 -0700 Created attachment 134415 Patch 591059 2 134415 jturcotte 2012-03-29 05:06:57 -0700 Comment on attachment 134415 Patch LGTM, TILED_BACKING_STORE guards don't have much value in WK2 anyway. We should also remove its support from WebCore if we ever can. 591067 3 134415 kenneth 2012-03-29 05:11:02 -0700 Comment on attachment 134415 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=134415&action=review > Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.h:123 > > -#if USE(TILED_BACKING_STORE) > // TiledBackingStoreClient > virtual void tiledBackingStorePaintBegin(); > virtual void tiledBackingStorePaint(GraphicsContext*, const IntRect&); So isn't this header shared across ports? Won't this break mac etc? 591130 4 noam 2012-03-29 06:48:36 -0700 (In reply to comment #3) > (From update of attachment 134415 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=134415&action=review > > > Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.h:123 > > > > -#if USE(TILED_BACKING_STORE) > > // TiledBackingStoreClient > > virtual void tiledBackingStorePaintBegin(); > > virtual void tiledBackingStorePaint(GraphicsContext*, const IntRect&); > > So isn't this header shared across ports? Won't this break mac etc? No, this header is only for UI_SIDE_COMPOSITING. 591132 5 134415 kenneth 2012-03-29 06:49:43 -0700 Comment on attachment 134415 Patch ok then 591146 6 zalan 2012-03-29 06:58:27 -0700 (In reply to comment #2) > (From update of attachment 134415 [details]) > LGTM, TILED_BACKING_STORE guards don't have much value in WK2 anyway. We should also remove its support from WebCore if we ever can. agree, especially with its mixture with fixed layout at some places at the webprocess side. 598381 7 136255 noam 2012-04-09 10:15:07 -0700 Created attachment 136255 Patch for landing 598563 8 136255 webkit.review.bot 2012-04-09 13:26:22 -0700 Comment on attachment 136255 Patch for landing Clearing flags on attachment: 136255 Committed r113610: <http://trac.webkit.org/changeset/113610> 598564 9 webkit.review.bot 2012-04-09 13:26:26 -0700 All reviewed patches have been landed. Closing bug. 134415 2012-03-28 15:10:39 -0700 2012-04-09 10:14:59 -0700 Patch bug-82533-20120328151032.patch text/plain 6222 noam U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyNDA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYWUyNzk0ZmMzYzM5OTlh NWFmYzQ0ZjdjODdhOGI5YWRjOGE4ZTg4OS4uMDFlMDA0ZjMwYTZhYjUyNzYxZGRmNDMxYjNmYTJi ZThkMDg1NGJlNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI1IEBACiAyMDEyLTAzLTI4ICBObydh bSBSb3NlbnRoYWwgIDxub2FtLnJvc2VudGhhbEBub2tpYS5jb20+CiAKKyAgICAgICAgW1F0XVtX SzJdIFJlbW92ZSBhbGwgVVNFKFRJTEVEX0JBQ0tJTkdfU1RPUkUpIGRlZmluZXMgZnJvbSBjb2Rl IHRoYXQgY29udGFpbnMgVUlfU0lERV9DT01QT1NJVElORworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODI1MzMKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBjaGFuZ2UgaW4gYmVoYXZpb3IsIHJlbW92aW5n IHNvbWUgI2RlZmluZXMuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dl YkdyYXBoaWNzTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V2ViR3JhcGhpY3NMYXllcjo6 c2V0U2hvdWxkVXBkYXRlVmlzaWJsZVJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6V2ViR3JhcGhp Y3NMYXllcjo6YWRqdXN0Q29udGVudHNTY2FsZSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJD b3JlU3VwcG9ydC9XZWJHcmFwaGljc0xheWVyLmg6CisgICAgICAgIChXZWJHcmFwaGljc0xheWVy KToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvTGF5ZXJUcmVlSG9zdC5oOgorICAgICAg ICAoTGF5ZXJUcmVlSG9zdCk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL3F0L0xheWVy VHJlZUhvc3RRdC5jcHA6CisgICAgICAgIChXZWJLaXQ6OkxheWVyVHJlZUhvc3RRdDo6TGF5ZXJU cmVlSG9zdFF0KToKKyAgICAgICAgKFdlYktpdDo6TGF5ZXJUcmVlSG9zdFF0OjpkZXRhY2hMYXll cik6CisKKzIwMTItMDMtMjggIE5vJ2FtIFJvc2VudGhhbCAgPG5vYW0ucm9zZW50aGFsQG5va2lh LmNvbT4KKwogICAgICAgICBbUXRdW1dLMl0gRGlzYWJsZSB0aGUgY29udGVudC1zY2FsaW5nIGFu ZCB2aXNpYmxlIGNvbnRlbnRzIHJlY3Qgd2hlbiB0aGUgbGF5ZXIncyB0cmFuc2Zvcm0gaXMgbm90 IGFmZmluZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 ODI1MjMKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3Vw cG9ydC9XZWJHcmFwaGljc0xheWVyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi Q29yZVN1cHBvcnQvV2ViR3JhcGhpY3NMYXllci5jcHAKaW5kZXggMmMyN2MyNDMwY2MxZTcwZTAx YWU5YTZhN2MyNTRiOTczMmZjNzM4ZC4uNDA0MDNjMzc0YjE4NzczOTFhZjMwMGM1NGU5MmQ5ZDU2 MTAwNjMzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3Vw cG9ydC9XZWJHcmFwaGljc0xheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYkNvcmVTdXBwb3J0L1dlYkdyYXBoaWNzTGF5ZXIuY3BwCkBAIC04NSwxMCArODUsOCBAQCBX ZWJHcmFwaGljc0xheWVyOjpXZWJHcmFwaGljc0xheWVyKEdyYXBoaWNzTGF5ZXJDbGllbnQqIGNs aWVudCkKICAgICAsIG1fY29udGVudE5lZWRzRGlzcGxheShmYWxzZSkKICAgICAsIG1faGFzUGVu ZGluZ0FuaW1hdGlvbnMoZmFsc2UpCiAgICAgLCBtX2luVXBkYXRlTW9kZShmYWxzZSkKLSNpZiBV U0UoVElMRURfQkFDS0lOR19TVE9SRSkKICAgICAsIG1fd2ViR3JhcGhpY3NMYXllckNsaWVudCgw KQogICAgICwgbV9jb250ZW50c1NjYWxlKDEuZikKLSNlbmRpZgogewogICAgIHN0YXRpYyBXZWJM YXllcklEIG5leHRMYXllcklEID0gMTsKICAgICBtX2xheWVySW5mby5pZCA9IG5leHRMYXllcklE Kys7CkBAIC00NzYsNyArNDc0LDYgQEAgdm9pZCBXZWJHcmFwaGljc0xheWVyOjpzeW5jQ29tcG9z aXRpbmdTdGF0ZUZvclRoaXNMYXllck9ubHkoKQogICAgIG1faGFzUGVuZGluZ0FuaW1hdGlvbnMg PSBmYWxzZTsKIH0KIAotI2lmIFVTRShUSUxFRF9CQUNLSU5HX1NUT1JFKQogdm9pZCBXZWJHcmFw aGljc0xheWVyOjp0aWxlZEJhY2tpbmdTdG9yZVBhaW50QmVnaW4oKQogewogfQpAQCAtNjc1LDcg KzY3Miw2IEBAIHZvaWQgV2ViR3JhcGhpY3NMYXllcjo6Y29tcHV0ZVRyYW5zZm9ybWVkVmlzaWJs ZVJlY3QoKQogICAgIGFkanVzdFZpc2libGVSZWN0KCk7CiAgICAgYWRqdXN0Q29udGVudHNTY2Fs ZSgpOwogfQotI2VuZGlmCiAKIHN0YXRpYyBQYXNzT3duUHRyPEdyYXBoaWNzTGF5ZXI+IGNyZWF0 ZVdlYkdyYXBoaWNzTGF5ZXIoR3JhcGhpY3NMYXllckNsaWVudCogY2xpZW50KQogewpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJHcmFwaGlj c0xheWVyLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkdy YXBoaWNzTGF5ZXIuaAppbmRleCBmZDljMTc2MTMyZDI4ZDc4MTcyMzQ4ZTA2ZTc2NGI4MDQwODE1 YzY5Li5mZWIxY2YwNjM4ZTEzMWM5NjIzMzQ5ZWZlZGJjNmFlMjRjZDNhYjEzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkdyYXBoaWNzTGF5 ZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkdy YXBoaWNzTGF5ZXIuaApAQCAtMTE4LDcgKzExOCw2IEBAIHB1YmxpYzoKIAogICAgIHN0YXRpYyB2 b2lkIGluaXRGYWN0b3J5KCk7CiAKLSNpZiBVU0UoVElMRURfQkFDS0lOR19TVE9SRSkKICAgICAv LyBUaWxlZEJhY2tpbmdTdG9yZUNsaWVudAogICAgIHZpcnR1YWwgdm9pZCB0aWxlZEJhY2tpbmdT dG9yZVBhaW50QmVnaW4oKTsKICAgICB2aXJ0dWFsIHZvaWQgdGlsZWRCYWNraW5nU3RvcmVQYWlu dChHcmFwaGljc0NvbnRleHQqLCBjb25zdCBJbnRSZWN0Jik7CkBAIC0xMzksNyArMTM4LDYgQEAg cHVibGljOgogICAgIGJvb2wgaXNSZWFkeUZvclRpbGVCdWZmZXJTd2FwKCkgY29uc3Q7CiAgICAg dm9pZCB1cGRhdGVDb250ZW50QnVmZmVycygpOwogICAgIHZvaWQgcHVyZ2VCYWNraW5nU3RvcmVz KCk7Ci0jZW5kaWYKIAogcHJpdmF0ZToKICAgICBXZWJLaXQ6OldlYkxheWVySW5mbyBtX2xheWVy SW5mbzsKQEAgLTE1OCw3ICsxNTYsNiBAQCBwcml2YXRlOgogICAgIHZvaWQgY3JlYXRlQmFja2lu Z1N0b3JlKCk7CiAgICAgSGFzaFNldDxTdHJpbmc+IG1fdHJhbnNmb3JtQW5pbWF0aW9uczsKIAot I2lmIFVTRShUSUxFRF9CQUNLSU5HX1NUT1JFKQogICAgIGJvb2wgc2VsZk9yQW5jZXN0b3JIYXZl Tm9uQWZmaW5lVHJhbnNmb3JtcygpOwogICAgIGJvb2wgc2hvdWxkVXNlVGlsZWRCYWNraW5nU3Rv cmUoKTsKICAgICB2b2lkIGFkanVzdENvbnRlbnRzU2NhbGUoKTsKQEAgLTE2OSw3ICsxNjYsNiBA QCBwcml2YXRlOgogICAgIE93blB0cjxXZWJDb3JlOjpUaWxlZEJhY2tpbmdTdG9yZT4gbV9tYWlu QmFja2luZ1N0b3JlOwogICAgIE93blB0cjxXZWJDb3JlOjpUaWxlZEJhY2tpbmdTdG9yZT4gbV9w cmV2aW91c0JhY2tpbmdTdG9yZTsKICAgICBmbG9hdCBtX2NvbnRlbnRzU2NhbGU7Ci0jZW5kaWYK IH07CiAKIFdlYkdyYXBoaWNzTGF5ZXIqIHRvV2ViR3JhcGhpY3NMYXllcihHcmFwaGljc0xheWVy Kik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvTGF5ZXJU cmVlSG9zdC5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0xheWVyVHJlZUhv c3QuaAppbmRleCAwMzQ5ZTI0ZTcxY2FjOTJhZWE2MTg0NDA2YTc2YWM3NWQ4NGQ3NzMzLi5iZWE4 ZGRjZWQxZjg3YzYwMzc1OTZhNzY0MzU0MmIzZjU4Y2Q0NWJlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvTGF5ZXJUcmVlSG9zdC5oCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9MYXllclRyZWVIb3N0LmgKQEAgLTc5LDcgKzc5LDcg QEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBwYXVzZVJlbmRlcmluZygpIHsgfQogICAgIHZp cnR1YWwgdm9pZCByZXN1bWVSZW5kZXJpbmcoKSB7IH0KIAotI2lmIFVTRShUSUxFRF9CQUNLSU5H X1NUT1JFKQorI2lmIFVTRShVSV9TSURFX0NPTVBPU0lUSU5HKQogICAgIHZpcnR1YWwgdm9pZCBz ZXRWaXNpYmxlQ29udGVudHNSZWN0KGNvbnN0IFdlYkNvcmU6OkludFJlY3QmLCBmbG9hdCBzY2Fs ZSwgY29uc3QgV2ViQ29yZTo6RmxvYXRQb2ludCYpIHsgfQogICAgIHZpcnR1YWwgdm9pZCBzZXRW aXNpYmxlQ29udGVudHNSZWN0Rm9yTGF5ZXIoaW50IGxheWVySUQsIGNvbnN0IFdlYkNvcmU6Oklu dFJlY3QmKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgcmVuZGVyTmV4dEZyYW1lKCkgeyB9CkBAIC05 Niw4ICs5Niw3IEBAIHByb3RlY3RlZDoKIAogICAgIFdlYlBhZ2UqIG1fd2ViUGFnZTsKIAotCi0j aWYgVVNFKFRJTEVEX0JBQ0tJTkdfU1RPUkUpCisjaWYgVVNFKFVJX1NJREVfQ09NUE9TSVRJTkcp CiAgICAgYm9vbCBtX3dhaXRpbmdGb3JVSVByb2Nlc3M7CiAjZW5kaWYKIH07CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvcXQvTGF5ZXJUcmVlSG9zdFF0LmNw cCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9xdC9MYXllclRyZWVIb3N0UXQu Y3BwCmluZGV4IGNhNzRmMTE0MGIyYjU4NTlmNzUxOTE3Zjg4YWM5MDI1N2NjY2E0NDMuLmJkYTYw NjM4ODI4MjljNGY2ZDFlYTVmMzE0MTczYmMzMmFlYjViNTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9xdC9MYXllclRyZWVIb3N0UXQuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9xdC9MYXllclRyZWVIb3N0UXQuY3BwCkBA IC02MywxMSArNjMsOSBAQCBMYXllclRyZWVIb3N0UXQ6OkxheWVyVHJlZUhvc3RRdChXZWJQYWdl KiB3ZWJQYWdlKQogICAgIDogTGF5ZXJUcmVlSG9zdCh3ZWJQYWdlKQogICAgICwgbV9ub3RpZnlB ZnRlclNjaGVkdWxlZExheWVyRmx1c2goZmFsc2UpCiAgICAgLCBtX2lzVmFsaWQodHJ1ZSkKLSNp ZiBVU0UoVElMRURfQkFDS0lOR19TVE9SRSkKICAgICAsIG1fd2FpdGluZ0ZvclVJUHJvY2Vzcyhm YWxzZSkKICAgICAsIG1faXNTdXNwZW5kZWQoZmFsc2UpCiAgICAgLCBtX2NvbnRlbnRzU2NhbGUo MSkKLSNlbmRpZgogICAgICwgbV9zaG91bGRTeW5jRnJhbWUoZmFsc2UpCiAgICAgLCBtX3Nob3Vs ZFN5bmNSb290TGF5ZXIodHJ1ZSkKICAgICAsIG1fbGF5ZXJGbHVzaFRpbWVyKHRoaXMsICZMYXll clRyZWVIb3N0UXQ6OmxheWVyRmx1c2hUaW1lckZpcmVkKQpAQCAtODUsOSArODMsNyBAQCBMYXll clRyZWVIb3N0UXQ6OkxheWVyVHJlZUhvc3RRdChXZWJQYWdlKiB3ZWJQYWdlKQogICAgIG1fbGF5 ZXJUcmVlQ29udGV4dC53ZWJMYXllcklEID0gdG9XZWJHcmFwaGljc0xheWVyKHdlYlJvb3RMYXll ciktPmlkKCk7CiAKICAgICBtX25vbkNvbXBvc2l0ZWRDb250ZW50TGF5ZXIgPSBHcmFwaGljc0xh eWVyOjpjcmVhdGUodGhpcyk7Ci0jaWYgVVNFKFRJTEVEX0JBQ0tJTkdfU1RPUkUpCiAgICAgdG9X ZWJHcmFwaGljc0xheWVyKG1fcm9vdExheWVyLmdldCgpKS0+c2V0V2ViR3JhcGhpY3NMYXllckNs aWVudCh0aGlzKTsKLSNlbmRpZgogI2lmbmRlZiBOREVCVUcKICAgICBtX25vbkNvbXBvc2l0ZWRD b250ZW50TGF5ZXItPnNldE5hbWUoIkxheWVyVHJlZUhvc3RRdCBub24tY29tcG9zaXRlZCBjb250 ZW50Iik7CiAjZW5kaWYKQEAgLTI1NCwxMCArMjUwLDggQEAgdm9pZCBMYXllclRyZWVIb3N0UXQ6 OmRldGFjaExheWVyKFdlYkdyYXBoaWNzTGF5ZXIqIGxheWVyKQogCiB2b2lkIExheWVyVHJlZUhv c3RRdDo6cGVyZm9ybVNjaGVkdWxlZExheWVyRmx1c2goKQogewotI2lmIFVTRShUSUxFRF9CQUNL SU5HX1NUT1JFKQogICAgIGlmIChtX2lzU3VzcGVuZGVkIHx8IG1fd2FpdGluZ0ZvclVJUHJvY2Vz cykKICAgICAgICAgcmV0dXJuOwotI2VuZGlmCiAKICAgICBtX3dlYlBhZ2UtPmxheW91dElmTmVl ZGVkKCk7CiAK 136255 2012-04-09 10:15:07 -0700 2012-04-09 13:26:22 -0700 Patch for landing bug-82533-20120409101505.patch text/plain 6234 noam U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzNTg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMzI5NTlkMTdhYzQ2OGY2 YWU0NDQ3NmU1YmU2N2ExMTdmOWUyNGRiOS4uOTIzOTU1MmIwM2U0YzQ4ZTdjNTJiMGQ5ZmZhZmIw NTA3ZWU0M2RlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI1IEBACiAyMDEyLTAzLTI4ICBObydh bSBSb3NlbnRoYWwgIDxub2FtLnJvc2VudGhhbEBub2tpYS5jb20+CiAKKyAgICAgICAgW1F0XVtX SzJdIFJlbW92ZSBhbGwgVVNFKFRJTEVEX0JBQ0tJTkdfU1RPUkUpIGRlZmluZXMgZnJvbSBjb2Rl IHRoYXQgY29udGFpbnMgVUlfU0lERV9DT01QT1NJVElORworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODI1MzMKKworICAgICAgICBSZXZpZXdlZCBieSBL ZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbi4KKworICAgICAgICBObyBjaGFuZ2UgaW4gYmVoYXZp b3IsIHJlbW92aW5nIHNvbWUgI2RlZmluZXMuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNv cmVTdXBwb3J0L1dlYkdyYXBoaWNzTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V2ViR3Jh cGhpY3NMYXllcjo6c2V0U2hvdWxkVXBkYXRlVmlzaWJsZVJlY3QpOgorICAgICAgICAoV2ViQ29y ZTo6V2ViR3JhcGhpY3NMYXllcjo6YWRqdXN0Q29udGVudHNTY2FsZSk6CisgICAgICAgICogV2Vi UHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJHcmFwaGljc0xheWVyLmg6CisgICAgICAgIChXZWJH cmFwaGljc0xheWVyKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvTGF5ZXJUcmVlSG9z dC5oOgorICAgICAgICAoTGF5ZXJUcmVlSG9zdCk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQ YWdlL3F0L0xheWVyVHJlZUhvc3RRdC5jcHA6CisgICAgICAgIChXZWJLaXQ6OkxheWVyVHJlZUhv c3RRdDo6TGF5ZXJUcmVlSG9zdFF0KToKKyAgICAgICAgKFdlYktpdDo6TGF5ZXJUcmVlSG9zdFF0 OjpkZXRhY2hMYXllcik6CisKKzIwMTItMDMtMjggIE5vJ2FtIFJvc2VudGhhbCAgPG5vYW0ucm9z ZW50aGFsQG5va2lhLmNvbT4KKwogICAgICAgICBbUXRdW1dLMl0gRGlzYWJsZSB0aGUgY29udGVu dC1zY2FsaW5nIGFuZCB2aXNpYmxlIGNvbnRlbnRzIHJlY3Qgd2hlbiB0aGUgbGF5ZXIncyB0cmFu c2Zvcm0gaXMgbm90IGFmZmluZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9ODI1MjMKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJDb3JlU3VwcG9ydC9XZWJHcmFwaGljc0xheWVyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViR3JhcGhpY3NMYXllci5jcHAKaW5kZXggYjQzNjgx MzZjZDg5N2E0OTEwNWNhNjM0MDk0YmRiZTU4MTgzZDM0YS4uNDgxZjQ3MTVkYzYzNWY2NjVhMDIx ZDM2YTAxYTc3NWI3ZDJmZjYxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJDb3JlU3VwcG9ydC9XZWJHcmFwaGljc0xheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkdyYXBoaWNzTGF5ZXIuY3BwCkBAIC04NSwx MCArODUsOCBAQCBXZWJHcmFwaGljc0xheWVyOjpXZWJHcmFwaGljc0xheWVyKEdyYXBoaWNzTGF5 ZXJDbGllbnQqIGNsaWVudCkKICAgICAsIG1fY29udGVudE5lZWRzRGlzcGxheShmYWxzZSkKICAg ICAsIG1faGFzUGVuZGluZ0FuaW1hdGlvbnMoZmFsc2UpCiAgICAgLCBtX2luVXBkYXRlTW9kZShm YWxzZSkKLSNpZiBVU0UoVElMRURfQkFDS0lOR19TVE9SRSkKICAgICAsIG1fd2ViR3JhcGhpY3NM YXllckNsaWVudCgwKQogICAgICwgbV9jb250ZW50c1NjYWxlKDEuZikKLSNlbmRpZgogewogICAg IHN0YXRpYyBXZWJMYXllcklEIG5leHRMYXllcklEID0gMTsKICAgICBtX2xheWVySW5mby5pZCA9 IG5leHRMYXllcklEKys7CkBAIC00NzYsNyArNDc0LDYgQEAgdm9pZCBXZWJHcmFwaGljc0xheWVy OjpzeW5jQ29tcG9zaXRpbmdTdGF0ZUZvclRoaXNMYXllck9ubHkoKQogICAgIG1faGFzUGVuZGlu Z0FuaW1hdGlvbnMgPSBmYWxzZTsKIH0KIAotI2lmIFVTRShUSUxFRF9CQUNLSU5HX1NUT1JFKQog dm9pZCBXZWJHcmFwaGljc0xheWVyOjp0aWxlZEJhY2tpbmdTdG9yZVBhaW50QmVnaW4oKQogewog fQpAQCAtNjc1LDcgKzY3Miw2IEBAIHZvaWQgV2ViR3JhcGhpY3NMYXllcjo6Y29tcHV0ZVRyYW5z Zm9ybWVkVmlzaWJsZVJlY3QoKQogICAgIGFkanVzdFZpc2libGVSZWN0KCk7CiAgICAgYWRqdXN0 Q29udGVudHNTY2FsZSgpOwogfQotI2VuZGlmCiAKIHN0YXRpYyBQYXNzT3duUHRyPEdyYXBoaWNz TGF5ZXI+IGNyZWF0ZVdlYkdyYXBoaWNzTGF5ZXIoR3JhcGhpY3NMYXllckNsaWVudCogY2xpZW50 KQogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9y dC9XZWJHcmFwaGljc0xheWVyLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVT dXBwb3J0L1dlYkdyYXBoaWNzTGF5ZXIuaAppbmRleCBlY2RmMzcxOWRlZWZlMTQzNWFiYWIyZjM1 MzkxOWM3MjMwNGUxNjliLi4yZjkwNmVhM2QxNTZmZmQwZjdjOGQ4MzFhZjAwMTJjNTZjYzM0MWYy IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dl YkdyYXBoaWNzTGF5ZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVT dXBwb3J0L1dlYkdyYXBoaWNzTGF5ZXIuaApAQCAtMTE4LDcgKzExOCw2IEBAIHB1YmxpYzoKIAog ICAgIHN0YXRpYyB2b2lkIGluaXRGYWN0b3J5KCk7CiAKLSNpZiBVU0UoVElMRURfQkFDS0lOR19T VE9SRSkKICAgICAvLyBUaWxlZEJhY2tpbmdTdG9yZUNsaWVudAogICAgIHZpcnR1YWwgdm9pZCB0 aWxlZEJhY2tpbmdTdG9yZVBhaW50QmVnaW4oKTsKICAgICB2aXJ0dWFsIHZvaWQgdGlsZWRCYWNr aW5nU3RvcmVQYWludChHcmFwaGljc0NvbnRleHQqLCBjb25zdCBJbnRSZWN0Jik7CkBAIC0xMzks NyArMTM4LDYgQEAgcHVibGljOgogICAgIGJvb2wgaXNSZWFkeUZvclRpbGVCdWZmZXJTd2FwKCkg Y29uc3Q7CiAgICAgdm9pZCB1cGRhdGVDb250ZW50QnVmZmVycygpOwogICAgIHZvaWQgcHVyZ2VC YWNraW5nU3RvcmVzKCk7Ci0jZW5kaWYKIAogcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgd2ls bEJlRGVzdHJveWVkKCk7CkBAIC0xNTksNyArMTU3LDYgQEAgcHJpdmF0ZToKICAgICB2b2lkIGNy ZWF0ZUJhY2tpbmdTdG9yZSgpOwogICAgIEhhc2hTZXQ8U3RyaW5nPiBtX3RyYW5zZm9ybUFuaW1h dGlvbnM7CiAKLSNpZiBVU0UoVElMRURfQkFDS0lOR19TVE9SRSkKICAgICBib29sIHNlbGZPckFu Y2VzdG9ySGF2ZU5vbkFmZmluZVRyYW5zZm9ybXMoKTsKICAgICBib29sIHNob3VsZFVzZVRpbGVk QmFja2luZ1N0b3JlKCk7CiAgICAgdm9pZCBhZGp1c3RDb250ZW50c1NjYWxlKCk7CkBAIC0xNzAs NyArMTY3LDYgQEAgcHJpdmF0ZToKICAgICBPd25QdHI8V2ViQ29yZTo6VGlsZWRCYWNraW5nU3Rv cmU+IG1fbWFpbkJhY2tpbmdTdG9yZTsKICAgICBPd25QdHI8V2ViQ29yZTo6VGlsZWRCYWNraW5n U3RvcmU+IG1fcHJldmlvdXNCYWNraW5nU3RvcmU7CiAgICAgZmxvYXQgbV9jb250ZW50c1NjYWxl OwotI2VuZGlmCiB9OwogCiBXZWJHcmFwaGljc0xheWVyKiB0b1dlYkdyYXBoaWNzTGF5ZXIoR3Jh cGhpY3NMYXllciopOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL0xheWVyVHJlZUhvc3QuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9M YXllclRyZWVIb3N0LmgKaW5kZXggMjQ1Y2FlMzc5YjUwMDIxZjBhYzQwMmJiYTYzODllMWU5OWI4 NTdkOS4uMzA3ZTA1NDc2ZTcxZTQyNTM1OTdjODhiZDFkNzY2MTg4ZWVmZjcxNiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0xheWVyVHJlZUhvc3QuaAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvTGF5ZXJUcmVlSG9zdC5oCkBAIC03 OSw3ICs3OSw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgcGF1c2VSZW5kZXJpbmcoKSB7 IH0KICAgICB2aXJ0dWFsIHZvaWQgcmVzdW1lUmVuZGVyaW5nKCkgeyB9CiAKLSNpZiBVU0UoVElM RURfQkFDS0lOR19TVE9SRSkKKyNpZiBVU0UoVUlfU0lERV9DT01QT1NJVElORykKICAgICB2aXJ0 dWFsIHZvaWQgc2V0VmlzaWJsZUNvbnRlbnRzUmVjdChjb25zdCBXZWJDb3JlOjpJbnRSZWN0Jiwg ZmxvYXQgc2NhbGUsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9pbnQmKSB7IH0KICAgICB2aXJ0dWFs IHZvaWQgc2V0VmlzaWJsZUNvbnRlbnRzUmVjdEZvckxheWVyKGludCBsYXllcklELCBjb25zdCBX ZWJDb3JlOjpJbnRSZWN0JikgeyB9CiAgICAgdmlydHVhbCB2b2lkIHJlbmRlck5leHRGcmFtZSgp IHsgfQpAQCAtMTAwLDggKzEwMCw3IEBAIHByb3RlY3RlZDoKIAogICAgIFdlYlBhZ2UqIG1fd2Vi UGFnZTsKIAotCi0jaWYgVVNFKFRJTEVEX0JBQ0tJTkdfU1RPUkUpCisjaWYgVVNFKFVJX1NJREVf Q09NUE9TSVRJTkcpCiAgICAgYm9vbCBtX3dhaXRpbmdGb3JVSVByb2Nlc3M7CiAjZW5kaWYKIH07 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvcXQvTGF5ZXJU cmVlSG9zdFF0LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9xdC9MYXll clRyZWVIb3N0UXQuY3BwCmluZGV4IGNhNzRmMTE0MGIyYjU4NTlmNzUxOTE3Zjg4YWM5MDI1N2Nj Y2E0NDMuLmJkYTYwNjM4ODI4MjljNGY2ZDFlYTVmMzE0MTczYmMzMmFlYjViNTYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9xdC9MYXllclRyZWVIb3N0UXQu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9xdC9MYXllclRyZWVI b3N0UXQuY3BwCkBAIC02MywxMSArNjMsOSBAQCBMYXllclRyZWVIb3N0UXQ6OkxheWVyVHJlZUhv c3RRdChXZWJQYWdlKiB3ZWJQYWdlKQogICAgIDogTGF5ZXJUcmVlSG9zdCh3ZWJQYWdlKQogICAg ICwgbV9ub3RpZnlBZnRlclNjaGVkdWxlZExheWVyRmx1c2goZmFsc2UpCiAgICAgLCBtX2lzVmFs aWQodHJ1ZSkKLSNpZiBVU0UoVElMRURfQkFDS0lOR19TVE9SRSkKICAgICAsIG1fd2FpdGluZ0Zv clVJUHJvY2VzcyhmYWxzZSkKICAgICAsIG1faXNTdXNwZW5kZWQoZmFsc2UpCiAgICAgLCBtX2Nv bnRlbnRzU2NhbGUoMSkKLSNlbmRpZgogICAgICwgbV9zaG91bGRTeW5jRnJhbWUoZmFsc2UpCiAg ICAgLCBtX3Nob3VsZFN5bmNSb290TGF5ZXIodHJ1ZSkKICAgICAsIG1fbGF5ZXJGbHVzaFRpbWVy KHRoaXMsICZMYXllclRyZWVIb3N0UXQ6OmxheWVyRmx1c2hUaW1lckZpcmVkKQpAQCAtODUsOSAr ODMsNyBAQCBMYXllclRyZWVIb3N0UXQ6OkxheWVyVHJlZUhvc3RRdChXZWJQYWdlKiB3ZWJQYWdl KQogICAgIG1fbGF5ZXJUcmVlQ29udGV4dC53ZWJMYXllcklEID0gdG9XZWJHcmFwaGljc0xheWVy KHdlYlJvb3RMYXllciktPmlkKCk7CiAKICAgICBtX25vbkNvbXBvc2l0ZWRDb250ZW50TGF5ZXIg PSBHcmFwaGljc0xheWVyOjpjcmVhdGUodGhpcyk7Ci0jaWYgVVNFKFRJTEVEX0JBQ0tJTkdfU1RP UkUpCiAgICAgdG9XZWJHcmFwaGljc0xheWVyKG1fcm9vdExheWVyLmdldCgpKS0+c2V0V2ViR3Jh cGhpY3NMYXllckNsaWVudCh0aGlzKTsKLSNlbmRpZgogI2lmbmRlZiBOREVCVUcKICAgICBtX25v bkNvbXBvc2l0ZWRDb250ZW50TGF5ZXItPnNldE5hbWUoIkxheWVyVHJlZUhvc3RRdCBub24tY29t cG9zaXRlZCBjb250ZW50Iik7CiAjZW5kaWYKQEAgLTI1NCwxMCArMjUwLDggQEAgdm9pZCBMYXll clRyZWVIb3N0UXQ6OmRldGFjaExheWVyKFdlYkdyYXBoaWNzTGF5ZXIqIGxheWVyKQogCiB2b2lk IExheWVyVHJlZUhvc3RRdDo6cGVyZm9ybVNjaGVkdWxlZExheWVyRmx1c2goKQogewotI2lmIFVT RShUSUxFRF9CQUNLSU5HX1NUT1JFKQogICAgIGlmIChtX2lzU3VzcGVuZGVkIHx8IG1fd2FpdGlu Z0ZvclVJUHJvY2VzcykKICAgICAgICAgcmV0dXJuOwotI2VuZGlmCiAKICAgICBtX3dlYlBhZ2Ut PmxheW91dElmTmVlZGVkKCk7CiAK