104861 2012-12-12 16:39:32 -0800 Don't dispatch fake mousemove events when we don't know where the cursor is 2012-12-29 00:01:16 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 aestes aestes apavlov eric mifenton ojan.autocc simon.fraser tkent webkit.review.bot oldest_to_newest 790058 0 aestes 2012-12-12 16:39:32 -0800 Don't dispatch fake mousemove events when we don't know where the cursor is 790076 1 179153 aestes 2012-12-12 16:58:12 -0800 Created attachment 179153 Patch 790082 2 aestes 2012-12-12 17:05:34 -0800 Committed r137539: <http://trac.webkit.org/changeset/137539> 798069 3 apavlov 2012-12-29 00:01:16 -0800 *** Bug 98016 has been marked as a duplicate of this bug. *** 179153 2012-12-12 16:58:12 -0800 2012-12-12 17:02:59 -0800 Patch bug-104861-20121212165533.patch text/plain 22980 aestes U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3NTM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWY1YTE0MDhhNThmNmUx NWQzY2Y4MmMxYjE0MjBiOGVjNzMzOWRmOS4uOGVjNmQ4Y2YwZDQ3MmM2YjVhMTY1ZDFmZTdkOTFh NjU4MDBhNWQ2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU0IEBACisyMDEyLTEyLTEyICBBbmR5 IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBEb24ndCBkaXNwYXRjaCBmYWtl IG1vdXNlbW92ZSBldmVudHMgd2hlbiB3ZSBkb24ndCBrbm93IHdoZXJlIHRoZSBjdXJzb3IgaXMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNDg2MQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gRXZl bnRIYW5kbGVyIGlzIGluc3RhbnRpYXRlZCBvciBjbGVhcmVkLCBpdCBzZXRzIHRoZSBjdXJyZW50 IG1vdXNlCisgICAgICAgIHBvc2l0aW9uIHRvICgwLCAwKSwgZXZlbiB0aG91Z2ggdGhpcyBpcyBw cm9iYWJseSBub3Qgd2hlcmUgdGhlIG1vdXNlCisgICAgICAgIGN1cnNvciByZWFsbHkgaXMgKGFu ZCB3ZSB3b24ndCBrbm93IHVudGlsIHRoZSBtb3VzZSBtb3ZlcyBpbnRvIHRoZSBXZWJWaWV3KS4K KyAgICAgICAgSWYgYSBmYWtlIG1vdXNlbW92ZSBldmVudCBmaXJlcyBhbmQgdGhlIHBhZ2UgaGFz IGFuIGVsZW1lbnQgYXQgKDAsIDApCisgICAgICAgIHRoYXQgcmVzcG9uZHMgdG8gbW91c2Vtb3Zl LCB3ZSBtaWdodCBlbmQgdXAgY2hhbmdpbmcgdGhlIGN1cnNvciBvcgorICAgICAgICBkaXNwbGF5 aW5nIGEgdG9vbHRpcCBhdCB0aGUgY3VycmVudCBtb3VzZSBwb3NpdGlvbiwgZXZlbiBpZiBpdCBp cworICAgICAgICBvdXRzaWRlIHRoZSBXZWJWaWV3LgorCisgICAgICAgIEZha2UgbW91c2Vtb3Zl IGV2ZW50cyBhcmUgZGlzcGF0Y2hlZCBpbiBvcmRlciB0byB1cGRhdGUgYSBjdXJzb3IgdGhhdAor ICAgICAgICBpcyBhbHJlYWR5IG92ZXIgdGhlIFdlYlZpZXcuIERvbid0IGRpc3BhdGNoIHRoZSBl dmVudCBpZiB3ZSBkb24ndCBrbm93CisgICAgICAgIHRoaXMgdG8gYmUgdHJ1ZS4KKworICAgICAg ICAqIHBhZ2UvRXZlbnRIYW5kbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxl cjo6RXZlbnRIYW5kbGVyKTogSW5zdGFudGlhdGUgbV9tb3VzZVBvc2l0aW9uSXNVbmtub3duIHRv IHRydWUuCisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OmNsZWFyKTogUmVzZXQgbV9t b3VzZVBvc2l0aW9uSXNVbmtub3duIHRvIHRydWUuCisgICAgICAgIChXZWJDb3JlOjpFdmVudEhh bmRsZXI6OmRpc3BhdGNoRmFrZU1vdXNlTW92ZUV2ZW50U29vbik6IFJldHVybiBlYXJseSBpZiB0 aGUgbW91c2UgcG9zaXRpb24gaXMgdW5rbm93bi4KKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFu ZGxlcjo6c2V0TGFzdEtub3duTW91c2VQb3NpdGlvbik6IFNldCB0aGUgbW91c2UgcG9zaXRpb24g ZnJvbSB0aGUgUGxhdGZvcm1Nb3VzZUV2ZW50IGFuZCBzZXQgbV9tb3VzZVBvc2l0aW9uSXNVbmtu b3duIHRvIGZhbHNlLgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpoYW5kbGVNb3Vz ZVByZXNzRXZlbnQpOiBDYWxsIHNldExhc3RLbm93bk1vdXNlUG9zaXRpb24oKSBpbnN0ZWFkIG9m IHNldHRpbmcgdGhlIHBvc2l0aW9uIGRpcmVjdGx5LgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRI YW5kbGVyOjpoYW5kbGVNb3VzZURvdWJsZUNsaWNrRXZlbnQpOiBEaXR0by4KKyAgICAgICAgKFdl YkNvcmU6OkV2ZW50SGFuZGxlcjo6aGFuZGxlTW91c2VNb3ZlRXZlbnQpOiBEaXR0by4KKyAgICAg ICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6aGFuZGxlTW91c2VSZWxlYXNlRXZlbnQpOiBEaXR0 by4KKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6dXBkYXRlU2VsZWN0aW9uRm9yTW91 c2VEcmFnKTogUmVuYW1lIGN1cnJlbnRNb3VzZShHbG9iYWwpUG9zaXRpb24gdG8gbGFzdEtub3du TW91c2UoR2xvYmFsKVBvc2l0aW9uLgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpo YW5kbGVBdXRvc2Nyb2xsKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6 OnVwZGF0ZVBhblNjcm9sbFN0YXRlKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpFdmVudEhh bmRsZXI6Omxhc3RLbm93bk1vdXNlUG9zaXRpb24pOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6 OkV2ZW50SGFuZGxlcjo6ZGlzcGF0Y2hGYWtlTW91c2VNb3ZlRXZlbnRTb29uSW5RdWFkKTogRGl0 dG8uCisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OmZha2VNb3VzZU1vdmVFdmVudFRp bWVyRmlyZWQpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6aG92ZXJU aW1lckZpcmVkKTogRGl0dG8uCisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpsYXN0S25vd25Nb3VzZVBvc2l0aW9uKTogRGl0dG8uCisg ICAgICAgICogcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNj cm9sbGFibGVBcmVhOjpsYXN0S25vd25Nb3VzZVBvc2l0aW9uKTogRGl0dG8uCisgICAgICAgICog cGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLm1tOgorICAgICAgICAoLVtXZWJTY3JvbGxi YXJQYWludGVyQ29udHJvbGxlckRlbGVnYXRlIG1vdXNlTG9jYXRpb25JbkNvbnRlbnRBcmVhRm9y U2Nyb2xsZXJJbXBQYWlyOl0pOiBEaXR0by4KKyAgICAgICAgKC1bV2ViU2Nyb2xsYmFyUGFpbnRl ckRlbGVnYXRlIG1vdXNlTG9jYXRpb25JblNjcm9sbGVyRm9yU2Nyb2xsZXJJbXA6XSk6IERpdHRv LgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJMYXllcjo6cGFuU2Nyb2xsRnJvbVBvaW50KTogRGl0dG8uCisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJMYXllcjo6YXV0b3Njcm9sbCk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyTGF5ZXI6Omxhc3RLbm93bk1vdXNlUG9zaXRpb24pOiBEaXR0by4KKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMaXN0 Qm94OjpwYW5TY3JvbGwpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxpc3RCb3g6 OmF1dG9zY3JvbGwpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxpc3RCb3g6Omxh c3RLbm93bk1vdXNlUG9zaXRpb24pOiBEaXR0by4KKwogMjAxMi0xMi0xMiAgU2hlcmlmZiBCb3Qg IDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9s bGluZyBvdXQgcjEzNzUyNC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRI YW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAppbmRleCA4 ZTJlY2ViZWFjNTJhNGI3YzM2Mjk5ZDM2ZWY2YmFmMGNlZWEyYzVjLi4xNThhZDVjZTAzNmMwNzJi MGRhMDVjNzk1NTljM2YyMDFiYzRmMzBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L0V2ZW50SGFuZGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIu Y3BwCkBAIC0zNDcsNiArMzQ3LDcgQEAgRXZlbnRIYW5kbGVyOjpFdmVudEhhbmRsZXIoRnJhbWUq IGZyYW1lKQogICAgICwgbV9yZXNpemVMYXllcigwKQogICAgICwgbV9ldmVudEhhbmRsZXJXaWxs UmVzZXRDYXB0dXJpbmdNb3VzZUV2ZW50c05vZGUoMCkKICAgICAsIG1fY2xpY2tDb3VudCgwKQor ICAgICwgbV9tb3VzZVBvc2l0aW9uSXNVbmtub3duKHRydWUpCiAgICAgLCBtX21vdXNlRG93blRp bWVzdGFtcCgwKQogICAgICwgbV93aWRnZXRJc0xhdGNoZWQoZmFsc2UpCiAjaWYgUExBVEZPUk0o TUFDKQpAQCAtMzk4LDggKzM5OSw5IEBAIHZvaWQgRXZlbnRIYW5kbGVyOjpjbGVhcigpCiAgICAg bV9kcmFnVGFyZ2V0ID0gMDsKICAgICBtX3Nob3VsZE9ubHlGaXJlRHJhZ092ZXJFdmVudCA9IGZh bHNlOwogI2VuZGlmCi0gICAgbV9jdXJyZW50TW91c2VQb3NpdGlvbiA9IEludFBvaW50KCk7Ci0g ICAgbV9jdXJyZW50TW91c2VHbG9iYWxQb3NpdGlvbiA9IEludFBvaW50KCk7CisgICAgbV9tb3Vz ZVBvc2l0aW9uSXNVbmtub3duID0gdHJ1ZTsKKyAgICBtX2xhc3RLbm93bk1vdXNlUG9zaXRpb24g PSBJbnRQb2ludCgpOworICAgIG1fbGFzdEtub3duTW91c2VHbG9iYWxQb3NpdGlvbiA9IEludFBv aW50KCk7CiAgICAgbV9tb3VzZVByZXNzTm9kZSA9IDA7CiAgICAgbV9tb3VzZVByZXNzZWQgPSBm YWxzZTsKICAgICBtX2NhcHR1cmVzRHJhZ2dpbmcgPSBmYWxzZTsKQEAgLTgyMCw3ICs4MjIsNyBA QCB2b2lkIEV2ZW50SGFuZGxlcjo6dXBkYXRlU2VsZWN0aW9uRm9yTW91c2VEcmFnKCkKICAgICBI aXRUZXN0UmVxdWVzdCByZXF1ZXN0KEhpdFRlc3RSZXF1ZXN0OjpSZWFkT25seSB8CiAgICAgICAg ICAgICAgICAgICAgICAgICAgICBIaXRUZXN0UmVxdWVzdDo6QWN0aXZlIHwKICAgICAgICAgICAg ICAgICAgICAgICAgICAgIEhpdFRlc3RSZXF1ZXN0OjpNb3ZlKTsKLSAgICBIaXRUZXN0UmVzdWx0 IHJlc3VsdCh2aWV3LT53aW5kb3dUb0NvbnRlbnRzKG1fY3VycmVudE1vdXNlUG9zaXRpb24pKTsK KyAgICBIaXRUZXN0UmVzdWx0IHJlc3VsdCh2aWV3LT53aW5kb3dUb0NvbnRlbnRzKG1fbGFzdEtu b3duTW91c2VQb3NpdGlvbikpOwogICAgIHJlbmRlcmVyLT5oaXRUZXN0KHJlcXVlc3QsIHJlc3Vs dCk7CiAgICAgdXBkYXRlU2VsZWN0aW9uRm9yTW91c2VEcmFnKHJlc3VsdCk7CiB9CkBAIC05OTgs NyArMTAwMCw3IEBAIHZvaWQgRXZlbnRIYW5kbGVyOjpoYW5kbGVBdXRvc2Nyb2xsKFJlbmRlck9i amVjdCogcmVuZGVyZXIpCiAKICNpZiBFTkFCTEUoUEFOX1NDUk9MTElORykKICAgICBpZiAobV9w YW5TY3JvbGxJblByb2dyZXNzKSB7Ci0gICAgICAgIG1fcGFuU2Nyb2xsU3RhcnRQb3MgPSBjdXJy ZW50TW91c2VQb3NpdGlvbigpOworICAgICAgICBtX3BhblNjcm9sbFN0YXJ0UG9zID0gbGFzdEtu b3duTW91c2VQb3NpdGlvbigpOwogICAgICAgICBpZiAoRnJhbWVWaWV3KiB2aWV3ID0gbV9mcmFt ZS0+dmlldygpKQogICAgICAgICAgICAgdmlldy0+YWRkUGFuU2Nyb2xsSWNvbihtX3BhblNjcm9s bFN0YXJ0UG9zKTsKICAgICAgICAgLy8gSWYgd2UncmUgbm90IGluIHRoZSB0b3AgZnJhbWUgd2Ug bm90aWZ5IGl0IHRoYXQgd2UgZG9pbmcgYSBwYW5TY3JvbGwuCkBAIC0xMDYwLDEwICsxMDYyLDEw IEBAIHZvaWQgRXZlbnRIYW5kbGVyOjp1cGRhdGVQYW5TY3JvbGxTdGF0ZSgpCiAKICAgICAvLyBB dCB0aGUgb3JpZ2luYWwgY2xpY2sgbG9jYXRpb24gd2UgZHJhdyBhIDQgYXJyb3dlZCBpY29uLiBP dmVyIHRoaXMgaWNvbiB0aGVyZSB3b24ndCBiZSBhbnkgc2Nyb2xsCiAgICAgLy8gU28gd2UgZG9u J3Qgd2FudCB0byBjaGFuZ2UgdGhlIGN1cnNvciBvdmVyIHRoaXMgYXJlYQotICAgIGJvb2wgZWFz dCA9IG1fcGFuU2Nyb2xsU3RhcnRQb3MueCgpIDwgKG1fY3VycmVudE1vdXNlUG9zaXRpb24ueCgp IC0gU2Nyb2xsVmlldzo6bm9QYW5TY3JvbGxSYWRpdXMpOwotICAgIGJvb2wgd2VzdCA9IG1fcGFu U2Nyb2xsU3RhcnRQb3MueCgpID4gKG1fY3VycmVudE1vdXNlUG9zaXRpb24ueCgpICsgU2Nyb2xs Vmlldzo6bm9QYW5TY3JvbGxSYWRpdXMpOwotICAgIGJvb2wgbm9ydGggPSBtX3BhblNjcm9sbFN0 YXJ0UG9zLnkoKSA+IChtX2N1cnJlbnRNb3VzZVBvc2l0aW9uLnkoKSArIFNjcm9sbFZpZXc6Om5v UGFuU2Nyb2xsUmFkaXVzKTsKLSAgICBib29sIHNvdXRoID0gbV9wYW5TY3JvbGxTdGFydFBvcy55 KCkgPCAobV9jdXJyZW50TW91c2VQb3NpdGlvbi55KCkgLSBTY3JvbGxWaWV3Ojpub1BhblNjcm9s bFJhZGl1cyk7CisgICAgYm9vbCBlYXN0ID0gbV9wYW5TY3JvbGxTdGFydFBvcy54KCkgPCAobV9s YXN0S25vd25Nb3VzZVBvc2l0aW9uLngoKSAtIFNjcm9sbFZpZXc6Om5vUGFuU2Nyb2xsUmFkaXVz KTsKKyAgICBib29sIHdlc3QgPSBtX3BhblNjcm9sbFN0YXJ0UG9zLngoKSA+IChtX2xhc3RLbm93 bk1vdXNlUG9zaXRpb24ueCgpICsgU2Nyb2xsVmlldzo6bm9QYW5TY3JvbGxSYWRpdXMpOworICAg IGJvb2wgbm9ydGggPSBtX3BhblNjcm9sbFN0YXJ0UG9zLnkoKSA+IChtX2xhc3RLbm93bk1vdXNl UG9zaXRpb24ueSgpICsgU2Nyb2xsVmlldzo6bm9QYW5TY3JvbGxSYWRpdXMpOworICAgIGJvb2wg c291dGggPSBtX3BhblNjcm9sbFN0YXJ0UG9zLnkoKSA8IChtX2xhc3RLbm93bk1vdXNlUG9zaXRp b24ueSgpIC0gU2Nyb2xsVmlldzo6bm9QYW5TY3JvbGxSYWRpdXMpOwogICAgICAgICAgCiAgICAg aWYgKChlYXN0IHx8IHdlc3QgfHwgbm9ydGggfHwgc291dGgpICYmIG1fcGFuU2Nyb2xsQnV0dG9u UHJlc3NlZCkKICAgICAgICAgbV9zcHJpbmdMb2FkZWRQYW5TY3JvbGxJblByb2dyZXNzID0gdHJ1 ZTsKQEAgLTEzMzcsOSArMTMzOSw5IEBAIGJvb2wgRXZlbnRIYW5kbGVyOjpsb2dpY2FsU2Nyb2xs UmVjdXJzaXZlbHkoU2Nyb2xsTG9naWNhbERpcmVjdGlvbiBkaXJlY3Rpb24sIFNjCiAgICAgcmV0 dXJuIGZyYW1lLT5ldmVudEhhbmRsZXIoKS0+bG9naWNhbFNjcm9sbFJlY3Vyc2l2ZWx5KGRpcmVj dGlvbiwgZ3JhbnVsYXJpdHksIG1fZnJhbWUtPm93bmVyRWxlbWVudCgpKTsKIH0KIAotSW50UG9p bnQgRXZlbnRIYW5kbGVyOjpjdXJyZW50TW91c2VQb3NpdGlvbigpIGNvbnN0CitJbnRQb2ludCBF dmVudEhhbmRsZXI6Omxhc3RLbm93bk1vdXNlUG9zaXRpb24oKSBjb25zdAogewotICAgIHJldHVy biBtX2N1cnJlbnRNb3VzZVBvc2l0aW9uOworICAgIHJldHVybiBtX2xhc3RLbm93bk1vdXNlUG9z aXRpb247CiB9CiAKIEZyYW1lKiBFdmVudEhhbmRsZXI6OnN1YmZyYW1lRm9ySGl0VGVzdFJlc3Vs dChjb25zdCBNb3VzZUV2ZW50V2l0aEhpdFRlc3RSZXN1bHRzJiBoaXRUZXN0UmVzdWx0KQpAQCAt MTYwNyw4ICsxNjA5LDcgQEAgYm9vbCBFdmVudEhhbmRsZXI6OmhhbmRsZU1vdXNlUHJlc3NFdmVu dChjb25zdCBQbGF0Zm9ybU1vdXNlRXZlbnQmIG1vdXNlRXZlbnQpCiAgICAgY2FuY2VsRmFrZU1v dXNlTW92ZUV2ZW50KCk7CiAgICAgbV9tb3VzZVByZXNzZWQgPSB0cnVlOwogICAgIG1fY2FwdHVy ZXNEcmFnZ2luZyA9IHRydWU7Ci0gICAgbV9jdXJyZW50TW91c2VQb3NpdGlvbiA9IG1vdXNlRXZl bnQucG9zaXRpb24oKTsKLSAgICBtX2N1cnJlbnRNb3VzZUdsb2JhbFBvc2l0aW9uID0gbW91c2VF dmVudC5nbG9iYWxQb3NpdGlvbigpOworICAgIHNldExhc3RLbm93bk1vdXNlUG9zaXRpb24obW91 c2VFdmVudCk7CiAgICAgbV9tb3VzZURvd25UaW1lc3RhbXAgPSBtb3VzZUV2ZW50LnRpbWVzdGFt cCgpOwogI2lmIEVOQUJMRShEUkFHX1NVUFBPUlQpCiAgICAgbV9tb3VzZURvd25NYXlTdGFydERy YWcgPSBmYWxzZTsKQEAgLTE3MzYsOCArMTczNyw3IEBAIGJvb2wgRXZlbnRIYW5kbGVyOjpoYW5k bGVNb3VzZURvdWJsZUNsaWNrRXZlbnQoY29uc3QgUGxhdGZvcm1Nb3VzZUV2ZW50JiBtb3VzZUV2 CiAKICAgICAvLyBXZSBnZXQgdGhpcyBpbnN0ZWFkIG9mIGEgc2Vjb25kIG1vdXNlLXVwIAogICAg IG1fbW91c2VQcmVzc2VkID0gZmFsc2U7Ci0gICAgbV9jdXJyZW50TW91c2VQb3NpdGlvbiA9IG1v dXNlRXZlbnQucG9zaXRpb24oKTsKLSAgICBtX2N1cnJlbnRNb3VzZUdsb2JhbFBvc2l0aW9uID0g bW91c2VFdmVudC5nbG9iYWxQb3NpdGlvbigpOworICAgIHNldExhc3RLbm93bk1vdXNlUG9zaXRp b24obW91c2VFdmVudCk7CiAKICAgICBIaXRUZXN0UmVxdWVzdCByZXF1ZXN0KEhpdFRlc3RSZXF1 ZXN0OjpBY3RpdmUpOwogICAgIE1vdXNlRXZlbnRXaXRoSGl0VGVzdFJlc3VsdHMgbWV2ID0gcHJl cGFyZU1vdXNlRXZlbnQocmVxdWVzdCwgbW91c2VFdmVudCk7CkBAIC0xODMxLDggKzE4MzEsOCBA QCBib29sIEV2ZW50SGFuZGxlcjo6aGFuZGxlTW91c2VNb3ZlRXZlbnQoY29uc3QgUGxhdGZvcm1N b3VzZUV2ZW50JiBtb3VzZUV2ZW50LCBIaQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBS ZWZQdHI8RnJhbWVWaWV3PiBwcm90ZWN0b3IobV9mcmFtZS0+dmlldygpKTsKLSAgICBtX2N1cnJl bnRNb3VzZVBvc2l0aW9uID0gbW91c2VFdmVudC5wb3NpdGlvbigpOwotICAgIG1fY3VycmVudE1v dXNlR2xvYmFsUG9zaXRpb24gPSBtb3VzZUV2ZW50Lmdsb2JhbFBvc2l0aW9uKCk7CisgICAgCisg ICAgc2V0TGFzdEtub3duTW91c2VQb3NpdGlvbihtb3VzZUV2ZW50KTsKIAogICAgIGlmIChtX2hv dmVyVGltZXIuaXNBY3RpdmUoKSkKICAgICAgICAgbV9ob3ZlclRpbWVyLnN0b3AoKTsKQEAgLTE4 NDEsNyArMTg0MSw3IEBAIGJvb2wgRXZlbnRIYW5kbGVyOjpoYW5kbGVNb3VzZU1vdmVFdmVudChj b25zdCBQbGF0Zm9ybU1vdXNlRXZlbnQmIG1vdXNlRXZlbnQsIEhpCiAKICNpZiBFTkFCTEUoU1ZH KQogICAgIGlmIChtX3N2Z1BhbikgewotICAgICAgICBzdGF0aWNfY2FzdDxTVkdEb2N1bWVudCo+ KG1fZnJhbWUtPmRvY3VtZW50KCkpLT51cGRhdGVQYW4obV9mcmFtZS0+dmlldygpLT53aW5kb3dU b0NvbnRlbnRzKG1fY3VycmVudE1vdXNlUG9zaXRpb24pKTsKKyAgICAgICAgc3RhdGljX2Nhc3Q8 U1ZHRG9jdW1lbnQqPihtX2ZyYW1lLT5kb2N1bWVudCgpKS0+dXBkYXRlUGFuKG1fZnJhbWUtPnZp ZXcoKS0+d2luZG93VG9Db250ZW50cyhtX2xhc3RLbm93bk1vdXNlUG9zaXRpb24pKTsKICAgICAg ICAgcmV0dXJuIHRydWU7CiAgICAgfQogI2VuZGlmCkBAIC0xOTU3LDEzICsxOTU3LDEyIEBAIGJv b2wgRXZlbnRIYW5kbGVyOjpoYW5kbGVNb3VzZVJlbGVhc2VFdmVudChjb25zdCBQbGF0Zm9ybU1v dXNlRXZlbnQmIG1vdXNlRXZlbnQpCiAjZW5kaWYKIAogICAgIG1fbW91c2VQcmVzc2VkID0gZmFs c2U7Ci0gICAgbV9jdXJyZW50TW91c2VQb3NpdGlvbiA9IG1vdXNlRXZlbnQucG9zaXRpb24oKTsK LSAgICBtX2N1cnJlbnRNb3VzZUdsb2JhbFBvc2l0aW9uID0gbW91c2VFdmVudC5nbG9iYWxQb3Np dGlvbigpOworICAgIHNldExhc3RLbm93bk1vdXNlUG9zaXRpb24obW91c2VFdmVudCk7CiAKICNp ZiBFTkFCTEUoU1ZHKQogICAgIGlmIChtX3N2Z1BhbikgewogICAgICAgICBtX3N2Z1BhbiA9IGZh bHNlOwotICAgICAgICBzdGF0aWNfY2FzdDxTVkdEb2N1bWVudCo+KG1fZnJhbWUtPmRvY3VtZW50 KCkpLT51cGRhdGVQYW4obV9mcmFtZS0+dmlldygpLT53aW5kb3dUb0NvbnRlbnRzKG1fY3VycmVu dE1vdXNlUG9zaXRpb24pKTsKKyAgICAgICAgc3RhdGljX2Nhc3Q8U1ZHRG9jdW1lbnQqPihtX2Zy YW1lLT5kb2N1bWVudCgpKS0+dXBkYXRlUGFuKG1fZnJhbWUtPnZpZXcoKS0+d2luZG93VG9Db250 ZW50cyhtX2xhc3RLbm93bk1vdXNlUG9zaXRpb24pKTsKICAgICAgICAgcmV0dXJuIHRydWU7CiAg ICAgfQogI2VuZGlmCkBAIC0yOTkzLDYgKzI5OTIsOSBAQCB2b2lkIEV2ZW50SGFuZGxlcjo6ZGlz cGF0Y2hGYWtlTW91c2VNb3ZlRXZlbnRTb29uKCkKICAgICBpZiAobV9tb3VzZVByZXNzZWQpCiAg ICAgICAgIHJldHVybjsKIAorICAgIGlmIChtX21vdXNlUG9zaXRpb25Jc1Vua25vd24pCisgICAg ICAgIHJldHVybjsKKwogICAgIFNldHRpbmdzKiBzZXR0aW5ncyA9IG1fZnJhbWUtPnNldHRpbmdz KCk7CiAgICAgaWYgKHNldHRpbmdzICYmICFzZXR0aW5ncy0+ZGV2aWNlU3VwcG9ydHNNb3VzZSgp KQogICAgICAgICByZXR1cm47CkBAIC0zMDE3LDcgKzMwMTksNyBAQCB2b2lkIEV2ZW50SGFuZGxl cjo6ZGlzcGF0Y2hGYWtlTW91c2VNb3ZlRXZlbnRTb29uSW5RdWFkKGNvbnN0IEZsb2F0UXVhZCYg cXVhZCkKICAgICBpZiAoIXZpZXcpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmICghcXVhZC5j b250YWluc1BvaW50KHZpZXctPndpbmRvd1RvQ29udGVudHMobV9jdXJyZW50TW91c2VQb3NpdGlv bikpKQorICAgIGlmICghcXVhZC5jb250YWluc1BvaW50KHZpZXctPndpbmRvd1RvQ29udGVudHMo bV9sYXN0S25vd25Nb3VzZVBvc2l0aW9uKSkpCiAgICAgICAgIHJldHVybjsKIAogICAgIGRpc3Bh dGNoRmFrZU1vdXNlTW92ZUV2ZW50U29vbigpOwpAQCAtMzA0OSw3ICszMDUxLDcgQEAgdm9pZCBF dmVudEhhbmRsZXI6OmZha2VNb3VzZU1vdmVFdmVudFRpbWVyRmlyZWQoVGltZXI8RXZlbnRIYW5k bGVyPiogdGltZXIpCiAgICAgYm9vbCBhbHRLZXk7CiAgICAgYm9vbCBtZXRhS2V5OwogICAgIFBs YXRmb3JtS2V5Ym9hcmRFdmVudDo6Z2V0Q3VycmVudE1vZGlmaWVyU3RhdGUoc2hpZnRLZXksIGN0 cmxLZXksIGFsdEtleSwgbWV0YUtleSk7Ci0gICAgUGxhdGZvcm1Nb3VzZUV2ZW50IGZha2VNb3Vz ZU1vdmVFdmVudChtX2N1cnJlbnRNb3VzZVBvc2l0aW9uLCBtX2N1cnJlbnRNb3VzZUdsb2JhbFBv c2l0aW9uLCBOb0J1dHRvbiwgUGxhdGZvcm1FdmVudDo6TW91c2VNb3ZlZCwgMCwgc2hpZnRLZXks IGN0cmxLZXksIGFsdEtleSwgbWV0YUtleSwgY3VycmVudFRpbWUoKSk7CisgICAgUGxhdGZvcm1N b3VzZUV2ZW50IGZha2VNb3VzZU1vdmVFdmVudChtX2xhc3RLbm93bk1vdXNlUG9zaXRpb24sIG1f bGFzdEtub3duTW91c2VHbG9iYWxQb3NpdGlvbiwgTm9CdXR0b24sIFBsYXRmb3JtRXZlbnQ6Ok1v dXNlTW92ZWQsIDAsIHNoaWZ0S2V5LCBjdHJsS2V5LCBhbHRLZXksIG1ldGFLZXksIGN1cnJlbnRU aW1lKCkpOwogICAgIG1vdXNlTW92ZWQoZmFrZU1vdXNlTW92ZUV2ZW50KTsKIH0KIApAQCAtMzA3 NCw3ICszMDc2LDcgQEAgdm9pZCBFdmVudEhhbmRsZXI6OmhvdmVyVGltZXJGaXJlZChUaW1lcjxF dmVudEhhbmRsZXI+KikKICAgICBpZiAoUmVuZGVyVmlldyogcmVuZGVyZXIgPSBtX2ZyYW1lLT5j b250ZW50UmVuZGVyZXIoKSkgewogICAgICAgICBpZiAoRnJhbWVWaWV3KiB2aWV3ID0gbV9mcmFt ZS0+dmlldygpKSB7CiAgICAgICAgICAgICBIaXRUZXN0UmVxdWVzdCByZXF1ZXN0KEhpdFRlc3RS ZXF1ZXN0OjpNb3ZlKTsKLSAgICAgICAgICAgIEhpdFRlc3RSZXN1bHQgcmVzdWx0KHZpZXctPndp bmRvd1RvQ29udGVudHMobV9jdXJyZW50TW91c2VQb3NpdGlvbikpOworICAgICAgICAgICAgSGl0 VGVzdFJlc3VsdCByZXN1bHQodmlldy0+d2luZG93VG9Db250ZW50cyhtX2xhc3RLbm93bk1vdXNl UG9zaXRpb24pKTsKICAgICAgICAgICAgIHJlbmRlcmVyLT5oaXRUZXN0KHJlcXVlc3QsIHJlc3Vs dCk7CiAgICAgICAgICAgICBtX2ZyYW1lLT5kb2N1bWVudCgpLT51cGRhdGVTdHlsZUlmTmVlZGVk KCk7CiAgICAgICAgIH0KQEAgLTQwNzAsNCArNDA3MiwxMSBAQCBib29sIEV2ZW50SGFuZGxlcjo6 ZGlzcGF0Y2hTeW50aGV0aWNUb3VjaEV2ZW50SWZFbmFibGVkKGNvbnN0IFBsYXRmb3JtTW91c2VF dmVudAogCiAjZW5kaWYKIAordm9pZCBFdmVudEhhbmRsZXI6OnNldExhc3RLbm93bk1vdXNlUG9z aXRpb24oY29uc3QgUGxhdGZvcm1Nb3VzZUV2ZW50JiBldmVudCkKK3sKKyAgICBtX21vdXNlUG9z aXRpb25Jc1Vua25vd24gPSBmYWxzZTsKKyAgICBtX2xhc3RLbm93bk1vdXNlUG9zaXRpb24gPSBl dmVudC5wb3NpdGlvbigpOworICAgIG1fbGFzdEtub3duTW91c2VHbG9iYWxQb3NpdGlvbiA9IGV2 ZW50Lmdsb2JhbFBvc2l0aW9uKCk7CiB9CisKK30gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmggYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0V2ZW50SGFuZGxlci5oCmluZGV4IGM5ZjhlNmRiZjRjY2I1MWJhYWQzZjljMzEzYzgx NTg4ODY5OTRjYjQuLjI3ZTA4MTcwYjlhMDcwMTY1MGJjMzg4ZjEzMTVkMTBiMzNkNjY1ZjEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmgKKysrIGIvU291cmNl L1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuaApAQCAtMTQyLDcgKzE0Miw3IEBAIHB1YmxpYzoK IAogICAgIHZvaWQgcmVzaXplTGF5ZXJEZXN0cm95ZWQoKTsKIAotICAgIEludFBvaW50IGN1cnJl bnRNb3VzZVBvc2l0aW9uKCkgY29uc3Q7CisgICAgSW50UG9pbnQgbGFzdEtub3duTW91c2VQb3Np dGlvbigpIGNvbnN0OwogICAgIEN1cnNvciBjdXJyZW50TW91c2VDdXJzb3IoKSBjb25zdCB7IHJl dHVybiBtX2N1cnJlbnRNb3VzZUN1cnNvcjsgfQogCiAgICAgc3RhdGljIEZyYW1lKiBzdWJmcmFt ZUZvclRhcmdldE5vZGUoTm9kZSopOwpAQCAtMzgwLDYgKzM4MCw4IEBAIHByaXZhdGU6CiAgICAg Ym9vbCBoYW5kbGVHZXN0dXJlRm9yVGV4dFNlbGVjdGlvbk9yQ29udGV4dE1lbnUoY29uc3QgUGxh dGZvcm1HZXN0dXJlRXZlbnQmKTsKICNlbmRpZgogCisgICAgdm9pZCBzZXRMYXN0S25vd25Nb3Vz ZVBvc2l0aW9uKGNvbnN0IFBsYXRmb3JtTW91c2VFdmVudCYpOworCiAgICAgRnJhbWUqIG1fZnJh bWU7CiAKICAgICBib29sIG1fbW91c2VQcmVzc2VkOwpAQCAtNDQ0LDggKzQ0Niw5IEBAIHByaXZh dGU6CiAKICAgICBMYXlvdXRTaXplIG1fb2Zmc2V0RnJvbVJlc2l6ZUNvcm5lcjsgLy8gSW4gdGhl IGNvb3JkcyBvZiBtX3Jlc2l6ZUxheWVyLgogICAgIAotICAgIEludFBvaW50IG1fY3VycmVudE1v dXNlUG9zaXRpb247Ci0gICAgSW50UG9pbnQgbV9jdXJyZW50TW91c2VHbG9iYWxQb3NpdGlvbjsK KyAgICBib29sIG1fbW91c2VQb3NpdGlvbklzVW5rbm93bjsKKyAgICBJbnRQb2ludCBtX2xhc3RL bm93bk1vdXNlUG9zaXRpb247CisgICAgSW50UG9pbnQgbV9sYXN0S25vd25Nb3VzZUdsb2JhbFBv c2l0aW9uOwogICAgIEludFBvaW50IG1fbW91c2VEb3duUG9zOyAvLyBJbiBvdXIgdmlldydzIGNv b3Jkcy4KICAgICBkb3VibGUgbV9tb3VzZURvd25UaW1lc3RhbXA7CiAgICAgUGxhdGZvcm1Nb3Vz ZUV2ZW50IG1fbW91c2VEb3duOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFt ZVZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCmluZGV4IDUzZDE0 NmE4OGM3YjBjZDlmYTUwZWY0NWIyN2FlZmM4OTBjYTQ3N2MuLmRhMDZiMTU5YTI0MzEyYTI5Njk5 YjIxNjkxNGZmNTExMjE3NGQ5ZWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJh bWVWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKQEAgLTE1 MDQsOSArMTUwNCw5IEBAIGJvb2wgRnJhbWVWaWV3OjpmaXhlZEVsZW1lbnRzTGF5b3V0UmVsYXRp dmVUb0ZyYW1lKCkgY29uc3QKICAgICByZXR1cm4gbV9mcmFtZS0+c2V0dGluZ3MoKS0+Zml4ZWRF bGVtZW50c0xheW91dFJlbGF0aXZlVG9GcmFtZSgpOwogfQogCi1JbnRQb2ludCBGcmFtZVZpZXc6 OmN1cnJlbnRNb3VzZVBvc2l0aW9uKCkgY29uc3QKK0ludFBvaW50IEZyYW1lVmlldzo6bGFzdEtu b3duTW91c2VQb3NpdGlvbigpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1fZnJhbWUgPyBtX2ZyYW1l LT5ldmVudEhhbmRsZXIoKS0+Y3VycmVudE1vdXNlUG9zaXRpb24oKSA6IEludFBvaW50KCk7Cisg ICAgcmV0dXJuIG1fZnJhbWUgPyBtX2ZyYW1lLT5ldmVudEhhbmRsZXIoKS0+bGFzdEtub3duTW91 c2VQb3NpdGlvbigpIDogSW50UG9pbnQoKTsKIH0KIAogYm9vbCBGcmFtZVZpZXc6OnNjcm9sbENv bnRlbnRzRmFzdFBhdGgoY29uc3QgSW50U2l6ZSYgc2Nyb2xsRGVsdGEsIGNvbnN0IEludFJlY3Qm IHJlY3RUb1Njcm9sbCwgY29uc3QgSW50UmVjdCYgY2xpcFJlY3QpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZp ZXcuaAppbmRleCA3MzQ2ZTk5Zjk2NzNjM2ViM2NjMzkzMjgzODI5NjZmOWU5ZWY3NDYzLi5mYWIz NzQ2MGJmZmIzMzQ4NjYyNDRmMjcwODcxNTgwYTNhYTQwOTVhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVW aWV3LmgKQEAgLTMyMyw3ICszMjMsNyBAQCBwdWJsaWM6CiAgICAgLy8gT24gZWFjaCByZXBhaW50 IHRoZSBkZWxheSBpbmNyZXNlcyBieSB0aGlzIGFtb3VudAogICAgIHN0YXRpYyB2b2lkIHNldFJl cGFpbnRUaHJvdHRsaW5nRGVmZXJyZWRSZXBhaW50RGVsYXlJbmNyZW1lbnREdXJpbmdMb2FkaW5n KGRvdWJsZSBwKTsKIAotICAgIHZpcnR1YWwgSW50UG9pbnQgY3VycmVudE1vdXNlUG9zaXRpb24o KSBjb25zdDsKKyAgICB2aXJ0dWFsIEludFBvaW50IGxhc3RLbm93bk1vdXNlUG9zaXRpb24oKSBj b25zdDsKIAogICAgIHZpcnR1YWwgYm9vbCBzY3JvbGxiYXJzQ2FuQmVBY3RpdmUoKSBjb25zdCBP VkVSUklERTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJs ZUFyZWEuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmgKaW5kZXgg MTJiNGNmNGNlNTEyZjllNDY3YmM1N2E5MzYzMDA0NTY4YzljZmE4OC4uOTQzMTFmYjhhMTg1Nzdk YWJjM2ViMGRmYmJkNDIwMTE2ZmY0Y2I3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vU2Nyb2xsYWJsZUFyZWEuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3Jv bGxhYmxlQXJlYS5oCkBAIC0xNDMsNyArMTQzLDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgaW50 IHZpc2libGVXaWR0aCgpIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIEludFNpemUgY29udGVudHNT aXplKCkgY29uc3QgPSAwOwogICAgIHZpcnR1YWwgSW50U2l6ZSBvdmVyaGFuZ0Ftb3VudCgpIGNv bnN0IHsgcmV0dXJuIEludFNpemUoKTsgfQotICAgIHZpcnR1YWwgSW50UG9pbnQgY3VycmVudE1v dXNlUG9zaXRpb24oKSBjb25zdCB7IHJldHVybiBJbnRQb2ludCgpOyB9CisgICAgdmlydHVhbCBJ bnRQb2ludCBsYXN0S25vd25Nb3VzZVBvc2l0aW9uKCkgY29uc3QgeyByZXR1cm4gSW50UG9pbnQo KTsgfQogCiAgICAgdmlydHVhbCBib29sIHNob3VsZFN1c3BlbmRTY3JvbGxBbmltYXRpb25zKCkg Y29uc3QgeyByZXR1cm4gdHJ1ZTsgfQogICAgIHZpcnR1YWwgdm9pZCBzY3JvbGxiYXJTdHlsZUNo YW5nZWQoaW50IC8qbmV3U3R5bGUqLywgYm9vbCAvKmZvcmNlVXBkYXRlKi8pIHsgfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLm1tIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLm1tCmluZGV4IDM4 MmU1NTNkMWI1MDhlNTNiYWIzNmYyYjE1NWFjMWYzYzM3ZTRmNWUuLmVkNGNkN2UwNTUxNDI5OTdi MzUyZWRlNDc5NmJkYWY3N2ExNDEwOWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMubW0KQEAgLTIyNiw3ICsyMjYsNyBAQCBzdGF0aWMgTlNT aXplIGFicyhOU1NpemUgc2l6ZSkKICAgICBpZiAoIV9zY3JvbGxhYmxlQXJlYSkKICAgICAgICAg cmV0dXJuIE5TWmVyb1BvaW50OwogCi0gICAgcmV0dXJuIF9zY3JvbGxhYmxlQXJlYS0+Y3VycmVu dE1vdXNlUG9zaXRpb24oKTsKKyAgICByZXR1cm4gX3Njcm9sbGFibGVBcmVhLT5sYXN0S25vd25N b3VzZVBvc2l0aW9uKCk7CiB9CiAKIC0gKE5TUG9pbnQpc2Nyb2xsZXJJbXBQYWlyOihpZClzY3Jv bGxlckltcFBhaXIgY29udmVydENvbnRlbnRQb2ludDooTlNQb2ludClwb2ludEluQ29udGVudEFy ZWEgdG9TY3JvbGxlckltcDooaWQpc2Nyb2xsZXJJbXAKQEAgLTQ0OCw3ICs0NDgsNyBAQCBlbnVt IEZlYXR1cmVUb0FuaW1hdGUgewogCiAgICAgQVNTRVJUX1VOVVNFRChzY3JvbGxlckltcCwgc2Ny b2xsZXJJbXAgPT0gc2Nyb2xsYmFyUGFpbnRlckZvclNjcm9sbGJhcihfc2Nyb2xsYmFyKSk7CiAK LSAgICByZXR1cm4gX3Njcm9sbGJhci0+Y29udmVydEZyb21Db250YWluaW5nVmlldyhfc2Nyb2xs YmFyLT5zY3JvbGxhYmxlQXJlYSgpLT5jdXJyZW50TW91c2VQb3NpdGlvbigpKTsKKyAgICByZXR1 cm4gX3Njcm9sbGJhci0+Y29udmVydEZyb21Db250YWluaW5nVmlldyhfc2Nyb2xsYmFyLT5zY3Jv bGxhYmxlQXJlYSgpLT5sYXN0S25vd25Nb3VzZVBvc2l0aW9uKCkpOwogfQogCiAtICh2b2lkKXNl dFVwQWxwaGFBbmltYXRpb246KFJldGFpblB0cjxXZWJTY3JvbGxiYXJQYXJ0QW5pbWF0aW9uPiYp c2Nyb2xsYmFyUGFydEFuaW1hdGlvbiBzY3JvbGxlclBhaW50ZXI6KFNjcm9sbGJhclBhaW50ZXIp c2Nyb2xsZXJQYWludGVyIHBhcnQ6KFdlYkNvcmU6OlNjcm9sbGJhclBhcnQpcGFydCBhbmltYXRl QWxwaGFUbzooQ0dGbG9hdCluZXdBbHBoYSBkdXJhdGlvbjooTlNUaW1lSW50ZXJ2YWwpZHVyYXRp b24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCmluZGV4IDEwZGUyZmU4 YjlkZDdjYzcxNTk1ZjZkNTRhNjZiMzlmY2IxYWNhOGUuLjQ3MTAzMDA5Y2JiY2E1NmE0ZmVjOWMw OTlhYjFhZmE2Y2U4ODY3ODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJMYXllci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy LmNwcApAQCAtMTY1OCwxNiArMTY1OCwxNiBAQCB2b2lkIFJlbmRlckxheWVyOjpwYW5TY3JvbGxG cm9tUG9pbnQoY29uc3QgSW50UG9pbnQmIHNvdXJjZVBvaW50KQogICAgIGlmICghZnJhbWUpCiAg ICAgICAgIHJldHVybjsKICAgICAKLSAgICBJbnRQb2ludCBjdXJyZW50TW91c2VQb3NpdGlvbiA9 IGZyYW1lLT5ldmVudEhhbmRsZXIoKS0+Y3VycmVudE1vdXNlUG9zaXRpb24oKTsKKyAgICBJbnRQ b2ludCBsYXN0S25vd25Nb3VzZVBvc2l0aW9uID0gZnJhbWUtPmV2ZW50SGFuZGxlcigpLT5sYXN0 S25vd25Nb3VzZVBvc2l0aW9uKCk7CiAgICAgCi0gICAgLy8gV2UgbmVlZCB0byBjaGVjayBpZiB0 aGUgY3VycmVudCBtb3VzZSBwb3NpdGlvbiBpcyBvdXQgb2YgdGhlIHdpbmRvdy4gV2hlbiB0aGUg bW91c2UgaXMgb3V0IG9mIHRoZSB3aW5kb3csIHRoZSBwb3NpdGlvbiBpcyBpbmNvaGVyZW50Cisg ICAgLy8gV2UgbmVlZCB0byBjaGVjayBpZiB0aGUgbGFzdCBrbm93biBtb3VzZSBwb3NpdGlvbiBp cyBvdXQgb2YgdGhlIHdpbmRvdy4gV2hlbiB0aGUgbW91c2UgaXMgb3V0IG9mIHRoZSB3aW5kb3cs IHRoZSBwb3NpdGlvbiBpcyBpbmNvaGVyZW50CiAgICAgc3RhdGljIEludFBvaW50IHByZXZpb3Vz TW91c2VQb3NpdGlvbjsKLSAgICBpZiAoY3VycmVudE1vdXNlUG9zaXRpb24ueCgpIDwgMCB8fCBj dXJyZW50TW91c2VQb3NpdGlvbi55KCkgPCAwKQotICAgICAgICBjdXJyZW50TW91c2VQb3NpdGlv biA9IHByZXZpb3VzTW91c2VQb3NpdGlvbjsKKyAgICBpZiAobGFzdEtub3duTW91c2VQb3NpdGlv bi54KCkgPCAwIHx8IGxhc3RLbm93bk1vdXNlUG9zaXRpb24ueSgpIDwgMCkKKyAgICAgICAgbGFz dEtub3duTW91c2VQb3NpdGlvbiA9IHByZXZpb3VzTW91c2VQb3NpdGlvbjsKICAgICBlbHNlCi0g ICAgICAgIHByZXZpb3VzTW91c2VQb3NpdGlvbiA9IGN1cnJlbnRNb3VzZVBvc2l0aW9uOworICAg ICAgICBwcmV2aW91c01vdXNlUG9zaXRpb24gPSBsYXN0S25vd25Nb3VzZVBvc2l0aW9uOwogCi0g ICAgSW50U2l6ZSBkZWx0YSA9IGN1cnJlbnRNb3VzZVBvc2l0aW9uIC0gc291cmNlUG9pbnQ7Cisg ICAgSW50U2l6ZSBkZWx0YSA9IGxhc3RLbm93bk1vdXNlUG9zaXRpb24gLSBzb3VyY2VQb2ludDsK IAogICAgIGlmIChhYnMoZGVsdGEud2lkdGgoKSkgPD0gU2Nyb2xsVmlldzo6bm9QYW5TY3JvbGxS YWRpdXMpIC8vIGF0IHRoZSBjZW50ZXIgd2UgbGV0IHRoZSBzcGFjZSBmb3IgdGhlIGljb24KICAg ICAgICAgZGVsdGEuc2V0V2lkdGgoMCk7CkBAIC0yMDE4LDcgKzIwMTgsNyBAQCB2b2lkIFJlbmRl ckxheWVyOjphdXRvc2Nyb2xsKCkKICAgICBmcmFtZS0+ZXZlbnRIYW5kbGVyKCktPnVwZGF0ZVNl bGVjdGlvbkZvck1vdXNlRHJhZygpOwogI2VuZGlmCiAKLSAgICBJbnRQb2ludCBjdXJyZW50RG9j dW1lbnRQb3NpdGlvbiA9IGZyYW1lVmlldy0+d2luZG93VG9Db250ZW50cyhmcmFtZS0+ZXZlbnRI YW5kbGVyKCktPmN1cnJlbnRNb3VzZVBvc2l0aW9uKCkpOworICAgIEludFBvaW50IGN1cnJlbnRE b2N1bWVudFBvc2l0aW9uID0gZnJhbWVWaWV3LT53aW5kb3dUb0NvbnRlbnRzKGZyYW1lLT5ldmVu dEhhbmRsZXIoKS0+bGFzdEtub3duTW91c2VQb3NpdGlvbigpKTsKICAgICBzY3JvbGxSZWN0VG9W aXNpYmxlKExheW91dFJlY3QoY3VycmVudERvY3VtZW50UG9zaXRpb24sIExheW91dFNpemUoMSwg MSkpLCBTY3JvbGxBbGlnbm1lbnQ6OmFsaWduVG9FZGdlSWZOZWVkZWQsIFNjcm9sbEFsaWdubWVu dDo6YWxpZ25Ub0VkZ2VJZk5lZWRlZCk7CiB9CiAKQEAgLTIyOTcsOSArMjI5Nyw5IEBAIGJvb2wg UmVuZGVyTGF5ZXI6OnNjcm9sbGJhcnNDYW5CZUFjdGl2ZSgpIGNvbnN0CiAgICAgcmV0dXJuIHZp ZXctPmZyYW1lVmlldygpLT5zY3JvbGxiYXJzQ2FuQmVBY3RpdmUoKTsKIH0KIAotSW50UG9pbnQg UmVuZGVyTGF5ZXI6OmN1cnJlbnRNb3VzZVBvc2l0aW9uKCkgY29uc3QKK0ludFBvaW50IFJlbmRl ckxheWVyOjpsYXN0S25vd25Nb3VzZVBvc2l0aW9uKCkgY29uc3QKIHsKLSAgICByZXR1cm4gcmVu ZGVyZXIoKS0+ZnJhbWUoKSA/IHJlbmRlcmVyKCktPmZyYW1lKCktPmV2ZW50SGFuZGxlcigpLT5j dXJyZW50TW91c2VQb3NpdGlvbigpIDogSW50UG9pbnQoKTsKKyAgICByZXR1cm4gcmVuZGVyZXIo KS0+ZnJhbWUoKSA/IHJlbmRlcmVyKCktPmZyYW1lKCktPmV2ZW50SGFuZGxlcigpLT5sYXN0S25v d25Nb3VzZVBvc2l0aW9uKCkgOiBJbnRQb2ludCgpOwogfQogCiBJbnRSZWN0IFJlbmRlckxheWVy OjpyZWN0Rm9ySG9yaXpvbnRhbFNjcm9sbGJhcihjb25zdCBJbnRSZWN0JiBib3JkZXJCb3hSZWN0 KSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaAppbmRleCBkODZiZDMx ODEwZjFmNTYwOWVlNzBkMGM0MjA0NmQ4ZWFjOWU2ZDg1Li5jYzZiOThhMjI1MDYxZmUyNTBjNzBj ZmIzNDQxMzlhYjI3M2ZhNzlhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGF5ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIu aApAQCAtODU2LDcgKzg1Niw3IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCBpbnQgdmlzaWJsZVdp ZHRoKCkgY29uc3Q7CiAgICAgdmlydHVhbCBJbnRTaXplIGNvbnRlbnRzU2l6ZSgpIGNvbnN0Owog ICAgIHZpcnR1YWwgSW50U2l6ZSBvdmVyaGFuZ0Ftb3VudCgpIGNvbnN0OwotICAgIHZpcnR1YWwg SW50UG9pbnQgY3VycmVudE1vdXNlUG9zaXRpb24oKSBjb25zdDsKKyAgICB2aXJ0dWFsIEludFBv aW50IGxhc3RLbm93bk1vdXNlUG9zaXRpb24oKSBjb25zdDsKICAgICB2aXJ0dWFsIGJvb2wgc2hv dWxkU3VzcGVuZFNjcm9sbEFuaW1hdGlvbnMoKSBjb25zdDsKICAgICB2aXJ0dWFsIGJvb2wgc2Ny b2xsYmFyc0NhbkJlQWN0aXZlKCkgY29uc3Q7CiAgICAgdmlydHVhbCBJbnRSZWN0IHNjcm9sbGFi bGVBcmVhQm91bmRpbmdCb3goKSBjb25zdCBPVkVSUklERTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0Qm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMaXN0Qm94LmNwcAppbmRleCBiOTJkOWYwOGRjM2JjNjNiNWI5NWRjZDFlNGI3 ZmQ2YjIwYzE0N2Y1Li5iMGE3ZWY2MDYzZjkxY2RiZWZmMjIxMDY5NThkY2NlZTFkODM2N2FjIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guY3BwCkBAIC00OTksMTUg KzQ5OSwxNSBAQCB2b2lkIFJlbmRlckxpc3RCb3g6OnBhblNjcm9sbChjb25zdCBJbnRQb2ludCYg cGFuU3RhcnRNb3VzZVBvc2l0aW9uKQogICAgIC8vIEZJWE1FOiBUaGlzIGRvZXNuJ3Qgd29yayBj b3JyZWN0bHkgd2l0aCB0cmFuc2Zvcm1zLgogICAgIEZsb2F0UG9pbnQgYWJzT2Zmc2V0ID0gbG9j YWxUb0Fic29sdXRlKCk7CiAKLSAgICBJbnRQb2ludCBjdXJyZW50TW91c2VQb3NpdGlvbiA9IGZy YW1lKCktPmV2ZW50SGFuZGxlcigpLT5jdXJyZW50TW91c2VQb3NpdGlvbigpOwotICAgIC8vIFdl IG5lZWQgdG8gY2hlY2sgaWYgdGhlIGN1cnJlbnQgbW91c2UgcG9zaXRpb24gaXMgb3V0IG9mIHRo ZSB3aW5kb3cuIFdoZW4gdGhlIG1vdXNlIGlzIG91dCBvZiB0aGUgd2luZG93LCB0aGUgcG9zaXRp b24gaXMgaW5jb2hlcmVudAorICAgIEludFBvaW50IGxhc3RLbm93bk1vdXNlUG9zaXRpb24gPSBm cmFtZSgpLT5ldmVudEhhbmRsZXIoKS0+bGFzdEtub3duTW91c2VQb3NpdGlvbigpOworICAgIC8v IFdlIG5lZWQgdG8gY2hlY2sgaWYgdGhlIGxhc3Qga25vd24gbW91c2UgcG9zaXRpb24gaXMgb3V0 IG9mIHRoZSB3aW5kb3cuIFdoZW4gdGhlIG1vdXNlIGlzIG91dCBvZiB0aGUgd2luZG93LCB0aGUg cG9zaXRpb24gaXMgaW5jb2hlcmVudAogICAgIHN0YXRpYyBJbnRQb2ludCBwcmV2aW91c01vdXNl UG9zaXRpb247Ci0gICAgaWYgKGN1cnJlbnRNb3VzZVBvc2l0aW9uLnkoKSA8IDApCi0gICAgICAg IGN1cnJlbnRNb3VzZVBvc2l0aW9uID0gcHJldmlvdXNNb3VzZVBvc2l0aW9uOworICAgIGlmIChs YXN0S25vd25Nb3VzZVBvc2l0aW9uLnkoKSA8IDApCisgICAgICAgIGxhc3RLbm93bk1vdXNlUG9z aXRpb24gPSBwcmV2aW91c01vdXNlUG9zaXRpb247CiAgICAgZWxzZQotICAgICAgICBwcmV2aW91 c01vdXNlUG9zaXRpb24gPSBjdXJyZW50TW91c2VQb3NpdGlvbjsKKyAgICAgICAgcHJldmlvdXNN b3VzZVBvc2l0aW9uID0gbGFzdEtub3duTW91c2VQb3NpdGlvbjsKIAotICAgIGludCB5RGVsdGEg PSBjdXJyZW50TW91c2VQb3NpdGlvbi55KCkgLSBwYW5TdGFydE1vdXNlUG9zaXRpb24ueSgpOwor ICAgIGludCB5RGVsdGEgPSBsYXN0S25vd25Nb3VzZVBvc2l0aW9uLnkoKSAtIHBhblN0YXJ0TW91 c2VQb3NpdGlvbi55KCk7CiAKICAgICAvLyBJZiB0aGUgcG9pbnQgaXMgdG9vIGZhciBmcm9tIHRo ZSBjZW50ZXIgd2UgbGltaXQgdGhlIHNwZWVkCiAgICAgeURlbHRhID0gbWF4PGludD4obWluPGlu dD4oeURlbHRhLCBtYXhTcGVlZCksIC1tYXhTcGVlZCk7CkBAIC01NTYsNyArNTU2LDcgQEAgaW50 IFJlbmRlckxpc3RCb3g6OnNjcm9sbFRvd2FyZChjb25zdCBJbnRQb2ludCYgZGVzdGluYXRpb24p CiAKIHZvaWQgUmVuZGVyTGlzdEJveDo6YXV0b3Njcm9sbCgpCiB7Ci0gICAgSW50UG9pbnQgcG9z ID0gZnJhbWUoKS0+dmlldygpLT53aW5kb3dUb0NvbnRlbnRzKGZyYW1lKCktPmV2ZW50SGFuZGxl cigpLT5jdXJyZW50TW91c2VQb3NpdGlvbigpKTsKKyAgICBJbnRQb2ludCBwb3MgPSBmcmFtZSgp LT52aWV3KCktPndpbmRvd1RvQ29udGVudHMoZnJhbWUoKS0+ZXZlbnRIYW5kbGVyKCktPmxhc3RL bm93bk1vdXNlUG9zaXRpb24oKSk7CiAKICAgICBpbnQgZW5kSW5kZXggPSBzY3JvbGxUb3dhcmQo cG9zKTsKICAgICBpZiAoZW5kSW5kZXggPj0gMCkgewpAQCAtODAzLDEyICs4MDMsMTIgQEAgaW50 IFJlbmRlckxpc3RCb3g6OnZpc2libGVXaWR0aCgpIGNvbnN0CiAgICAgcmV0dXJuIHdpZHRoKCk7 CiB9CiAKLUludFBvaW50IFJlbmRlckxpc3RCb3g6OmN1cnJlbnRNb3VzZVBvc2l0aW9uKCkgY29u c3QKK0ludFBvaW50IFJlbmRlckxpc3RCb3g6Omxhc3RLbm93bk1vdXNlUG9zaXRpb24oKSBjb25z dAogewogICAgIFJlbmRlclZpZXcqIHZpZXcgPSB0aGlzLT52aWV3KCk7CiAgICAgaWYgKCF2aWV3 KQogICAgICAgICByZXR1cm4gSW50UG9pbnQoKTsKLSAgICByZXR1cm4gdmlldy0+ZnJhbWVWaWV3 KCktPmN1cnJlbnRNb3VzZVBvc2l0aW9uKCk7CisgICAgcmV0dXJuIHZpZXctPmZyYW1lVmlldygp LT5sYXN0S25vd25Nb3VzZVBvc2l0aW9uKCk7CiB9CiAKIGJvb2wgUmVuZGVyTGlzdEJveDo6c2hv dWxkU3VzcGVuZFNjcm9sbEFuaW1hdGlvbnMoKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJMaXN0Qm94LmgKaW5kZXggYzY2MmFmMjdmNjlkNDM1YjZhNjFjMzhjNDlmMDM5N2Ew ZDQ4ZTM5Zi4uM2JhZmJlM2UzMzE0OTUyMWExYmY0ZWZmYmM0YmRhZGFjYWU4OWU1YSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5oCkBAIC0xMTcsNyArMTE3LDcgQEAg cHJpdmF0ZToKICAgICB2aXJ0dWFsIEludFNpemUgY29udGVudHNTaXplKCkgY29uc3QgT1ZFUlJJ REU7CiAgICAgdmlydHVhbCBpbnQgdmlzaWJsZUhlaWdodCgpIGNvbnN0IE9WRVJSSURFOwogICAg IHZpcnR1YWwgaW50IHZpc2libGVXaWR0aCgpIGNvbnN0IE9WRVJSSURFOwotICAgIHZpcnR1YWwg SW50UG9pbnQgY3VycmVudE1vdXNlUG9zaXRpb24oKSBjb25zdCBPVkVSUklERTsKKyAgICB2aXJ0 dWFsIEludFBvaW50IGxhc3RLbm93bk1vdXNlUG9zaXRpb24oKSBjb25zdCBPVkVSUklERTsKICAg ICB2aXJ0dWFsIGJvb2wgc2hvdWxkU3VzcGVuZFNjcm9sbEFuaW1hdGlvbnMoKSBjb25zdCBPVkVS UklERTsKICAgICB2aXJ0dWFsIGJvb2wgc2Nyb2xsYmFyc0NhbkJlQWN0aXZlKCkgY29uc3QgT1ZF UlJJREU7CiAK