95020 2012-08-25 19:47:31 -0700 [BlackBerry] Remove the 'in region scrollable starting node' concept from InRegionScroller 2012-08-27 08:55:30 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 95019 1 tonikitoo tonikitoo tonikitoo oldest_to_newest 704774 0 tonikitoo 2012-08-25 19:47:31 -0700 Now, each active InRegionScrollableArea has a Layer, so the individual cached 'node' becomes really not needed any more. 704775 1 160585 tonikitoo 2012-08-25 20:03:08 -0700 Created attachment 160585 patch 705308 2 tonikitoo 2012-08-27 08:55:30 -0700 https://trac.webkit.org/changeset/126768 160585 2012-08-25 20:03:08 -0700 2012-08-25 20:16:15 -0700 patch 0001-BlackBerry-Remove-the-in-region-scrollable-starting-.patch text/plain 12976 tonikitoo RnJvbSBiOWUxMjVmMmZkNjE3NjhlNDJkNzJjNmQyYWVjMmU0ZTI2Y2NmNGYzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmlvIEdvbWVzIDxhZ29tZXNAcmltLmNvbT4KRGF0ZTog U2F0LCAyNSBBdWcgMjAxMiAyMjo1MzoxMCAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIFtCbGFja0Jl cnJ5XSBSZW1vdmUgdGhlICdpbiByZWdpb24gc2Nyb2xsYWJsZSBzdGFydGluZyBub2RlJwogY29u Y2VwdCBmcm9tIEluUmVnaW9uU2Nyb2xsZXIKIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD05NTAyMAoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuClBhdGNoIGJ5IEFu dG9uaW8gR29tZXMgPGFnb21lc0ByaW0uY29tPgoKJ0luLXJlZ2lvbiBzdGFydCBzY3JvbGxpbmcg bm9kZScgaXMgYW4gb2Jzb2xldGUgY29uY2VwdCwgYW5kIHdlIGNhbiByZW1vdmUgaXQKaW4gZmF2 b3Igb2YgdXNpbmcgdGhlIGluZm9ybWF0aW9uIGZyb20gdGhlIGNhY2hlZCBsYXllcnMuCgoqIEFw aS9JblJlZ2lvblNjcm9sbGVyLmNwcDoKKFdlYktpdCk6CihCbGFja0JlcnJ5OjpXZWJLaXQ6Oklu UmVnaW9uU2Nyb2xsZXJQcml2YXRlOjpyZXNldCk6IEFkanVzdGVkIGFzIGl0IHVzZWQgdG8gY2xl YXIKdGhlIGNhY2hlZCAnbm9kZScuCihCbGFja0JlcnJ5OjpXZWJLaXQ6OkluUmVnaW9uU2Nyb2xs ZXJQcml2YXRlOjppc0FjdGl2ZSk6IEFkZGVkIG1ldGhvZCB0byBiZQpjaGVja2VkIGRpcmVjdGx5 IGluc3RlYWQgb2Ygb25seSBudWxsLWNoZWNraW5nIHRoZSBwcmV2aW91c2x5IGNhY2hlZCAnbm9k ZScuCihCbGFja0JlcnJ5OjpXZWJLaXQ6OkluUmVnaW9uU2Nyb2xsZXJQcml2YXRlOjpjbGVhckRv Y3VtZW50RGF0YSk6IE5ldyBtZXRob2QgdG8KY2xlYXIgdGhlIGNhY2hlZCByZXNvdXJjZXMgaWYg aXRzIGRvY3VtZW50IGlzIGRvbmUuCihCbGFja0JlcnJ5OjpXZWJLaXQ6OkluUmVnaW9uU2Nyb2xs ZXJQcml2YXRlOjpwdXNoQmFja0luUmVnaW9uU2Nyb2xsYWJsZSk6IEFkanVzdGVkCnRvIG5vdCBj YXJlIGFib3V0IHRoZSBjYWNoZWQgJ25vZGUnIGFueW1vcmUuCiogQXBpL0luUmVnaW9uU2Nyb2xs ZXJfcC5oOgooSW5SZWdpb25TY3JvbGxlclByaXZhdGUpOgoqIEFwaS9XZWJQYWdlLmNwcDoKKEJs YWNrQmVycnk6OldlYktpdDo6V2ViUGFnZVByaXZhdGU6Om5vdGlmeUluUmVnaW9uU2Nyb2xsU3Rv cHBlZCk6IENoZWNrIDo6aXNBY3RpdmUgaW5zdGVhZApvZiA6Omhhc05vZGUsIHNpbmNlIHRoZSBs YXRlciBpcyBnb25lLgooQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlUHJpdmF0ZTo6ZW5xdWV1 ZVJlbmRlcmluZ09mQ2xpcHBlZENvbnRlbnRPZlNjcm9sbGFibGVBcmVhQWZ0ZXJJblJlZ2lvblNj cm9sbGluZyk6CkNoYW5nZWQgdGhlIG1ldGhvZCBzaWduYXR1cmUsIGdpdmVuIHRoYXQgd2UgZG8g aGF2ZSBhIGNhY2hlZCAnbm9kZScgdG8gcGFzcyBpbiBhcyBwYXJhbWV0ZXIgYW55bW9yZS4KKEJs YWNrQmVycnk6OldlYktpdDo6V2ViUGFnZVByaXZhdGU6OmNsZWFyRG9jdW1lbnREYXRhKTogRGVs ZWdhdGUgYWxsIHRoZSByZWxhdGVkIHdvcmsgdG8gSW5SZWdpb25TY3JvbGxlci4KKiBBcGkvV2Vi UGFnZV9wLmg6CihXZWJQYWdlUHJpdmF0ZSk6CiogV2ViS2l0U3VwcG9ydC9Ub3VjaEV2ZW50SGFu ZGxlci5jcHA6CihCbGFja0JlcnJ5OjpXZWJLaXQ6OlRvdWNoRXZlbnRIYW5kbGVyOjpkcmF3VGFw SGlnaGxpZ2h0KToKLS0tCiBTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0luUmVnaW9uU2Ny b2xsZXIuY3BwICB8ICAgNDUgKysrKysrLS0tLS0tLS0tLS0tLS0KIFNvdXJjZS9XZWJLaXQvYmxh Y2tiZXJyeS9BcGkvSW5SZWdpb25TY3JvbGxlcl9wLmggIHwgICAxMSArKy0tLQogU291cmNlL1dl YktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcCAgICAgICAgICAgfCAgIDE5ICsrKysrKy0t LQogU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlX3AuaCAgICAgICAgICAgfCAg ICAyICstCiBTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nICAgICAgICAgICAgICAg ICB8ICAgMzMgKysrKysrKysrKysrKysKIC4uLi9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvVG91 Y2hFdmVudEhhbmRsZXIuY3BwIHwgICAgMiArLQogNiBmaWxlcyBjaGFuZ2VkLCA2NSBpbnNlcnRp b25zKCspLCA0NyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNr YmVycnkvQXBpL0luUmVnaW9uU2Nyb2xsZXIuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5 L0FwaS9JblJlZ2lvblNjcm9sbGVyLmNwcAppbmRleCA1ZTRkMDIwLi5lYTMyYmU3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0luUmVnaW9uU2Nyb2xsZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvSW5SZWdpb25TY3JvbGxlci5jcHAKQEAg LTQ0LDcgKzQ0LDYgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiBzdGF0aWMgYm9vbCBjYW5TY3JvbGxJ bm5lckZyYW1lKEZyYW1lKik7CiBzdGF0aWMgYm9vbCBjYW5TY3JvbGxSZW5kZXJCb3goUmVuZGVy Qm94Kik7CiBzdGF0aWMgUmVuZGVyTGF5ZXIqIHBhcmVudExheWVyKFJlbmRlckxheWVyKik7Ci1z dGF0aWMgTm9kZSogZW5jbG9zaW5nTGF5ZXJOb2RlKFJlbmRlckxheWVyKik7CiBzdGF0aWMgYm9v bCBpc05vblJlbmRlclZpZXdGaXhlZFBvc2l0aW9uZWRDb250YWluZXIoUmVuZGVyTGF5ZXIqKTsK IAogSW5SZWdpb25TY3JvbGxlcjo6SW5SZWdpb25TY3JvbGxlcihXZWJQYWdlUHJpdmF0ZSogd2Vi UGFnZVByaXZhdGUpCkBAIC04MCwzNCArNzksMzEgQEAgSW5SZWdpb25TY3JvbGxlclByaXZhdGU6 OkluUmVnaW9uU2Nyb2xsZXJQcml2YXRlKFdlYlBhZ2VQcml2YXRlKiB3ZWJQYWdlUHJpdmF0ZSkK IHsKIH0KIAotdm9pZCBJblJlZ2lvblNjcm9sbGVyUHJpdmF0ZTo6c2V0Tm9kZShXZWJDb3JlOjpO b2RlKiBub2RlKQotewotICAgIG1faW5SZWdpb25TY3JvbGxTdGFydGluZ05vZGUgPSBub2RlOwot fQotCi1XZWJDb3JlOjpOb2RlKiBJblJlZ2lvblNjcm9sbGVyUHJpdmF0ZTo6bm9kZSgpIGNvbnN0 Ci17Ci0gICAgcmV0dXJuIG1faW5SZWdpb25TY3JvbGxTdGFydGluZ05vZGUuZ2V0KCk7Ci19Ci0K IHZvaWQgSW5SZWdpb25TY3JvbGxlclByaXZhdGU6OnJlc2V0KCkKIHsKLSAgICBzZXROb2RlKDAp OwotCiAgICAgbV9uZWVkc0FjdGl2ZVNjcm9sbGFibGVBcmVhQ2FsY3VsYXRpb24gPSBmYWxzZTsK ICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG1fYWN0aXZlSW5SZWdpb25TY3JvbGxhYmxlQXJl YXMuc2l6ZSgpOyArK2kpCiAgICAgICAgIGRlbGV0ZSBtX2FjdGl2ZUluUmVnaW9uU2Nyb2xsYWJs ZUFyZWFzW2ldOwogICAgIG1fYWN0aXZlSW5SZWdpb25TY3JvbGxhYmxlQXJlYXMuY2xlYXIoKTsK IH0KIAotYm9vbCBJblJlZ2lvblNjcm9sbGVyUHJpdmF0ZTo6aGFzTm9kZSgpIGNvbnN0Citib29s IEluUmVnaW9uU2Nyb2xsZXJQcml2YXRlOjppc0FjdGl2ZSgpIGNvbnN0CiB7Ci0gICAgcmV0dXJu ICEhbV9pblJlZ2lvblNjcm9sbFN0YXJ0aW5nTm9kZTsKKyAgICByZXR1cm4gbV9hY3RpdmVJblJl Z2lvblNjcm9sbGFibGVBcmVhcy5zaXplKCkgPiAwOwogfQogCi1ib29sIEluUmVnaW9uU2Nyb2xs ZXJQcml2YXRlOjpjYW5TY3JvbGwoKSBjb25zdAordm9pZCBJblJlZ2lvblNjcm9sbGVyUHJpdmF0 ZTo6Y2xlYXJEb2N1bWVudERhdGEoY29uc3QgRG9jdW1lbnQqIGRvY3VtZW50R29pbmdBd2F5KQog ewotICAgIHJldHVybiBoYXNOb2RlKCk7CisgICAgaWYgKG1fbmVlZHNBY3RpdmVTY3JvbGxhYmxl QXJlYUNhbGN1bGF0aW9uKSB7CisgICAgICAgIHJlc2V0KCk7CisgICAgICAgIHJldHVybjsKKyAg ICB9CisKKyAgICBJblJlZ2lvblNjcm9sbGFibGVBcmVhKiBzY3JvbGxhYmxlQXJlYSA9IHN0YXRp Y19jYXN0PEluUmVnaW9uU2Nyb2xsYWJsZUFyZWEqPihtX2FjdGl2ZUluUmVnaW9uU2Nyb2xsYWJs ZUFyZWFzWzBdKTsKKyAgICBBU1NFUlQoc2Nyb2xsYWJsZUFyZWEpOworICAgIE5vZGUqIG5vZGUg PSBzY3JvbGxhYmxlQXJlYS0+bGF5ZXIoKS0+ZW5jbG9zaW5nRWxlbWVudCgpOworICAgIGlmIChu b2RlICYmIG5vZGUtPmRvY3VtZW50KCkgPT0gZG9jdW1lbnRHb2luZ0F3YXkpCisgICAgICAgIHJl c2V0KCk7CiB9CiAKIGJvb2wgSW5SZWdpb25TY3JvbGxlclByaXZhdGU6OnNldFNjcm9sbFBvc2l0 aW9uQ29tcG9zaXRpbmdUaHJlYWQodW5zaWduZWQgY2Ftb3VmbGFnZWRMYXllciwgY29uc3QgV2Vi Q29yZTo6SW50UG9pbnQmIHNjcm9sbFBvc2l0aW9uKQpAQCAtMzc2LDE3ICszNzIsNiBAQCBzdGF0 aWMgUmVuZGVyTGF5ZXIqIHBhcmVudExheWVyKFJlbmRlckxheWVyKiBsYXllcikKICAgICByZXR1 cm4gMDsKIH0KIAotLy8gRklYTUU6IE1ha2UgUmVuZGVyTGF5ZXI6OmVuY2xvc2luZ0VsZW1lbnQg cHVibGljIHNvIHRoaXMgb25lIGNhbiBiZSByZW1vdmVkLgotc3RhdGljIE5vZGUqIGVuY2xvc2lu Z0xheWVyTm9kZShSZW5kZXJMYXllciogbGF5ZXIpCi17Ci0gICAgZm9yIChSZW5kZXJPYmplY3Qq IHIgPSBsYXllci0+cmVuZGVyZXIoKTsgcjsgciA9IHItPnBhcmVudCgpKSB7Ci0gICAgICAgIGlm IChOb2RlKiBlID0gci0+bm9kZSgpKQotICAgICAgICAgICAgcmV0dXJuIGU7Ci0gICAgfQotICAg IEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgIHJldHVybiAwOwotfQotCiBzdGF0aWMgYm9vbCBp c05vblJlbmRlclZpZXdGaXhlZFBvc2l0aW9uZWRDb250YWluZXIoUmVuZGVyTGF5ZXIqIGxheWVy KQogewogICAgIFJlbmRlck9iamVjdCogbyA9IGxheWVyLT5yZW5kZXJlcigpOwpAQCAtNDAyLDEw ICszODcsNiBAQCB2b2lkIEluUmVnaW9uU2Nyb2xsZXJQcml2YXRlOjpwdXNoQmFja0luUmVnaW9u U2Nyb2xsYWJsZShJblJlZ2lvblNjcm9sbGFibGVBcmVhKgogCiAgICAgc2Nyb2xsYWJsZUFyZWEt PnNldENhblByb3BhZ2F0ZVNjcm9sbGluZ1RvRW5jbG9zaW5nU2Nyb2xsYWJsZSghaXNOb25SZW5k ZXJWaWV3Rml4ZWRQb3NpdGlvbmVkQ29udGFpbmVyKHNjcm9sbGFibGVBcmVhLT5sYXllcigpKSk7 CiAgICAgbV9hY3RpdmVJblJlZ2lvblNjcm9sbGFibGVBcmVhcy5wdXNoX2JhY2soc2Nyb2xsYWJs ZUFyZWEpOwotICAgIGlmIChtX2FjdGl2ZUluUmVnaW9uU2Nyb2xsYWJsZUFyZWFzLnNpemUoKSA9 PSAxKSB7Ci0gICAgICAgIC8vIEZJWE1FOiBVc2UgUmVuZGVyTGF5ZXI6OnJlbmRlckJveCgpLT5u b2RlKCkgaW5zdGVhZD8KLSAgICAgICAgc2V0Tm9kZShlbmNsb3NpbmdMYXllck5vZGUoc2Nyb2xs YWJsZUFyZWEtPmxheWVyKCkpKTsKLSAgICB9CiB9CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvYmxhY2tiZXJyeS9BcGkvSW5SZWdpb25TY3JvbGxlcl9wLmggYi9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQXBpL0luUmVnaW9uU2Nyb2xsZXJfcC5oCmluZGV4IGE4NDVlYzIuLjAzMTQw YzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvSW5SZWdpb25TY3Jv bGxlcl9wLmgKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9JblJlZ2lvblNjcm9s bGVyX3AuaApAQCAtNDIsMTIgKzQyLDggQEAgY2xhc3MgSW5SZWdpb25TY3JvbGxlclByaXZhdGUg ewogcHVibGljOgogICAgIEluUmVnaW9uU2Nyb2xsZXJQcml2YXRlKFdlYlBhZ2VQcml2YXRlKik7 CiAKLSAgICB2b2lkIHNldE5vZGUoV2ViQ29yZTo6Tm9kZSopOwotICAgIFdlYkNvcmU6Ok5vZGUq IG5vZGUoKSBjb25zdDsKICAgICB2b2lkIHJlc2V0KCk7Ci0KLSAgICBib29sIGNhblNjcm9sbCgp IGNvbnN0OwotICAgIGJvb2wgaGFzTm9kZSgpIGNvbnN0OworICAgIGJvb2wgaXNBY3RpdmUoKSBj b25zdDsKIAogICAgIGJvb2wgc2V0U2Nyb2xsUG9zaXRpb25Db21wb3NpdGluZ1RocmVhZCh1bnNp Z25lZCBjYW1vdWZsYWdlZExheWVyLCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgc2Nyb2xsUG9z aXRpb24pOwogICAgIGJvb2wgc2V0U2Nyb2xsUG9zaXRpb25XZWJLaXRUaHJlYWQodW5zaWduZWQg Y2Ftb3VmbGFnZWRMYXllciwgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIHNjcm9sbFBvc2l0aW9u LCBib29sIHN1cHBvcnRzQWNjZWxlcmF0ZWRTY3JvbGxpbmcpOwpAQCAtNTUsNyArNTEsMTAgQEAg cHVibGljOgogICAgIHZvaWQgY2FsY3VsYXRlSW5SZWdpb25TY3JvbGxhYmxlQXJlYXNGb3JQb2lu dChjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYpOwogICAgIGNvbnN0IHN0ZDo6dmVjdG9yPFBsYXRm b3JtOjpTY3JvbGxWaWV3QmFzZSo+JiBhY3RpdmVJblJlZ2lvblNjcm9sbGFibGVBcmVhcygpIGNv bnN0OwogCisgICAgdm9pZCBjbGVhckRvY3VtZW50RGF0YShjb25zdCBXZWJDb3JlOjpEb2N1bWVu dCopOworCiAgICAgV2ViUGFnZVByaXZhdGUqIG1fd2ViUGFnZTsKKyAgICBib29sIG1fbmVlZHNB Y3RpdmVTY3JvbGxhYmxlQXJlYUNhbGN1bGF0aW9uOwogCiBwcml2YXRlOgogICAgIGJvb2wgc2V0 TGF5ZXJTY3JvbGxQb3NpdGlvbihXZWJDb3JlOjpSZW5kZXJMYXllciosIGNvbnN0IFdlYkNvcmU6 OkludFBvaW50JiBzY3JvbGxQb3NpdGlvbik7CkBAIC02Niw5ICs2NSw3IEBAIHByaXZhdGU6CiAK ICAgICB2b2lkIGFkanVzdFNjcm9sbERlbHRhKGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBtYXhP ZmZzZXQsIGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBjdXJyZW50T2Zmc2V0LCBXZWJDb3JlOjpJ bnRTaXplJiBkZWx0YSkgY29uc3Q7CiAKLSAgICBSZWZQdHI8V2ViQ29yZTo6Tm9kZT4gbV9pblJl Z2lvblNjcm9sbFN0YXJ0aW5nTm9kZTsKICAgICBzdGQ6OnZlY3RvcjxQbGF0Zm9ybTo6U2Nyb2xs Vmlld0Jhc2UqPiBtX2FjdGl2ZUluUmVnaW9uU2Nyb2xsYWJsZUFyZWFzOwotICAgIGJvb2wgbV9u ZWVkc0FjdGl2ZVNjcm9sbGFibGVBcmVhQ2FsY3VsYXRpb247CiB9OwogCiB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcAppbmRleCA5MGM2OWFhLi43NzMwYmUwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAKQEAgLTE0ODIsOCArMTQ4Miw4 IEBAIHZvaWQgV2ViUGFnZTo6c2Nyb2xsQnkoY29uc3QgUGxhdGZvcm06OkludFNpemUmIGRlbHRh KQogCiB2b2lkIFdlYlBhZ2VQcml2YXRlOjpub3RpZnlJblJlZ2lvblNjcm9sbFN0b3BwZWQoKQog ewotICAgIGlmIChtX2luUmVnaW9uU2Nyb2xsZXItPmQtPmhhc05vZGUoKSkgewotICAgICAgICBl bnF1ZXVlUmVuZGVyaW5nT2ZDbGlwcGVkQ29udGVudE9mU2Nyb2xsYWJsZU5vZGVBZnRlckluUmVn aW9uU2Nyb2xsaW5nKG1faW5SZWdpb25TY3JvbGxlci0+ZC0+bm9kZSgpKTsKKyAgICBpZiAobV9p blJlZ2lvblNjcm9sbGVyLT5kLT5pc0FjdGl2ZSgpKSB7CisgICAgICAgIGVucXVldWVSZW5kZXJp bmdPZkNsaXBwZWRDb250ZW50T2ZTY3JvbGxhYmxlQXJlYUFmdGVySW5SZWdpb25TY3JvbGxpbmco KTsKICAgICAgICAgbV9pblJlZ2lvblNjcm9sbGVyLT5kLT5yZXNldCgpOwogICAgIH0KIH0KQEAg LTE0OTMsOSArMTQ5MywxNiBAQCB2b2lkIFdlYlBhZ2U6Om5vdGlmeUluUmVnaW9uU2Nyb2xsU3Rv cHBlZCgpCiAgICAgZC0+bm90aWZ5SW5SZWdpb25TY3JvbGxTdG9wcGVkKCk7CiB9CiAKLXZvaWQg V2ViUGFnZVByaXZhdGU6OmVucXVldWVSZW5kZXJpbmdPZkNsaXBwZWRDb250ZW50T2ZTY3JvbGxh YmxlTm9kZUFmdGVySW5SZWdpb25TY3JvbGxpbmcoTm9kZSogc2Nyb2xsZWROb2RlKQordm9pZCBX ZWJQYWdlUHJpdmF0ZTo6ZW5xdWV1ZVJlbmRlcmluZ09mQ2xpcHBlZENvbnRlbnRPZlNjcm9sbGFi bGVBcmVhQWZ0ZXJJblJlZ2lvblNjcm9sbGluZygpCiB7Ci0gICAgQVNTRVJUKHNjcm9sbGVkTm9k ZSk7CisgICAgLy8gSWYgbm8gc2Nyb2xsaW5nIHdhcyBldmVuIHBlcmZvcm1lZCwgYmFpbCBvdXQu CisgICAgaWYgKG1faW5SZWdpb25TY3JvbGxlci0+ZC0+bV9uZWVkc0FjdGl2ZVNjcm9sbGFibGVB cmVhQ2FsY3VsYXRpb24pCisgICAgICAgIHJldHVybjsKKworICAgIEluUmVnaW9uU2Nyb2xsYWJs ZUFyZWEqIHNjcm9sbGFibGVBcmVhID0gc3RhdGljX2Nhc3Q8SW5SZWdpb25TY3JvbGxhYmxlQXJl YSo+KG1faW5SZWdpb25TY3JvbGxlci0+ZC0+YWN0aXZlSW5SZWdpb25TY3JvbGxhYmxlQXJlYXMo KVswXSk7CisgICAgQVNTRVJUKHNjcm9sbGFibGVBcmVhKTsKKyAgICBOb2RlKiBzY3JvbGxlZE5v ZGUgPSBzY3JvbGxhYmxlQXJlYS0+bGF5ZXIoKS0+ZW5jbG9zaW5nRWxlbWVudCgpOworCiAgICAg aWYgKHNjcm9sbGVkTm9kZS0+aXNEb2N1bWVudE5vZGUoKSkgewogICAgICAgICBGcmFtZSogZnJh bWUgPSBzdGF0aWNfY2FzdDxjb25zdCBEb2N1bWVudCo+KHNjcm9sbGVkTm9kZSktPmZyYW1lKCk7 CiAgICAgICAgIEFTU0VSVChmcmFtZSk7CkBAIC0yNTQ5LDggKzI1NTYsOCBAQCB2b2lkIFdlYlBh Z2VQcml2YXRlOjpjbGVhckRvY3VtZW50RGF0YShjb25zdCBEb2N1bWVudCogZG9jdW1lbnRHb2lu Z0F3YXkpCiAgICAgaWYgKG1fY3VycmVudEJsb2NrWm9vbUFkanVzdGVkTm9kZSAmJiBtX2N1cnJl bnRCbG9ja1pvb21BZGp1c3RlZE5vZGUtPmRvY3VtZW50KCkgPT0gZG9jdW1lbnRHb2luZ0F3YXkp CiAgICAgICAgIG1fY3VycmVudEJsb2NrWm9vbUFkanVzdGVkTm9kZSA9IDA7CiAKLSAgICBpZiAo bV9pblJlZ2lvblNjcm9sbGVyLT5kLT5oYXNOb2RlKCkgJiYgbV9pblJlZ2lvblNjcm9sbGVyLT5k LT5ub2RlKCktPmRvY3VtZW50KCkgPT0gZG9jdW1lbnRHb2luZ0F3YXkpCi0gICAgICAgIG1faW5S ZWdpb25TY3JvbGxlci0+ZC0+cmVzZXQoKTsKKyAgICBpZiAobV9pblJlZ2lvblNjcm9sbGVyLT5k LT5pc0FjdGl2ZSgpKQorICAgICAgICBtX2luUmVnaW9uU2Nyb2xsZXItPmQtPmNsZWFyRG9jdW1l bnREYXRhKGRvY3VtZW50R29pbmdBd2F5KTsKIAogICAgIGlmIChkb2N1bWVudEdvaW5nQXdheS0+ ZnJhbWUoKSkKICAgICAgICAgbV9pbnB1dEhhbmRsZXItPmZyYW1lVW5sb2FkZWQoZG9jdW1lbnRH b2luZ0F3YXktPmZyYW1lKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5 L0FwaS9XZWJQYWdlX3AuaCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZV9w LmgKaW5kZXggMWU1YWYwYi4uZTczMDQxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFj a2JlcnJ5L0FwaS9XZWJQYWdlX3AuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBp L1dlYlBhZ2VfcC5oCkBAIC0xNTIsNyArMTUyLDcgQEAgcHVibGljOgogICAgIHZvaWQgc2V0U2Ny b2xsUG9zaXRpb24oY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmKTsKICAgICB2b2lkIHNjcm9sbEJ5 KGludCBkZWx0YVgsIGludCBkZWx0YVkpOwogCi0gICAgdm9pZCBlbnF1ZXVlUmVuZGVyaW5nT2ZD bGlwcGVkQ29udGVudE9mU2Nyb2xsYWJsZU5vZGVBZnRlckluUmVnaW9uU2Nyb2xsaW5nKFdlYkNv cmU6Ok5vZGUqKTsKKyAgICB2b2lkIGVucXVldWVSZW5kZXJpbmdPZkNsaXBwZWRDb250ZW50T2ZT Y3JvbGxhYmxlQXJlYUFmdGVySW5SZWdpb25TY3JvbGxpbmcoKTsKICAgICB2b2lkIG5vdGlmeUlu UmVnaW9uU2Nyb2xsU3RvcHBlZCgpOwogICAgIHZvaWQgc2V0U2Nyb2xsT3JpZ2luUG9pbnQoY29u c3QgUGxhdGZvcm06OkludFBvaW50Jik7CiAgICAgdm9pZCBzZXRIYXNJblJlZ2lvblNjcm9sbGFi bGVBcmVhcyhib29sKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCmluZGV4IGRkNGVmNWQu LjY1NzgxOGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM4IEBA CiAyMDEyLTA4LTI1ICBBbnRvbmlvIEdvbWVzICA8YWdvbWVzQHJpbS5jb20+CiAKKyAgICAgICAg W0JsYWNrQmVycnldIFJlbW92ZSB0aGUgJ2luIHJlZ2lvbiBzY3JvbGxhYmxlIHN0YXJ0aW5nIG5v ZGUnIGNvbmNlcHQgZnJvbSBJblJlZ2lvblNjcm9sbGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NTAyMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICdJbi1yZWdpb24gc3RhcnQgc2Nyb2xsaW5nIG5vZGUn IGlzIGFuIG9ic29sZXRlIGNvbmNlcHQsIGFuZCB3ZSBjYW4gcmVtb3ZlIGl0CisgICAgICAgIGlu IGZhdm9yIG9mIHVzaW5nIHRoZSBpbmZvcm1hdGlvbiBmcm9tIHRoZSBjYWNoZWQgbGF5ZXJzLgor CisgICAgICAgICogQXBpL0luUmVnaW9uU2Nyb2xsZXIuY3BwOgorICAgICAgICAoV2ViS2l0KToK KyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6SW5SZWdpb25TY3JvbGxlclByaXZhdGU6OnJl c2V0KTogQWRqdXN0ZWQgYXMgaXQgdXNlZCB0byBjbGVhcgorICAgICAgICB0aGUgY2FjaGVkICdu b2RlJy4KKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6SW5SZWdpb25TY3JvbGxlclByaXZh dGU6OmlzQWN0aXZlKTogQWRkZWQgbWV0aG9kIHRvIGJlCisgICAgICAgIGNoZWNrZWQgZGlyZWN0 bHkgaW5zdGVhZCBvZiBvbmx5IG51bGwtY2hlY2tpbmcgdGhlIHByZXZpb3VzbHkgY2FjaGVkICdu b2RlJy4KKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6SW5SZWdpb25TY3JvbGxlclByaXZh dGU6OmNsZWFyRG9jdW1lbnREYXRhKTogTmV3IG1ldGhvZCB0bworICAgICAgICBjbGVhciB0aGUg Y2FjaGVkIHJlc291cmNlcyBpZiBpdHMgZG9jdW1lbnQgaXMgZG9uZS4KKyAgICAgICAgKEJsYWNr QmVycnk6OldlYktpdDo6SW5SZWdpb25TY3JvbGxlclByaXZhdGU6OnB1c2hCYWNrSW5SZWdpb25T Y3JvbGxhYmxlKTogQWRqdXN0ZWQKKyAgICAgICAgdG8gbm90IGNhcmUgYWJvdXQgdGhlIGNhY2hl ZCAnbm9kZScgYW55bW9yZS4KKyAgICAgICAgKiBBcGkvSW5SZWdpb25TY3JvbGxlcl9wLmg6Cisg ICAgICAgIChJblJlZ2lvblNjcm9sbGVyUHJpdmF0ZSk6CisgICAgICAgICogQXBpL1dlYlBhZ2Uu Y3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlUHJpdmF0ZTo6bm90aWZ5 SW5SZWdpb25TY3JvbGxTdG9wcGVkKTogQ2hlY2sgOjppc0FjdGl2ZSBpbnN0ZWFkCisgICAgICAg IG9mIDo6aGFzTm9kZSwgc2luY2UgdGhlIGxhdGVyIGlzIGdvbmUuCisgICAgICAgIChCbGFja0Jl cnJ5OjpXZWJLaXQ6OldlYlBhZ2VQcml2YXRlOjplbnF1ZXVlUmVuZGVyaW5nT2ZDbGlwcGVkQ29u dGVudE9mU2Nyb2xsYWJsZUFyZWFBZnRlckluUmVnaW9uU2Nyb2xsaW5nKToKKyAgICAgICAgQ2hh bmdlZCB0aGUgbWV0aG9kIHNpZ25hdHVyZSwgZ2l2ZW4gdGhhdCB3ZSBkbyBoYXZlIGEgY2FjaGVk ICdub2RlJyB0byBwYXNzIGluIGFzIHBhcmFtZXRlciBhbnltb3JlLgorICAgICAgICAoQmxhY2tC ZXJyeTo6V2ViS2l0OjpXZWJQYWdlUHJpdmF0ZTo6Y2xlYXJEb2N1bWVudERhdGEpOiBEZWxlZ2F0 ZSBhbGwgdGhlIHJlbGF0ZWQgd29yayB0byBJblJlZ2lvblNjcm9sbGVyLgorICAgICAgICAqIEFw aS9XZWJQYWdlX3AuaDoKKyAgICAgICAgKFdlYlBhZ2VQcml2YXRlKToKKyAgICAgICAgKiBXZWJL aXRTdXBwb3J0L1RvdWNoRXZlbnRIYW5kbGVyLmNwcDoKKyAgICAgICAgKEJsYWNrQmVycnk6Oldl YktpdDo6VG91Y2hFdmVudEhhbmRsZXI6OmRyYXdUYXBIaWdobGlnaHQpOgorLgorMjAxMi0wOC0y NSAgQW50b25pbyBHb21lcyAgPGFnb21lc0ByaW0uY29tPgorCiAgICAgICAgIEJsYWNrQmVycnld IFNocmluayB0aGUgaW4tcmVnaW9uIG5lc3RlZCBzY3JvbGxhYmxlIGxpc3QgYXMgc29vbiBhcyB3 ZSBjYW4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk1 MDE5CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0 L1RvdWNoRXZlbnRIYW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRT dXBwb3J0L1RvdWNoRXZlbnRIYW5kbGVyLmNwcAppbmRleCAyZmEzNTkyLi5mN2QzN2QwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9Ub3VjaEV2ZW50 SGFuZGxlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQv VG91Y2hFdmVudEhhbmRsZXIuY3BwCkBAIC0zNTEsNyArMzUxLDcgQEAgdm9pZCBUb3VjaEV2ZW50 SGFuZGxlcjo6ZHJhd1RhcEhpZ2hsaWdodCgpCiAgICAgLy8gT24gdGhlIGNsaWVudCBzaWRlLCB0 aGlzIGluZm8gaXMgYmVpbmcgdXNlZCB0byBoaWRlIHRoZSB0YXAgaGlnaGxpZ2h0IHdpbmRvdyBv biBzY3JvbGwuCiAgICAgUmVuZGVyTGF5ZXIqIGxheWVyID0gbV93ZWJQYWdlLT5lbmNsb3NpbmdG aXhlZFBvc2l0aW9uZWRBbmNlc3Rvck9yU2VsZklmRml4ZWRQb3NpdGlvbmVkKHJlbmRlcmVyLT5l bmNsb3NpbmdMYXllcigpKTsKICAgICBib29sIHNob3VsZEhpZGVUYXBIaWdobGlnaHRSaWdodEFm dGVyU2Nyb2xsaW5nID0gIWxheWVyLT5yZW5kZXJlcigpLT5pc1JlbmRlclZpZXcoKTsKLSAgICBz aG91bGRIaWRlVGFwSGlnaGxpZ2h0UmlnaHRBZnRlclNjcm9sbGluZyB8PSAhIW1fd2ViUGFnZS0+ bV9pblJlZ2lvblNjcm9sbGVyLT5kLT5ub2RlKCk7CisgICAgc2hvdWxkSGlkZVRhcEhpZ2hsaWdo dFJpZ2h0QWZ0ZXJTY3JvbGxpbmcgfD0gISFtX3dlYlBhZ2UtPm1faW5SZWdpb25TY3JvbGxlci0+ ZC0+aXNBY3RpdmUoKTsKIAogICAgIEludFBvaW50IGZyYW1lUG9zKG1fd2ViUGFnZS0+ZnJhbWVP ZmZzZXQoZWxlbWVudEZyYW1lKSk7CiAKLS0gCjEuNy41LjQKCg==