71366 2011-11-02 08:08:52 -0700 [Qt] Handle interruption of page interaction better 2011-11-02 09:14:40 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kenneth kenneth abecsi hausmann webkit.review.bot zoltan oldest_to_newest 494629 0 kenneth 2011-11-02 08:08:52 -0700 As the bounce back animation from pinch zoom centers the content using the contents point which was in the center of the viewport, this animation cannot be used when stopping a pan animation, as it won't position the content at the place it was when the pan animation was interrupted. 494631 1 113319 kenneth 2011-11-02 08:11:29 -0700 Created attachment 113319 Patch 494634 2 113319 hausmann 2011-11-02 08:17:25 -0700 Comment on attachment 113319 Patch r=me 494651 3 113319 webkit.review.bot 2011-11-02 09:14:36 -0700 Comment on attachment 113319 Patch Clearing flags on attachment: 113319 Committed r99065: <http://trac.webkit.org/changeset/99065> 494652 4 webkit.review.bot 2011-11-02 09:14:40 -0700 All reviewed patches have been landed. Closing bug. 113319 2011-11-02 08:11:29 -0700 2011-11-02 09:14:36 -0700 Patch 0001-Qt-Handle-interruption-of-page-interaction-better.patch text/plain 13262 kenneth RnJvbSA2NGMxYTFlMGFhMWJiNTE5Yjc5NWQxMDRjZTI2YmM2MDQ3YjBkNTMxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbiA8a2VubmV0aEB3 ZWJraXQub3JnPgpEYXRlOiBXZWQsIDIgTm92IDIwMTEgMTY6MDQ6MjkgKzAxMDAKU3ViamVjdDog W1BBVENIXSBbUXRdIEhhbmRsZSBpbnRlcnJ1cHRpb24gb2YgcGFnZSBpbnRlcmFjdGlvbiBiZXR0 ZXIKIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MTM2NgoKUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpUb3VjaGluZyB0aGUgc2NyZWVuIHdoZW4gYSBraW5ldGlj IHNjcm9sbGluZyBhbmltYXRpb24gaXMgcnVubmluZyBvcgppdCBpcyBib3VuY2luZyBiYWNrIGJl Y2F1c2UgaXQgd2FzIG91dCBvZiBib3VuZHMsIHRoZSBhbmltYXRpb24gaXMKaW1tZWRpYXRlbHkg c3RvcHBlZCBhbmQgdGhlIGNvbnRlbnQgaXMgaW1tZWRpYXRlbHkgcHV0IGludG8gdmFsaWQKYm91 bmRzLgoKVG91Y2hpbmcgdGhlIHNjcmVlbiB3aGVuIHRoZSBjb250ZW50cyBpcyBib3VuY2luZyBi YWNrIGZyb20gYSBwaW5jaAp6b29tIHdoaWNoIHdhcyBvdXQgb2YgYm91bmRzLCB3ZSBkbyBub3Qg c3RvcCB0aGUgYW5pbWF0aW9uLCBidXQKaW5zdGVhZCBpZ25vcmVkIHRoZSB0b3VjaCBldmVudHMg d2hpbGUgdGhlIGFuaW1hdGlvbiBsYXN0cy4KCkluIHRoZSBmdXR1cmUgd2Ugd2FudCB0byBxdWV1 ZSB0aGUgZXZlbnRzIGluc3RlYWQuCgpUaGlzIGFsc28gZml4ZXMgc29tZSBpc3N1ZXMgd2hpY2gg d2FzIHByZXNlbnQgYmVmb3JlOiBBcyB0aGUgYm91bmNlCmJhY2sgYW5pbWF0aW9uIGZyb20gcGlu Y2ggem9vbSBjZW50ZXJzIHRoZSBjb250ZW50IHVzaW5nIHRoZSBjb250ZW50cwpwb2ludCB3aGlj aCB3YXMgaW4gdGhlIGNlbnRlciBvZiB0aGUgdmlld3BvcnQsIHRoaXMgYW5pbWF0aW9uIGNvdWxk Cm5vdCBiZSB1c2VkIHdoZW4gc3RvcHBpbmcgYSBwYW4gYW5pbWF0aW9uLCBhcyBpdCB3b3VsZG4n dCBwb3NpdGlvbiB0aGUKY29udGVudCBhdCB0aGUgcGxhY2UgaXQgd2FzIHdoZW4gdGhlIHBhbiBh bmltYXRpb24gd2FzIGludGVycnVwdGVkLgoKKiBVSVByb2Nlc3MvcXQvUXRQYW5HZXN0dXJlUmVj b2duaXplci5jcHA6CihXZWJLaXQ6OlF0UGFuR2VzdHVyZVJlY29nbml6ZXI6OnJlY29nbml6ZSk6 CiogVUlQcm9jZXNzL3F0L1F0UGluY2hHZXN0dXJlUmVjb2duaXplci5jcHA6CihXZWJLaXQ6OlF0 UGluY2hHZXN0dXJlUmVjb2duaXplcjo6cmVjb2duaXplKToKKiBVSVByb2Nlc3MvcXQvUXRWaWV3 cG9ydEludGVyYWN0aW9uRW5naW5lLmNwcDoKKFdlYktpdDo6UXRWaWV3cG9ydEludGVyYWN0aW9u RW5naW5lOjphbmltYXRlQ29udGVudEludG9Cb3VuZGFyaWVzSWZOZWVkZWQpOgooV2ViS2l0OjpR dFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OnJlc2V0KToKKFdlYktpdDo6UXRWaWV3cG9ydElu dGVyYWN0aW9uRW5naW5lOjpzZXRDb25zdHJhaW50cyk6CihXZWJLaXQ6OlF0Vmlld3BvcnRJbnRl cmFjdGlvbkVuZ2luZTo6cGFuQW5pbWF0aW9uQWN0aXZlKToKKFdlYktpdDo6UXRWaWV3cG9ydElu dGVyYWN0aW9uRW5naW5lOjpwYW5HZXN0dXJlU3RhcnRlZCk6CihXZWJLaXQ6OlF0Vmlld3BvcnRJ bnRlcmFjdGlvbkVuZ2luZTo6cGFuR2VzdHVyZUNhbmNlbGxlZCk6CihXZWJLaXQ6OlF0Vmlld3Bv cnRJbnRlcmFjdGlvbkVuZ2luZTo6cGluY2hBbmltYXRpb25BY3RpdmUpOgoqIFVJUHJvY2Vzcy9x dC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuaDoKLS0tCiBTb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMzggKysrKysrKysrKysrKysrKysr CiAuLi4vVUlQcm9jZXNzL3F0L1F0UGFuR2VzdHVyZVJlY29nbml6ZXIuY3BwICAgICAgICB8ICAg MTMgKysrKystCiAuLi4vVUlQcm9jZXNzL3F0L1F0UGluY2hHZXN0dXJlUmVjb2duaXplci5jcHAg ICAgICB8ICAgIDkgKysrKwogLi4uL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25F bmdpbmUuY3BwICAgfCAgIDQyICsrKysrKysrKysrLS0tLS0tLS0KIC4uLi9VSVByb2Nlc3MvcXQv UXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmggICAgIHwgICAgNCArLQogNSBmaWxlcyBjaGFu Z2VkLCA4NCBpbnNlcnRpb25zKCspLCAyMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOWM5 YWRmOC4uZjMxNTZiYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDExLTExLTAyICBL ZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbiAgPGtlbm5ldGhAd2Via2l0Lm9yZz4KKworICAgICAg ICBbUXRdIEhhbmRsZSBpbnRlcnJ1cHRpb24gb2YgcGFnZSBpbnRlcmFjdGlvbiBiZXR0ZXIKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcxMzY2CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVG91Y2hpbmcgdGhl IHNjcmVlbiB3aGVuIGEga2luZXRpYyBzY3JvbGxpbmcgYW5pbWF0aW9uIGlzIHJ1bm5pbmcgb3IK KyAgICAgICAgaXQgaXMgYm91bmNpbmcgYmFjayBiZWNhdXNlIGl0IHdhcyBvdXQgb2YgYm91bmRz LCB0aGUgYW5pbWF0aW9uIGlzCisgICAgICAgIGltbWVkaWF0ZWx5IHN0b3BwZWQgYW5kIHRoZSBj b250ZW50IGlzIGltbWVkaWF0ZWx5IHB1dCBpbnRvIHZhbGlkCisgICAgICAgIGJvdW5kcy4KKwor ICAgICAgICBUb3VjaGluZyB0aGUgc2NyZWVuIHdoZW4gdGhlIGNvbnRlbnRzIGlzIGJvdW5jaW5n IGJhY2sgZnJvbSBhIHBpbmNoCisgICAgICAgIHpvb20gd2hpY2ggd2FzIG91dCBvZiBib3VuZHMs IHdlIGRvIG5vdCBzdG9wIHRoZSBhbmltYXRpb24sIGJ1dAorICAgICAgICBpbnN0ZWFkIGlnbm9y ZWQgdGhlIHRvdWNoIGV2ZW50cyB3aGlsZSB0aGUgYW5pbWF0aW9uIGxhc3RzLgorCisgICAgICAg IEluIHRoZSBmdXR1cmUgd2Ugd2FudCB0byBxdWV1ZSB0aGUgZXZlbnRzIGluc3RlYWQuCisKKyAg ICAgICAgVGhpcyBhbHNvIGZpeGVzIHNvbWUgaXNzdWVzIHdoaWNoIHdhcyBwcmVzZW50IGJlZm9y ZTogQXMgdGhlIGJvdW5jZQorICAgICAgICBiYWNrIGFuaW1hdGlvbiBmcm9tIHBpbmNoIHpvb20g Y2VudGVycyB0aGUgY29udGVudCB1c2luZyB0aGUgY29udGVudHMKKyAgICAgICAgcG9pbnQgd2hp Y2ggd2FzIGluIHRoZSBjZW50ZXIgb2YgdGhlIHZpZXdwb3J0LCB0aGlzIGFuaW1hdGlvbiBjb3Vs ZAorICAgICAgICBub3QgYmUgdXNlZCB3aGVuIHN0b3BwaW5nIGEgcGFuIGFuaW1hdGlvbiwgYXMg aXQgd291bGRuJ3QgcG9zaXRpb24gdGhlCisgICAgICAgIGNvbnRlbnQgYXQgdGhlIHBsYWNlIGl0 IHdhcyB3aGVuIHRoZSBwYW4gYW5pbWF0aW9uIHdhcyBpbnRlcnJ1cHRlZC4KKworICAgICAgICAq IFVJUHJvY2Vzcy9xdC9RdFBhbkdlc3R1cmVSZWNvZ25pemVyLmNwcDoKKyAgICAgICAgKFdlYktp dDo6UXRQYW5HZXN0dXJlUmVjb2duaXplcjo6cmVjb2duaXplKToKKyAgICAgICAgKiBVSVByb2Nl c3MvcXQvUXRQaW5jaEdlc3R1cmVSZWNvZ25pemVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UXRQ aW5jaEdlc3R1cmVSZWNvZ25pemVyOjpyZWNvZ25pemUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9x dC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpRdFZp ZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OmFuaW1hdGVDb250ZW50SW50b0JvdW5kYXJpZXNJZk5l ZWRlZCk6CisgICAgICAgIChXZWJLaXQ6OlF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6cmVz ZXQpOgorICAgICAgICAoV2ViS2l0OjpRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OnNldENv bnN0cmFpbnRzKToKKyAgICAgICAgKFdlYktpdDo6UXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5l OjpwYW5BbmltYXRpb25BY3RpdmUpOgorICAgICAgICAoV2ViS2l0OjpRdFZpZXdwb3J0SW50ZXJh Y3Rpb25FbmdpbmU6OnBhbkdlc3R1cmVTdGFydGVkKToKKyAgICAgICAgKFdlYktpdDo6UXRWaWV3 cG9ydEludGVyYWN0aW9uRW5naW5lOjpwYW5HZXN0dXJlQ2FuY2VsbGVkKToKKyAgICAgICAgKFdl YktpdDo6UXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpwaW5jaEFuaW1hdGlvbkFjdGl2ZSk6 CisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5oOgor CiAyMDExLTExLTAyICBTaW1vbiBIYXVzbWFubiAgPHNpbW9uLmhhdXNtYW5uQG5va2lhLmNvbT4K IAogICAgICAgICBbV0syXSBSZW1vdmUgdW51c2VkL2R1cGxpY2F0ZWQgbW9kaWZpZXJzIG1lbWJl ciBmcm9tIFdlYlRvdWNoRXZlbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9xdC9RdFBhbkdlc3R1cmVSZWNvZ25pemVyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9xdC9RdFBhbkdlc3R1cmVSZWNvZ25pemVyLmNwcAppbmRleCBlZjJiYjY3Li4xZmE2MjBmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRQYW5HZXN0dXJlUmVjb2du aXplci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0UGFuR2VzdHVyZVJl Y29nbml6ZXIuY3BwCkBAIC0zOSw3ICszOSw4IEBAIFF0UGFuR2VzdHVyZVJlY29nbml6ZXI6OlF0 UGFuR2VzdHVyZVJlY29nbml6ZXIoUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lKiBpbnRlCiAK IGJvb2wgUXRQYW5HZXN0dXJlUmVjb2duaXplcjo6cmVjb2duaXplKGNvbnN0IFFUb3VjaEV2ZW50 KiBldmVudCwgcWludDY0IGV2ZW50VGltZXN0YW1wTWlsbGlzKQogewotICAgIC8vIFBhbiBnZXN0 dXJlIGFsd2F5cyBzdGFydHMgb24gVG91Y2hCZWdpbiB1bmxlc3MgdGhlIGVuZ2luZSBpcyBzdXNw ZW5kZWQuCisgICAgLy8gUGFuIGdlc3R1cmUgYWx3YXlzIHN0YXJ0cyBvbiBUb3VjaEJlZ2luIHVu bGVzcyB0aGUgZW5naW5lIGlzIHN1c3BlbmRlZCwgb3IKKyAgICAvLyB3ZSBpZ25vcmVkIHRoZSBl dmVudC4KICAgICBpZiAobV9zdGF0ZSA9PSBOb0dlc3R1cmUgJiYgZXZlbnQtPnR5cGUoKSAhPSBR RXZlbnQ6OlRvdWNoQmVnaW4pCiAgICAgICAgIHJldHVybiBmYWxzZTsKIApAQCAtNTYsOSArNTcs MTcgQEAgYm9vbCBRdFBhbkdlc3R1cmVSZWNvZ25pemVyOjpyZWNvZ25pemUoY29uc3QgUVRvdWNo RXZlbnQqIGV2ZW50LCBxaW50NjQgZXZlbnRUaW0KICAgICBzd2l0Y2ggKGV2ZW50LT50eXBlKCkp IHsKICAgICBjYXNlIFFFdmVudDo6VG91Y2hCZWdpbjoKICAgICAgICAgQVNTRVJUKG1fc3RhdGUg PT0gTm9HZXN0dXJlKTsKKyAgICAgICAgLy8gVGhlIHBhbiBnZXN0dXJlIG1pZ2h0IHN0aWxsIGJl IGFuaW1hdGluZyBraW5ldGljIHNjcm9sbGluZy9ib3VuY2UgYmFjayBlZmZlY3QuCisgICAgICAg IGlmIChtX3ZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUtPnBhbkFuaW1hdGlvbkFjdGl2ZSgpKQor ICAgICAgICAgICAgbV92aWV3cG9ydEludGVyYWN0aW9uRW5naW5lLT5wYW5HZXN0dXJlQ2FuY2Vs bGVkKCk7CisKKyAgICAgICAgLy8gV2UgZG8gbm90IHN0b3AgYm91bmNlIGJhY2sgZWZmZWN0cyBm b3IgcGluY2ggem9vbSwgYnV0IGluc3RlYWQgaWdub3JlIHRoZSB0b3VjaCBldmVudC4KKyAgICAg ICAgLy8gRklYTUU6IFdlIHNob3VsZCBxdWV1ZSB0aGUgZXZlbnRzIGluc3RlYWQgYW5kIHJlcG9z dCB0aGVuIHdoZW4gZG9uZSB3aXRoIHRoZSBhbmltYXRpb24uCisgICAgICAgIGlmIChtX3ZpZXdw b3J0SW50ZXJhY3Rpb25FbmdpbmUtPnBpbmNoQW5pbWF0aW9uQWN0aXZlKCkpCisgICAgICAgICAg ICByZXR1cm4gZmFsc2U7CisKICAgICAgICAgbV9zdGF0ZSA9IEdlc3R1cmVSZWNvZ25pdGlvblN0 YXJ0ZWQ7CiAgICAgICAgIG1fZmlyc3RQb3NpdGlvbiA9IHRvdWNoUG9pbnQuc2NyZWVuUG9zKCk7 Ci0gICAgICAgIG1fdmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS0+c3RvcEFuaW1hdGlvbnMoKTsK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGNhc2UgUUV2ZW50OjpUb3VjaFVwZGF0ZTogewog ICAgICAgICBBU1NFUlQobV9zdGF0ZSAhPSBOb0dlc3R1cmUpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0UGluY2hHZXN0dXJlUmVjb2duaXplci5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRQaW5jaEdlc3R1cmVSZWNvZ25pemVyLmNwcAppbmRl eCAxNmRiNWRkLi44OTJiNzczIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv cXQvUXRQaW5jaEdlc3R1cmVSZWNvZ25pemVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvcXQvUXRQaW5jaEdlc3R1cmVSZWNvZ25pemVyLmNwcApAQCAtNjUsNiArNjUsMTUgQEAg Ym9vbCBRdFBpbmNoR2VzdHVyZVJlY29nbml6ZXI6OnJlY29nbml6ZShjb25zdCBRVG91Y2hFdmVu dCogZXZlbnQpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAKKyAgICAvLyBUaGUgcGFu IGdlc3R1cmUgbWlnaHQgc3RpbGwgYmUgYW5pbWF0aW5nIGtpbmV0aWMgc2Nyb2xsaW5nL2JvdW5j ZSBiYWNrIGVmZmVjdC4KKyAgICBpZiAobV92aWV3cG9ydEludGVyYWN0aW9uRW5naW5lLT5wYW5B bmltYXRpb25BY3RpdmUoKSkKKyAgICAgICAgbV92aWV3cG9ydEludGVyYWN0aW9uRW5naW5lLT5w YW5HZXN0dXJlQ2FuY2VsbGVkKCk7CisKKyAgICAvLyBXZSBkbyBub3Qgc3RvcCBib3VuY2UgYmFj ayBlZmZlY3RzIGZvciBwaW5jaCB6b29tLCBidXQgaW5zdGVhZCBpZ25vcmUgdGhlIHRvdWNoIGV2 ZW50LgorICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgcXVldWUgdGhlIGV2ZW50cyBpbnN0ZWFkIGFu ZCByZXBvc3QgdGhlbiB3aGVuIGRvbmUgd2l0aCB0aGUgYW5pbWF0aW9uLgorICAgIGlmIChtX3Zp ZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUtPnBpbmNoQW5pbWF0aW9uQWN0aXZlKCkpCisgICAgICAg IHJldHVybiBmYWxzZTsKKwogICAgIHN3aXRjaCAoZXZlbnQtPnR5cGUoKSkgewogICAgIGNhc2Ug UUV2ZW50OjpUb3VjaEJlZ2luOgogICAgIGNhc2UgUUV2ZW50OjpUb3VjaFVwZGF0ZToKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25F bmdpbmUuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFj dGlvbkVuZ2luZS5jcHAKaW5kZXggMGM2MGE3Ny4uYmRkZTdlOCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5jcHAKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2lu ZS5jcHAKQEAgLTE5NSwxNyArMTk1LDYgQEAgYm9vbCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25Fbmdp bmU6OmV2ZW50KFFFdmVudCogZXZlbnQpCiAgICAgcmV0dXJuIFFPYmplY3Q6OmV2ZW50KGV2ZW50 KTsKIH0KIAotdm9pZCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OnN0b3BBbmltYXRpb25z KCkKLXsKLSAgICBtX3NjYWxlQW5pbWF0aW9uLT5zdG9wKCk7Ci0gICAgc2Nyb2xsZXIoKS0+c3Rv cCgpOwotCi0gICAgLy8gSWYgdGhlIGFuaW1hdGlvbnMgd2VyZSBzdG9wcGVkIHdlIG5lZWQgdG8g c2NhbGUgYW5kIHJlcG9zaXRpb24gdGhlIGNvbnRlbnQgaW50byB2YWxpZCBib3VuZGFyaWVzIGlt bWVkaWF0ZWx5LgotICAgIG1fdXNlckludGVyYWN0aW9uRmxhZ3MgfD0gVXNlckhhc1N0b3BwZWRB bmltYXRpb25zOwotICAgIGFuaW1hdGVDb250ZW50SW50b0JvdW5kYXJpZXNJZk5lZWRlZCgpOwot ICAgIG1fdXNlckludGVyYWN0aW9uRmxhZ3MgJj0gflVzZXJIYXNTdG9wcGVkQW5pbWF0aW9uczsK LX0KLQogUVJlY3RGIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6Y29tcHV0ZVBvc1Jhbmdl Rm9ySXRlbVNjYWxlKHFyZWFsIGl0ZW1TY2FsZSkgY29uc3QKIHsKICAgICBjb25zdCBRU2l6ZUYg Y29udGVudEl0ZW1TaXplID0gbV9jb250ZW50LT5ib3VuZGluZ1JlY3QoKS5zaXplKCkgKiBpdGVt U2NhbGU7CkBAIC0yMTksMTEgKzIwOCwxMSBAQCBRUmVjdEYgUXRWaWV3cG9ydEludGVyYWN0aW9u RW5naW5lOjpjb21wdXRlUG9zUmFuZ2VGb3JJdGVtU2NhbGUocXJlYWwgaXRlbVNjYWxlKQogCiB2 b2lkIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6YW5pbWF0ZUNvbnRlbnRJbnRvQm91bmRh cmllc0lmTmVlZGVkKCkKIHsKLSAgICBtX3NjYWxlQW5pbWF0aW9uLT5zdG9wKCk7CisgICAgaWYg KHBhbkFuaW1hdGlvbkFjdGl2ZSgpIHx8IHBpbmNoQW5pbWF0aW9uQWN0aXZlKCkpCisgICAgICAg IHJldHVybjsKIAogICAgIHFyZWFsIGN1cnJlbnRDU1NTY2FsZSA9IGNzc1NjYWxlRnJvbUl0ZW0o bV9jb250ZW50LT5zY2FsZSgpKTsKICAgICBib29sIHVzZXJIYXNTY2FsZWRDb250ZW50ID0gbV91 c2VySW50ZXJhY3Rpb25GbGFncyAmIFVzZXJIYXNTY2FsZWRDb250ZW50OwotICAgIGJvb2wgdXNl ckhhc1N0b3BwZWRBbmltYXRpb25zID0gbV91c2VySW50ZXJhY3Rpb25GbGFncyAmIFVzZXJIYXNT dG9wcGVkQW5pbWF0aW9uczsKIAogICAgIGlmICghdXNlckhhc1NjYWxlZENvbnRlbnQpCiAgICAg ICAgIGN1cnJlbnRDU1NTY2FsZSA9IG1fY29uc3RyYWludHMuaW5pdGlhbFNjYWxlOwpAQCAtMjQy LDEzICsyMzEsMTMgQEAgdm9pZCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OmFuaW1hdGVD b250ZW50SW50b0JvdW5kYXJpZXNJZk5lZWRlZCgpCiAgICAgZW5kUG9zaXRpb24uc2V0WChxQm91 bmQobWluVmFsdWUueCgpLCBlbmRQb3NpdGlvbi54KCksIG1heFZhbHVlLngoKSkpOwogICAgIGVu ZFBvc2l0aW9uLnNldFkocUJvdW5kKG1pblZhbHVlLnkoKSwgZW5kUG9zaXRpb24ueSgpLCBtYXhW YWx1ZS55KCkpKTsKIAotICAgIFFSZWN0RiBzdGFydFZpc2libGVDb250ZW50UmVjdChtX3ZpZXdw b3J0LT5tYXBSZWN0VG9JdGVtKG1fY29udGVudCwgdmlld3BvcnRSZWN0KSk7CisgICAgUVJlY3RG IHN0YXJ0VmlzaWJsZUNvbnRlbnRSZWN0ID0gbV9jb250ZW50LT5tYXBSZWN0RnJvbUl0ZW0obV92 aWV3cG9ydCwgdmlld3BvcnRSZWN0KTsKICAgICBRUmVjdEYgZW5kVmlzaWJsZUNvbnRlbnRSZWN0 KGVuZFBvc2l0aW9uLCB2aWV3cG9ydFJlY3Quc2l6ZSgpIC8gZW5kSXRlbVNjYWxlKTsKIAogICAg IGlmIChlbmRWaXNpYmxlQ29udGVudFJlY3QgPT0gc3RhcnRWaXNpYmxlQ29udGVudFJlY3QpCiAg ICAgICAgIHJldHVybjsKIAotICAgIGlmICh1c2VySGFzU2NhbGVkQ29udGVudCAmJiAhdXNlckhh c1N0b3BwZWRBbmltYXRpb25zKSB7CisgICAgaWYgKHVzZXJIYXNTY2FsZWRDb250ZW50KSB7CiAg ICAgICAgIG1fc2NhbGVBbmltYXRpb24tPnNldER1cmF0aW9uKGtTY2FsZUFuaW1hdGlvbkR1cmF0 aW9uTWlsbGlzKTsKICAgICAgICAgbV9zY2FsZUFuaW1hdGlvbi0+c2V0RWFzaW5nQ3VydmUoUUVh c2luZ0N1cnZlOjpPdXRDdWJpYyk7CiAgICAgICAgIG1fc2NhbGVBbmltYXRpb24tPnNldFN0YXJ0 VmFsdWUoc3RhcnRWaXNpYmxlQ29udGVudFJlY3QpOwpAQCAtMjYzLDcgKzI1Miw4IEBAIHZvaWQg UXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpyZXNldCgpCiAgICAgVmlld3BvcnRVcGRhdGVH dWFyZCBndWFyZCh0aGlzKTsKICAgICBtX3VzZXJJbnRlcmFjdGlvbkZsYWdzID0gVXNlckhhc05v dEludGVyYWN0ZWRXaXRoQ29udGVudDsKIAotICAgIHN0b3BBbmltYXRpb25zKCk7CisgICAgc2Ny b2xsZXIoKS0+c3RvcCgpOworICAgIG1fc2NhbGVBbmltYXRpb24tPnN0b3AoKTsKIAogICAgIFFT Y3JvbGxlclByb3BlcnRpZXMgcHJvcGVydGllcyA9IHNjcm9sbGVyKCktPnNjcm9sbGVyUHJvcGVy dGllcygpOwogCkBAIC0yOTAsMTEgKzI4MCwyMSBAQCB2b2lkIFF0Vmlld3BvcnRJbnRlcmFjdGlv bkVuZ2luZTo6c2V0Q29uc3RyYWludHMoY29uc3QgQ29uc3RyYWludHMmIGNvbnN0cmFpbnRzKQog CiAgICAgVmlld3BvcnRVcGRhdGVHdWFyZCBndWFyZCh0aGlzKTsKICAgICBtX2NvbnN0cmFpbnRz ID0gY29uc3RyYWludHM7CisKICAgICBhbmltYXRlQ29udGVudEludG9Cb3VuZGFyaWVzSWZOZWVk ZWQoKTsKIH0KIAorYm9vbCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OnBhbkFuaW1hdGlv bkFjdGl2ZSgpIGNvbnN0Cit7CisgICAgUVNjcm9sbGVyKiBzY3JvbGxlciA9IGNvbnN0X2Nhc3Q8 UXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lKj4odGhpcyktPnNjcm9sbGVyKCk7CisKKyAgICBy ZXR1cm4gc2Nyb2xsZXItPnN0YXRlKCkgIT0gUVNjcm9sbGVyOjpJbmFjdGl2ZTsKK30KKwogdm9p ZCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OnBhbkdlc3R1cmVTdGFydGVkKGNvbnN0IFFQ b2ludEYmIHRvdWNoUG9pbnQsIHFpbnQ2NCBldmVudFRpbWVzdGFtcE1pbGxpcykKIHsKKyAgICBR X0FTU0VSVCghcGFuR2VzdHVyZUFjdGl2ZSk7CisKICAgICAvLyBGSVhNRTogc3VzcGVuZCB0aGUg V2ViIGVuZ2luZSAoc3RvcCBhbmltYXRlZCBHSUYsIGV0YykuCiAgICAgbV91c2VySW50ZXJhY3Rp b25GbGFncyB8PSBVc2VySGFzTW92ZWRDb250ZW50OwogICAgIHNjcm9sbGVyKCktPmhhbmRsZUlu cHV0KFFTY3JvbGxlcjo6SW5wdXRQcmVzcywgbV92aWV3cG9ydC0+bWFwRnJvbUl0ZW0obV9jb250 ZW50LCB0b3VjaFBvaW50KSwgZXZlbnRUaW1lc3RhbXBNaWxsaXMpOwpAQCAtMzA4LDggKzMwOCw5 IEBAIHZvaWQgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpwYW5HZXN0dXJlUmVxdWVzdFVw ZGF0ZShjb25zdCBRUG9pbnRGJiB0b3VjaFBvCiAKIHZvaWQgUXRWaWV3cG9ydEludGVyYWN0aW9u RW5naW5lOjpwYW5HZXN0dXJlQ2FuY2VsbGVkKCkKIHsKLSAgICBWaWV3cG9ydFVwZGF0ZUd1YXJk IGd1YXJkKHRoaXMpOwotICAgIHN0b3BBbmltYXRpb25zKCk7CisgICAgLy8gU3RvcHBpbmcgdGhl IHNjcm9sbGVyIGltbWVkaWF0ZWx5IHN0b3BzIGtpbmV0aWMgc2Nyb2xsaW5nIGFuZCBpZiB0aGUg dmlldyBpcyBvdXQgb2YgYm91bmRzIGl0CisgICAgLy8gaXMgbW92ZWQgaW5zaWRlIHZhbGlkIGJv dW5kcyBpbW1lZGlhdGVseSBhcyB3ZWxsLiBUaGlzIGlzIHRoZSBiZWhhdmlvciB0aGF0IHdlIHdh bnQuCisgICAgc2Nyb2xsZXIoKS0+c3RvcCgpOwogfQogCiB2b2lkIFF0Vmlld3BvcnRJbnRlcmFj dGlvbkVuZ2luZTo6cGFuR2VzdHVyZUVuZGVkKGNvbnN0IFFQb2ludEYmIHRvdWNoUG9pbnQsIHFp bnQ2NCBldmVudFRpbWVzdGFtcE1pbGxpcykKQEAgLTMxOCw2ICszMTksMTEgQEAgdm9pZCBRdFZp ZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OnBhbkdlc3R1cmVFbmRlZChjb25zdCBRUG9pbnRGJiB0 b3VjaFBvaW50LCBxaW4KICAgICBzY3JvbGxlcigpLT5oYW5kbGVJbnB1dChRU2Nyb2xsZXI6Oklu cHV0UmVsZWFzZSwgbV92aWV3cG9ydC0+bWFwRnJvbUl0ZW0obV9jb250ZW50LCB0b3VjaFBvaW50 KSwgZXZlbnRUaW1lc3RhbXBNaWxsaXMpOwogfQogCitib29sIFF0Vmlld3BvcnRJbnRlcmFjdGlv bkVuZ2luZTo6cGluY2hBbmltYXRpb25BY3RpdmUoKSBjb25zdAoreworICAgIHJldHVybiBtX3Nj YWxlQW5pbWF0aW9uLT5zdGF0ZSgpID09IFFBYnN0cmFjdEFuaW1hdGlvbjo6UnVubmluZzsKK30K Kwogdm9pZCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OnBpbmNoR2VzdHVyZVN0YXJ0ZWQo Y29uc3QgUVBvaW50RiYgcGluY2hDZW50ZXJJbkNvbnRlbnRDb29yZGluYXRlcykKIHsKICAgICBp ZiAoIW1fY29uc3RyYWludHMuaXNVc2VyU2NhbGFibGUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmggYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmgKaW5kZXgg MTZmNjU4Yy4uMzVjYzBmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0 L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuaApAQCAtNjYsMTUgKzY2LDE2IEBA IHB1YmxpYzoKICAgICB2b2lkIHJlc2V0KCk7CiAgICAgdm9pZCBzZXRDb25zdHJhaW50cyhjb25z dCBDb25zdHJhaW50cyYpOwogCisgICAgYm9vbCBwYW5BbmltYXRpb25BY3RpdmUoKSBjb25zdDsK ICAgICB2b2lkIHBhbkdlc3R1cmVTdGFydGVkKGNvbnN0IFFQb2ludEYmIHRvdWNoUG9pbnQsIHFp bnQ2NCBldmVudFRpbWVzdGFtcE1pbGxpcyk7CiAgICAgdm9pZCBwYW5HZXN0dXJlUmVxdWVzdFVw ZGF0ZShjb25zdCBRUG9pbnRGJiB0b3VjaFBvaW50LCBxaW50NjQgZXZlbnRUaW1lc3RhbXBNaWxs aXMpOwogICAgIHZvaWQgcGFuR2VzdHVyZUNhbmNlbGxlZCgpOwogICAgIHZvaWQgcGFuR2VzdHVy ZUVuZGVkKGNvbnN0IFFQb2ludEYmIHRvdWNoUG9pbnQsIHFpbnQ2NCBldmVudFRpbWVzdGFtcE1p bGxpcyk7CiAKKyAgICBib29sIHBpbmNoQW5pbWF0aW9uQWN0aXZlKCkgY29uc3Q7CiAgICAgdm9p ZCBwaW5jaEdlc3R1cmVTdGFydGVkKGNvbnN0IFFQb2ludEYmIHBpbmNoQ2VudGVySW5Db250ZW50 Q29vcmRpbmF0ZXMpOwogICAgIHZvaWQgcGluY2hHZXN0dXJlUmVxdWVzdFVwZGF0ZShjb25zdCBR UG9pbnRGJiBwaW5jaENlbnRlckluQ29udGVudENvb3JkaW5hdGVzLCBxcmVhbCB0b3RhbFNjYWxl RmFjdG9yKTsKICAgICB2b2lkIHBpbmNoR2VzdHVyZUVuZGVkKCk7Ci0gICAgdm9pZCBzdG9wQW5p bWF0aW9ucygpOwogCiBRX1NJR05BTFM6CiAgICAgdm9pZCB2aWV3cG9ydFVwZGF0ZVJlcXVlc3Rl ZCgpOwpAQCAtMTEyLDcgKzExMyw2IEBAIHByaXZhdGU6CiAgICAgICAgIFVzZXJIYXNOb3RJbnRl cmFjdGVkV2l0aENvbnRlbnQgPSAwLAogICAgICAgICBVc2VySGFzTW92ZWRDb250ZW50ID0gMSwK ICAgICAgICAgVXNlckhhc1NjYWxlZENvbnRlbnQgPSAyLAotICAgICAgICBVc2VySGFzU3RvcHBl ZEFuaW1hdGlvbnMgPSA0CiAgICAgfTsKICAgICBRX0RFQ0xBUkVfRkxBR1MoVXNlckludGVyYWN0 aW9uRmxhZ3MsIFVzZXJJbnRlcmFjdGlvbkZsYWcpOwogICAgIFVzZXJJbnRlcmFjdGlvbkZsYWdz IG1fdXNlckludGVyYWN0aW9uRmxhZ3M7Ci0tIAoxLjcuNC4xCgo=