88872 2012-06-12 07:35:55 -0700 [Qt] Do not move/scale content while the user is interacting with it. 2012-06-12 07:57:07 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kenneth kenneth cmarcelo hausmann menard webkit.review.bot yael zalan zoltan oldest_to_newest 646923 0 kenneth 2012-06-12 07:35:55 -0700 SSIA 646924 1 147083 kenneth 2012-06-12 07:37:43 -0700 Created attachment 147083 Patch 646935 2 147083 hausmann 2012-06-12 07:52:33 -0700 Comment on attachment 147083 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=147083&action=review > Source/WebKit2/UIProcess/qt/QtViewportHandler.cpp:83 > + if (handler->m_suspendCount == 1) > + handler->setInitialScaleIfNeeded(); > + This one is worth a comment before landing IMHO :) 646937 3 147086 kenneth 2012-06-12 07:54:04 -0700 Created attachment 147086 Patch 646938 4 kenneth 2012-06-12 07:56:55 -0700 Landed in r120075 147083 2012-06-12 07:37:43 -0700 2012-06-12 07:53:57 -0700 Patch bug-88872-20120612163512.patch text/plain 6533 kenneth U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwMDUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNGI1MTI5YzFjMzc0NTk5 NmU2MTExZjVkZDRlZTZjNjY3OTY2YWQwOC4uOGUzY2YwNDlkM2Q2ZTEyZmE3NTZkM2IxY2MwYTU0 OTlmOTE5M2M2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA2LTEyICBLZW5u ZXRoIFJvaGRlIENocmlzdGlhbnNlbiAgPGtlbm5ldGhAd2Via2l0Lm9yZz4KKworICAgICAgICBb UXRdIERvIG5vdCBtb3ZlL3NjYWxlIGNvbnRlbnQgd2hpbGUgdGhlIHVzZXIgaXMgaW50ZXJhY3Rp bmcgd2l0aCBpdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9ODg4NzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBEb24ndCB0cnkgbW92aW5nIGNvbnRlbnQgaW50byB2YWxpZCBib3VuZHMgd2hlbiB0aGUgY29u dGVudAorICAgICAgICBzaXplIGNoYW5nZXMgYW5kIHRoZSB1c2VyIGlzIGludGVyYWN0aW5nIHdp dGggdGhlIGNvbnRlbnQuCisKKyAgICAgICAgT25seSBhcHBseSB0aGUgdmlld3BvcnQgaW5pdGlh bCBzY2FsZSBhZnRlciB1c2VyIGludGVyYWN0aW9uCisgICAgICAgIGhhcyBlbmRlZC4KKworICAg ICAgICAqIFVJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SGFuZGxlci5jcHA6CisgICAgICAgIChXZWJL aXQ6OlZpZXdwb3J0VXBkYXRlRGVmZXJyZXI6On5WaWV3cG9ydFVwZGF0ZURlZmVycmVyKToKKyAg ICAgICAgKFdlYktpdDo6UXRWaWV3cG9ydEhhbmRsZXI6OnNldEluaXRpYWxTY2FsZUlmTmVlZGVk KToKKyAgICAgICAgKFdlYktpdDo6UXRWaWV3cG9ydEhhbmRsZXI6OnZpZXdwb3J0QXR0cmlidXRl c0NoYW5nZWQpOgorICAgICAgICAoV2ViS2l0OjpRdFZpZXdwb3J0SGFuZGxlcjo6cGFnZUNvbnRl bnRzU2l6ZUNoYW5nZWQpOgorICAgICAgICAoV2ViS2l0OjpRdFZpZXdwb3J0SGFuZGxlcjo6aW5p dGlhbFJlY3QpOgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvcXQvUXRW aWV3cG9ydEhhbmRsZXIuaDoKKyAgICAgICAgKFF0Vmlld3BvcnRIYW5kbGVyKToKKwogMjAxMi0w Ni0xMSAgUnl1YW4gQ2hvaSAgPHJ5dWFuLmNob2lAc2Ftc3VuZy5jb20+CiAKICAgICAgICAgW0NN QUtFXVtXSzJdIE1ha2UgV2ViUHJvY2VzcyB0YXJnZXQgbmFtZSBtb3JlIGNsZWFyLgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRIYW5kbGVyLmNwcCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SGFuZGxlci5jcHAKaW5kZXgg N2Q5OWZhMmExZDUwZDI0YTg4NzViYWY0NGRiMDEyZmMzNDgyYTBmZi4uMjJlMWM5MGFhMTlmMDE4 N2Q3MDc5YmZlMjIxMTRlMGExNjEyNGE4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL3F0L1F0Vmlld3BvcnRIYW5kbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvcXQvUXRWaWV3cG9ydEhhbmRsZXIuY3BwCkBAIC03OCw2ICs3OCw5IEBAIHB1YmxpYzoK IAogICAgIH5WaWV3cG9ydFVwZGF0ZURlZmVycmVyKCkKICAgICB7CisgICAgICAgIGlmIChoYW5k bGVyLT5tX3N1c3BlbmRDb3VudCA9PSAxKQorICAgICAgICAgICAgaGFuZGxlci0+c2V0SW5pdGlh bFNjYWxlSWZOZWVkZWQoKTsKKwogICAgICAgICBpZiAoLS0oaGFuZGxlci0+bV9zdXNwZW5kQ291 bnQpKQogICAgICAgICAgICAgcmV0dXJuOwogCkBAIC0xOTUsNTEgKzE5OCwzNyBAQCBxcmVhbCBR dFZpZXdwb3J0SGFuZGxlcjo6b3V0ZXJCb3VuZGVkQ1NTU2NhbGUocXJlYWwgY3NzU2NhbGUpIGNv bnN0CiAgICAgcmV0dXJuIGlubmVyQm91bmRlZENTU1NjYWxlKGNzc1NjYWxlKTsKIH0KIAotdm9p ZCBRdFZpZXdwb3J0SGFuZGxlcjo6dmlld3BvcnRBdHRyaWJ1dGVzQ2hhbmdlZChjb25zdCBXZWJD b3JlOjpWaWV3cG9ydEF0dHJpYnV0ZXMmIG5ld0F0dHJpYnV0ZXMpCit2b2lkIFF0Vmlld3BvcnRI YW5kbGVyOjpzZXRJbml0aWFsU2NhbGVJZk5lZWRlZCgpCiB7Ci0gICAgbV9yYXdBdHRyaWJ1dGVz ID0gbmV3QXR0cmlidXRlczsKLSAgICBXZWJDb3JlOjpyZXN0cmljdFNjYWxlRmFjdG9yVG9Jbml0 aWFsU2NhbGVJZk5vdFVzZXJTY2FsYWJsZShtX3Jhd0F0dHJpYnV0ZXMpOwotCi0gICAgewotICAg ICAgICAvLyBGSVhNRTogUmVzZXR0aW5nIGhlcmUgaXMgd3JvbmcsIGl0IHNob3VsZCBoYXBwZW4g b25seSBmb3IgdGhlIGZpcnN0Ci0gICAgICAgIC8vIHZpZXdwb3J0IGNoYW5nZSBmb3IgYSBnaXZl biBwYWdlIGFuZCBmaXJzdCB3aGVuIHdlIHBhaW50IHRoZSBwYWdlIGZvcgotICAgICAgICAvLyB0 aGUgZmlyc3QgdGltZS4KKyAgICBpZiAobV9yYXdBdHRyaWJ1dGVzLmluaXRpYWxTY2FsZSA8IDAp CisgICAgICAgIHJldHVybjsKIAotICAgICAgICBtX2hhZFVzZXJJbnRlcmFjdGlvbiA9IGZhbHNl OworICAgIG1fem9vbU91dFNjYWxlID0gMC4wOworICAgIG1fc2NhbGVTdGFjay5jbGVhcigpOwog Ci0gICAgICAgIG1fem9vbU91dFNjYWxlID0gMC4wOwotICAgICAgICBtX3NjYWxlU3RhY2suY2xl YXIoKTsKKyAgICBtX2hhZFVzZXJJbnRlcmFjdGlvbiA9IGZhbHNlOwogCi0gICAgICAgIC8vIFRo aXMgcGFydCBiZWxvdyBzaG91bGQgZ28gZnVsbHkgYXdheSB3aGVuIHRoZSBhYm92ZSBwbGFuIGlz IGltcGxlbWVudGVkLgorICAgIC8vIFdlIG11c3Qgbm90IGFuaW1hdGUgaGVyZSBhcyB0aGUgbmV3 IGNvbnRlbnRzIHNpemUgbWlnaHQgYmUgdmVyeSBkaWZmZXJlbnQKKyAgICAvLyB0aGFuIHRoZSBj dXJyZW50IG9uZS4KKyAgICBzZXRQYWdlSXRlbVJlY3RWaXNpYmxlKGluaXRpYWxSZWN0KCkpOwog Ci0gICAgICAgIG1fdmlld3BvcnRJdGVtLT5jYW5jZWxGbGljaygpOwotICAgICAgICBtX3NjYWxl QW5pbWF0aW9uLT5zdG9wKCk7CisgICAgbV9yYXdBdHRyaWJ1dGVzLmluaXRpYWxTY2FsZSA9IC0x OyAvLyBNYXJrIHVzZWQuCit9CiAKLSAgICAgICAgbV9zY2FsZVVwZGF0ZURlZmVycmVyLmNsZWFy KCk7Ci0gICAgICAgIG1fc2Nyb2xsVXBkYXRlRGVmZXJyZXIuY2xlYXIoKTsKLSAgICAgICAgbV90 b3VjaFVwZGF0ZURlZmVycmVyLmNsZWFyKCk7Ci0gICAgICAgIG1fYW5pbWF0aW9uVXBkYXRlRGVm ZXJyZXIuY2xlYXIoKTsKLSAgICAgICAgQVNTRVJUKCFtX3N1c3BlbmRDb3VudCk7Ci0gICAgICAg IEFTU0VSVCghbV9oYXNTdXNwZW5kZWRDb250ZW50KTsKLSAgICB9Cit2b2lkIFF0Vmlld3BvcnRI YW5kbGVyOjp2aWV3cG9ydEF0dHJpYnV0ZXNDaGFuZ2VkKGNvbnN0IFdlYkNvcmU6OlZpZXdwb3J0 QXR0cmlidXRlcyYgbmV3QXR0cmlidXRlcykKK3sKKyAgICBtX3Jhd0F0dHJpYnV0ZXMgPSBuZXdB dHRyaWJ1dGVzOworICAgIFdlYkNvcmU6OnJlc3RyaWN0U2NhbGVGYWN0b3JUb0luaXRpYWxTY2Fs ZUlmTm90VXNlclNjYWxhYmxlKG1fcmF3QXR0cmlidXRlcyk7CiAKICAgICBtX2RldmljZVBpeGVs UmF0aW8gPSBtX3Jhd0F0dHJpYnV0ZXMuZGV2aWNlUGl4ZWxSYXRpbzsgLy8gU2hvdWxkIHJldHVy biB2YWx1ZSBmcm9tIHRoZSB3ZWJQYWdlUHJveHkuCiAgICAgbV9hbGxvd3NVc2VyU2NhbGluZyA9 ICEhbV9yYXdBdHRyaWJ1dGVzLnVzZXJTY2FsYWJsZTsKICAgICBtX21pbmltdW1TY2FsZSA9IG1f cmF3QXR0cmlidXRlcy5taW5pbXVtU2NhbGU7CiAgICAgbV9tYXhpbXVtU2NhbGUgPSBtX3Jhd0F0 dHJpYnV0ZXMubWF4aW11bVNjYWxlOwogCi0gICAgaWYgKCFtX2hhZFVzZXJJbnRlcmFjdGlvbiAm JiAhbV9oYXNTdXNwZW5kZWRDb250ZW50KSB7Ci0gICAgICAgIEFTU0VSVChtX3BpbmNoU3RhcnRT Y2FsZSA9PSAtMSk7Ci0gICAgICAgIC8vIEVtaXRzIGNvbnRlbnRzU2NhbGVDaGFuZ2VkKCk7Ci0g ICAgICAgIHNldENTU1NjYWxlKG1fcmF3QXR0cmlidXRlcy5pbml0aWFsU2NhbGUpOwotICAgIH0K KyAgICAvLyBNYWtlIHN1cmUgd2UgYXBwbHkgdGhlIG5ldyBpbml0aWFsIHNjYWxlIHdoZW4gZGVm ZXJyaW5nIGVuZHMuCisgICAgVmlld3BvcnRVcGRhdGVEZWZlcnJlciBndWFyZCh0aGlzKTsKIAog ICAgIGVtaXQgbV92aWV3cG9ydEl0ZW0tPmV4cGVyaW1lbnRhbCgpLT50ZXN0KCktPnZpZXdwb3J0 Q2hhbmdlZCgpOwotCi0gICAgLy8gSWYgdGhlIHdlYiBhcHAgc3VjY2Vzc2l2ZWx5IGNoYW5nZXMg dGhlIHZpZXdwb3J0IG9uIHB1cnBvc2UKLSAgICAvLyBpdCB3YW50cyB0byBiZSBpbiBjb250cm9s IGFuZCB3ZSBzaG91bGQgZGlzYWJsZSBhbmltYXRpb25zLgotICAgIFZpZXdwb3J0VXBkYXRlRGVm ZXJyZXIgZ3VhcmQodGhpcyk7Ci0gICAgc2V0UGFnZUl0ZW1SZWN0VmlzaWJsZShuZWFyZXN0VmFs aWRCb3VuZHMoKSk7CiB9CiAKIHZvaWQgUXRWaWV3cG9ydEhhbmRsZXI6OnBhZ2VDb250ZW50c1Np emVDaGFuZ2VkKGNvbnN0IFFTaXplJiBuZXdTaXplLCBjb25zdCBRU2l6ZSYgdmlld3BvcnRTaXpl KQpAQCAtMjYwLDggKzI0OSwxMCBAQCB2b2lkIFF0Vmlld3BvcnRIYW5kbGVyOjpwYWdlQ29udGVu dHNTaXplQ2hhbmdlZChjb25zdCBRU2l6ZSYgbmV3U2l6ZSwgY29uc3QgUVNpegogICAgIC8vIHdl IGRpZG4ndCBkbyBzY2FsZSBhZGp1c3RtZW50LgogICAgIGVtaXQgbV92aWV3cG9ydEl0ZW0tPmV4 cGVyaW1lbnRhbCgpLT50ZXN0KCktPmNvbnRlbnRzU2NhbGVDb21taXR0ZWQoKTsKIAotICAgIFZp ZXdwb3J0VXBkYXRlRGVmZXJyZXIgZ3VhcmQodGhpcyk7Ci0gICAgc2V0UGFnZUl0ZW1SZWN0Vmlz aWJsZShuZWFyZXN0VmFsaWRCb3VuZHMoKSk7CisgICAgaWYgKCFtX2hhc1N1c3BlbmRlZENvbnRl bnQpIHsKKyAgICAgICAgVmlld3BvcnRVcGRhdGVEZWZlcnJlciBndWFyZCh0aGlzKTsKKyAgICAg ICAgc2V0UGFnZUl0ZW1SZWN0VmlzaWJsZShuZWFyZXN0VmFsaWRCb3VuZHMoKSk7CisgICAgfQog fQogCiB2b2lkIFF0Vmlld3BvcnRIYW5kbGVyOjpzZXRQYWdlSXRlbVJlY3RWaXNpYmxlKGNvbnN0 IFFSZWN0RiYgaXRlbVJlY3QpCkBAIC01MjIsNiArNTEzLDE2IEBAIHZvaWQgUXRWaWV3cG9ydEhh bmRsZXI6Onpvb21Ub0FyZWFHZXN0dXJlRW5kZWQoY29uc3QgUVBvaW50RiYgdG91Y2hQb2ludCwg Y29uc3QKICAgICBhbmltYXRlUGFnZUl0ZW1SZWN0VmlzaWJsZShlbmRWaXNpYmxlQ29udGVudFJl Y3QpOwogfQogCitRUmVjdEYgUXRWaWV3cG9ydEhhbmRsZXI6OmluaXRpYWxSZWN0KCkgY29uc3QK K3sKKyAgICBBU1NFUlQobV9yYXdBdHRyaWJ1dGVzLmluaXRpYWxTY2FsZSA+IDApOworCisgICAg cXJlYWwgZW5kSXRlbVNjYWxlID0gaXRlbVNjYWxlRnJvbUNTUyhpbm5lckJvdW5kZWRDU1NTY2Fs ZShtX3Jhd0F0dHJpYnV0ZXMuaW5pdGlhbFNjYWxlKSk7CisgICAgUVJlY3RGIGVuZFZpc2libGVD b250ZW50UmVjdChRUG9pbnRGKDAsIDApLCB2aWV3cG9ydFJlY3Quc2l6ZSgpIC8gZW5kSXRlbVNj YWxlKTsKKworICAgIHJldHVybiBlbmRWaXNpYmxlQ29udGVudFJlY3Q7Cit9CisKIFFSZWN0RiBR dFZpZXdwb3J0SGFuZGxlcjo6bmVhcmVzdFZhbGlkQm91bmRzKCkgY29uc3QKIHsKICAgICBxcmVh bCBlbmRJdGVtU2NhbGUgPSBpdGVtU2NhbGVGcm9tQ1NTKGlubmVyQm91bmRlZENTU1NjYWxlKGN1 cnJlbnRDU1NTY2FsZSgpKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv cXQvUXRWaWV3cG9ydEhhbmRsZXIuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZp ZXdwb3J0SGFuZGxlci5oCmluZGV4IDA5ZjUzN2RiZTBmMzRiODFmYzQ5MjYxYWQyMzI0YmE3MDQ3 YTI1N2MuLmU0YThjNTFmYjc1NzVkNmVlN2Q0MjQ4MTkzOTQyYjNhZmUxYTJiZGQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SGFuZGxlci5oCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SGFuZGxlci5oCkBAIC0xMDcs NiArMTA3LDggQEAgcHJpdmF0ZToKICAgICBxcmVhbCBpbm5lckJvdW5kZWRDU1NTY2FsZShxcmVh bCkgY29uc3Q7CiAgICAgcXJlYWwgb3V0ZXJCb3VuZGVkQ1NTU2NhbGUocXJlYWwpIGNvbnN0Owog CisgICAgdm9pZCBzZXRJbml0aWFsU2NhbGVJZk5lZWRlZCgpOworCiAgICAgdm9pZCBzZXRDU1NT Y2FsZShxcmVhbCk7CiAgICAgcXJlYWwgY3VycmVudENTU1NjYWxlKCkgY29uc3Q7CiAKQEAgLTEx NCw2ICsxMTYsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgYW5pbWF0ZVBhZ2VJdGVtUmVjdFZpc2li bGUoY29uc3QgUVJlY3RGJik7CiAKICAgICBRUmVjdCB2aXNpYmxlQ29udGVudHNSZWN0KCkgY29u c3Q7CisgICAgUVJlY3RGIGluaXRpYWxSZWN0KCkgY29uc3Q7CiAgICAgUVJlY3RGIG5lYXJlc3RW YWxpZEJvdW5kcygpIGNvbnN0OwogCiAgICAgUVJlY3RGIGNvbXB1dGVQb3NSYW5nZUZvclBhZ2VJ dGVtQXRTY2FsZShxcmVhbCBpdGVtU2NhbGUpIGNvbnN0Owo= 147086 2012-06-12 07:54:04 -0700 2012-06-12 07:57:07 -0700 Patch bug-88872-20120612165133.patch text/plain 6693 kenneth U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwMDUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNGI1MTI5YzFjMzc0NTk5 NmU2MTExZjVkZDRlZTZjNjY3OTY2YWQwOC4uNjJhMDVhMTE2MDgyYTNlOTQ5YWMyNTdjZDU5OGY1 ZTE0NzI2OGVjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA2LTEyICBLZW5u ZXRoIFJvaGRlIENocmlzdGlhbnNlbiAgPGtlbm5ldGhAd2Via2l0Lm9yZz4KKworICAgICAgICBb UXRdIERvIG5vdCBtb3ZlL3NjYWxlIGNvbnRlbnQgd2hpbGUgdGhlIHVzZXIgaXMgaW50ZXJhY3Rp bmcgd2l0aCBpdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9ODg4NzIKKworICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBIYXVzbWFubi4KKworICAgICAg ICBEb24ndCB0cnkgbW92aW5nIGNvbnRlbnQgaW50byB2YWxpZCBib3VuZHMgd2hlbiB0aGUgY29u dGVudAorICAgICAgICBzaXplIGNoYW5nZXMgYW5kIHRoZSB1c2VyIGlzIGludGVyYWN0aW5nIHdp dGggdGhlIGNvbnRlbnQuCisKKyAgICAgICAgT25seSBhcHBseSB0aGUgdmlld3BvcnQgaW5pdGlh bCBzY2FsZSBhZnRlciB1c2VyIGludGVyYWN0aW9uCisgICAgICAgIGhhcyBlbmRlZC4KKworICAg ICAgICAqIFVJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SGFuZGxlci5jcHA6CisgICAgICAgIChXZWJL aXQ6OlZpZXdwb3J0VXBkYXRlRGVmZXJyZXI6On5WaWV3cG9ydFVwZGF0ZURlZmVycmVyKToKKyAg ICAgICAgKFdlYktpdDo6UXRWaWV3cG9ydEhhbmRsZXI6OnNldEluaXRpYWxTY2FsZUlmTmVlZGVk KToKKyAgICAgICAgKFdlYktpdDo6UXRWaWV3cG9ydEhhbmRsZXI6OnZpZXdwb3J0QXR0cmlidXRl c0NoYW5nZWQpOgorICAgICAgICAoV2ViS2l0OjpRdFZpZXdwb3J0SGFuZGxlcjo6cGFnZUNvbnRl bnRzU2l6ZUNoYW5nZWQpOgorICAgICAgICAoV2ViS2l0OjpRdFZpZXdwb3J0SGFuZGxlcjo6aW5p dGlhbFJlY3QpOgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvcXQvUXRW aWV3cG9ydEhhbmRsZXIuaDoKKyAgICAgICAgKFF0Vmlld3BvcnRIYW5kbGVyKToKKwogMjAxMi0w Ni0xMSAgUnl1YW4gQ2hvaSAgPHJ5dWFuLmNob2lAc2Ftc3VuZy5jb20+CiAKICAgICAgICAgW0NN QUtFXVtXSzJdIE1ha2UgV2ViUHJvY2VzcyB0YXJnZXQgbmFtZSBtb3JlIGNsZWFyLgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRIYW5kbGVyLmNwcCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SGFuZGxlci5jcHAKaW5kZXgg N2Q5OWZhMmExZDUwZDI0YTg4NzViYWY0NGRiMDEyZmMzNDgyYTBmZi4uMTU2ZmVhZTllY2M4YjFm ZmQ2MGY0ODhiNzg4MjY2OWMwMWQzNTE0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL3F0L1F0Vmlld3BvcnRIYW5kbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvcXQvUXRWaWV3cG9ydEhhbmRsZXIuY3BwCkBAIC03OCw2ICs3OCwxMSBAQCBwdWJsaWM6 CiAKICAgICB+Vmlld3BvcnRVcGRhdGVEZWZlcnJlcigpCiAgICAgeworICAgICAgICAvLyBXZSBh cmUgY2FsbGluZyBzZXRJbml0aWFsU2NhbGVJZk5lZWRlZCgpIGhlcmUgYXMgaXQgcmVxdWlyZXMg YQorICAgICAgICAvLyBwb3NzaXRpdmUgbV9zdXNwZW5kQ291bnQgZHVlIHRvIHRoZSBhc3NlcnQg aW4gc2V0UGFnZUl0ZW1SZWN0VmlzaWJsZSgpLgorICAgICAgICBpZiAoaGFuZGxlci0+bV9zdXNw ZW5kQ291bnQgPT0gMSkKKyAgICAgICAgICAgIGhhbmRsZXItPnNldEluaXRpYWxTY2FsZUlmTmVl ZGVkKCk7CisKICAgICAgICAgaWYgKC0tKGhhbmRsZXItPm1fc3VzcGVuZENvdW50KSkKICAgICAg ICAgICAgIHJldHVybjsKIApAQCAtMTk1LDUxICsyMDAsMzcgQEAgcXJlYWwgUXRWaWV3cG9ydEhh bmRsZXI6Om91dGVyQm91bmRlZENTU1NjYWxlKHFyZWFsIGNzc1NjYWxlKSBjb25zdAogICAgIHJl dHVybiBpbm5lckJvdW5kZWRDU1NTY2FsZShjc3NTY2FsZSk7CiB9CiAKLXZvaWQgUXRWaWV3cG9y dEhhbmRsZXI6OnZpZXdwb3J0QXR0cmlidXRlc0NoYW5nZWQoY29uc3QgV2ViQ29yZTo6Vmlld3Bv cnRBdHRyaWJ1dGVzJiBuZXdBdHRyaWJ1dGVzKQordm9pZCBRdFZpZXdwb3J0SGFuZGxlcjo6c2V0 SW5pdGlhbFNjYWxlSWZOZWVkZWQoKQogewotICAgIG1fcmF3QXR0cmlidXRlcyA9IG5ld0F0dHJp YnV0ZXM7Ci0gICAgV2ViQ29yZTo6cmVzdHJpY3RTY2FsZUZhY3RvclRvSW5pdGlhbFNjYWxlSWZO b3RVc2VyU2NhbGFibGUobV9yYXdBdHRyaWJ1dGVzKTsKLQotICAgIHsKLSAgICAgICAgLy8gRklY TUU6IFJlc2V0dGluZyBoZXJlIGlzIHdyb25nLCBpdCBzaG91bGQgaGFwcGVuIG9ubHkgZm9yIHRo ZSBmaXJzdAotICAgICAgICAvLyB2aWV3cG9ydCBjaGFuZ2UgZm9yIGEgZ2l2ZW4gcGFnZSBhbmQg Zmlyc3Qgd2hlbiB3ZSBwYWludCB0aGUgcGFnZSBmb3IKLSAgICAgICAgLy8gdGhlIGZpcnN0IHRp bWUuCisgICAgaWYgKG1fcmF3QXR0cmlidXRlcy5pbml0aWFsU2NhbGUgPCAwKQorICAgICAgICBy ZXR1cm47CiAKLSAgICAgICAgbV9oYWRVc2VySW50ZXJhY3Rpb24gPSBmYWxzZTsKKyAgICBtX3pv b21PdXRTY2FsZSA9IDAuMDsKKyAgICBtX3NjYWxlU3RhY2suY2xlYXIoKTsKIAotICAgICAgICBt X3pvb21PdXRTY2FsZSA9IDAuMDsKLSAgICAgICAgbV9zY2FsZVN0YWNrLmNsZWFyKCk7CisgICAg bV9oYWRVc2VySW50ZXJhY3Rpb24gPSBmYWxzZTsKIAotICAgICAgICAvLyBUaGlzIHBhcnQgYmVs b3cgc2hvdWxkIGdvIGZ1bGx5IGF3YXkgd2hlbiB0aGUgYWJvdmUgcGxhbiBpcyBpbXBsZW1lbnRl ZC4KKyAgICAvLyBXZSBtdXN0IG5vdCBhbmltYXRlIGhlcmUgYXMgdGhlIG5ldyBjb250ZW50cyBz aXplIG1pZ2h0IGJlIHZlcnkgZGlmZmVyZW50CisgICAgLy8gdGhhbiB0aGUgY3VycmVudCBvbmUu CisgICAgc2V0UGFnZUl0ZW1SZWN0VmlzaWJsZShpbml0aWFsUmVjdCgpKTsKIAotICAgICAgICBt X3ZpZXdwb3J0SXRlbS0+Y2FuY2VsRmxpY2soKTsKLSAgICAgICAgbV9zY2FsZUFuaW1hdGlvbi0+ c3RvcCgpOworICAgIG1fcmF3QXR0cmlidXRlcy5pbml0aWFsU2NhbGUgPSAtMTsgLy8gTWFyayB1 c2VkLgorfQogCi0gICAgICAgIG1fc2NhbGVVcGRhdGVEZWZlcnJlci5jbGVhcigpOwotICAgICAg ICBtX3Njcm9sbFVwZGF0ZURlZmVycmVyLmNsZWFyKCk7Ci0gICAgICAgIG1fdG91Y2hVcGRhdGVE ZWZlcnJlci5jbGVhcigpOwotICAgICAgICBtX2FuaW1hdGlvblVwZGF0ZURlZmVycmVyLmNsZWFy KCk7Ci0gICAgICAgIEFTU0VSVCghbV9zdXNwZW5kQ291bnQpOwotICAgICAgICBBU1NFUlQoIW1f aGFzU3VzcGVuZGVkQ29udGVudCk7Ci0gICAgfQordm9pZCBRdFZpZXdwb3J0SGFuZGxlcjo6dmll d3BvcnRBdHRyaWJ1dGVzQ2hhbmdlZChjb25zdCBXZWJDb3JlOjpWaWV3cG9ydEF0dHJpYnV0ZXMm IG5ld0F0dHJpYnV0ZXMpCit7CisgICAgbV9yYXdBdHRyaWJ1dGVzID0gbmV3QXR0cmlidXRlczsK KyAgICBXZWJDb3JlOjpyZXN0cmljdFNjYWxlRmFjdG9yVG9Jbml0aWFsU2NhbGVJZk5vdFVzZXJT Y2FsYWJsZShtX3Jhd0F0dHJpYnV0ZXMpOwogCiAgICAgbV9kZXZpY2VQaXhlbFJhdGlvID0gbV9y YXdBdHRyaWJ1dGVzLmRldmljZVBpeGVsUmF0aW87IC8vIFNob3VsZCByZXR1cm4gdmFsdWUgZnJv bSB0aGUgd2ViUGFnZVByb3h5LgogICAgIG1fYWxsb3dzVXNlclNjYWxpbmcgPSAhIW1fcmF3QXR0 cmlidXRlcy51c2VyU2NhbGFibGU7CiAgICAgbV9taW5pbXVtU2NhbGUgPSBtX3Jhd0F0dHJpYnV0 ZXMubWluaW11bVNjYWxlOwogICAgIG1fbWF4aW11bVNjYWxlID0gbV9yYXdBdHRyaWJ1dGVzLm1h eGltdW1TY2FsZTsKIAotICAgIGlmICghbV9oYWRVc2VySW50ZXJhY3Rpb24gJiYgIW1faGFzU3Vz cGVuZGVkQ29udGVudCkgewotICAgICAgICBBU1NFUlQobV9waW5jaFN0YXJ0U2NhbGUgPT0gLTEp OwotICAgICAgICAvLyBFbWl0cyBjb250ZW50c1NjYWxlQ2hhbmdlZCgpOwotICAgICAgICBzZXRD U1NTY2FsZShtX3Jhd0F0dHJpYnV0ZXMuaW5pdGlhbFNjYWxlKTsKLSAgICB9CisgICAgLy8gTWFr ZSBzdXJlIHdlIGFwcGx5IHRoZSBuZXcgaW5pdGlhbCBzY2FsZSB3aGVuIGRlZmVycmluZyBlbmRz LgorICAgIFZpZXdwb3J0VXBkYXRlRGVmZXJyZXIgZ3VhcmQodGhpcyk7CiAKICAgICBlbWl0IG1f dmlld3BvcnRJdGVtLT5leHBlcmltZW50YWwoKS0+dGVzdCgpLT52aWV3cG9ydENoYW5nZWQoKTsK LQotICAgIC8vIElmIHRoZSB3ZWIgYXBwIHN1Y2Nlc3NpdmVseSBjaGFuZ2VzIHRoZSB2aWV3cG9y dCBvbiBwdXJwb3NlCi0gICAgLy8gaXQgd2FudHMgdG8gYmUgaW4gY29udHJvbCBhbmQgd2Ugc2hv dWxkIGRpc2FibGUgYW5pbWF0aW9ucy4KLSAgICBWaWV3cG9ydFVwZGF0ZURlZmVycmVyIGd1YXJk KHRoaXMpOwotICAgIHNldFBhZ2VJdGVtUmVjdFZpc2libGUobmVhcmVzdFZhbGlkQm91bmRzKCkp OwogfQogCiB2b2lkIFF0Vmlld3BvcnRIYW5kbGVyOjpwYWdlQ29udGVudHNTaXplQ2hhbmdlZChj b25zdCBRU2l6ZSYgbmV3U2l6ZSwgY29uc3QgUVNpemUmIHZpZXdwb3J0U2l6ZSkKQEAgLTI2MCw4 ICsyNTEsMTAgQEAgdm9pZCBRdFZpZXdwb3J0SGFuZGxlcjo6cGFnZUNvbnRlbnRzU2l6ZUNoYW5n ZWQoY29uc3QgUVNpemUmIG5ld1NpemUsIGNvbnN0IFFTaXoKICAgICAvLyB3ZSBkaWRuJ3QgZG8g c2NhbGUgYWRqdXN0bWVudC4KICAgICBlbWl0IG1fdmlld3BvcnRJdGVtLT5leHBlcmltZW50YWwo KS0+dGVzdCgpLT5jb250ZW50c1NjYWxlQ29tbWl0dGVkKCk7CiAKLSAgICBWaWV3cG9ydFVwZGF0 ZURlZmVycmVyIGd1YXJkKHRoaXMpOwotICAgIHNldFBhZ2VJdGVtUmVjdFZpc2libGUobmVhcmVz dFZhbGlkQm91bmRzKCkpOworICAgIGlmICghbV9oYXNTdXNwZW5kZWRDb250ZW50KSB7CisgICAg ICAgIFZpZXdwb3J0VXBkYXRlRGVmZXJyZXIgZ3VhcmQodGhpcyk7CisgICAgICAgIHNldFBhZ2VJ dGVtUmVjdFZpc2libGUobmVhcmVzdFZhbGlkQm91bmRzKCkpOworICAgIH0KIH0KIAogdm9pZCBR dFZpZXdwb3J0SGFuZGxlcjo6c2V0UGFnZUl0ZW1SZWN0VmlzaWJsZShjb25zdCBRUmVjdEYmIGl0 ZW1SZWN0KQpAQCAtNTIyLDYgKzUxNSwxNiBAQCB2b2lkIFF0Vmlld3BvcnRIYW5kbGVyOjp6b29t VG9BcmVhR2VzdHVyZUVuZGVkKGNvbnN0IFFQb2ludEYmIHRvdWNoUG9pbnQsIGNvbnN0CiAgICAg YW5pbWF0ZVBhZ2VJdGVtUmVjdFZpc2libGUoZW5kVmlzaWJsZUNvbnRlbnRSZWN0KTsKIH0KIAor UVJlY3RGIFF0Vmlld3BvcnRIYW5kbGVyOjppbml0aWFsUmVjdCgpIGNvbnN0Cit7CisgICAgQVNT RVJUKG1fcmF3QXR0cmlidXRlcy5pbml0aWFsU2NhbGUgPiAwKTsKKworICAgIHFyZWFsIGVuZEl0 ZW1TY2FsZSA9IGl0ZW1TY2FsZUZyb21DU1MoaW5uZXJCb3VuZGVkQ1NTU2NhbGUobV9yYXdBdHRy aWJ1dGVzLmluaXRpYWxTY2FsZSkpOworICAgIFFSZWN0RiBlbmRWaXNpYmxlQ29udGVudFJlY3Qo UVBvaW50RigwLCAwKSwgdmlld3BvcnRSZWN0LnNpemUoKSAvIGVuZEl0ZW1TY2FsZSk7CisKKyAg ICByZXR1cm4gZW5kVmlzaWJsZUNvbnRlbnRSZWN0OworfQorCiBRUmVjdEYgUXRWaWV3cG9ydEhh bmRsZXI6Om5lYXJlc3RWYWxpZEJvdW5kcygpIGNvbnN0CiB7CiAgICAgcXJlYWwgZW5kSXRlbVNj YWxlID0gaXRlbVNjYWxlRnJvbUNTUyhpbm5lckJvdW5kZWRDU1NTY2FsZShjdXJyZW50Q1NTU2Nh bGUoKSkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3Bv cnRIYW5kbGVyLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEhhbmRs ZXIuaAppbmRleCAwOWY1MzdkYmUwZjM0YjgxZmM0OTI2MWFkMjMyNGJhNzA0N2EyNTdjLi5lNGE4 YzUxZmI3NTc1ZDZlZTdkNDI0ODE5Mzk0MmIzYWZlMWEyYmRkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEhhbmRsZXIuaAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEhhbmRsZXIuaApAQCAtMTA3LDYgKzEwNyw4IEBA IHByaXZhdGU6CiAgICAgcXJlYWwgaW5uZXJCb3VuZGVkQ1NTU2NhbGUocXJlYWwpIGNvbnN0Owog ICAgIHFyZWFsIG91dGVyQm91bmRlZENTU1NjYWxlKHFyZWFsKSBjb25zdDsKIAorICAgIHZvaWQg c2V0SW5pdGlhbFNjYWxlSWZOZWVkZWQoKTsKKwogICAgIHZvaWQgc2V0Q1NTU2NhbGUocXJlYWwp OwogICAgIHFyZWFsIGN1cnJlbnRDU1NTY2FsZSgpIGNvbnN0OwogCkBAIC0xMTQsNiArMTE2LDcg QEAgcHJpdmF0ZToKICAgICB2b2lkIGFuaW1hdGVQYWdlSXRlbVJlY3RWaXNpYmxlKGNvbnN0IFFS ZWN0RiYpOwogCiAgICAgUVJlY3QgdmlzaWJsZUNvbnRlbnRzUmVjdCgpIGNvbnN0OworICAgIFFS ZWN0RiBpbml0aWFsUmVjdCgpIGNvbnN0OwogICAgIFFSZWN0RiBuZWFyZXN0VmFsaWRCb3VuZHMo KSBjb25zdDsKIAogICAgIFFSZWN0RiBjb21wdXRlUG9zUmFuZ2VGb3JQYWdlSXRlbUF0U2NhbGUo cXJlYWwgaXRlbVNjYWxlKSBjb25zdDsK