110183 2013-02-18 23:04:42 -0800 [chromium] Fix races in double-tap zoom minimum scale policy 2013-02-19 10:44:13 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 aelias aelias abarth aelias klobag webkit.review.bot yusufo oldest_to_newest 835997 0 aelias 2013-02-18 23:04:42 -0800 [chromium] Fix races in double-tap zoom minimum scale policy 835998 1 188997 aelias 2013-02-18 23:10:11 -0800 Created attachment 188997 Patch 836511 2 188997 abarth 2013-02-19 10:10:20 -0800 Comment on attachment 188997 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=188997&action=review This code really needs to be refactored. All the page scaling state should be moved into a separate object that can be unit tested without introducing a bunch of "for testing" state. One way to do that is to have the object call back through a virtual interface that actually operators on the WebView. For testing, we can supply a mock implementation of the interface (e.g., so we don't need a "for testing" branch to avoid m_layerTreeView->startPageScaleAnimation). We can land this patch as-is, but please consider a followup patch to refactor this code. > Source/WebKit/chromium/src/WebViewImpl.cpp:406 > + , m_doubleTapZoomPageScaleFactor(0) > + , m_doubleTapZoomPending(false) > + , m_enableFakeDoubleTapAnimationForTesting(false) > + , m_fakeDoubleTapPageScaleFactor(0) > + , m_fakeDoubleTapUseAnchor(false) So much state! We really should move all this viewport related state out into its own object. 836531 3 188997 aelias 2013-02-19 10:39:48 -0800 Comment on attachment 188997 Patch Agreed completely, filed http://crbug.com/176998 to track. 836540 4 188997 webkit.review.bot 2013-02-19 10:44:10 -0800 Comment on attachment 188997 Patch Clearing flags on attachment: 188997 Committed r143355: <http://trac.webkit.org/changeset/143355> 836541 5 webkit.review.bot 2013-02-19 10:44:13 -0800 All reviewed patches have been landed. Closing bug. 188997 2013-02-18 23:10:11 -0800 2013-02-19 10:44:10 -0800 Patch bug-110183-20130218230633.patch text/plain 14917 aelias U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzMTc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDM0OTRmYjgzZjBhMWIyZWZmMDE5MzQ0YmYzNDJlNzFhMzAzNzc4NWQuLmM2ZDljZTM0MDM3OGQ1 Zjg0MTA4YTliYWJiMGMwMWM0NTQ5N2ZlODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMzkgQEAKKzIwMTMtMDItMTggIEFsZXhhbmRyZSBFbGlhcyAgPGFlbGlhc0BjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBGaXggcmFjZXMgaW4gZG91YmxlLXRhcCB6 b29tIG1pbmltdW0gc2NhbGUgcG9saWN5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMTAxODMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBEb3VibGUtdGFwIHpvb20gb24gQW5kcm9pZCBpcyBzdXBwb3NlZCB0 byByZXR1cm4gdG8gbWluaW11bSBzY2FsZQorICAgICAgICBpZiBubyBwaW5jaCB6b29tIG9jY3Vy cmVkIHNpbmNlIHRoZSBsYXN0IGRvdWJsZS10YXAuIEJlY2F1c2UgYm90aAorICAgICAgICBwaW5j aCB6b29tIGFuZCB0aGUgcmVzdWx0IG9mIGRvdWJsZS10YXAgem9vbSBnZXRzIHBhc3NlZCBpbiBm cm9tIENDCisgICAgICAgIHZpYSBhcHBseVNjcm9sbEFuZFNjYWxlLCB0aGlzIGxvZ2ljIHdhcyBi cml0dGxlIGFuZCBwcm9uZSB0byByYWNlcworICAgICAgICBkZXBlbmRpbmcgb24gd2hlbiB0aGUg YW5pbWF0aW9uIHVwZGF0ZSB3YXMgcmVjZWl2ZWQuIFRoaXMgcGF0Y2gKKyAgICAgICAga2VlcHMg dHJhY2sgb2Ygd2hhdCB0aGUgdGFyZ2V0IGRvdWJsZS10YXAgc2NhbGUgaXMgdG8gbWFrZSBpdCBt b3JlCisgICAgICAgIHJvYnVzdC4KKworICAgICAgICBJIGFsc28gZml4ZWQgZG91YmxlLXRhcCB6 b29tIHRlc3QgbW9ja2luZyB0byBleGVyY2lzZSB0aGUgZW50aXJlCisgICAgICAgIHBhZ2Ugc2Nh bGUgYW5pbWF0aW9uIGZsb3cgKG91ciBwcmV2aW91cyB3YXkgb2YgdGVzdGluZyB3YXMgaGlkaW5n IHRoZQorICAgICAgICByYWNpbmVzcyksIGFuZCBhZGRlZCBhIG5ldyB0ZXN0IGNhc2UgaW4gRGl2 QXV0b1pvb21NdWx0aXBsZVBhcmFtc1Rlc3QuCisKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwu Y3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6V2ViVmlld0ltcGwpOgorICAgICAg ICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6c3RhcnRQYWdlU2NhbGVBbmltYXRpb24pOgorICAgICAg ICAoV2ViS2l0KToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmVuYWJsZUZha2VEb3Vi bGVUYXBBbmltYXRpb25Gb3JUZXN0aW5nKToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6 OmNvbXB1dGVTY2FsZUFuZFNjcm9sbEZvckhpdFJlY3QpOgorICAgICAgICAoV2ViS2l0OjpXZWJW aWV3SW1wbDo6YW5pbWF0ZVpvb21Bcm91bmRQb2ludCk6CisgICAgICAgIChXZWJLaXQ6OldlYlZp ZXdJbXBsOjpkaWRDb21taXRMb2FkKToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmFw cGx5U2Nyb2xsQW5kU2NhbGUpOgorICAgICAgICAqIHNyYy9XZWJWaWV3SW1wbC5oOgorICAgICAg ICAoV2ViVmlld0ltcGwpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6ZmFrZURvdWJs ZVRhcEFuaW1hdGlvblBlbmRpbmdGb3JUZXN0aW5nKToKKyAgICAgICAgKFdlYktpdDo6V2ViVmll d0ltcGw6OmZha2VEb3VibGVUYXBUYXJnZXRQb3NpdGlvbkZvclRlc3RpbmcpOgorICAgICAgICAo V2ViS2l0OjpXZWJWaWV3SW1wbDo6ZmFrZURvdWJsZVRhcFBhZ2VTY2FsZUZhY3RvckZvclRlc3Rp bmcpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6ZmFrZURvdWJsZVRhcFVzZUFuY2hv ckZvclRlc3RpbmcpOgorICAgICAgICAqIHRlc3RzL1dlYkZyYW1lVGVzdC5jcHA6CisKIDIwMTMt MDItMTUgIEFsZWMgRmxldHQgIDxhbGVjZmxldHRAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIElu ZGV4ZWREQjogU3R1YiBvdXQgU2hhcmVkQnVmZmVyIHZlcnNpb24gb2YgZ2V0KCkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcCBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAppbmRleCBiMmU0Yjc3MDNhMTM0ZWVk NjllZmMwMzEwZGJmODdjNmVkM2E5YjQ3Li5hMzcxZGYwZTM1MTU2Njg4M2MxNzA0ODhkMzE1ZDAx OWYwYjEyMDE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3 SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3Bw CkBAIC0zOTksOCArMzk5LDExIEBAIFdlYlZpZXdJbXBsOjpXZWJWaWV3SW1wbChXZWJWaWV3Q2xp ZW50KiBjbGllbnQpCiAgICAgLCBtX2lnbm9yZVZpZXdwb3J0VGFnTWF4aW11bVNjYWxlKGZhbHNl KQogICAgICwgbV9wYWdlU2NhbGVGYWN0b3JJc1NldChmYWxzZSkKICAgICAsIG1fc2F2ZWRQYWdl U2NhbGVGYWN0b3IoMCkKLSAgICAsIG1fZG91YmxlVGFwWm9vbUluRWZmZWN0KGZhbHNlKQotICAg ICwgbV9zaG91bGRVc2VEb3VibGVUYXBUaW1lWmVybyhmYWxzZSkKKyAgICAsIG1fZG91YmxlVGFw Wm9vbVBhZ2VTY2FsZUZhY3RvcigwKQorICAgICwgbV9kb3VibGVUYXBab29tUGVuZGluZyhmYWxz ZSkKKyAgICAsIG1fZW5hYmxlRmFrZURvdWJsZVRhcEFuaW1hdGlvbkZvclRlc3RpbmcoZmFsc2Up CisgICAgLCBtX2Zha2VEb3VibGVUYXBQYWdlU2NhbGVGYWN0b3IoMCkKKyAgICAsIG1fZmFrZURv dWJsZVRhcFVzZUFuY2hvcihmYWxzZSkKICAgICAsIG1fY29udGV4dE1lbnVBbGxvd2VkKGZhbHNl KQogICAgICwgbV9kb2luZ0RyYWdBbmREcm9wKGZhbHNlKQogICAgICwgbV9pZ25vcmVJbnB1dEV2 ZW50cyhmYWxzZSkKQEAgLTg1NiwxOSArODU5LDM0IEBAIHZvaWQgV2ViVmlld0ltcGw6OnRyYW5z ZmVyQWN0aXZlV2hlZWxGbGluZ0FuaW1hdGlvbihjb25zdCBXZWJBY3RpdmVXaGVlbEZsaW5nUGFy CiAgICAgc2NoZWR1bGVBbmltYXRpb24oKTsKIH0KIAotdm9pZCBXZWJWaWV3SW1wbDo6c3RhcnRQ YWdlU2NhbGVBbmltYXRpb24oY29uc3QgSW50UG9pbnQmIHRhcmdldFBvc2l0aW9uLCBib29sIHVz ZUFuY2hvciwgZmxvYXQgbmV3U2NhbGUsIGRvdWJsZSBkdXJhdGlvbkluU2Vjb25kcykKK2Jvb2wg V2ViVmlld0ltcGw6OnN0YXJ0UGFnZVNjYWxlQW5pbWF0aW9uKGNvbnN0IEludFBvaW50JiB0YXJn ZXRQb3NpdGlvbiwgYm9vbCB1c2VBbmNob3IsIGZsb2F0IG5ld1NjYWxlLCBkb3VibGUgZHVyYXRp b25JblNlY29uZHMpCiB7CiAgICAgV2ViUG9pbnQgY2xhbXBlZFBvaW50ID0gdGFyZ2V0UG9zaXRp b247Ci0gICAgaWYgKCF1c2VBbmNob3IpCisgICAgaWYgKCF1c2VBbmNob3IpIHsKICAgICAgICAg Y2xhbXBlZFBvaW50ID0gY2xhbXBPZmZzZXRBdFNjYWxlKHRhcmdldFBvc2l0aW9uLCBuZXdTY2Fs ZSk7Ci0gICAgaWYgKCghZHVyYXRpb25JblNlY29uZHMgJiYgIXVzZUFuY2hvcikgfHwgbV9zaG91 bGRVc2VEb3VibGVUYXBUaW1lWmVybykgewotICAgICAgICBzZXRQYWdlU2NhbGVGYWN0b3IobmV3 U2NhbGUsIGNsYW1wZWRQb2ludCk7Ci0gICAgICAgIHJldHVybjsKKyAgICAgICAgaWYgKCFkdXJh dGlvbkluU2Vjb25kcykgeworICAgICAgICAgICAgc2V0UGFnZVNjYWxlRmFjdG9yKG5ld1NjYWxl LCBjbGFtcGVkUG9pbnQpOworICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICB9CiAg ICAgfQotICAgIGlmICghbV9sYXllclRyZWVWaWV3KQotICAgICAgICByZXR1cm47CisgICAgaWYg KHVzZUFuY2hvciAmJiBuZXdTY2FsZSA9PSBwYWdlU2NhbGVGYWN0b3IoKSkKKyAgICAgICAgcmV0 dXJuIGZhbHNlOwogCi0gICAgbV9sYXllclRyZWVWaWV3LT5zdGFydFBhZ2VTY2FsZUFuaW1hdGlv bih0YXJnZXRQb3NpdGlvbiwgdXNlQW5jaG9yLCBuZXdTY2FsZSwgZHVyYXRpb25JblNlY29uZHMp OworICAgIGlmIChtX2VuYWJsZUZha2VEb3VibGVUYXBBbmltYXRpb25Gb3JUZXN0aW5nKSB7Cisg ICAgICAgIG1fZmFrZURvdWJsZVRhcFRhcmdldFBvc2l0aW9uID0gdGFyZ2V0UG9zaXRpb247Cisg ICAgICAgIG1fZmFrZURvdWJsZVRhcFVzZUFuY2hvciA9IHVzZUFuY2hvcjsKKyAgICAgICAgbV9m YWtlRG91YmxlVGFwUGFnZVNjYWxlRmFjdG9yID0gbmV3U2NhbGU7CisgICAgfSBlbHNlIHsKKyAg ICAgICAgaWYgKCFtX2xheWVyVHJlZVZpZXcpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7Cisg ICAgICAgIG1fbGF5ZXJUcmVlVmlldy0+c3RhcnRQYWdlU2NhbGVBbmltYXRpb24odGFyZ2V0UG9z aXRpb24sIHVzZUFuY2hvciwgbmV3U2NhbGUsIGR1cmF0aW9uSW5TZWNvbmRzKTsKKyAgICB9Cisg ICAgcmV0dXJuIHRydWU7Cit9CisKK3ZvaWQgV2ViVmlld0ltcGw6OmVuYWJsZUZha2VEb3VibGVU YXBBbmltYXRpb25Gb3JUZXN0aW5nKGJvb2wgZW5hYmxlKQoreworICAgIG1fZW5hYmxlRmFrZURv dWJsZVRhcEFuaW1hdGlvbkZvclRlc3RpbmcgPSBlbmFibGU7CiB9CiAjZW5kaWYKIApAQCAtMTE1 MywxMSArMTE3MSw2IEBAIFdlYlJlY3QgV2ViVmlld0ltcGw6OndpZGVuUmVjdFdpdGhpblBhZ2VC b3VuZHMoY29uc3QgV2ViUmVjdCYgc291cmNlLCBpbnQgdGFyZ2V0CiAgICAgcmV0dXJuIFdlYlJl Y3QobmV3WCwgc291cmNlLnksIG5ld1dpZHRoLCBzb3VyY2UuaGVpZ2h0KTsKIH0KIAotdm9pZCBX ZWJWaWV3SW1wbDo6c2hvdWxkVXNlQW5pbWF0ZURvdWJsZVRhcFRpbWVaZXJvRm9yVGVzdGluZyhi b29sIHNldFRvWmVybykKLXsKLSAgICBtX3Nob3VsZFVzZURvdWJsZVRhcFRpbWVaZXJvID0gc2V0 VG9aZXJvOwotfQotCiB2b2lkIFdlYlZpZXdJbXBsOjpjb21wdXRlU2NhbGVBbmRTY3JvbGxGb3JI aXRSZWN0KGNvbnN0IFdlYlJlY3QmIGhpdFJlY3QsIEF1dG9ab29tVHlwZSB6b29tVHlwZSwgZmxv YXQmIHNjYWxlLCBXZWJQb2ludCYgc2Nyb2xsLCBib29sJiBpc0FuY2hvcikKIHsKICAgICBzY2Fs ZSA9IHBhZ2VTY2FsZUZhY3RvcigpOwpAQCAtMTIxNSwxNyArMTIyOCwxNSBAQCB2b2lkIFdlYlZp ZXdJbXBsOjpjb21wdXRlU2NhbGVBbmRTY3JvbGxGb3JIaXRSZWN0KGNvbnN0IFdlYlJlY3QmIGhp dFJlY3QsIEF1dG9abwogICAgICAgICBzY2FsZVVuY2hhbmdlZCA9IGZhYnMocGFnZVNjYWxlRmFj dG9yKCkgLSBzY2FsZSkgPCBtaW5TY2FsZURpZmZlcmVuY2U7CiAgICAgfQogCi0gICAgaWYgKHpv b21UeXBlID09IERvdWJsZVRhcCAmJiAocmVjdC5pc0VtcHR5KCkgfHwgc2NhbGVVbmNoYW5nZWQg fHwgbV9kb3VibGVUYXBab29tSW5FZmZlY3QpKSB7CisgICAgYm9vbCBzdGlsbEF0UHJldmlvdXNE b3VibGVUYXBTY2FsZSA9IChwYWdlU2NhbGVGYWN0b3IoKSA9PSBtX2RvdWJsZVRhcFpvb21QYWdl U2NhbGVGYWN0b3IKKyAgICAgICAgJiYgbV9kb3VibGVUYXBab29tUGFnZVNjYWxlRmFjdG9yICE9 IG1fbWluaW11bVBhZ2VTY2FsZUZhY3RvcikKKyAgICAgICAgfHwgbV9kb3VibGVUYXBab29tUGVu ZGluZzsKKyAgICBpZiAoem9vbVR5cGUgPT0gRG91YmxlVGFwICYmIChyZWN0LmlzRW1wdHkoKSB8 fCBzY2FsZVVuY2hhbmdlZCB8fCBzdGlsbEF0UHJldmlvdXNEb3VibGVUYXBTY2FsZSkpIHsKICAg ICAgICAgLy8gWm9vbSBvdXQgdG8gbWluaW11bSBzY2FsZS4KICAgICAgICAgc2NhbGUgPSBtX21p bmltdW1QYWdlU2NhbGVGYWN0b3I7CiAgICAgICAgIHNjcm9sbCA9IFdlYlBvaW50KGhpdFJlY3Qu eCwgaGl0UmVjdC55KTsKICAgICAgICAgaXNBbmNob3IgPSB0cnVlOwotICAgICAgICBtX2RvdWJs ZVRhcFpvb21JbkVmZmVjdCA9IGZhbHNlOwogICAgIH0gZWxzZSB7Ci0gICAgICAgIGlmICh6b29t VHlwZSA9PSBEb3VibGVUYXAgJiYgc2NhbGUgIT0gbV9taW5pbXVtUGFnZVNjYWxlRmFjdG9yKQot ICAgICAgICAgICAgbV9kb3VibGVUYXBab29tSW5FZmZlY3QgPSB0cnVlOwotICAgICAgICBlbHNl Ci0gICAgICAgICAgICBtX2RvdWJsZVRhcFpvb21JbkVmZmVjdCA9IGZhbHNlOwogICAgICAgICAv LyBGSVhNRTogSWYgdGhpcyBpcyBiZWluZyBjYWxsZWQgZm9yIGF1dG8gem9vbSBkdXJpbmcgZmlu ZCBpbiBwYWdlLAogICAgICAgICAvLyB0aGVuIGlmIHRoZSB1c2VyIG1hbnVhbGx5IHpvb21zIGlu IGl0J2QgYmUgbmljZSB0byBwcmVzZXJ2ZSB0aGUKICAgICAgICAgLy8gcmVsYXRpdmUgaW5jcmVh c2UgaW4gem9vbSB0aGV5IGNhdXNlZCAoaWYgdGhleSB6b29tIG91dCB0aGVuIGl0J3Mgb2sKQEAg LTEzNDMsOCArMTM1NCwxMyBAQCB2b2lkIFdlYlZpZXdJbXBsOjphbmltYXRlWm9vbUFyb3VuZFBv aW50KGNvbnN0IEludFBvaW50JiBwb2ludCwgQXV0b1pvb21UeXBlIHpvbwogICAgIGNvbXB1dGVT Y2FsZUFuZFNjcm9sbEZvckhpdFJlY3QoV2ViUmVjdCh3ZWJQb2ludC54LCB3ZWJQb2ludC55LCAw LCAwKSwgem9vbVR5cGUsIHNjYWxlLCBzY3JvbGwsIGlzQW5jaG9yKTsKIAogICAgIGJvb2wgaXNE b3VibGVUYXAgPSAoem9vbVR5cGUgPT0gRG91YmxlVGFwKTsKLSAgICBkb3VibGUgZHVyYXRpb25J blNlY29uZHMgPSAoaXNEb3VibGVUYXAgJiYgIW1fc2hvdWxkVXNlRG91YmxlVGFwVGltZVplcm8p ID8gZG91YmxlVGFwWm9vbUFuaW1hdGlvbkR1cmF0aW9uSW5TZWNvbmRzIDogMDsKLSAgICBzdGFy dFBhZ2VTY2FsZUFuaW1hdGlvbihzY3JvbGwsIGlzQW5jaG9yLCBzY2FsZSwgZHVyYXRpb25JblNl Y29uZHMpOworICAgIGRvdWJsZSBkdXJhdGlvbkluU2Vjb25kcyA9IGlzRG91YmxlVGFwID8gZG91 YmxlVGFwWm9vbUFuaW1hdGlvbkR1cmF0aW9uSW5TZWNvbmRzIDogMDsKKyAgICBib29sIGlzQW5p bWF0aW5nID0gc3RhcnRQYWdlU2NhbGVBbmltYXRpb24oc2Nyb2xsLCBpc0FuY2hvciwgc2NhbGUs IGR1cmF0aW9uSW5TZWNvbmRzKTsKKworICAgIGlmIChpc0RvdWJsZVRhcCAmJiBpc0FuaW1hdGlu ZykgeworICAgICAgICBtX2RvdWJsZVRhcFpvb21QYWdlU2NhbGVGYWN0b3IgPSBzY2FsZTsKKyAg ICAgICAgbV9kb3VibGVUYXBab29tUGVuZGluZyA9IHRydWU7CisgICAgfQogI2VuZGlmCiB9CiAK QEAgLTM3NjcsMTAgKzM3ODMsOCBAQCB2b2lkIFdlYlZpZXdJbXBsOjpkaWRDb21taXRMb2FkKGJv b2wqIGlzTmV3TmF2aWdhdGlvbiwgYm9vbCBpc05hdmlnYXRpb25XaXRoaW5QYQogICAgIG1fbmV3 TmF2aWdhdGlvbkxvYWRlciA9IDA7CiAjZW5kaWYKICAgICBtX29ic2VydmVkTmV3TmF2aWdhdGlv biA9IGZhbHNlOwotICAgIGlmICgqaXNOZXdOYXZpZ2F0aW9uICYmICFpc05hdmlnYXRpb25XaXRo aW5QYWdlKSB7CisgICAgaWYgKCppc05ld05hdmlnYXRpb24gJiYgIWlzTmF2aWdhdGlvbldpdGhp blBhZ2UpCiAgICAgICAgIG1fcGFnZVNjYWxlRmFjdG9ySXNTZXQgPSBmYWxzZTsKLSAgICAgICAg bV9kb3VibGVUYXBab29tSW5FZmZlY3QgPSBmYWxzZTsKLSAgICB9CiAKICAgICAvLyBNYWtlIHN1 cmUgbGluayBoaWdobGlnaHQgZnJvbSBwcmV2aW91cyBwYWdlIGlzIGNsZWFyZWQuCiAgICAgbV9s aW5rSGlnaGxpZ2h0LmNsZWFyKCk7CkBAIC00MjE3LDcgKzQyMzEsNyBAQCB2b2lkIFdlYlZpZXdJ bXBsOjphcHBseVNjcm9sbEFuZFNjYWxlKGNvbnN0IFdlYlNpemUmIHNjcm9sbERlbHRhLCBmbG9h dCBwYWdlU2NhbAogICAgICAgICB9CiAKICAgICAgICAgc2V0UGFnZVNjYWxlRmFjdG9yKHBhZ2VT Y2FsZUZhY3RvcigpICogcGFnZVNjYWxlRGVsdGEsIHNjcm9sbFBvaW50KTsKLSAgICAgICAgbV9k b3VibGVUYXBab29tSW5FZmZlY3QgPSBmYWxzZTsKKyAgICAgICAgbV9kb3VibGVUYXBab29tUGVu ZGluZyA9IGZhbHNlOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvV2ViVmlld0ltcGwuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZp ZXdJbXBsLmgKaW5kZXggYTk1MTk2Y2UzNmJhZjM2ZDgwMjkxM2VlZjkyZWI0MTFkY2FmZmYzOS4u NmRjYzQ3MzdhNThlZWZkNGMwMmM0NWJkZmQ2MjhkMTEzYmRiMDZlNCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCkBAIC00MDIsNyArNDAyLDcgQEAgcHVibGljOgog ICAgIHZvaWQgbW91c2VEb3VibGVDbGljayhjb25zdCBXZWJNb3VzZUV2ZW50Jik7CiAKICAgICBi b29sIGRldGVjdENvbnRlbnRPblRvdWNoKGNvbnN0IFdlYlBvaW50Jik7Ci0gICAgdm9pZCBzdGFy dFBhZ2VTY2FsZUFuaW1hdGlvbihjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgdGFyZ2V0UG9zaXRp b24sIGJvb2wgdXNlQW5jaG9yLCBmbG9hdCBuZXdTY2FsZSwgZG91YmxlIGR1cmF0aW9uSW5TZWNv bmRzKTsKKyAgICBib29sIHN0YXJ0UGFnZVNjYWxlQW5pbWF0aW9uKGNvbnN0IFdlYkNvcmU6Oklu dFBvaW50JiB0YXJnZXRQb3NpdGlvbiwgYm9vbCB1c2VBbmNob3IsIGZsb2F0IG5ld1NjYWxlLCBk b3VibGUgZHVyYXRpb25JblNlY29uZHMpOwogCiAgICAgdm9pZCBudW1iZXJPZldoZWVsRXZlbnRI YW5kbGVyc0NoYW5nZWQodW5zaWduZWQpOwogICAgIHZvaWQgaGFzVG91Y2hFdmVudEhhbmRsZXJz KGJvb2wpOwpAQCAtNTgyLDcgKzU4MiwxMSBAQCBwdWJsaWM6CiAjZW5kaWYKICAgICB2b2lkIGFu aW1hdGVab29tQXJvdW5kUG9pbnQoY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmLCBBdXRvWm9vbVR5 cGUpOwogCi0gICAgdm9pZCBzaG91bGRVc2VBbmltYXRlRG91YmxlVGFwVGltZVplcm9Gb3JUZXN0 aW5nKGJvb2wpOworICAgIHZvaWQgZW5hYmxlRmFrZURvdWJsZVRhcEFuaW1hdGlvbkZvclRlc3Rp bmcoYm9vbCk7CisgICAgYm9vbCBmYWtlRG91YmxlVGFwQW5pbWF0aW9uUGVuZGluZ0ZvclRlc3Rp bmcoKSBjb25zdCB7IHJldHVybiBtX2RvdWJsZVRhcFpvb21QZW5kaW5nOyB9CisgICAgV2ViQ29y ZTo6SW50UG9pbnQgZmFrZURvdWJsZVRhcFRhcmdldFBvc2l0aW9uRm9yVGVzdGluZygpIGNvbnN0 IHsgcmV0dXJuIG1fZmFrZURvdWJsZVRhcFRhcmdldFBvc2l0aW9uOyB9CisgICAgZmxvYXQgZmFr ZURvdWJsZVRhcFBhZ2VTY2FsZUZhY3RvckZvclRlc3RpbmcoKSBjb25zdCB7IHJldHVybiBtX2Zh a2VEb3VibGVUYXBQYWdlU2NhbGVGYWN0b3I7IH0KKyAgICBib29sIGZha2VEb3VibGVUYXBVc2VB bmNob3JGb3JUZXN0aW5nKCkgY29uc3QgeyByZXR1cm4gbV9mYWtlRG91YmxlVGFwVXNlQW5jaG9y OyB9CiAKICAgICB2b2lkIGVudGVyRnVsbFNjcmVlbkZvckVsZW1lbnQoV2ViQ29yZTo6RWxlbWVu dCopOwogICAgIHZvaWQgZXhpdEZ1bGxTY3JlZW5Gb3JFbGVtZW50KFdlYkNvcmU6OkVsZW1lbnQq KTsKQEAgLTc2MiwxMSArNzY2LDE2IEBAIHByaXZhdGU6CiAgICAgZmxvYXQgbV9zYXZlZFBhZ2VT Y2FsZUZhY3RvcjsgLy8gMCBtZWFucyB0aGF0IG5vIHBhZ2Ugc2NhbGUgZmFjdG9yIGlzIHNhdmVk LgogICAgIFdlYkNvcmU6OkludFNpemUgbV9zYXZlZFNjcm9sbE9mZnNldDsKIAotICAgIC8vIFdo ZXRoZXIgdGhlIGN1cnJlbnQgc2NhbGUgd2FzIGFjaGlldmVkIGJ5IHpvb21pbmcgaW4gd2l0aCBk b3VibGUgdGFwLgotICAgIGJvb2wgbV9kb3VibGVUYXBab29tSW5FZmZlY3Q7CisgICAgLy8gVGhl IHNjYWxlIG1vdmVkIHRvIGJ5IHRoZSBsYXRlc3QgZG91YmxlIHRhcCB6b29tLCBpZiBhbnkuCisg ICAgZmxvYXQgbV9kb3VibGVUYXBab29tUGFnZVNjYWxlRmFjdG9yOworICAgIC8vIEhhdmUgd2Ug c2VudCBhIGRvdWJsZS10YXAgem9vbSBhbmQgbm90IHlldCBoZWFyZCBiYWNrIHRoZSBzY2FsZT8K KyAgICBib29sIG1fZG91YmxlVGFwWm9vbVBlbmRpbmc7CiAKICAgICAvLyBVc2VkIGZvciB0ZXN0 aW5nIHB1cnBvc2VzLgotICAgIGJvb2wgbV9zaG91bGRVc2VEb3VibGVUYXBUaW1lWmVybzsKKyAg ICBib29sIG1fZW5hYmxlRmFrZURvdWJsZVRhcEFuaW1hdGlvbkZvclRlc3Rpbmc7CisgICAgV2Vi Q29yZTo6SW50UG9pbnQgbV9mYWtlRG91YmxlVGFwVGFyZ2V0UG9zaXRpb247CisgICAgZmxvYXQg bV9mYWtlRG91YmxlVGFwUGFnZVNjYWxlRmFjdG9yOworICAgIGJvb2wgbV9mYWtlRG91YmxlVGFw VXNlQW5jaG9yOwogCiAgICAgYm9vbCBtX2NvbnRleHRNZW51QWxsb3dlZDsKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9XZWJGcmFtZVRlc3QuY3BwIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS90ZXN0cy9XZWJGcmFtZVRlc3QuY3BwCmluZGV4IDM4ZWQ0ODNjZDlm ODc5MjNhM2IwZmFkNDlmNmViODk2ODE3OGJiNTMuLmM5YmFmOTZmMzdiODlkYTU0Zjc5ZjhkYWU1 MjNhNzQ2YjNjOWNhYWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMv V2ViRnJhbWVUZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1dlYkZy YW1lVGVzdC5jcHAKQEAgLTU5NSw3ICs1OTUsNyBAQCB2b2lkIHNldFNjYWxlQW5kU2Nyb2xsQW5k TGF5b3V0KFdlYktpdDo6V2ViVmlldyogd2ViVmlldywgV2ViUG9pbnQgc2Nyb2xsLCBmbG9hdAog ICAgIHdlYlZpZXctPmxheW91dCgpOwogfQogCi1URVNUX0YoV2ViRnJhbWVUZXN0LCBEaXZBdXRv Wm9vbVBhcmFtc1Rlc3RDb21wb3NpdG9yU2NhbGluZykKK1RFU1RfRihXZWJGcmFtZVRlc3QsIERp dkF1dG9ab29tUGFyYW1zVGVzdCkKIHsKICAgICByZWdpc3Rlck1vY2tlZEh0dHBVUkxMb2FkKCJn ZXRfc2NhbGVfZm9yX2F1dG9fem9vbV9pbnRvX2Rpdl90ZXN0Lmh0bWwiKTsKIApAQCAtNjU2LDEx ICs2NTYsMTQgQEAgVEVTVF9GKFdlYkZyYW1lVGVzdCwgRGl2QXV0b1pvb21QYXJhbXNUZXN0Q29t cG9zaXRvclNjYWxpbmcpCiB2b2lkIHNpbXVsYXRlRG91YmxlVGFwKFdlYlZpZXdJbXBsKiB3ZWJW aWV3SW1wbCwgV2ViUG9pbnQmIHBvaW50LCBmbG9hdCYgc2NhbGUpCiB7CiAgICAgd2ViVmlld0lt cGwtPmFuaW1hdGVab29tQXJvdW5kUG9pbnQocG9pbnQsIFdlYlZpZXdJbXBsOjpEb3VibGVUYXAp OwotICAgIHdlYlZpZXdJbXBsLT5tYWluRnJhbWVJbXBsKCktPmZyYW1lVmlldygpLT5sYXlvdXQo KTsKKyAgICBFWFBFQ1RfVFJVRSh3ZWJWaWV3SW1wbC0+ZmFrZURvdWJsZVRhcEFuaW1hdGlvblBl bmRpbmdGb3JUZXN0aW5nKCkpOworICAgIFdlYkNvcmU6OkludFNpemUgc2Nyb2xsRGVsdGEgPSB3 ZWJWaWV3SW1wbC0+ZmFrZURvdWJsZVRhcFRhcmdldFBvc2l0aW9uRm9yVGVzdGluZygpIC0gd2Vi Vmlld0ltcGwtPm1haW5GcmFtZUltcGwoKS0+ZnJhbWVWaWV3KCktPnNjcm9sbFBvc2l0aW9uKCk7 CisgICAgZmxvYXQgc2NhbGVEZWx0YSA9IHdlYlZpZXdJbXBsLT5mYWtlRG91YmxlVGFwUGFnZVNj YWxlRmFjdG9yRm9yVGVzdGluZygpIC8gd2ViVmlld0ltcGwtPnBhZ2VTY2FsZUZhY3RvcigpOwor ICAgIHdlYlZpZXdJbXBsLT5hcHBseVNjcm9sbEFuZFNjYWxlKHNjcm9sbERlbHRhLCBzY2FsZURl bHRhKTsKICAgICBzY2FsZSA9IHdlYlZpZXdJbXBsLT5wYWdlU2NhbGVGYWN0b3IoKTsKIH0KIAot VEVTVF9GKFdlYkZyYW1lVGVzdCwgRGl2QXV0b1pvb21NdWx0aXBsZURpdnNUZXN0Q29tcG9zaXRv clNjYWxpbmcpCitURVNUX0YoV2ViRnJhbWVUZXN0LCBEaXZBdXRvWm9vbU11bHRpcGxlRGl2c1Rl c3QpCiB7CiAgICAgcmVnaXN0ZXJNb2NrZWRIdHRwVVJMTG9hZCgiZ2V0X211bHRpcGxlX2RpdnNf Zm9yX2F1dG9fem9vbV90ZXN0Lmh0bWwiKTsKIApAQCAtNjc5LDcgKzY4Miw3IEBAIFRFU1RfRihX ZWJGcmFtZVRlc3QsIERpdkF1dG9ab29tTXVsdGlwbGVEaXZzVGVzdENvbXBvc2l0b3JTY2FsaW5n KQogICAgIG1fd2ViVmlldy0+bGF5b3V0KCk7CiAKICAgICBXZWJWaWV3SW1wbCogd2ViVmlld0lt cGwgPSBzdGF0aWNfY2FzdDxXZWJWaWV3SW1wbCo+KG1fd2ViVmlldyk7Ci0gICAgd2ViVmlld0lt cGwtPnNob3VsZFVzZUFuaW1hdGVEb3VibGVUYXBUaW1lWmVyb0ZvclRlc3RpbmcodHJ1ZSk7Cisg ICAgd2ViVmlld0ltcGwtPmVuYWJsZUZha2VEb3VibGVUYXBBbmltYXRpb25Gb3JUZXN0aW5nKHRy dWUpOwogCiAgICAgV2ViUmVjdCB0b3BEaXYoMjAwLCAxMDAsIDIwMCwgMTUwKTsKICAgICBXZWJS ZWN0IGJvdHRvbURpdigyMDAsIDMwMCwgMjAwLCAxNTApOwpAQCAtNzAxLDkgKzcwNCwxOCBAQCBU RVNUX0YoV2ViRnJhbWVUZXN0LCBEaXZBdXRvWm9vbU11bHRpcGxlRGl2c1Rlc3RDb21wb3NpdG9y U2NhbGluZykKICAgICB3ZWJWaWV3SW1wbC0+YXBwbHlTY3JvbGxBbmRTY2FsZShXZWJTaXplKCks IDAuNmYpOwogICAgIHNpbXVsYXRlRG91YmxlVGFwKHdlYlZpZXdJbXBsLCBib3R0b21Qb2ludCwg c2NhbGUpOwogICAgIEVYUEVDVF9GTE9BVF9FUSgxLCBzY2FsZSk7CisgICAgc2ltdWxhdGVEb3Vi bGVUYXAod2ViVmlld0ltcGwsIGJvdHRvbVBvaW50LCBzY2FsZSk7CisgICAgRVhQRUNUX0ZMT0FU X0VRKHdlYlZpZXdJbXBsLT5taW5pbXVtUGFnZVNjYWxlRmFjdG9yKCksIHNjYWxlKTsKKworICAg IC8vIElmIHdlIGRpZG4ndCB5ZXQgZ2V0IGFuIGF1dG8tem9vbSB1cGRhdGUgYW5kIGEgc2Vjb25k IGRvdWJsZS10YXAgYXJyaXZlcywgc2hvdWxkIGdvIGJhY2sgdG8gbWluaW11bSBzY2FsZS4KKyAg ICB3ZWJWaWV3SW1wbC0+YXBwbHlTY3JvbGxBbmRTY2FsZShXZWJTaXplKCksIDEuMWYpOworICAg IHdlYlZpZXdJbXBsLT5hbmltYXRlWm9vbUFyb3VuZFBvaW50KHRvcFBvaW50LCBXZWJWaWV3SW1w bDo6RG91YmxlVGFwKTsKKyAgICBFWFBFQ1RfVFJVRSh3ZWJWaWV3SW1wbC0+ZmFrZURvdWJsZVRh cEFuaW1hdGlvblBlbmRpbmdGb3JUZXN0aW5nKCkpOworICAgIHNpbXVsYXRlRG91YmxlVGFwKHdl YlZpZXdJbXBsLCBib3R0b21Qb2ludCwgc2NhbGUpOworICAgIEVYUEVDVF9GTE9BVF9FUSh3ZWJW aWV3SW1wbC0+bWluaW11bVBhZ2VTY2FsZUZhY3RvcigpLCBzY2FsZSk7CiB9CiAKLVRFU1RfRihX ZWJGcmFtZVRlc3QsIERpdkF1dG9ab29tU2NhbGVCb3VuZHNUZXN0Q29tcG9zaXRvclNjYWxpbmcp CitURVNUX0YoV2ViRnJhbWVUZXN0LCBEaXZBdXRvWm9vbVNjYWxlQm91bmRzVGVzdCkKIHsKICAg ICByZWdpc3Rlck1vY2tlZEh0dHBVUkxMb2FkKCJnZXRfc2NhbGVfYm91bmRzX2NoZWNrX2Zvcl9h dXRvX3pvb21fdGVzdC5odG1sIik7CiAKQEAgLTcxOSw3ICs3MzEsNyBAQCBURVNUX0YoV2ViRnJh bWVUZXN0LCBEaXZBdXRvWm9vbVNjYWxlQm91bmRzVGVzdENvbXBvc2l0b3JTY2FsaW5nKQogICAg IG1fd2ViVmlldy0+bGF5b3V0KCk7CiAKICAgICBXZWJWaWV3SW1wbCogd2ViVmlld0ltcGwgPSBz dGF0aWNfY2FzdDxXZWJWaWV3SW1wbCo+KG1fd2ViVmlldyk7Ci0gICAgd2ViVmlld0ltcGwtPnNo b3VsZFVzZUFuaW1hdGVEb3VibGVUYXBUaW1lWmVyb0ZvclRlc3RpbmcodHJ1ZSk7CisgICAgd2Vi Vmlld0ltcGwtPmVuYWJsZUZha2VEb3VibGVUYXBBbmltYXRpb25Gb3JUZXN0aW5nKHRydWUpOwog CiAgICAgV2ViUmVjdCBkaXYoMjAwLCAxMDAsIDIwMCwgMTUwKTsKICAgICBXZWJQb2ludCBkb3Vi bGVUYXBQb2ludChkaXYueCArIDUwLCBkaXYueSArIDUwKTsKQEAgLTc2OCw3ICs3ODAsNyBAQCBU RVNUX0YoV2ViRnJhbWVUZXN0LCBEaXZBdXRvWm9vbVNjYWxlQm91bmRzVGVzdENvbXBvc2l0b3JT Y2FsaW5nKQogfQogCiAjaWYgRU5BQkxFKFRFWFRfQVVUT1NJWklORykKLVRFU1RfRihXZWJGcmFt ZVRlc3QsIERpdkF1dG9ab29tU2NhbGVGb250U2NhbGVGYWN0b3JUZXN0Q29tcG9zaXRvclNjYWxp bmcpCitURVNUX0YoV2ViRnJhbWVUZXN0LCBEaXZBdXRvWm9vbVNjYWxlRm9udFNjYWxlRmFjdG9y VGVzdCkKIHsKICAgICByZWdpc3Rlck1vY2tlZEh0dHBVUkxMb2FkKCJnZXRfc2NhbGVfYm91bmRz X2NoZWNrX2Zvcl9hdXRvX3pvb21fdGVzdC5odG1sIik7CiAKQEAgLTc4NCw3ICs3OTYsNyBAQCBU RVNUX0YoV2ViRnJhbWVUZXN0LCBEaXZBdXRvWm9vbVNjYWxlRm9udFNjYWxlRmFjdG9yVGVzdENv bXBvc2l0b3JTY2FsaW5nKQogICAgIG1fd2ViVmlldy0+bGF5b3V0KCk7CiAKICAgICBXZWJWaWV3 SW1wbCogd2ViVmlld0ltcGwgPSBzdGF0aWNfY2FzdDxXZWJWaWV3SW1wbCo+KG1fd2ViVmlldyk7 Ci0gICAgd2ViVmlld0ltcGwtPnNob3VsZFVzZUFuaW1hdGVEb3VibGVUYXBUaW1lWmVyb0ZvclRl c3RpbmcodHJ1ZSk7CisgICAgd2ViVmlld0ltcGwtPmVuYWJsZUZha2VEb3VibGVUYXBBbmltYXRp b25Gb3JUZXN0aW5nKHRydWUpOwogICAgIHdlYlZpZXdJbXBsLT5wYWdlKCktPnNldHRpbmdzKCkt PnNldFRleHRBdXRvc2l6aW5nRm9udFNjYWxlRmFjdG9yKHRleHRBdXRvc2l6aW5nRm9udFNjYWxl RmFjdG9yKTsKIAogICAgIFdlYlJlY3QgZGl2KDIwMCwgMTAwLCAyMDAsIDE1MCk7CkBAIC04Njks NyArODgxLDcgQEAgVEVTVF9GKFdlYkZyYW1lVGVzdCwgRGl2U2Nyb2xsSW50b0VkaXRhYmxlVGVz dCkKICAgICBtX3dlYlZpZXctPnNldHRpbmdzKCktPnNldEF1dG9ab29tRm9jdXNlZE5vZGVUb0xl Z2libGVTY2FsZSh0cnVlKTsKIAogICAgIFdlYlZpZXdJbXBsKiB3ZWJWaWV3SW1wbCA9IHN0YXRp Y19jYXN0PFdlYlZpZXdJbXBsKj4obV93ZWJWaWV3KTsKLSAgICB3ZWJWaWV3SW1wbC0+c2hvdWxk VXNlQW5pbWF0ZURvdWJsZVRhcFRpbWVaZXJvRm9yVGVzdGluZyh0cnVlKTsKKyAgICB3ZWJWaWV3 SW1wbC0+ZW5hYmxlRmFrZURvdWJsZVRhcEFuaW1hdGlvbkZvclRlc3RpbmcodHJ1ZSk7CiAKICAg ICBXZWJSZWN0IGVkaXRCb3hXaXRoVGV4dCgyMDAsIDIwMCwgMjUwLCAyMCk7CiAgICAgV2ViUmVj dCBlZGl0Qm94V2l0aE5vVGV4dCgyMDAsIDI1MCwgMjUwLCAyMCk7Cg==