126472 2014-01-03 16:44:17 -0800 There should be a delay when quickly switching to a different popover at build.webkit.org/dashboard 2014-01-07 11:32:18 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ap ap commit-queue mitz thorton timothy oldest_to_newest 964325 0 ap 2014-01-03 16:44:17 -0800 When moving mouse pointer from an active element to its popover, there is a small area in between which is neither. A different active element is sometimes there, in which case we quickly switch to its popover. This is a correct behavior in general, but it makes it difficult to interact with the popover in some cases. Adding a tiny timeout before switching to another popover should help I think. 964330 1 220354 ap 2014-01-03 16:59:31 -0800 Created attachment 220354 WIP patch Seems to work correctly at first glance, but needs more refactoring and testing. 964442 2 220384 ap 2014-01-04 20:50:12 -0800 Created attachment 220384 proposed patch 965094 3 220384 commit-queue 2014-01-07 11:32:16 -0800 Comment on attachment 220384 proposed patch Clearing flags on attachment: 220384 Committed r161441: <http://trac.webkit.org/changeset/161441> 965095 4 commit-queue 2014-01-07 11:32:18 -0800 All reviewed patches have been landed. Closing bug. 220354 2014-01-03 16:59:31 -0800 2014-01-04 20:50:12 -0800 WIP patch DelaySwitchWIP.txt text/plain 4866 ap SW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1 YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL1BvcG92ZXJUcmFja2VyLmpzCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1Ymxp Y19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL1BvcG92ZXJUcmFja2VyLmpzCShyZXZpc2lvbiAxNjEy NzIpCisrKyBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9w dWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9Qb3BvdmVyVHJhY2tlci5qcwkod29ya2luZyBj b3B5KQpAQCAtMjgsNyArMjgsNyBAQCBQb3BvdmVyVHJhY2tlciA9IGZ1bmN0aW9uKGVsZW1lbnQs IHByZXNlCiAgICAgQmFzZU9iamVjdC5jYWxsKHRoaXMpOwogCiAgICAgY29uc29sZS5hc3NlcnQo ZWxlbWVudCk7Ci0gICAgY29uc29sZS5hc3NlcnQocHJlc2VudFBvcG92ZXJDYWxsYmFjayAmJiB0 eXBlb2YgcHJlc2VudFBvcG92ZXJDYWxsYmFjayA9PSAiZnVuY3Rpb24iKTsKKyAgICBjb25zb2xl LmFzc2VydChwcmVzZW50UG9wb3ZlckNhbGxiYWNrICYmIHR5cGVvZiBwcmVzZW50UG9wb3ZlckNh bGxiYWNrID09PSAiZnVuY3Rpb24iKTsKIAogICAgIHRoaXMuX2VsZW1lbnQgPSBlbGVtZW50Owog ICAgIHRoaXMuX3ByZXNlbnRQb3BvdmVyID0gcHJlc2VudFBvcG92ZXJDYWxsYmFjazsKQEAgLTQy LDQ0ICs0Miw5MCBAQCBQb3BvdmVyVHJhY2tlciA9IGZ1bmN0aW9uKGVsZW1lbnQsIHByZXNlCiAK IFBvcG92ZXJUcmFja2VyLl9wb3BvdmVyID0gbnVsbDsgLy8gT25seSBvbmUgcG9wb3ZlciBtYXkg YmUgYWN0aXZlIGF0IGFueSB0aW1lLgogCisvLyBXaGVuIHdlIGFscmVhZHkgaGF2ZSBhIHBvcG92 ZXIsIGFuZCBtb3ZlIHRoZSBtb3VzZSBwb2ludGVyIHRvIGFub3RoZXIgYWN0aXZlIGVsZW1lbnQs CisvLyB3ZSBzaG91bGQgcXVpY2tseSBzd2l0Y2ggdG8gaXQuIEJ1dCBub3QgdG9vIHF1aWNrbHks IGFzIHRoYXQgY2FuIG1ha2UgaXQgaGFyZCB0byBtb3ZlCisvLyB0aGUgbW91c2UgcG9pbnRlciBm cm9tIGFuIGVsZW1lbnQgdG8gaXRzIHBvcG92ZXIgb24gcGFnZXMgd2l0aCBsb3RzIG9mIGFjdGl2 ZSBlbGVtZW50cy4KK1BvcG92ZXJUcmFja2VyLl9jYW5kaWRhdGVUcmFja2VyID0gbnVsbDsKK1Bv cG92ZXJUcmFja2VyLl9jYW5kaWRhdGVUaW1lciA9IG51bGw7CitQb3BvdmVyVHJhY2tlci5DYW5k aWRhdGVTd2l0Y2hEZWxheSA9IDIwMDsKKwogQmFzZU9iamVjdC5hZGRDb25zdHJ1Y3RvckZ1bmN0 aW9ucyhQb3BvdmVyVHJhY2tlcik7CiAKK1BvcG92ZXJUcmFja2VyLl9zZXRDYW5kaWRhdGVQb3Bv dmVyVHJhY2tlciA9IGZ1bmN0aW9uKHBvcG92ZXJUcmFja2VyKQoreworICAgIGlmIChQb3BvdmVy VHJhY2tlci5fY2FuZGlkYXRlVHJhY2tlcikgeworICAgICAgICBjbGVhclRpbWVvdXQoUG9wb3Zl clRyYWNrZXIuX2NhbmRpZGF0ZVRpbWVyKTsKKyAgICAgICAgUG9wb3ZlclRyYWNrZXIuX2NhbmRp ZGF0ZVRpbWVyID0gbnVsbDsKKyAgICB9CisKKyAgICBjb25zb2xlLmFzc2VydCghUG9wb3ZlclRy YWNrZXIuX2NhbmRpZGF0ZVRpbWVyKTsKKyAgICAKKyAgICBQb3BvdmVyVHJhY2tlci5fY2FuZGlk YXRlVHJhY2tlciA9IHBvcG92ZXJUcmFja2VyOworCisgICAgaWYgKHBvcG92ZXJUcmFja2VyKSB7 CisgICAgICAgIFBvcG92ZXJUcmFja2VyLl9jYW5kaWRhdGVUaW1lciA9IHNldFRpbWVvdXQoZnVu Y3Rpb24oKSB7CisgICAgICAgICAgICBpZiAoUG9wb3ZlclRyYWNrZXIuX3BvcG92ZXIpCisgICAg ICAgICAgICAgICAgUG9wb3ZlclRyYWNrZXIuX3BvcG92ZXIuZGlzbWlzc0ltbWVkaWF0ZWx5KCk7 CisKKyAgICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KCFQb3BvdmVyVHJhY2tlci5fcG9wb3Zlcik7 CisgICAgICAgICAgICBQb3BvdmVyVHJhY2tlci5fc2V0Q2FuZGlkYXRlUG9wb3ZlclRyYWNrZXIo bnVsbCk7CisgICAgICAgICAgICBwb3BvdmVyVHJhY2tlci5fc2hvd1BvcG92ZXIocG9wb3ZlclRy YWNrZXIuX2VsZW1lbnQpOworICAgICAgICAgICAgaWYgKFBvcG92ZXJUcmFja2VyLl9wb3BvdmVy KQorICAgICAgICAgICAgICAgIFBvcG92ZXJUcmFja2VyLl9wb3BvdmVyLm1ha2VWaXNpYmxlSW1t ZWRpYXRlbHkoKTsKKyAgICAgICAgfSwgUG9wb3ZlclRyYWNrZXIuQ2FuZGlkYXRlU3dpdGNoRGVs YXkpOworICAgIH0KK30KKwogUG9wb3ZlclRyYWNrZXIucHJvdG90eXBlID0gewogICAgIGNvbnN0 cnVjdG9yOiBQb3BvdmVyVHJhY2tlciwKICAgICBfX3Byb3RvX186IEJhc2VPYmplY3QucHJvdG90 eXBlLAogCisgICAgX3Nob3dQb3BvdmVyOiBmdW5jdGlvbihlbGVtZW50KQorICAgIHsKKyAgICAg ICAgdmFyIHBvcG92ZXIgPSBuZXcgRGFzaGJvYXJkLlBvcG92ZXIodGhpcyk7CisgICAgICAgIGlm ICghdGhpcy5fcHJlc2VudFBvcG92ZXIoZWxlbWVudCwgcG9wb3ZlciwgdGhpcy5fY29udGV4dCkp CisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgdGhpcy5fYWN0aXZlID0gdHJ1ZTsKKyAg ICAgICAgUG9wb3ZlclRyYWNrZXIuX3BvcG92ZXIgPSBwb3BvdmVyOworICAgICAgICBwb3BvdmVy LmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2VlbnRlciIsIHRoaXMuX21vdXNlRW50ZXJl ZFBvcG92ZXJPckVsZW1lbnQuYmluZCh0aGlzKSwgdHJ1ZSk7CisgICAgICAgIHBvcG92ZXIuZWxl bWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWxlYXZlIiwgdGhpcy5fbW91c2VFeGl0ZWRQb3Bv dmVyT3JFbGVtZW50LmJpbmQodGhpcyksIHRydWUpOworICAgIH0sCisKICAgICBfbW91c2VFbnRl cmVkUG9wb3Zlck9yRWxlbWVudDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewogICAgICAgICB2YXIg cG9wb3ZlciA9IFBvcG92ZXJUcmFja2VyLl9wb3BvdmVyOwotICAgICAgICB2YXIgcG9wb3Zlcldh c1Zpc2libGUgPSBwb3BvdmVyICYmIHBvcG92ZXIudmlzaWJsZTsKKwogICAgICAgICBpZiAocG9w b3ZlcikgewogICAgICAgICAgICAgLy8gQWJvcnQgZmFkZS1vdXQgd2hlbiByZS1lbnRlcmluZyB0 aGUgc2FtZSBlbGVtZW50IG9yIGFuIGV4aXN0aW5nIHBvcG92ZXIuCiAgICAgICAgICAgICBpZiAo KHRoaXMuX2FjdGl2ZSAmJiB0aGlzLl9lbGVtZW50LmlzU2VsZk9yQW5jZXN0b3IoZXZlbnQudG9F bGVtZW50KSkKICAgICAgICAgICAgICAgICB8fCBwb3BvdmVyLmVsZW1lbnQuaXNTZWxmT3JBbmNl c3RvcihldmVudC50b0VsZW1lbnQpKSB7CiAgICAgICAgICAgICAgICAgcG9wb3Zlci5tYWtlVmlz aWJsZUltbWVkaWF0ZWx5KCk7CisgICAgICAgICAgICAgICAgUG9wb3ZlclRyYWNrZXIuX3NldENh bmRpZGF0ZVBvcG92ZXJUcmFja2VyKG51bGwpOwogICAgICAgICAgICAgICAgIHJldHVybjsKICAg ICAgICAgICAgIH0KIAotICAgICAgICAgICAgLy8gV2UgZW50ZXJlZCBhIGRpZmZlcmVudCBlbGVt ZW50LCBkaXNtaXNzIHRoZSBvbGQgcG9wb3Zlci4KLSAgICAgICAgICAgIHBvcG92ZXIuZGlzbWlz c0ltbWVkaWF0ZWx5KCk7CisgICAgICAgICAgICAvLyBXZSBlbnRlcmVkIGEgZGlmZmVyZW50IGVs ZW1lbnQuCisgICAgICAgICAgICBpZiAocG9wb3Zlci52aXNpYmxlKSB7CisgICAgICAgICAgICAg ICAgUG9wb3ZlclRyYWNrZXIuX3NldENhbmRpZGF0ZVBvcG92ZXJUcmFja2VyKHRoaXMpOworICAg ICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIH0gZWxzZQorICAgICAgICAgICAgICAg IHBvcG92ZXIuZGlzbWlzc0ltbWVkaWF0ZWx5KCk7CiAgICAgICAgIH0KICAgICAgICAgY29uc29s ZS5hc3NlcnQoIVBvcG92ZXJUcmFja2VyLl9wb3BvdmVyKTsKIAotICAgICAgICB2YXIgcG9wb3Zl ciA9IG5ldyBEYXNoYm9hcmQuUG9wb3Zlcih0aGlzKTsKLSAgICAgICAgaWYgKCF0aGlzLl9wcmVz ZW50UG9wb3ZlcihldmVudC50YXJnZXQsIHBvcG92ZXIsIHRoaXMuX2NvbnRleHQpKQotICAgICAg ICAgICAgcmV0dXJuOwotCi0gICAgICAgIGlmIChwb3BvdmVyV2FzVmlzaWJsZSkKLSAgICAgICAg ICAgIHBvcG92ZXIubWFrZVZpc2libGVJbW1lZGlhdGVseSgpOwotCi0gICAgICAgIHRoaXMuX2Fj dGl2ZSA9IHRydWU7Ci0gICAgICAgIFBvcG92ZXJUcmFja2VyLl9wb3BvdmVyID0gcG9wb3ZlcjsK LSAgICAgICAgcG9wb3Zlci5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlZW50ZXIiLCB0 aGlzLl9tb3VzZUVudGVyZWRQb3BvdmVyT3JFbGVtZW50LmJpbmQodGhpcyksIHRydWUpOwotICAg ICAgICBwb3BvdmVyLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2VsZWF2ZSIsIHRoaXMu X21vdXNlRXhpdGVkUG9wb3Zlck9yRWxlbWVudC5iaW5kKHRoaXMpLCB0cnVlKTsKKyAgICAgICAg dGhpcy5fc2hvd1BvcG92ZXIoZXZlbnQudGFyZ2V0KTsKICAgICB9LAogCiAgICAgX21vdXNlRXhp dGVkUG9wb3Zlck9yRWxlbWVudDogZnVuY3Rpb24oZXZlbnQpCiAgICAgeworICAgICAgICBpZiAo dGhpcyA9PT0gUG9wb3ZlclRyYWNrZXIuX2NhbmRpZGF0ZVRyYWNrZXIpIHsKKyAgICAgICAgICAg IGlmICh0aGlzLl9lbGVtZW50LmlzU2VsZk9yQW5jZXN0b3IoZXZlbnQudG9FbGVtZW50KSkKKyAg ICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICBQb3BvdmVyVHJhY2tlci5fc2V0Q2Fu ZGlkYXRlUG9wb3ZlclRyYWNrZXIobnVsbCk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAg IH0KKwogICAgICAgICB2YXIgcG9wb3ZlciA9IFBvcG92ZXJUcmFja2VyLl9wb3BvdmVyOwogCiAg ICAgICAgIGlmICghcG9wb3ZlcikK 220384 2014-01-04 20:50:12 -0800 2014-01-07 11:32:16 -0800 proposed patch PopoverDelay.txt text/plain 9339 ap SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE2MTMxNykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDMwIEBACisyMDE0LTAxLTA0ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgorCisgICAgICAgIFRoZXJlIHNob3VsZCBiZSBhIGRlbGF5IHdoZW4gcXVpY2tseSBzd2l0Y2hp bmcgdG8gYSBkaWZmZXJlbnQgcG9wb3ZlciBhdCBidWlsZC53ZWJraXQub3JnL2Rhc2hib2FyZAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI2NDcyCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgYSBk ZWxheSB3aGVuIHF1aWNrbHkgc3dpdGNoaW5nIHRvIGEgZGlmZmVyZW50IHBvcG92ZXIsIG1ha2lu ZyBpdCBlYXNpZXIgdG8KKyAgICAgICAgbW92ZSBtb3VzZSBwb2ludGVyIGZyb20gYWN0aXZlIGVs ZW1lbnQgdG8gaXRzIHBvcG92ZXIgd2l0aG91dCBhY2NpZGVudGFsbHkgb3BlbmluZworICAgICAg ICBhIGRpZmZlcmVudCBwb3BvdmVyLgorCisgICAgICAgIFVzZWQgdGhpcyBjb2RlIHRvIGFkZCBh IGRlbGF5IGJlZm9yZSBjcmVhdGluZyBhIHBvcG92ZXIuIFRoaXMgZG9lc24ndCBjaGFuZ2UgVUkK KyAgICAgICAgYmVoYXZpb3IsIGFzIHRoZXJlIHdhcyBhbGVyYWR5IGEgZGVsYXkgYmVmb3JlIGl0 IGJlY2FtZSB2aXNpYmxlLCBidXQgaXQgYXZvaWRzCisgICAgICAgIGZsb29kaW5nIGJ1aWxkYm90 IHNlcnZlciB3aXRoIGh0dHAgcmVxdWVzdHMgd2hlbiBxdWlja2x5IG1vdmluZyB0aGUgbW91c2Ug b3ZlcgorICAgICAgICBkYXNoYm9hcmQgcGFnZS4KKworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBw b3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRz L1BvcG92ZXIuanM6CisgICAgICAgIEZpeGVkIGEgY2FzZSB3aGVyZSBwb3BvdmVyIGNvdWxkIGdl dCBzdHVjay4gSWYgY29udGVudCB3YXMgdXBkYXRlZCB3aGlsZSBmYWRlLW91dAorICAgICAgICB0 cmFuc2l0aW9uIHdhcyBhbHJlYWR5IGluIHBsYWNlLCB0aGUgdHJhbnNpdGlvbiB3YXMgcmVtb3Zl ZCBmb3Igbm8gZ29vZCByZWFzb24uCisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWls ZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9Qb3BvdmVy VHJhY2tlci5qczoKKyAgICAgICAgKFBvcG92ZXJUcmFja2VyLl9vbmJsdXIpOiBXaGlsZSBhdCBp dCwgYWxzbyB0YXVnaHQgcG9wb3ZlcnMgdG8gZGlzYXBwZWFyIG9uIHdpbmRvdyBibHVyLgorCisg ICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGlj X2h0bWwvZGFzaGJvYXJkL1N0eWxlcy9Qb3BvdmVyLmNzczoKKyAgICAgICAgKC5wb3BvdmVyLnN0 ZXAtaW4pOiBOb3cgdGhhdCBQb3BvdmVyVHJhY2tlciBoYXMgYSAyMDBtcyBkZWxheSBvZiBpdHMg b3duLCByZWR1Y2VkCisgICAgICAgIHBvcG92ZXIgZGVsYXkgZnJvbSAxcyB0byA4MDBtcy4KKwog MjAxNC0wMS0wNCAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CiAKICAg ICAgICAgW0dUS10gW0NNYWtlXSBGaXggdGhlIHZpZGVvIGFuZCBhdWRpbyBidWlsZApJbmRleDog VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0 bWwvZGFzaGJvYXJkL1NjcmlwdHMvUG9wb3Zlci5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWls ZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9h cmQvU2NyaXB0cy9Qb3BvdmVyLmpzCShyZXZpc2lvbiAxNjEzMDMpCisrKyBUb29scy9CdWlsZFNs YXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQv U2NyaXB0cy9Qb3BvdmVyLmpzCSh3b3JraW5nIGNvcHkpCkBAIC0yMDgsMTIgKzIwOCw5IEBAIERh c2hib2FyZC5Qb3BvdmVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgdmFyIHRhcmdldEZyYW1lID0g dGhpcy5fdGFyZ2V0RnJhbWU7CiAgICAgICAgIHZhciBwcmVmZXJyZWRFZGdlcyA9IHRoaXMuX3By ZWZlcnJlZEVkZ2VzOwogCi0gICAgICAgIC8vIEVuc3VyZSBvdXIgZWxlbWVudCBpcyBvbiBkaXNw bGF5IHNvIHRoYXQgaXRzIG1ldHJpY3MgY2FuIGJlIHJlc29sdmVkCi0gICAgICAgIC8vIG9yIGlu dGVycnVwdCBhbnkgcGVuZGluZyB0cmFuc2l0aW9uIHRvIHJlbW92ZSBpdCBmcm9tIGRpc3BsYXku CisgICAgICAgIC8vIEVuc3VyZSBvdXIgZWxlbWVudCBpcyBvbiBkaXNwbGF5IHNvIHRoYXQgaXRz IG1ldHJpY3MgY2FuIGJlIHJlc29sdmVkLgogICAgICAgICBpZiAodGhpcy5fZWxlbWVudC5wYXJl bnROb2RlICE9PSBkb2N1bWVudC5ib2R5KQogICAgICAgICAgICAgZG9jdW1lbnQuYm9keS5hcHBl bmRDaGlsZCh0aGlzLl9lbGVtZW50KTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgdGhpcy5f ZWxlbWVudC5jbGFzc0xpc3QucmVtb3ZlKERhc2hib2FyZC5Qb3BvdmVyLkZhZGVPdXRDbGFzc05h bWUpOwogCiAgICAgICAgIGlmICh0aGlzLl9jb250ZW50TmVlZHNVcGRhdGUpIHsKICAgICAgICAg ICAgIC8vIFJlc2V0IENTUyBwcm9wZXJ0aWVzIG9uIGVsZW1lbnQgc28gdGhhdCB0aGUgZWxlbWVu dCBtYXkgYmUgc2l6ZWQgdG8gZml0IGl0cyBjb250ZW50LgpJbmRleDogVG9vbHMvQnVpbGRTbGF2 ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1Nj cmlwdHMvUG9wb3ZlclRyYWNrZXIuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1 cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1Njcmlw dHMvUG9wb3ZlclRyYWNrZXIuanMJKHJldmlzaW9uIDE2MTMwMykKKysrIFRvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9T Y3JpcHRzL1BvcG92ZXJUcmFja2VyLmpzCSh3b3JraW5nIGNvcHkpCkBAIC0yOCw3ICsyOCw3IEBA IFBvcG92ZXJUcmFja2VyID0gZnVuY3Rpb24oZWxlbWVudCwgcHJlc2UKICAgICBCYXNlT2JqZWN0 LmNhbGwodGhpcyk7CiAKICAgICBjb25zb2xlLmFzc2VydChlbGVtZW50KTsKLSAgICBjb25zb2xl LmFzc2VydChwcmVzZW50UG9wb3ZlckNhbGxiYWNrICYmIHR5cGVvZiBwcmVzZW50UG9wb3ZlckNh bGxiYWNrID09ICJmdW5jdGlvbiIpOworICAgIGNvbnNvbGUuYXNzZXJ0KHByZXNlbnRQb3BvdmVy Q2FsbGJhY2sgJiYgdHlwZW9mIHByZXNlbnRQb3BvdmVyQ2FsbGJhY2sgPT09ICJmdW5jdGlvbiIp OwogCiAgICAgdGhpcy5fZWxlbWVudCA9IGVsZW1lbnQ7CiAgICAgdGhpcy5fcHJlc2VudFBvcG92 ZXIgPSBwcmVzZW50UG9wb3ZlckNhbGxiYWNrOwpAQCAtNDAsNDYgKzQwLDExNiBAQCBQb3BvdmVy VHJhY2tlciA9IGZ1bmN0aW9uKGVsZW1lbnQsIHByZXNlCiAgICAgZWxlbWVudC5hZGRFdmVudExp c3RlbmVyKCJtb3VzZWxlYXZlIiwgdGhpcy5fbW91c2VFeGl0ZWRQb3BvdmVyT3JFbGVtZW50LmJp bmQodGhpcyksIHRydWUpOwogfTsKIAotUG9wb3ZlclRyYWNrZXIuX3BvcG92ZXIgPSBudWxsOyAv LyBPbmx5IG9uZSBwb3BvdmVyIG1heSBiZSBhY3RpdmUgYXQgYW55IHRpbWUuCisvLyBPbmx5IG9u ZSBwb3BvdmVyIG1heSBiZSBhY3RpdmUgYXQgYW55IHRpbWUuIEFuIGFjdGl2ZSBwb3BvdmVyIGlz IG5vdCBuZWNlc3NhcmlseSB2aXNpYmxlIGFscmVhZHkuCitQb3BvdmVyVHJhY2tlci5fcG9wb3Zl ciA9IG51bGw7CisKKy8vIEEgY2FuZGlkYXRlIHRpbWVyIG1heSBiZSBhY3RpdmUgd2hldGhlciB3 ZSBoYXZlIGFuIGFjdGl2ZSBwb3BvdmVyIG9yIG5vdC4KK1BvcG92ZXJUcmFja2VyLl9jYW5kaWRh dGVUcmFja2VyID0gbnVsbDsKK1BvcG92ZXJUcmFja2VyLl9jYW5kaWRhdGVUaW1lciA9IG51bGw7 CitQb3BvdmVyVHJhY2tlci5DYW5kaWRhdGVTd2l0Y2hEZWxheSA9IDIwMDsKIAogQmFzZU9iamVj dC5hZGRDb25zdHJ1Y3RvckZ1bmN0aW9ucyhQb3BvdmVyVHJhY2tlcik7CiAKK1BvcG92ZXJUcmFj a2VyLl9zZXRDYW5kaWRhdGVQb3BvdmVyVHJhY2tlciA9IGZ1bmN0aW9uKHBvcG92ZXJUcmFja2Vy KQoreworICAgIGNvbnNvbGUuYXNzZXJ0KCFwb3BvdmVyVHJhY2tlciB8fCAhcG9wb3ZlclRyYWNr ZXIuX2FjdGl2ZSk7CisKKyAgICBpZiAoUG9wb3ZlclRyYWNrZXIuX2NhbmRpZGF0ZVRyYWNrZXIp IHsKKyAgICAgICAgY2xlYXJUaW1lb3V0KFBvcG92ZXJUcmFja2VyLl9jYW5kaWRhdGVUaW1lcik7 CisgICAgICAgIFBvcG92ZXJUcmFja2VyLl9jYW5kaWRhdGVUaW1lciA9IG51bGw7CisgICAgfQor CisgICAgY29uc29sZS5hc3NlcnQoIVBvcG92ZXJUcmFja2VyLl9jYW5kaWRhdGVUaW1lcik7Cisg ICAgCisgICAgUG9wb3ZlclRyYWNrZXIuX2NhbmRpZGF0ZVRyYWNrZXIgPSBwb3BvdmVyVHJhY2tl cjsKKworICAgIGlmIChwb3BvdmVyVHJhY2tlcikKKyAgICAgICAgUG9wb3ZlclRyYWNrZXIuX2Nh bmRpZGF0ZVRpbWVyID0gc2V0VGltZW91dChQb3BvdmVyVHJhY2tlci5fY2FuZGlkYXRlUG9wb3Zl clRyYWNrZXJUaW1lckZpcmVkLCBQb3BvdmVyVHJhY2tlci5DYW5kaWRhdGVTd2l0Y2hEZWxheSk7 Cit9CisKK1BvcG92ZXJUcmFja2VyLl9jYW5kaWRhdGVQb3BvdmVyVHJhY2tlclRpbWVyRmlyZWQg PSBmdW5jdGlvbigpCit7CisgICAgdmFyIGhhZFBvcG92ZXIgPSAhIVBvcG92ZXJUcmFja2VyLl9w b3BvdmVyOworICAgIGlmIChoYWRQb3BvdmVyKSB7CisgICAgICAgIGNvbnNvbGUuYXNzZXJ0KFBv cG92ZXJUcmFja2VyLl9wb3BvdmVyLnZpc2libGUpOworICAgICAgICBQb3BvdmVyVHJhY2tlci5f cG9wb3Zlci5kaXNtaXNzSW1tZWRpYXRlbHkoKTsKKyAgICB9CisgICAgY29uc29sZS5hc3NlcnQo IVBvcG92ZXJUcmFja2VyLl9wb3BvdmVyKTsKKworICAgIHZhciB0cmFja2VyID0gUG9wb3ZlclRy YWNrZXIuX2NhbmRpZGF0ZVRyYWNrZXI7CisKKyAgICBQb3BvdmVyVHJhY2tlci5fc2V0Q2FuZGlk YXRlUG9wb3ZlclRyYWNrZXIobnVsbCk7CisgICAgdHJhY2tlci5fc2hvd1BvcG92ZXIoKTsKKwor ICAgIGlmIChQb3BvdmVyVHJhY2tlci5fcG9wb3ZlciAmJiBoYWRQb3BvdmVyKQorICAgICAgICBQ b3BvdmVyVHJhY2tlci5fcG9wb3Zlci5tYWtlVmlzaWJsZUltbWVkaWF0ZWx5KCk7Cit9CisKK1Bv cG92ZXJUcmFja2VyLl9vbmJsdXIgPSBmdW5jdGlvbigpCit7CisgICAgaWYgKFBvcG92ZXJUcmFj a2VyLl9wb3BvdmVyKQorICAgICAgICBQb3BvdmVyVHJhY2tlci5fcG9wb3Zlci5kaXNtaXNzSW1t ZWRpYXRlbHkoKTsKKworICAgIFBvcG92ZXJUcmFja2VyLl9zZXRDYW5kaWRhdGVQb3BvdmVyVHJh Y2tlcihudWxsKTsKK30KKword2luZG93LmFkZEV2ZW50TGlzdGVuZXIoImJsdXIiLCBQb3BvdmVy VHJhY2tlci5fb25ibHVyLCB0cnVlKTsKKwogUG9wb3ZlclRyYWNrZXIucHJvdG90eXBlID0gewog ICAgIGNvbnN0cnVjdG9yOiBQb3BvdmVyVHJhY2tlciwKICAgICBfX3Byb3RvX186IEJhc2VPYmpl Y3QucHJvdG90eXBlLAogCisgICAgX3Nob3dQb3BvdmVyOiBmdW5jdGlvbigpCisgICAgeworICAg ICAgICB2YXIgcG9wb3ZlciA9IG5ldyBEYXNoYm9hcmQuUG9wb3Zlcih0aGlzKTsKKyAgICAgICAg aWYgKCF0aGlzLl9wcmVzZW50UG9wb3Zlcih0aGlzLl9lbGVtZW50LCBwb3BvdmVyLCB0aGlzLl9j b250ZXh0KSkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICB0aGlzLl9hY3RpdmUgPSB0 cnVlOworICAgICAgICBQb3BvdmVyVHJhY2tlci5fcG9wb3ZlciA9IHBvcG92ZXI7CisgICAgICAg IHBvcG92ZXIuZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWVudGVyIiwgdGhpcy5fbW91 c2VFbnRlcmVkUG9wb3Zlck9yRWxlbWVudC5iaW5kKHRoaXMpLCB0cnVlKTsKKyAgICAgICAgcG9w b3Zlci5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlbGVhdmUiLCB0aGlzLl9tb3VzZUV4 aXRlZFBvcG92ZXJPckVsZW1lbnQuYmluZCh0aGlzKSwgdHJ1ZSk7CisgICAgfSwKKwogICAgIF9t b3VzZUVudGVyZWRQb3BvdmVyT3JFbGVtZW50OiBmdW5jdGlvbihldmVudCkKICAgICB7CiAgICAg ICAgIHZhciBwb3BvdmVyID0gUG9wb3ZlclRyYWNrZXIuX3BvcG92ZXI7Ci0gICAgICAgIHZhciBw b3BvdmVyV2FzVmlzaWJsZSA9IHBvcG92ZXIgJiYgcG9wb3Zlci52aXNpYmxlOworCiAgICAgICAg IGlmIChwb3BvdmVyKSB7CiAgICAgICAgICAgICAvLyBBYm9ydCBmYWRlLW91dCB3aGVuIHJlLWVu dGVyaW5nIHRoZSBzYW1lIGVsZW1lbnQgb3IgYW4gZXhpc3RpbmcgcG9wb3Zlci4KICAgICAgICAg ICAgIGlmICgodGhpcy5fYWN0aXZlICYmIHRoaXMuX2VsZW1lbnQuaXNTZWxmT3JBbmNlc3Rvcihl dmVudC50b0VsZW1lbnQpKQogICAgICAgICAgICAgICAgIHx8IHBvcG92ZXIuZWxlbWVudC5pc1Nl bGZPckFuY2VzdG9yKGV2ZW50LnRvRWxlbWVudCkpIHsKICAgICAgICAgICAgICAgICBwb3BvdmVy Lm1ha2VWaXNpYmxlSW1tZWRpYXRlbHkoKTsKKyAgICAgICAgICAgICAgICBQb3BvdmVyVHJhY2tl ci5fc2V0Q2FuZGlkYXRlUG9wb3ZlclRyYWNrZXIobnVsbCk7CisgICAgICAgICAgICAgICAgcmV0 dXJuOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICAvLyBXZSBlbnRlcmVkIGEgZGlmZmVy ZW50IGVsZW1lbnQuCisgICAgICAgICAgICBpZiAocG9wb3Zlci52aXNpYmxlKSB7CisgICAgICAg ICAgICAgICAgUG9wb3ZlclRyYWNrZXIuX3NldENhbmRpZGF0ZVBvcG92ZXJUcmFja2VyKHRoaXMp OwogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAg Ly8gV2UgZW50ZXJlZCBhIGRpZmZlcmVudCBlbGVtZW50LCBkaXNtaXNzIHRoZSBvbGQgcG9wb3Zl ci4KKyAgICAgICAgICAgIC8vIFRoZSBwb3BvdmVyIHdhc24ndCB2aXNpYmxlIHlldCwgc28gaXQg d2FzIGVmZmVjdGl2ZWx5IG5vbi1leGlzdGVudC4KICAgICAgICAgICAgIHBvcG92ZXIuZGlzbWlz c0ltbWVkaWF0ZWx5KCk7CiAgICAgICAgIH0KLSAgICAgICAgY29uc29sZS5hc3NlcnQoIVBvcG92 ZXJUcmFja2VyLl9wb3BvdmVyKTsKLQotICAgICAgICB2YXIgcG9wb3ZlciA9IG5ldyBEYXNoYm9h cmQuUG9wb3Zlcih0aGlzKTsKLSAgICAgICAgaWYgKCF0aGlzLl9wcmVzZW50UG9wb3ZlcihldmVu dC50YXJnZXQsIHBvcG92ZXIsIHRoaXMuX2NvbnRleHQpKQotICAgICAgICAgICAgcmV0dXJuOwog Ci0gICAgICAgIGlmIChwb3BvdmVyV2FzVmlzaWJsZSkKLSAgICAgICAgICAgIHBvcG92ZXIubWFr ZVZpc2libGVJbW1lZGlhdGVseSgpOworICAgICAgICBjb25zb2xlLmFzc2VydCghUG9wb3ZlclRy YWNrZXIuX3BvcG92ZXIpOworICAgICAgICBjb25zb2xlLmFzc2VydCghUG9wb3ZlclRyYWNrZXIu X2NhbmRpZGF0ZVRyYWNrZXIpOworICAgICAgICBjb25zb2xlLmFzc2VydCghUG9wb3ZlclRyYWNr ZXIuX2NhbmRpZGF0ZVRpbWVyKTsKIAotICAgICAgICB0aGlzLl9hY3RpdmUgPSB0cnVlOwotICAg ICAgICBQb3BvdmVyVHJhY2tlci5fcG9wb3ZlciA9IHBvcG92ZXI7Ci0gICAgICAgIHBvcG92ZXIu ZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWVudGVyIiwgdGhpcy5fbW91c2VFbnRlcmVk UG9wb3Zlck9yRWxlbWVudC5iaW5kKHRoaXMpLCB0cnVlKTsKLSAgICAgICAgcG9wb3Zlci5lbGVt ZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlbGVhdmUiLCB0aGlzLl9tb3VzZUV4aXRlZFBvcG92 ZXJPckVsZW1lbnQuYmluZCh0aGlzKSwgdHJ1ZSk7CisgICAgICAgIFBvcG92ZXJUcmFja2VyLl9z ZXRDYW5kaWRhdGVQb3BvdmVyVHJhY2tlcih0aGlzKTsKICAgICB9LAogCiAgICAgX21vdXNlRXhp dGVkUG9wb3Zlck9yRWxlbWVudDogZnVuY3Rpb24oZXZlbnQpCiAgICAgeworICAgICAgICBpZiAo dGhpcyA9PT0gUG9wb3ZlclRyYWNrZXIuX2NhbmRpZGF0ZVRyYWNrZXIpIHsKKyAgICAgICAgICAg IGlmICh0aGlzLl9lbGVtZW50LmlzU2VsZk9yQW5jZXN0b3IoZXZlbnQudG9FbGVtZW50KSkKKyAg ICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICBQb3BvdmVyVHJhY2tlci5fc2V0Q2Fu ZGlkYXRlUG9wb3ZlclRyYWNrZXIobnVsbCk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAg IH0KKwogICAgICAgICB2YXIgcG9wb3ZlciA9IFBvcG92ZXJUcmFja2VyLl9wb3BvdmVyOwogCiAg ICAgICAgIGlmICghcG9wb3ZlcikKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxk LndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TdHlsZXMvUG9wb3Zlci5j c3MKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9y Zy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1N0eWxlcy9Qb3BvdmVyLmNzcwkocmV2aXNp b24gMTYxMzAzKQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1j b25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1N0eWxlcy9Qb3BvdmVyLmNzcwkod29ya2luZyBj b3B5KQpAQCAtNTUsNyArNTUsOSBAQAogCiAucG9wb3Zlci5zdGVwLWluIHsKICAgICB0cmFuc2l0 aW9uOiBvcGFjaXR5IDBtczsKLSAgICB0cmFuc2l0aW9uLWRlbGF5OiAxczsKKyAgICAvKiBUaGlz IGlzIGEgZGVsYXkgYWZ0ZXIgcG9wb3ZlciBjcmVhdGlvbi4gUG9wb3ZlciB0cmFja2luZyBjb2Rl IG1heSBhZGQgYSBkZWxheSBvZiBpdHMgb3duIGJlZm9yZSBpdCBkZWNpZGVzIHRvIGNyZWF0ZSB0 aGUgcG9wb3Zlci4gKi8KKyAgICAvKiBJdCBpcyB1c2VmdWwgdG8gc2VwYXJhdGUgdGhlIGRlbGF5 cyBiZWNhdXNlIHBvcG92ZXIgY3JlYXRpb24gY2FuIGJlIGNvc3RseSwgZS5nLiBpdCBjYW4gbGF6 aWx5IGxvYWQgZGF0YSBmcm9tIG5ldHdvcmsgZHVyaW5nIHRoZSB0cmFuc2l0aW9uLiAqLworICAg IHRyYW5zaXRpb24tZGVsYXk6IDgwMG1zOwogICAgIG9wYWNpdHk6IDE7CiB9CiAK