105302 2012-12-18 08:05:55 -0800 [BlackBerry] Remove the visible tile buffer from the BackingStore 2012-12-18 09:19:09 -0800 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 105199 1 jpetsovits jpetsovits manyoso staikos webkit.review.bot oldest_to_newest 793655 0 jpetsovits 2012-12-18 08:05:55 -0800 Once the patch for bug 105199 has gone in, we can remove the visible tile buffer which has been a source of complexity and memory usage, and can now be replaced with different functionality. Yay! Patch below. 793659 1 179944 jpetsovits 2012-12-18 08:14:00 -0800 Created attachment 179944 Patch 793666 2 179944 staikos 2012-12-18 08:18:58 -0800 Comment on attachment 179944 Patch Dependent on bug 105199 793716 3 179944 webkit.review.bot 2012-12-18 09:19:06 -0800 Comment on attachment 179944 Patch Clearing flags on attachment: 179944 Committed r138028: <http://trac.webkit.org/changeset/138028> 793717 4 webkit.review.bot 2012-12-18 09:19:09 -0800 All reviewed patches have been landed. Closing bug. 179944 2012-12-18 08:14:00 -0800 2012-12-18 09:19:06 -0800 Patch bug-105302-20121218111117.patch text/plain 15217 jpetsovits U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4MDE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCA2OTliODg2NjI3YWFiODE1YWM3YjZkMzcwZWZlOTI5ZmViYzIwODdlLi44YTExYzc1ZGNk ZDhkNjhlZDE5YjgyZDMwM2JlN2MwYWEyYWNjYzNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSw0OCBAQAorMjAxMi0xMi0xNyAgSmFrb2IgUGV0c292aXRzICA8anBl dHNvdml0c0ByaW0uY29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBSZW1vdmUgdGhlIHZpc2li bGUgdGlsZSBidWZmZXIgZnJvbSB0aGUgQmFja2luZ1N0b3JlLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA1MzAyCisgICAgICAgIFJJTSBQUiAyNjAy MzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUg dmlzaWJsZSB0aWxlIGJ1ZmZlciB3YXMgaW50cm9kdWNlZCBhcyBhbiBhZGRpdGlvbmFsCisgICAg ICAgIGJ1ZmZlcmluZyBzb2x1dGlvbiB0aGF0IHdhcyBuZWNlc3NhcnkgYmVjYXVzZSBvdGhlcgor ICAgICAgICBidWZmZXJzIHdvdWxkIG9ubHkgY292ZXIgcGFydCBvZiB0aGUgc2NyZWVuIGFuZCBj b3VsZAorICAgICAgICBvbmx5IGJlIHN3YXBwZWQgb25lIGJ5IG9uZSwgd2l0aCBsb25nIGJsb2Nr aW5nIGNhbGxzCisgICAgICAgIGJldHdlZW4gZWFjaCBuZXdseSByZW5kZXJlZCB0aWxlLiBCeSBj YXJyeWluZyBhbiBvbGQgY29weQorICAgICAgICBvZiBhbGwgdGlsZXMgYXQgb25jZSwgd2Ugd2Vy ZSBhdm9pZGluZyBjaGVja2VyYm9hcmQgYW5kCisgICAgICAgIHZpc3VhbCBhcnRpZmFjdHMgZHVy aW5nIGxvYWQgdGltZSB3aGVuIG11Y2ggem9vbS10by1maXQKKyAgICAgICAgYWN0aW9uIGlzIGdv aW5nIG9uLgorCisgICAgICAgIFRoZXNlIGRheXMsIHRoZSB2aXN1YWwgdGlsZSBidWZmZXIgaHVy dHMgbW9yZSB0aGFuIGl0IGhlbHBzLAorICAgICAgICBub3Qgb25seSB0YWtpbmcgdXAgbG90cyBv ZiBtZW1vcnkgYnV0IGFsc28gcmVxdWlyaW5nCisgICAgICAgIGNvbXBsZXhpdHkgdGhhdCB3ZSdk IHJhdGhlciBnZXQgcmlkIG9mLiBOb3cgdGhhdCBtdWx0aXBsZQorICAgICAgICBidWZmZXJzIGFy ZSBiZWluZyBzd2FwcGVkIGludG8gdGhlIHVzZXIgaW50ZXJmYWNlIHRocmVhZAorICAgICAgICBh dCBvbmNlLCB0aGUgbmVlZCBmb3IgdGhlIHZpc2libGUgdGlsZSBidWZmZXIgaXMgbm8gbG9uZ2Vy CisgICAgICAgIHRoZXJlIGFuZCBjYW4gYmUgZXhjaGFuZ2VkIGZvciBzdGFuZGFyZCBnZW9tZXRy eSBiZWhhdmlvci4KKworICAgICAgICBUaGlzIHBhdGNoIHNpbXBseSBkZWxldGVzIHRoZSB2aXNp YmxlIHRpbGUgYnVmZmVyIHRvIHVzZQorICAgICAgICBleGlzdGluZyBvdGhlciBjb2RlIGluc3Rl YWQuIERpZmZlcmVuY2VzIGluIGJlaGF2aW9yIGFyZQorICAgICAgICBub24tZXhpc3RlbnQgb3Ig bmVnbGlnaWJsZS4KKworICAgICAgICAqIEFwaS9CYWNraW5nU3RvcmUuY3BwOgorICAgICAgICAo QmxhY2tCZXJyeTo6V2ViS2l0OjpCYWNraW5nU3RvcmVQcml2YXRlOjpibGl0VmlzaWJsZUNvbnRl bnRzKToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6QmFja2luZ1N0b3JlUHJpdmF0ZTo6 dHJhbnNmb3JtQ2hhbmdlZCk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OkJhY2tpbmdT dG9yZVByaXZhdGU6Om9yaWVudGF0aW9uQ2hhbmdlZCk6CisgICAgICAgIChCbGFja0JlcnJ5OjpX ZWJLaXQ6OkJhY2tpbmdTdG9yZVByaXZhdGU6OmNyZWF0ZVN1cmZhY2VzKToKKyAgICAgICAgKiBB cGkvQmFja2luZ1N0b3JlX3AuaDoKKyAgICAgICAgKEJhY2tpbmdTdG9yZVByaXZhdGUpOgorICAg ICAgICAqIEFwaS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2Vi UGFnZVByaXZhdGU6OnNldFZpZXdwb3J0U2l6ZSk6CisgICAgICAgICogV2ViS2l0U3VwcG9ydC9T dXJmYWNlUG9vbC5jcHA6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OlN1cmZhY2VQb29s OjpTdXJmYWNlUG9vbCk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OlN1cmZhY2VQb29s Ojppbml0aWFsaXplKToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6U3VyZmFjZVBvb2w6 OmNyZWF0ZUJ1ZmZlcnMpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpTdXJmYWNlUG9v bDo6cmVsZWFzZUJ1ZmZlcnMpOgorICAgICAgICAqIFdlYktpdFN1cHBvcnQvU3VyZmFjZVBvb2wu aDoKKyAgICAgICAgKFN1cmZhY2VQb29sKToKKwogMjAxMi0xMi0xOCAgSmFrb2IgUGV0c292aXRz ICA8anBldHNvdml0c0ByaW0uY29tPgogCiAgICAgICAgIFtCbGFja0JlcnJ5XSBSZXN0cnVjdHVy ZSB0aGUgcmVuZGVyIHF1ZXVlIHRvIHByb2Nlc3MgbXVsdGlwbGUgdGlsZXMgYXQgb25jZS4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvQmFja2luZ1N0b3JlLmNwcCBi L1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvQmFja2luZ1N0b3JlLmNwcAppbmRleCBiNTdm ZWM0OGEzODdjNTkyZWFiMzE1MjdlNjk4ODVmYzAwOWY1ZDk4Li45MDU1YWNmYjJkNThkNjA5MGNl OWZiMWNiYjk0ZmQ1MDg5MTVkY2I5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVy cnkvQXBpL0JhY2tpbmdTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0Fw aS9CYWNraW5nU3RvcmUuY3BwCkBAIC0xMzg2LDQyICsxMzg2LDcgQEAgdm9pZCBCYWNraW5nU3Rv cmVQcml2YXRlOjpibGl0VmlzaWJsZUNvbnRlbnRzKGJvb2wgZm9yY2UpCiAgICAgICAgICAgICB9 CiAKICAgICAgICAgICAgIC8vIEJsaXQgdGhlIHZpc2libGUgYnVmZmVyIGhlcmUgaWYgd2UgaGF2 ZSB2aXNpYmxlIHpvb20gam9icy4KLSAgICAgICAgICAgIGlmIChtX3JlbmRlclF1ZXVlLT5oYXND dXJyZW50VmlzaWJsZVpvb21Kb2IoKSkgewotCi0gICAgICAgICAgICAgICAgLy8gTmVlZHMgdG8g YmUgaW4gc2FtZSBjb29yZGluYXRlIHN5c3RlbSBhcyBkaXJ0eVJlY3QuCi0gICAgICAgICAgICAg ICAgUGxhdGZvcm06OkludFJlY3QgdmlzaWJsZVRpbGVCdWZmZXJSZWN0ID0gbV92aXNpYmxlVGls ZUJ1ZmZlclJlY3Q7Ci0gICAgICAgICAgICAgICAgdmlzaWJsZVRpbGVCdWZmZXJSZWN0Lm1vdmUo LW9yaWdpbi54KCksIC1vcmlnaW4ueSgpKTsKLQotICAgICAgICAgICAgICAgIC8vIENsaXAgdG8g dGhlIHZpc2libGVUaWxlQnVmZmVyUmVjdC4KLSAgICAgICAgICAgICAgICBkaXJ0eVJlY3QuaW50 ZXJzZWN0KHZpc2libGVUaWxlQnVmZmVyUmVjdCk7Ci0KLSAgICAgICAgICAgICAgICAvLyBDbGlw IHRvIHRoZSBkaXJ0eVJlY3QuCi0gICAgICAgICAgICAgICAgdmlzaWJsZVRpbGVCdWZmZXJSZWN0 LmludGVyc2VjdChkaXJ0eVJlY3QpOwotCi0gICAgICAgICAgICAgICAgaWYgKCFkaXJ0eVJlY3Qu aXNFbXB0eSgpICYmICF2aXNpYmxlVGlsZUJ1ZmZlclJlY3QuaXNFbXB0eSgpKSB7Ci0gICAgICAg ICAgICAgICAgICAgIFRpbGVCdWZmZXIqIHZpc2libGVUaWxlQnVmZmVyID0gU3VyZmFjZVBvb2w6 Omdsb2JhbFN1cmZhY2VQb29sKCktPnZpc2libGVUaWxlQnVmZmVyKCk7Ci0gICAgICAgICAgICAg ICAgICAgIEFTU0VSVCh2aXNpYmxlVGlsZUJ1ZmZlci0+c2l6ZSgpID09IHZpc2libGVDb250ZW50 c1JlY3QoKS5zaXplKCkpOwotCi0gICAgICAgICAgICAgICAgICAgIC8vIFRoZSBvZmZzZXQgb2Yg dGhlIGN1cnJlbnQgdmlld3BvcnQgd2l0aCB0aGUgdmlzYmxlIHRpbGUgYnVmZmVyLgotICAgICAg ICAgICAgICAgICAgICBQbGF0Zm9ybTo6SW50UG9pbnQgZGlmZmVyZW5jZSA9IG9yaWdpbiAtIG1f dmlzaWJsZVRpbGVCdWZmZXJSZWN0LmxvY2F0aW9uKCk7Ci0gICAgICAgICAgICAgICAgICAgIFBs YXRmb3JtOjpJbnRTaXplIG9mZnNldCA9IFBsYXRmb3JtOjpJbnRTaXplKGRpZmZlcmVuY2UueCgp LCBkaWZmZXJlbmNlLnkoKSk7Ci0KLSAgICAgICAgICAgICAgICAgICAgLy8gTWFwIHRvIHRoZSB2 aXNpYmxlVGlsZUJ1ZmZlciBjb29yZGluYXRlcy4KLSAgICAgICAgICAgICAgICAgICAgUGxhdGZv cm06OkludFJlY3QgZGlydHlUaWxlUmVjdCA9IHZpc2libGVUaWxlQnVmZmVyUmVjdDsKLSAgICAg ICAgICAgICAgICAgICAgZGlydHlUaWxlUmVjdC5tb3ZlKG9mZnNldC53aWR0aCgpLCBvZmZzZXQu aGVpZ2h0KCkpOwotCi0gICAgICAgICAgICAgICAgICAgIFBsYXRmb3JtOjpJbnRSZWN0IGRpcnR5 UmVjdFQgPSB0cmFuc2Zvcm1hdGlvbi5tYXBSZWN0KGRpcnR5UmVjdCk7Ci0KLSAgICAgICAgICAg ICAgICAgICAgaWYgKCF0cmFuc2Zvcm1hdGlvbi5pc0lkZW50aXR5KCkpIHsKLSAgICAgICAgICAg ICAgICAgICAgICAgIC8vIEJlY2F1c2Ugb2Ygcm91bmRpbmcgaXQgaXMgcG9zc2libGUgdGhhdCBk aXJ0eVJlY3QgY291bGQgYmUgb2ZmLWJ5LW9uZSBsYXJnZXIKLSAgICAgICAgICAgICAgICAgICAg ICAgIC8vIHRoYW4gdGhlIHN1cmZhY2Ugc2l6ZSBvZiB0aGUgZHN0IGJ1ZmZlci4gV2UgcHJldmVu dCB0aGlzIGhlcmUsIGJ5IGNsYW1waW5nCi0gICAgICAgICAgICAgICAgICAgICAgICAvLyBpdCB0 byBlbnN1cmUgdGhhdCBjYW4ndCBoYXBwZW4uCi0gICAgICAgICAgICAgICAgICAgICAgICBkaXJ0 eVJlY3RULmludGVyc2VjdChQbGF0Zm9ybTo6SW50UmVjdChQbGF0Zm9ybTo6SW50UG9pbnQoMCwg MCksIHN1cmZhY2VTaXplKCkpKTsKLSAgICAgICAgICAgICAgICAgICAgfQotCi0gICAgICAgICAg ICAgICAgICAgIGJsaXRUb1dpbmRvdyhkaXJ0eVJlY3RULCB2aXNpYmxlVGlsZUJ1ZmZlci0+bmF0 aXZlQnVmZmVyKCksIGRpcnR5VGlsZVJlY3QsIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpHcmFwaGlj czo6U291cmNlQ29weSwgMjU1KTsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB9IGVs c2UgaWYgKGlzVGlsZUNvcnJlc3BvbmRpbmdUb0J1ZmZlcikgeworICAgICAgICAgICAgaWYgKGlz VGlsZUNvcnJlc3BvbmRpbmdUb0J1ZmZlcikgewogICAgICAgICAgICAgICAgIC8vIEludGVyc2Vj dCB0aGUgcmVuZGVyZWQgcmVnaW9uLgogICAgICAgICAgICAgICAgIFBsYXRmb3JtOjpJbnRSZWN0 UmVnaW9uIHJlbmRlcmVkUmVnaW9uID0gdGlsZUJ1ZmZlci0+cmVuZGVyZWRSZWdpb24oKTsKICAg ICAgICAgICAgICAgICBzdGQ6OnZlY3RvcjxQbGF0Zm9ybTo6SW50UmVjdD4gZGlydHlSZW5kZXJl ZFJlY3RzID0gcmVuZGVyZWRSZWdpb24ucmVjdHMoKTsKQEAgLTE4MjgsNjAgKzE3OTMsMTIgQEAg dm9pZCBCYWNraW5nU3RvcmVQcml2YXRlOjp0cmFuc2Zvcm1DaGFuZ2VkKCkKICAgICBpZiAoIW1f d2ViUGFnZS0+aXNWaXNpYmxlKCkpCiAgICAgICAgIHJldHVybjsKIAorICAgIG1fcmVuZGVyUXVl dWUtPnJlc2V0KCk7CisKICAgICBpZiAoIWlzQWN0aXZlKCkpIHsKLSAgICAgICAgbV9yZW5kZXJR dWV1ZS0+cmVzZXQoKTsKLSAgICAgICAgbV9yZW5kZXJRdWV1ZS0+YWRkVG9RdWV1ZShSZW5kZXJR dWV1ZTo6VmlzaWJsZVpvb20sIHZpc2libGVDb250ZW50c1JlY3QoKSk7CiAgICAgICAgIG1fd2Vi UGFnZS0+ZC0+c2V0U2hvdWxkUmVzZXRUaWxlc1doZW5TaG93bih0cnVlKTsKICAgICAgICAgcmV0 dXJuOwogICAgIH0KLQotICAgIEJhY2tpbmdTdG9yZUdlb21ldHJ5KiBjdXJyZW50U3RhdGUgPSBm cm9udFN0YXRlKCk7Ci0gICAgVGlsZU1hcCBjdXJyZW50TWFwID0gY3VycmVudFN0YXRlLT50aWxl TWFwKCk7Ci0KLSAgICBib29sIGhhc0N1cnJlbnRWaXNpYmxlWm9vbUpvYiA9IG1fcmVuZGVyUXVl dWUtPmhhc0N1cnJlbnRWaXNpYmxlWm9vbUpvYigpOwotICAgIGJvb2wgaXNMb2FkaW5nID0gbV9j bGllbnQtPmlzTG9hZGluZygpOwotICAgIGlmIChpc0xvYWRpbmcpIHsKLSAgICAgICAgaWYgKCFo YXNDdXJyZW50VmlzaWJsZVpvb21Kb2IpCi0gICAgICAgICAgICBtX3Zpc2libGVUaWxlQnVmZmVy UmVjdCA9IHZpc2libGVDb250ZW50c1JlY3QoKTsgLy8gQ2FjaGUgdGhpcyBmb3IgYmxpdFZpc2li bGVDb250ZW50cy4KLQotICAgICAgICAvLyBGSVhNRTogV2l0aCBtX3JlbmRlclF1ZXVlLT5yZXNl dCgpIGNhbGxlZCByaWdodCBhZnRlcndhcmRzLCB0aGlzIGNhbGwKLSAgICAgICAgLy8gICBzZWVt cyBsaWtlIGEgcG9pbnRsZXNzIGV4ZXJjaXNlLiBGaWd1cmUgb3V0IGhvdyB0byBkZWFsIHdpdGgg aXQuCi0gICAgICAgIG1fcmVuZGVyUXVldWUtPmFkZFRvUXVldWUoUmVuZGVyUXVldWU6OlZpc2li bGVab29tLCB2aXNpYmxlQ29udGVudHNSZWN0KCkpOwotCi0gICAgICAgIC8vIEFkZCB0aGUgY3Vy cmVudGx5IHZpc2libGUgdGlsZXMgdG8gdGhlIHJlbmRlciBxdWV1ZSBhcyB2aXNpYmxlIHpvb20g am9icy4KLSAgICAgICAgVGlsZVJlY3RMaXN0IHRpbGVSZWN0TGlzdCA9IG1hcEZyb21QaXhlbENv bnRlbnRzVG9UaWxlcyh2aXNpYmxlQ29udGVudHNSZWN0KCksIGN1cnJlbnRTdGF0ZSk7Ci0KLSAg ICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCB0aWxlUmVjdExpc3Quc2l6ZSgpOyArK2kpIHsK LSAgICAgICAgICAgIFRpbGVSZWN0IHRpbGVSZWN0ID0gdGlsZVJlY3RMaXN0W2ldOwotICAgICAg ICAgICAgVGlsZUluZGV4IGluZGV4ID0gdGlsZVJlY3QuZmlyc3Q7Ci0gICAgICAgICAgICBQbGF0 Zm9ybTo6SW50UmVjdCBkaXJ0eVJlY3QgPSB0aWxlUmVjdC5zZWNvbmQ7Ci0gICAgICAgICAgICBU aWxlQnVmZmVyKiB0aWxlQnVmZmVyID0gY3VycmVudE1hcC5nZXQoaW5kZXgpOwotCi0gICAgICAg ICAgICBpZiAoIXRpbGVCdWZmZXIpCi0gICAgICAgICAgICAgICAgY29udGludWU7Ci0KLSAgICAg ICAgICAgIC8vIENvcHkgdGhlIHZpc2libGUgY29udGVudHMgaW50byB0aGUgdmlzaWJsZVRpbGVC dWZmZXIgaWYgd2UgZG9uJ3QgaGF2ZQotICAgICAgICAgICAgLy8gYW55IGN1cnJlbnQgdmlzaWJs ZSB6b29tIGpvYnMuCi0gICAgICAgICAgICBpZiAoIWhhc0N1cnJlbnRWaXNpYmxlWm9vbUpvYikg ewotICAgICAgICAgICAgICAgIFBsYXRmb3JtOjpJbnRSZWN0IHRpbGVTcmNSZWN0ID0gZGlydHlS ZWN0OwotICAgICAgICAgICAgICAgIFBsYXRmb3JtOjpJbnRQb2ludCB0aWxlT3JpZ2luID0gY3Vy cmVudFN0YXRlLT5vcmlnaW5PZlRpbGUoaW5kZXgpOwotICAgICAgICAgICAgICAgIHRpbGVTcmNS ZWN0Lm1vdmUoLXRpbGVPcmlnaW4ueCgpLCAtdGlsZU9yaWdpbi55KCkpOwotCi0gICAgICAgICAg ICAgICAgLy8gTWFwIHRvIHRoZSBkZXN0aW5hdGlvbidzIGNvb3JkaW5hdGUgc3lzdGVtLgotICAg ICAgICAgICAgICAgIFBsYXRmb3JtOjpJbnRQb2ludCB2aXNpYmxlVGlsZU9yaWdpbiA9IG1fdmlz aWJsZVRpbGVCdWZmZXJSZWN0LmxvY2F0aW9uKCk7Ci0gICAgICAgICAgICAgICAgUGxhdGZvcm06 OkludFJlY3QgdmlzaWJsZVRpbGVEc3RSZWN0ID0gZGlydHlSZWN0OwotICAgICAgICAgICAgICAg IHZpc2libGVUaWxlRHN0UmVjdC5tb3ZlKC12aXNpYmxlVGlsZU9yaWdpbi54KCksIC12aXNpYmxl VGlsZU9yaWdpbi55KCkpOwotCi0gICAgICAgICAgICAgICAgVGlsZUJ1ZmZlciogdmlzaWJsZVRp bGVCdWZmZXIgPSBTdXJmYWNlUG9vbDo6Z2xvYmFsU3VyZmFjZVBvb2woKS0+dmlzaWJsZVRpbGVC dWZmZXIoKTsKLSAgICAgICAgICAgICAgICBBU1NFUlQodmlzaWJsZVRpbGVCdWZmZXItPnNpemUo KSA9PSBQbGF0Zm9ybTo6SW50U2l6ZShtX3dlYlBhZ2UtPmQtPnRyYW5zZm9ybWVkVmlld3BvcnRT aXplKCkpKTsKLSAgICAgICAgICAgICAgICBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6R3JhcGhpY3M6 OmJsaXRUb0J1ZmZlcigKLSAgICAgICAgICAgICAgICAgICAgdmlzaWJsZVRpbGVCdWZmZXItPm5h dGl2ZUJ1ZmZlcigpLCB2aXNpYmxlVGlsZURzdFJlY3QsCi0gICAgICAgICAgICAgICAgICAgIHRp bGVCdWZmZXItPm5hdGl2ZUJ1ZmZlcigpLCB0aWxlU3JjUmVjdCk7Ci0gICAgICAgICAgICB9Ci0g ICAgICAgIH0KLSAgICB9Ci0KLSAgICBtX3JlbmRlclF1ZXVlLT5yZXNldCgpOwogICAgIHJlc2V0 VGlsZXMoKTsKIH0KIApAQCAtMTg5MCwyMCArMTgwNywxMiBAQCB2b2lkIEJhY2tpbmdTdG9yZVBy aXZhdGU6Om9yaWVudGF0aW9uQ2hhbmdlZCgpCiAgICAgQVNTRVJUKEJsYWNrQmVycnk6OlBsYXRm b3JtOjp3ZWJLaXRUaHJlYWRNZXNzYWdlQ2xpZW50KCktPmlzQ3VycmVudFRocmVhZCgpKTsKICAg ICBzZXRUaWxlTWF0cml4TmVlZHNVcGRhdGUoKTsKICAgICB1cGRhdGVUaWxlTWF0cml4SWZOZWVk ZWQoKTsKLSAgICBjcmVhdGVWaXNpYmxlVGlsZUJ1ZmZlcigpOwogfQogCiB2b2lkIEJhY2tpbmdT dG9yZVByaXZhdGU6OmFjdHVhbFZpc2libGVTaXplQ2hhbmdlZChjb25zdCBQbGF0Zm9ybTo6SW50 U2l6ZSYgc2l6ZSkKIHsKIH0KIAotc3RhdGljIHZvaWQgY3JlYXRlVmlzaWJsZVRpbGVCdWZmZXJG b3JXZWJQYWdlKFdlYlBhZ2VQcml2YXRlKiBwYWdlKQotewotICAgIEFTU0VSVChwYWdlKTsKLSAg ICBTdXJmYWNlUG9vbCogc3VyZmFjZVBvb2wgPSBTdXJmYWNlUG9vbDo6Z2xvYmFsU3VyZmFjZVBv b2woKTsKLSAgICBzdXJmYWNlUG9vbC0+aW5pdGlhbGl6ZVZpc2libGVUaWxlQnVmZmVyKHBhZ2Ut PnRyYW5zZm9ybWVkVmlld3BvcnRTaXplKCkpOwotfQotCiB2b2lkIEJhY2tpbmdTdG9yZVByaXZh dGU6OmNyZWF0ZVN1cmZhY2VzKCkKIHsKICAgICBCYWNraW5nU3RvcmVHZW9tZXRyeSogY3VycmVu dFN0YXRlID0gZnJvbnRTdGF0ZSgpOwpAQCAtMTk0OSwxNiArMTg1OCw2IEBAIHZvaWQgQmFja2lu Z1N0b3JlUHJpdmF0ZTo6Y3JlYXRlU3VyZmFjZXMoKQogICAgIG5ld0dlb21ldHJ5LT5zZXROdW1i ZXJPZlRpbGVzSGlnaChkaXZpc29yLnNlY29uZCk7CiAgICAgbmV3R2VvbWV0cnktPnNldFRpbGVN YXAobmV3VGlsZU1hcCk7CiAgICAgYWRvcHRBc0Zyb250U3RhdGUobmV3R2VvbWV0cnkpOyAvLyBz d2FwIGludG8gVUkgdGhyZWFkCi0KLSAgICBjcmVhdGVWaXNpYmxlVGlsZUJ1ZmZlckZvcldlYlBh Z2UobV93ZWJQYWdlLT5kKTsKLX0KLQotdm9pZCBCYWNraW5nU3RvcmVQcml2YXRlOjpjcmVhdGVW aXNpYmxlVGlsZUJ1ZmZlcigpCi17Ci0gICAgaWYgKCFtX3dlYlBhZ2UtPmlzVmlzaWJsZSgpIHx8 ICFpc0FjdGl2ZSgpKQotICAgICAgICByZXR1cm47Ci0KLSAgICBjcmVhdGVWaXNpYmxlVGlsZUJ1 ZmZlckZvcldlYlBhZ2UobV93ZWJQYWdlLT5kKTsKIH0KIAogUGxhdGZvcm06OkludFBvaW50IEJh Y2tpbmdTdG9yZUdlb21ldHJ5OjpvcmlnaW5PZlRpbGUoY29uc3QgVGlsZUluZGV4JiBpbmRleCkg Y29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvQmFja2luZ1N0 b3JlX3AuaCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvQmFja2luZ1N0b3JlX3AuaApp bmRleCA1Mjk4NmRkMzgxMGJiZGUyNGZjNDMxNzQyNThlYzAzMDQxMzA2MmMyLi5jMjNjMTVmMzlk NGJmMTgxZmRmMDk3MTVkMGU0OGQ2ZDRmM2M1NzIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQXBpL0JhY2tpbmdTdG9yZV9wLmgKKysrIGIvU291cmNlL1dlYktpdC9ibGFj a2JlcnJ5L0FwaS9CYWNraW5nU3RvcmVfcC5oCkBAIC0yOTMsNyArMjkzLDYgQEAgcHVibGljOgog CiAgICAgLy8gQ3JlYXRlIHRoZSBzdXJmYWNlcyBvZiB0aGUgYmFja2luZyBzdG9yZS4KICAgICB2 b2lkIGNyZWF0ZVN1cmZhY2VzKCk7Ci0gICAgdm9pZCBjcmVhdGVWaXNpYmxlVGlsZUJ1ZmZlcigp OwogCiAgICAgLy8gVmFyaW91cyBjYWxjdWxhdGlvbnMgb2YgcXVhbnRpdGllcyByZWxldmFudCB0 byBiYWNraW5nIHN0b3JlLgogICAgIGludCBtaW5pbXVtTnVtYmVyT2ZUaWxlc1dpZGUoKSBjb25z dDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAg Yi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwCmluZGV4IGJjMmZjZWM0 NTRlYmVlOTUxYmU2OThmMzQwNTk2OTc2ZTY0YmZlNWIuLjkxMTNiMWRmODVmNzVlYjljYTllZGE1 YWY4NGY2NDdlMzM1NGY2ZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9B cGkvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdl LmNwcApAQCAtMzYzMiwxMyArMzYzMiw2IEBAIHZvaWQgV2ViUGFnZVByaXZhdGU6OnNldFZpZXdw b3J0U2l6ZShjb25zdCBJbnRTaXplJiB0cmFuc2Zvcm1lZEFjdHVhbFZpc2libGVTaXplCiAgICAg Ym9vbCBhdFRvcCA9ICFzY3JvbGxQb3NpdGlvbigpLnkoKTsKICAgICBib29sIGF0TGVmdCA9ICFz Y3JvbGxQb3NpdGlvbigpLngoKTsKIAotICAgIC8vIFdlIG5lZWQgdG8gcmVvcmllbnQgdGhlIHZp c2libGVUaWxlUmVjdCBiZWNhdXNlIHRoZSBmb2xsb3dpbmcgY29kZQotICAgIC8vIGNvdWxkIGNh dXNlIEJhY2tpbmdTdG9yZTo6dHJhbnNmb3JtQ2hhbmdlZCB0byBiZSBjYWxsZWQsIHdoZXJlIGl0 Ci0gICAgLy8gaXMgdXNlZC4KLSAgICAvLyBJdCBpcyBvbmx5IGRlcGVuZGVudCBvbiB0aGUgdHJh bnNmb3JtZWRWaWV3cG9ydFNpemUgd2hpY2ggaGFzIGJlZW4KLSAgICAvLyB1cGRhdGVkIGJ5IG5v dy4KLSAgICBtX2JhY2tpbmdTdG9yZS0+ZC0+Y3JlYXRlVmlzaWJsZVRpbGVCdWZmZXIoKTsKLQog ICAgIHNldERlZmF1bHRMYXlvdXRTaXplKHRyYW5zZm9ybWVkQWN0dWFsVmlzaWJsZVNpemUpOwog CiAgICAgLy8gUmVjb21wdXRlIG91ciB2aXJ0dWFsIHZpZXdwb3J0LgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvU3VyZmFjZVBvb2wuY3BwIGIvU291 cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvU3VyZmFjZVBvb2wuY3BwCmluZGV4 IGQwOGM2YWFkMmU3ZDYwNWJkOWY2ZDU3YTZmYWZmZmI5YTk4Y2RjY2MuLjE5YTljOGM1OTA0MTRi MzQ3ZmFkM2NiOTFhZDM0NWNhODZjMGM5NjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxh Y2tiZXJyeS9XZWJLaXRTdXBwb3J0L1N1cmZhY2VQb29sLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9TdXJmYWNlUG9vbC5jcHAKQEAgLTU1LDggKzU1LDcg QEAgU3VyZmFjZVBvb2wqIFN1cmZhY2VQb29sOjpnbG9iYWxTdXJmYWNlUG9vbCgpCiB9CiAKIFN1 cmZhY2VQb29sOjpTdXJmYWNlUG9vbCgpCi0gICAgOiBtX3Zpc2libGVUaWxlQnVmZmVyKDApCi0g ICAgLCBtX251bWJlck9mRnJvbnRCdWZmZXJzKDApCisgICAgOiBtX251bWJlck9mRnJvbnRCdWZm ZXJzKDApCiAgICAgLCBtX3RpbGVSZW5kZXJpbmdTdXJmYWNlKDApCiAgICAgLCBtX2luaXRpYWxp emVkKGZhbHNlKQogICAgICwgbV9idWZmZXJzU3VzcGVuZGVkKGZhbHNlKQpAQCAtNzksOSArNzgs NyBAQCB2b2lkIFN1cmZhY2VQb29sOjppbml0aWFsaXplKGNvbnN0IFBsYXRmb3JtOjpJbnRTaXpl JiB0aWxlU2l6ZSkKICAgICBjb25zdCB1bnNpZ25lZCBtYXhOdW1iZXJPZlRpbGVzID0gUGxhdGZv cm06OlNldHRpbmdzOjppbnN0YW5jZSgpLT5tYXhpbXVtTnVtYmVyT2ZCYWNraW5nU3RvcmVUaWxl c0Fjcm9zc1Byb2Nlc3NlcygpOwogCiAgICAgaWYgKG1fbnVtYmVyT2ZGcm9udEJ1ZmZlcnMpIHsg Ly8gT25seSBhbGxvY2F0ZSBpZiB3ZSBhY3R1YWxseSB1c2UgYSBiYWNraW5nc3RvcmUuCi0gICAg ICAgIFBsYXRmb3JtOjpJbnRTaXplIHNjcmVlblNpemUgPSBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6 U2V0dGluZ3M6Omluc3RhbmNlKCktPmFwcGxpY2F0aW9uU2l6ZSgpOwogICAgICAgICB1bnNpZ25l ZCBieXRlTGltaXQgPSBtYXhOdW1iZXJPZlRpbGVzICogdGlsZVNpemUud2lkdGgoKSAqIHRpbGVT aXplLmhlaWdodCgpICogNDsKLSAgICAgICAgYnl0ZUxpbWl0ICs9IHNjcmVlblNpemUud2lkdGgo KSAqIHNjcmVlblNpemUuaGVpZ2h0KCkgKiA0OyAvLyB2aXNpYmxlIHRpbGUgYnVmZmVyIC0gRklY TUUsIGZyYWdpbGUgZm9yIGZ1cnRoZXIgbWFpbnRlbmFuY2UgYXMgaXRzIHNpemUgZG9lc24ndCBz eW5jIHVwIHdpdGggdGhlIHJlc3QKICAgICAgICAgYm9vbCBzdWNjZXNzID0gUGxhdGZvcm06Okdy YXBoaWNzOjpjcmVhdGVQaXhtYXBHcm91cChTSEFSRURfUElYTUFQX0dST1VQLCBieXRlTGltaXQp OwogICAgICAgICBpZiAoIXN1Y2Nlc3MpIHsKICAgICAgICAgICAgIFBsYXRmb3JtOjpsb2dBbHdh eXMoUGxhdGZvcm06OkxvZ0xldmVsV2FybiwKQEAgLTE0OCwxNCArMTQ1LDYgQEAgdm9pZCBTdXJm YWNlUG9vbDo6cmVsZWFzZVRpbGVSZW5kZXJpbmdTdXJmYWNlKFBsYXRmb3JtR3JhcGhpY3NDb250 ZXh0KiBjb250ZXh0KQogICAgIFBsYXRmb3JtOjpHcmFwaGljczo6cmVsZWFzZUJ1ZmZlckRyYXdh YmxlKG1fdGlsZVJlbmRlcmluZ1N1cmZhY2UpOwogfQogCi12b2lkIFN1cmZhY2VQb29sOjppbml0 aWFsaXplVmlzaWJsZVRpbGVCdWZmZXIoY29uc3QgUGxhdGZvcm06OkludFNpemUmIHZpc2libGVT aXplKQotewotICAgIGlmICghbV92aXNpYmxlVGlsZUJ1ZmZlciB8fCBtX3Zpc2libGVUaWxlQnVm ZmVyLT5zaXplKCkgIT0gdmlzaWJsZVNpemUpIHsKLSAgICAgICAgZGVsZXRlIG1fdmlzaWJsZVRp bGVCdWZmZXI7Ci0gICAgICAgIG1fdmlzaWJsZVRpbGVCdWZmZXIgPSBuZXcgVGlsZUJ1ZmZlcih2 aXNpYmxlU2l6ZSk7Ci0gICAgfQotfQotCiB1bnNpZ25lZCBTdXJmYWNlUG9vbDo6bnVtYmVyT2ZB dmFpbGFibGVCYWNrQnVmZmVycygpIGNvbnN0CiB7CiAgICAgcmV0dXJuIG1fYXZhaWxhYmxlQmFj a0J1ZmZlclBvb2wuc2l6ZSgpOwpAQCAtMjAxLDkgKzE5MCw2IEBAIHZvaWQgU3VyZmFjZVBvb2w6 OmNyZWF0ZUJ1ZmZlcnMoKQogICAgICAgICAgICAgUGxhdGZvcm06OkdyYXBoaWNzOjpjcmVhdGVQ aXhtYXBCdWZmZXIobV90aWxlQnVmZmVyUG9vbFtpXS0+bmF0aXZlQnVmZmVyKCkpOwogICAgIH0K IAotICAgIGlmIChtX3Zpc2libGVUaWxlQnVmZmVyICYmIG1fdmlzaWJsZVRpbGVCdWZmZXItPndh c05hdGl2ZUJ1ZmZlckNyZWF0ZWQoKSkKLSAgICAgICAgUGxhdGZvcm06OkdyYXBoaWNzOjpjcmVh dGVQaXhtYXBCdWZmZXIobV92aXNpYmxlVGlsZUJ1ZmZlci0+bmF0aXZlQnVmZmVyKCkpOwotCiAg ICAgbV9idWZmZXJzU3VzcGVuZGVkID0gZmFsc2U7CiB9CiAKQEAgLTIyNCwxMiArMjEwLDYgQEAg dm9pZCBTdXJmYWNlUG9vbDo6cmVsZWFzZUJ1ZmZlcnMoKQogICAgICAgICBQbGF0Zm9ybTo6R3Jh cGhpY3M6OmRlc3Ryb3lQaXhtYXBCdWZmZXIobV90aWxlQnVmZmVyUG9vbFtpXS0+bmF0aXZlQnVm ZmVyKCkpOwogICAgIH0KIAotICAgIGlmIChtX3Zpc2libGVUaWxlQnVmZmVyICYmIG1fdmlzaWJs ZVRpbGVCdWZmZXItPndhc05hdGl2ZUJ1ZmZlckNyZWF0ZWQoKSkgewotICAgICAgICBtX3Zpc2li bGVUaWxlQnVmZmVyLT5jbGVhclJlbmRlcmVkUmVnaW9uKCk7Ci0gICAgICAgIFBsYXRmb3JtOjpH cmFwaGljczo6Y2xlYXJCdWZmZXIobV92aXNpYmxlVGlsZUJ1ZmZlci0+bmF0aXZlQnVmZmVyKCks IDAsIDAsIDAsIDApOwotICAgICAgICBQbGF0Zm9ybTo6R3JhcGhpY3M6OmRlc3Ryb3lQaXhtYXBC dWZmZXIobV92aXNpYmxlVGlsZUJ1ZmZlci0+bmF0aXZlQnVmZmVyKCkpOwotICAgIH0KLQogICAg IFBsYXRmb3JtOjp1c2VySW50ZXJmYWNlVGhyZWFkTWVzc2FnZUNsaWVudCgpLT5kaXNwYXRjaFN5 bmNNZXNzYWdlKAogICAgICAgICBQbGF0Zm9ybTo6Y3JlYXRlRnVuY3Rpb25DYWxsTWVzc2FnZSgm UGxhdGZvcm06OkdyYXBoaWNzOjpjb2xsZWN0VGhyZWFkU3BlY2lmaWNHYXJiYWdlKSk7CiB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9TdXJmYWNl UG9vbC5oIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvU3VyZmFjZVBv b2wuaAppbmRleCA1ZWYzM2NmYjVhZGMyMGViNDE3ZDdiNGQ0YjUwZGNlMjYzMzk1N2M1Li44NGVi YzI3MmI1NjQ1MTEwZjkxZTE5YTg2MTRjZmNhNjE1NjIxZDI4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9TdXJmYWNlUG9vbC5oCisrKyBiL1NvdXJj ZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L1N1cmZhY2VQb29sLmgKQEAgLTQ1LDkg KzQ1LDYgQEAgcHVibGljOgogICAgIFBsYXRmb3JtR3JhcGhpY3NDb250ZXh0KiBjcmVhdGVQbGF0 Zm9ybUdyYXBoaWNzQ29udGV4dChCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6R3JhcGhpY3M6OkRyYXdh YmxlKikgY29uc3Q7CiAgICAgUGxhdGZvcm1HcmFwaGljc0NvbnRleHQqIGxvY2tUaWxlUmVuZGVy aW5nU3VyZmFjZSgpIGNvbnN0OwogICAgIHZvaWQgcmVsZWFzZVRpbGVSZW5kZXJpbmdTdXJmYWNl KFBsYXRmb3JtR3JhcGhpY3NDb250ZXh0KikgY29uc3Q7Ci0gICAgVGlsZUJ1ZmZlciogdmlzaWJs ZVRpbGVCdWZmZXIoKSBjb25zdCB7IHJldHVybiBtX3Zpc2libGVUaWxlQnVmZmVyOyB9Ci0KLSAg ICB2b2lkIGluaXRpYWxpemVWaXNpYmxlVGlsZUJ1ZmZlcihjb25zdCBCbGFja0JlcnJ5OjpQbGF0 Zm9ybTo6SW50U2l6ZSYpOwogCiAgICAgLy8gVGhlIHN1cmZhY2UgcG9vbCB3aWxsIGFsbG9jYXRl IGFzIG1hbnkgYmFjayBidWZmZXJzIGFzIHNwZWNpZmllZCBieQogICAgIC8vIFBsYXRmb3JtOjpT ZXR0aW5nczo6aW5zdGFuY2UoKS0+bnVtYmVyT2ZCYWNraW5nU3RvcmVCYWNrQnVmZmVycygpIHdo aWNoCkBAIC04MCw3ICs3Nyw2IEBAIHByaXZhdGU6CiAgICAgdHlwZWRlZiBXVEY6OlZlY3RvcjxU aWxlQnVmZmVyKj4gVGlsZUJ1ZmZlckxpc3Q7CiAgICAgVGlsZUJ1ZmZlckxpc3QgbV90aWxlQnVm ZmVyUG9vbDsKICAgICBUaWxlQnVmZmVyTGlzdCBtX2F2YWlsYWJsZUJhY2tCdWZmZXJQb29sOwot ICAgIFRpbGVCdWZmZXIqIG1fdmlzaWJsZVRpbGVCdWZmZXI7CiAgICAgdW5zaWduZWQgbV9udW1i ZXJPZkZyb250QnVmZmVyczsKICAgICBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6R3JhcGhpY3M6OkJ1 ZmZlciogbV90aWxlUmVuZGVyaW5nU3VyZmFjZTsKICAgICBib29sIG1faW5pdGlhbGl6ZWQ7IC8v IFN1cmZhY2VQb29sIGhhcyBiZWVuIHNldCB1cCwgd2l0aCBvciB3aXRob3V0IGJ1ZmZlcnMuCg==