62521 2011-06-12 17:42:58 -0700 [Qt] Remove tile creation timer from tiled backing store. 2012-03-07 11:55:25 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED WONTFIX Qt P3 Normal --- 62506 53894 1 ostap73 webkit-unassigned ahf eric hausmann jturcotte kenneth oldest_to_newest 419359 0 ostap73 2011-06-12 17:42:58 -0700 Tiles can be created together with tile painting. Extra timer just creates additional CPU usage. 419363 1 96900 ostap73 2011-06-12 18:20:12 -0700 Created attachment 96900 Patch 555980 2 hausmann 2012-02-13 22:57:03 -0800 Slava, Jocelyn: Is this still relevant? 568959 3 eric 2012-03-01 15:06:13 -0800 Does not appear to be so. Please re-open if I'm wrong. 573087 4 96900 hausmann 2012-03-07 11:55:25 -0800 Comment on attachment 96900 Patch Clearing review after the bug has been closed. But Kenneth and Alex have been working on cleaning up the tiling code and may be interested in this. 96900 2011-06-12 18:20:12 -0700 2012-03-07 11:55:25 -0800 Patch webkit_tiling_p2_01.diff text/plain 11955 ostap73 Y29tbWl0IDBkYzI3MTEyOWUxMjZmNDZjNTJiNzlkZjIxOWIyNDI1ZTEyZGQwOWEKQXV0aG9yOiBW aWF0Y2hlc2xhdiBPc3RhcGVua28gPG9zdGFwZW5rby52aWF0Y2hlc2xhdkBub2tpYS5jb20+CkRh dGU6ICAgTW9uIE1heSAyMyAxMjozNDo0NCAyMDExIC0wNDAwCgogICAgUGFydDIgb2YgdGlsZXMg cGFpbnRpbmcgcmVkZXNpZ24uIFJlbW92ZSB0aWxlIGNyZWF0aW9uIHRpbWVyIGFuZCBkbyB0aWxl CiAgICBjcmVhdGlvbiB0b2dldGhlciB3aXRoIHRpbGUgdXBkYXRlcy4KCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OTQ1MGMxOC4uNGQ4Y2QyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDExLTA2LTEy ICBWaWF0Y2hlc2xhdiBPc3RhcGVua28gIDxvc3RhcGVua28udmlhdGNoZXNsYXZAbm9raWEuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0g UmVtb3ZlIHRpbGUgY3JlYXRpb24gdGltZXIgZnJvbSB0aWxlZCBiYWNraW5nIHN0b3JlLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjI1MjEKKworICAg ICAgICBSZW1vdmUgdGlsZSBjcmVhdGlvbiB0aW1lciBhbmQgY3JlYXRlIHRpbGVzIHRvZ2V0ZXIg d2l0aCB0aWxlIHBhaW50aW5nLgorICAgICAgICBUaGlzIHdpbGwgYXZvaWQgZmlyaW5nIDAgaW50 ZXJ2YWwgdGlsZSB1cGRhdGUgdGltZXIgYWZ0ZXIgdGlsZSBjcmVhdGlvbgorICAgICAgICBkdXJp bmcgc2Nyb2xsaW5nLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvVGlsZWRCYWNraW5n U3RvcmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VGlsZWRCYWNraW5nU3RvcmU6OlRpbGVkQmFj a2luZ1N0b3JlKToKKyAgICAgICAgKFdlYkNvcmU6OlRpbGVkQmFja2luZ1N0b3JlOjp+VGlsZWRC YWNraW5nU3RvcmUpOgorICAgICAgICAoV2ViQ29yZTo6VGlsZWRCYWNraW5nU3RvcmU6OnNldFRp bGVTaXplKToKKyAgICAgICAgKFdlYkNvcmU6OlRpbGVkQmFja2luZ1N0b3JlOjpzZXRUaWxlVXBk YXRlRGVsYXkpOgorICAgICAgICAoV2ViQ29yZTo6VGlsZWRCYWNraW5nU3RvcmU6OnNldEtlZXBB bmRDb3ZlckFyZWFNdWx0aXBsaWVycyk6CisgICAgICAgIChXZWJDb3JlOjpUaWxlZEJhY2tpbmdT dG9yZTo6dXBkYXRlVGlsZUJ1ZmZlcnMpOgorICAgICAgICAoV2ViQ29yZTo6VGlsZWRCYWNraW5n U3RvcmU6OmFkanVzdFZpc2libGVSZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OlRpbGVkQmFja2lu Z1N0b3JlOjpjb21taXRTY2FsZUNoYW5nZSk6CisgICAgICAgIChXZWJDb3JlOjpUaWxlZEJhY2tp bmdTdG9yZTo6Y3JlYXRlVGlsZXMpOgorICAgICAgICAoV2ViQ29yZTo6VGlsZWRCYWNraW5nU3Rv cmU6OnN0YXJ0VGlsZUJ1ZmZlclVwZGF0ZVRpbWVyKToKKyAgICAgICAgKFdlYkNvcmU6OlRpbGVk QmFja2luZ1N0b3JlOjpzZXRDb250ZW50c0Zyb3plbik6CisgICAgICAgIChXZWJDb3JlOjpUaWxl ZEJhY2tpbmdTdG9yZTo6c2V0TGFzdFZpZXdwb3J0TW90aW9uKToKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9UaWxlZEJhY2tpbmdTdG9yZS5oOgorICAgICAgICAoV2ViQ29yZTo6VGlsZWRC YWNraW5nU3RvcmU6OnRpbGVVcGRhdGVEZWxheSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3MvcXQvR3JhcGhpY3NMYXllclF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5 ZXJRdEltcGw6OnJlY2FjaGUpOgorCiAyMDExLTA2LTExICBWaWF0Y2hlc2xhdiBPc3RhcGVua28g IDxvc3RhcGVua28udmlhdGNoZXNsYXZAbm9raWEuY29tPgoKICAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9UaWxlZEJhY2tpbmdTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9UaWxlZEJhY2tpbmdTdG9yZS5jcHAKaW5kZXggMDNmOTAxMi4uOTc0ZDI2ZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvVGlsZWRCYWNraW5nU3RvcmUu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1RpbGVkQmFja2luZ1N0 b3JlLmNwcApAQCAtMzMsOSArMzMsOCBAQCBzdGF0aWMgY29uc3QgaW50IGRlZmF1bHRUaWxlSGVp Z2h0ID0gNTEyOwogVGlsZWRCYWNraW5nU3RvcmU6OlRpbGVkQmFja2luZ1N0b3JlKFRpbGVkQmFj a2luZ1N0b3JlQ2xpZW50KiBjbGllbnQpCiAgICAgOiBtX2NsaWVudChjbGllbnQpCiAgICAgLCBt X3RpbGVCdWZmZXJVcGRhdGVUaW1lcihuZXcgVGlsZVRpbWVyKHRoaXMsICZUaWxlZEJhY2tpbmdT dG9yZTo6dGlsZUJ1ZmZlclVwZGF0ZVRpbWVyRmlyZWQpKQotICAgICwgbV90aWxlQ3JlYXRpb25U aW1lcihuZXcgVGlsZVRpbWVyKHRoaXMsICZUaWxlZEJhY2tpbmdTdG9yZTo6dGlsZUNyZWF0aW9u VGltZXJGaXJlZCkpCiAgICAgLCBtX3RpbGVTaXplKGRlZmF1bHRUaWxlV2lkdGgsIGRlZmF1bHRU aWxlSGVpZ2h0KQotICAgICwgbV90aWxlQ3JlYXRpb25EZWxheSgwLjAxKQorICAgICwgbV90aWxl VXBkYXRlRGVsYXkoMC4wMSkKICAgICAsIG1fa2VlcEFyZWFNdWx0aXBsaWVyKDIuZiwgMy41ZikK ICAgICAsIG1fY292ZXJBcmVhTXVsdGlwbGllcigxLjVmLCAyLjVmKQogICAgICwgbV9jb250ZW50 c1NjYWxlKDEuZikKQEAgLTQ4LDE5ICs0NywxOCBAQCBUaWxlZEJhY2tpbmdTdG9yZTo6VGlsZWRC YWNraW5nU3RvcmUoVGlsZWRCYWNraW5nU3RvcmVDbGllbnQqIGNsaWVudCkKIFRpbGVkQmFja2lu Z1N0b3JlOjp+VGlsZWRCYWNraW5nU3RvcmUoKQogewogICAgIGRlbGV0ZSBtX3RpbGVCdWZmZXJV cGRhdGVUaW1lcjsKLSAgICBkZWxldGUgbV90aWxlQ3JlYXRpb25UaW1lcjsKIH0KCiB2b2lkIFRp bGVkQmFja2luZ1N0b3JlOjpzZXRUaWxlU2l6ZShjb25zdCBJbnRTaXplJiBzaXplKQogewogICAg IG1fdGlsZVNpemUgPSBzaXplOwogICAgIG1fdGlsZXMuY2xlYXIoKTsKLSAgICBzdGFydFRpbGVD cmVhdGlvblRpbWVyKCk7CisgICAgc3RhcnRUaWxlQnVmZmVyVXBkYXRlVGltZXIoKTsKIH0KCi12 b2lkIFRpbGVkQmFja2luZ1N0b3JlOjpzZXRUaWxlQ3JlYXRpb25EZWxheShkb3VibGUgZGVsYXkp Cit2b2lkIFRpbGVkQmFja2luZ1N0b3JlOjpzZXRUaWxlVXBkYXRlRGVsYXkoZG91YmxlIGRlbGF5 KQogewotICAgIG1fdGlsZUNyZWF0aW9uRGVsYXkgPSBkZWxheTsKKyAgICBtX3RpbGVVcGRhdGVE ZWxheSA9IGRlbGF5OwogfQoKIHZvaWQgVGlsZWRCYWNraW5nU3RvcmU6OnNldEtlZXBBbmRDb3Zl ckFyZWFNdWx0aXBsaWVycyhjb25zdCBGbG9hdFNpemUmIGtlZXBNdWx0aXBsaWVyLCBjb25zdCBG bG9hdFNpemUmIGNvdmVyTXVsdGlwbGllcikKQEAgLTY4LDcgKzY2LDcgQEAgdm9pZCBUaWxlZEJh Y2tpbmdTdG9yZTo6c2V0S2VlcEFuZENvdmVyQXJlYU11bHRpcGxpZXJzKGNvbnN0IEZsb2F0U2l6 ZSYga2VlcE11bHQKICAgICBtX2tlZXBBcmVhTXVsdGlwbGllciA9IGtlZXBNdWx0aXBsaWVyOwog ICAgIG1fY292ZXJBcmVhTXVsdGlwbGllciA9IGNvdmVyTXVsdGlwbGllcjsKICAgICBjYWxjdWxh dGVCaWFzQWxwaGFzKCk7Ci0gICAgc3RhcnRUaWxlQ3JlYXRpb25UaW1lcigpOworICAgIHN0YXJ0 VGlsZUJ1ZmZlclVwZGF0ZVRpbWVyKCk7CiB9Cgogdm9pZCBUaWxlZEJhY2tpbmdTdG9yZTo6aW52 YWxpZGF0ZShjb25zdCBJbnRSZWN0JiBjb250ZW50c0RpcnR5UmVjdCkKQEAgLTk1LDYgKzkzLDgg QEAgdm9pZCBUaWxlZEJhY2tpbmdTdG9yZTo6dXBkYXRlVGlsZUJ1ZmZlcnMoKQogICAgIGlmICht X2NvbnRlbnRzRnJvemVuKQogICAgICAgICByZXR1cm47CgorICAgIGludCByZXF1aXJlZFRpbGVz ID0gY3JlYXRlVGlsZXMoKTsKKwogICAgIG1fY2xpZW50LT50aWxlZEJhY2tpbmdTdG9yZVBhaW50 QmVnaW4oKTsKCiAgICAgVmVjdG9yPEludFJlY3Q+IHBhaW50ZWRBcmVhOwpAQCAtMTIyLDYgKzEy Miw5IEBAIHZvaWQgVGlsZWRCYWNraW5nU3RvcmU6OnVwZGF0ZVRpbGVCdWZmZXJzKCkKICAgICB9 CgogICAgIG1fY2xpZW50LT50aWxlZEJhY2tpbmdTdG9yZVBhaW50RW5kKHBhaW50ZWRBcmVhKTsK KworICAgIGlmIChyZXF1aXJlZFRpbGVzKQorICAgICAgICBzdGFydFRpbGVCdWZmZXJVcGRhdGVU aW1lcigpOwogfQoKIHZvaWQgVGlsZWRCYWNraW5nU3RvcmU6OnBhaW50KEdyYXBoaWNzQ29udGV4 dCogY29udGV4dCwgY29uc3QgSW50UmVjdCYgcmVjdCkKQEAgLTE2Miw3ICsxNjUsNyBAQCB2b2lk IFRpbGVkQmFja2luZ1N0b3JlOjphZGp1c3RWaXNpYmxlUmVjdCgpCiAgICAgICAgIHJldHVybjsK ICAgICBtX3ByZXZpb3VzVmlzaWJsZVJlY3QgPSB2aXNpYmxlUmVjdDsKCi0gICAgc3RhcnRUaWxl Q3JlYXRpb25UaW1lcigpOworICAgIHN0YXJ0VGlsZUJ1ZmZlclVwZGF0ZVRpbWVyKCk7CiB9Cgog dm9pZCBUaWxlZEJhY2tpbmdTdG9yZTo6c2V0Q29udGVudHNTY2FsZShmbG9hdCBzY2FsZSkKQEAg LTE4Miw3ICsxODUsNyBAQCB2b2lkIFRpbGVkQmFja2luZ1N0b3JlOjpjb21taXRTY2FsZUNoYW5n ZSgpCiAgICAgbV9jb250ZW50c1NjYWxlID0gbV9wZW5kaW5nU2NhbGU7CiAgICAgbV9wZW5kaW5n U2NhbGUgPSAwOwogICAgIG1fdGlsZXMuY2xlYXIoKTsKLSAgICBjcmVhdGVUaWxlcygpOworICAg IHVwZGF0ZVRpbGVCdWZmZXJzKCk7CiB9CgogZG91YmxlIFRpbGVkQmFja2luZ1N0b3JlOjp0aWxl RGlzdGFuY2UoY29uc3QgSW50UmVjdCYgdmlld3BvcnQsIGNvbnN0IFRpbGU6OkNvb3JkaW5hdGUm IHRpbGVDb29yZGluYXRlKQpAQCAtMjEyLDE2ICsyMTUsMTYgQEAgZG91YmxlIFRpbGVkQmFja2lu Z1N0b3JlOjp0aWxlRGlzdGFuY2UoY29uc3QgSW50UmVjdCYgdmlld3BvcnQsIGNvbnN0IFRpbGU6 OkNvb3IKICAgICByZXR1cm4geUJpYXMgKiBhYnMoeU9mZnNldCkgKyB4QmlhcyAqIGFicyh4T2Zm c2V0KTsKIH0KCi12b2lkIFRpbGVkQmFja2luZ1N0b3JlOjpjcmVhdGVUaWxlcygpCitpbnQgVGls ZWRCYWNraW5nU3RvcmU6OmNyZWF0ZVRpbGVzKCkKIHsKICAgICBpZiAobV9jb250ZW50c0Zyb3pl bikKLSAgICAgICAgcmV0dXJuOworICAgICAgICByZXR1cm4gMDsKCiAgICAgSW50UmVjdCB2aXNp YmxlUmVjdCA9IG1hcEZyb21Db250ZW50cyhtX2NsaWVudC0+dGlsZWRCYWNraW5nU3RvcmVWaXNp YmxlUmVjdCgpKTsKICAgICBtX3ByZXZpb3VzVmlzaWJsZVJlY3QgPSB2aXNpYmxlUmVjdDsKCiAg ICAgaWYgKHZpc2libGVSZWN0LmlzRW1wdHkoKSkKLSAgICAgICAgcmV0dXJuOworICAgICAgICBy ZXR1cm4gMDsKCiAgICAgLy8gUmVtb3ZlIHRpbGVzIHRoYXQgZXh0ZW5kIG91dHNpZGUgdGhlIGN1 cnJlbnQgY29udGVudHMgcmVjdC4KICAgICBkcm9wT3ZlcmhhbmdpbmdUaWxlcygpOwpAQCAtMjY4 LDE0ICsyNzEsNyBAQCB2b2lkIFRpbGVkQmFja2luZ1N0b3JlOjpjcmVhdGVUaWxlcygpCiAgICAg ICAgIHNldFRpbGUoY29vcmRpbmF0ZSwgVGlsZTo6Y3JlYXRlKHRoaXMsIGNvb3JkaW5hdGUpKTsK ICAgICB9CiAgICAgcmVxdWlyZWRUaWxlQ291bnQgLT0gdGlsZXNUb0NyZWF0ZUNvdW50OwotCi0g ICAgLy8gUGFpbnQgdGhlIGNvbnRlbnQgb2YgdGhlIG5ld2x5IGNyZWF0ZWQgdGlsZXMKLSAgICBp ZiAodGlsZXNUb0NyZWF0ZUNvdW50KQotICAgICAgICB1cGRhdGVUaWxlQnVmZmVycygpOwotCi0g ICAgLy8gS2VlcCBjcmVhdGluZyB0aWxlcyB1bnRpbCB0aGUgd2hvbGUgY292ZXJSZWN0IGlzIGNv dmVyZWQuCi0gICAgaWYgKHJlcXVpcmVkVGlsZUNvdW50KQotICAgICAgICBtX3RpbGVDcmVhdGlv blRpbWVyLT5zdGFydE9uZVNob3QobV90aWxlQ3JlYXRpb25EZWxheSk7CisgICAgcmV0dXJuIHJl cXVpcmVkVGlsZUNvdW50OwogfQoKIHZvaWQgVGlsZWRCYWNraW5nU3RvcmU6OmRyb3BPdmVyaGFu Z2luZ1RpbGVzKCkKQEAgLTM3Miw3ICszNjgsNyBAQCB2b2lkIFRpbGVkQmFja2luZ1N0b3JlOjpz dGFydFRpbGVCdWZmZXJVcGRhdGVUaW1lcigpCiB7CiAgICAgaWYgKG1fdGlsZUJ1ZmZlclVwZGF0 ZVRpbWVyLT5pc0FjdGl2ZSgpIHx8IG1fY29udGVudHNGcm96ZW4pCiAgICAgICAgIHJldHVybjsK LSAgICBtX3RpbGVCdWZmZXJVcGRhdGVUaW1lci0+c3RhcnRPbmVTaG90KDApOworICAgIG1fdGls ZUJ1ZmZlclVwZGF0ZVRpbWVyLT5zdGFydE9uZVNob3QobV90aWxlVXBkYXRlRGVsYXkpOwogfQoK IHZvaWQgVGlsZWRCYWNraW5nU3RvcmU6OnRpbGVCdWZmZXJVcGRhdGVUaW1lckZpcmVkKFRpbGVU aW1lciopCkBAIC0zODAsMTggKzM3Niw2IEBAIHZvaWQgVGlsZWRCYWNraW5nU3RvcmU6OnRpbGVC dWZmZXJVcGRhdGVUaW1lckZpcmVkKFRpbGVUaW1lciopCiAgICAgdXBkYXRlVGlsZUJ1ZmZlcnMo KTsKIH0KCi12b2lkIFRpbGVkQmFja2luZ1N0b3JlOjpzdGFydFRpbGVDcmVhdGlvblRpbWVyKCkK LXsKLSAgICBpZiAobV90aWxlQ3JlYXRpb25UaW1lci0+aXNBY3RpdmUoKSB8fCBtX2NvbnRlbnRz RnJvemVuKQotICAgICAgICByZXR1cm47Ci0gICAgbV90aWxlQ3JlYXRpb25UaW1lci0+c3RhcnRP bmVTaG90KDApOwotfQotCi12b2lkIFRpbGVkQmFja2luZ1N0b3JlOjp0aWxlQ3JlYXRpb25UaW1l ckZpcmVkKFRpbGVUaW1lciopCi17Ci0gICAgY3JlYXRlVGlsZXMoKTsKLX0KLQogdm9pZCBUaWxl ZEJhY2tpbmdTdG9yZTo6c2V0Q29udGVudHNGcm96ZW4oYm9vbCBmcmVlemUpCiB7CiAgICAgaWYg KG1fY29udGVudHNGcm96ZW4gPT0gZnJlZXplKQpAQCAtNDA3LDcgKzM5MSw2IEBAIHZvaWQgVGls ZWRCYWNraW5nU3RvcmU6OnNldENvbnRlbnRzRnJvemVuKGJvb2wgZnJlZXplKQogICAgIGlmICht X3BlbmRpbmdTY2FsZSkKICAgICAgICAgY29tbWl0U2NhbGVDaGFuZ2UoKTsKICAgICBlbHNlIHsK LSAgICAgICAgc3RhcnRUaWxlQ3JlYXRpb25UaW1lcigpOwogICAgICAgICBzdGFydFRpbGVCdWZm ZXJVcGRhdGVUaW1lcigpOwogICAgIH0KIH0KQEAgLTQxNiw3ICszOTksNyBAQCB2b2lkIFRpbGVk QmFja2luZ1N0b3JlOjpzZXRMYXN0Vmlld3BvcnRNb3Rpb24oY29uc3QgSW50U2l6ZSYgbW90aW9u KQogewogICAgIG1fbGFzdFZpZXdwb3J0TW90aW9uID0gbW90aW9uOwoKLSAgICBzdGFydFRpbGVD cmVhdGlvblRpbWVyKCk7CisgICAgc3RhcnRUaWxlQnVmZmVyVXBkYXRlVGltZXIoKTsKIH0KCiB2 b2lkIFRpbGVkQmFja2luZ1N0b3JlOjpjYWxjdWxhdGVCaWFzQWxwaGFzKCkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1RpbGVkQmFja2luZ1N0b3JlLmggYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9UaWxlZEJhY2tpbmdTdG9yZS5oCmluZGV4 IGUxODZhMDMuLjViYjI5NzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL1RpbGVkQmFja2luZ1N0b3JlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvVGlsZWRCYWNraW5nU3RvcmUuaApAQCAtNTYsOSArNTYsOSBAQCBwdWJsaWM6CiAg ICAgSW50U2l6ZSB0aWxlU2l6ZSgpIHsgcmV0dXJuIG1fdGlsZVNpemU7IH0KICAgICB2b2lkIHNl dFRpbGVTaXplKGNvbnN0IEludFNpemUmKTsKCi0gICAgZG91YmxlIHRpbGVDcmVhdGlvbkRlbGF5 KCkgY29uc3QgeyByZXR1cm4gbV90aWxlQ3JlYXRpb25EZWxheTsgfQotICAgIHZvaWQgc2V0VGls ZUNyZWF0aW9uRGVsYXkoZG91YmxlIGRlbGF5KTsKLQorICAgIGRvdWJsZSB0aWxlVXBkYXRlRGVs YXkoKSBjb25zdCB7IHJldHVybiBtX3RpbGVVcGRhdGVEZWxheTsgfQorICAgIHZvaWQgc2V0VGls ZVVwZGF0ZURlbGF5KGRvdWJsZSk7CisKICAgICAvLyBUaWxlZCBhcmUgZHJvcHBlZCBvdXRzaWRl IHRoZSBrZWVwIGFyZWEsIGFuZCBjcmVhdGVkIGZvciBjb3ZlciBhcmVhLiBUaGUgdmFsdWVzIGEg cmVsYXRpdmUgdG8gdGhlIHZpZXdwb3J0IHNpemUuCiAgICAgdm9pZCBnZXRLZWVwQW5kQ292ZXJB cmVhTXVsdGlwbGllcnMoRmxvYXRTaXplJiBrZWVwTXVsdGlwbGllciwgRmxvYXRTaXplJiBjb3Zl ck11bHRpcGxpZXIpCiAgICAgewpAQCAtNzAsMTUgKzcwLDEzIEBAIHB1YmxpYzoKCiBwcml2YXRl OgogICAgIHZvaWQgc3RhcnRUaWxlQnVmZmVyVXBkYXRlVGltZXIoKTsKLSAgICB2b2lkIHN0YXJ0 VGlsZUNyZWF0aW9uVGltZXIoKTsKCiAgICAgdHlwZWRlZiBUaW1lcjxUaWxlZEJhY2tpbmdTdG9y ZT4gVGlsZVRpbWVyOwoKICAgICB2b2lkIHRpbGVCdWZmZXJVcGRhdGVUaW1lckZpcmVkKFRpbGVU aW1lciopOwotICAgIHZvaWQgdGlsZUNyZWF0aW9uVGltZXJGaXJlZChUaWxlVGltZXIqKTsKCiAg ICAgdm9pZCB1cGRhdGVUaWxlQnVmZmVycygpOwotICAgIHZvaWQgY3JlYXRlVGlsZXMoKTsKKyAg ICBpbnQgY3JlYXRlVGlsZXMoKTsKCiAgICAgdm9pZCBjb21taXRTY2FsZUNoYW5nZSgpOwoKQEAg LTEwOSwxMCArMTA3LDkgQEAgcHJpdmF0ZToKICAgICBUaWxlTWFwIG1fdGlsZXM7CgogICAgIFRp bGVUaW1lciogbV90aWxlQnVmZmVyVXBkYXRlVGltZXI7Ci0gICAgVGlsZVRpbWVyKiBtX3RpbGVD cmVhdGlvblRpbWVyOwoKICAgICBJbnRTaXplIG1fdGlsZVNpemU7Ci0gICAgZG91YmxlIG1fdGls ZUNyZWF0aW9uRGVsYXk7CisgICAgZG91YmxlIG1fdGlsZVVwZGF0ZURlbGF5OwogICAgIEZsb2F0 U2l6ZSBtX2tlZXBBcmVhTXVsdGlwbGllcjsKICAgICBGbG9hdFNpemUgbV9jb3ZlckFyZWFNdWx0 aXBsaWVyOwoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0 L0dyYXBoaWNzTGF5ZXJRdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9x dC9HcmFwaGljc0xheWVyUXQuY3BwCmluZGV4IGMzNGQ4YjUuLmFhNTNhZTEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzTGF5ZXJRdC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NMYXllclF0 LmNwcApAQCAtMzk4LDcgKzM5OCw3IEBAIFFQaXhtYXAgR3JhcGhpY3NMYXllclF0SW1wbDo6cmVj YWNoZShjb25zdCBRUmVnaW9uJiByZWdpb25Ub1VwZGF0ZSkKICAgICBjb25zdCBib29sIHJlcXVp cmVzVGlsaW5nID0gKG1fc3RhdGUuZHJhd3NDb250ZW50ICYmIG1fY3VycmVudENvbnRlbnQuY29u dGVudFR5cGUgPT0gSFRNTENvbnRlbnRUeXBlKSAmJiAobV9zaXplLndpZHRoKCkgPiBHUkFQSElD U19MQVlFUl9USUxJTkdfVEhSRVNIT0xEIHx8IG1fc2l6ZS5oZWlnaHQoKSA+IEdSQVBISUNTX0xB WUVSX1RJTElOR19USFJFU0hPTEQpOwogICAgIGlmIChyZXF1aXJlc1RpbGluZyAmJiAhbV90aWxl ZEJhY2tpbmdTdG9yZSkgewogICAgICAgICBtX3RpbGVkQmFja2luZ1N0b3JlID0gbmV3IFRpbGVk QmFja2luZ1N0b3JlKHRoaXMpOwotICAgICAgICBtX3RpbGVkQmFja2luZ1N0b3JlLT5zZXRUaWxl Q3JlYXRpb25EZWxheSgwKTsKKyAgICAgICAgbV90aWxlZEJhY2tpbmdTdG9yZS0+c2V0VGlsZVVw ZGF0ZURlbGF5KDApOwogICAgICAgICBzZXRGbGFnKEl0ZW1Vc2VzRXh0ZW5kZWRTdHlsZU9wdGlv biwgdHJ1ZSk7CiAgICAgfSBlbHNlIGlmICghcmVxdWlyZXNUaWxpbmcgJiYgbV90aWxlZEJhY2tp bmdTdG9yZSkgewogICAgICAgICBkZWxldGUgbV90aWxlZEJhY2tpbmdTdG9yZTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvcXQv QXBpL3F3ZWJwYWdlLmNwcAppbmRleCBmMDdhNjY3Li4xMDNjYTgyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9xdC9BcGkv cXdlYnBhZ2UuY3BwCkBAIC0xMTk4LDEyICsxMTk4LDEyIEBAIHZvaWQgUVdlYlBhZ2VQcml2YXRl OjpkeW5hbWljUHJvcGVydHlDaGFuZ2VFdmVudChRRHluYW1pY1Byb3BlcnR5Q2hhbmdlRXZlbnQq IGV2CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIFFTaXplIHRpbGVTaXplID0gcS0+cHJv cGVydHkoIl9xX1RpbGVkQmFja2luZ1N0b3JlVGlsZVNpemUiKS50b1NpemUoKTsKICAgICAgICAg ZnJhbWUtPnRpbGVkQmFja2luZ1N0b3JlKCktPnNldFRpbGVTaXplKHRpbGVTaXplKTsKLSAgICB9 IGVsc2UgaWYgKGV2ZW50LT5wcm9wZXJ0eU5hbWUoKSA9PSAiX3FfVGlsZWRCYWNraW5nU3RvcmVU aWxlQ3JlYXRpb25EZWxheSIpIHsKKyAgICB9IGVsc2UgaWYgKGV2ZW50LT5wcm9wZXJ0eU5hbWUo KSA9PSAiX3FfVGlsZWRCYWNraW5nU3RvcmVUaWxlVXBkYXRlRGVsYXkiKSB7CiAgICAgICAgIFdl YkNvcmU6OkZyYW1lKiBmcmFtZSA9IFFXZWJGcmFtZVByaXZhdGU6OmNvcmUocS0+bWFpbkZyYW1l KCkpOwogICAgICAgICBpZiAoIWZyYW1lLT50aWxlZEJhY2tpbmdTdG9yZSgpKQogICAgICAgICAg ICAgcmV0dXJuOwotICAgICAgICBpbnQgdGlsZUNyZWF0aW9uRGVsYXkgPSBxLT5wcm9wZXJ0eSgi X3FfVGlsZWRCYWNraW5nU3RvcmVUaWxlQ3JlYXRpb25EZWxheSIpLnRvSW50KCk7Ci0gICAgICAg IGZyYW1lLT50aWxlZEJhY2tpbmdTdG9yZSgpLT5zZXRUaWxlQ3JlYXRpb25EZWxheShzdGF0aWNf Y2FzdDxkb3VibGU+KHRpbGVDcmVhdGlvbkRlbGF5KSAvIDEwMDAuKTsKKyAgICAgICAgaW50IHRp bGVVcGRhdGVEZWxheSA9IHEtPnByb3BlcnR5KCJfcV9UaWxlZEJhY2tpbmdTdG9yZVRpbGVVcGRh dGVEZWxheSIpLnRvSW50KCk7CisgICAgICAgIGZyYW1lLT50aWxlZEJhY2tpbmdTdG9yZSgpLT5z ZXRUaWxlVXBkYXRlRGVsYXkoc3RhdGljX2Nhc3Q8ZG91YmxlPih0aWxlVXBkYXRlRGVsYXkpIC8g MTAwMC4pOwogICAgIH0gZWxzZSBpZiAoZXZlbnQtPnByb3BlcnR5TmFtZSgpID09ICJfcV9UaWxl ZEJhY2tpbmdTdG9yZUtlZXBBcmVhTXVsdGlwbGllciIpIHsKICAgICAgICAgV2ViQ29yZTo6RnJh bWUqIGZyYW1lID0gUVdlYkZyYW1lUHJpdmF0ZTo6Y29yZShxLT5tYWluRnJhbWUoKSk7CiAgICAg ICAgIGlmICghZnJhbWUtPnRpbGVkQmFja2luZ1N0b3JlKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L3F0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IGNi M2Q4OWEuLmFjNDhiYWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDYt MTIgIFZpYXRjaGVzbGF2IE9zdGFwZW5rbyAgPG9zdGFwZW5rby52aWF0Y2hlc2xhdkBub2tpYS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0 XSBSZW1vdmUgdGlsZSBjcmVhdGlvbiB0aW1lciBmcm9tIHRpbGVkIGJhY2tpbmcgc3RvcmUuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MjUyMQorCisg ICAgICAgIFJlbW92ZSB0aWxlIGNyZWF0aW9uIHRpbWVyIGFuZCBjcmVhdGUgdGlsZXMgdG9nZXRl ciB3aXRoIHRpbGUgcGFpbnRpbmcuCisgICAgICAgIFRoaXMgd2lsbCBhdm9pZCBmaXJpbmcgMCBp bnRlcnZhbCB0aWxlIHVwZGF0ZSB0aW1lciBhZnRlciB0aWxlIGNyZWF0aW9uCisgICAgICAgIGR1 cmluZyBzY3JvbGxpbmcuCisKKyAgICAgICAgKiBBcGkvcXdlYnBhZ2UuY3BwOgorICAgICAgICAo UVdlYlBhZ2VQcml2YXRlOjpkeW5hbWljUHJvcGVydHlDaGFuZ2VFdmVudCk6CisKIDIwMTEtMDYt MTEgIFZpYXRjaGVzbGF2IE9zdGFwZW5rbyAgPG9zdGFwZW5rby52aWF0Y2hlc2xhdkBub2tpYS5j b20+CgogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K