110132 2013-02-18 09:17:57 -0800 Add animation class for new calendar picker 2013-02-21 06:59:28 -0800 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 110131 109439 110137 1 keishi keishi tkent webkit.review.bot oldest_to_newest 835548 0 keishi 2013-02-18 09:17:57 -0800 Add animation related classes for the new calendar picker 835569 1 188910 keishi 2013-02-18 09:43:26 -0800 Created attachment 188910 Patch 837337 2 188910 tkent 2013-02-20 04:21:51 -0800 Comment on attachment 188910 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=188910&action=review > Source/WebCore/Resources/pagepopups/calendarPicker.js:782 > + this.dispatchEvent("animationFrameWillFinish"); If the name "animationFrameWillFinish" is used by other classes, this class should provide a constant symbol for it. > Source/WebCore/Resources/pagepopups/calendarPicker.js:797 > + */ need @override > Source/WebCore/Resources/pagepopups/calendarPicker.js:807 > + */ Ditto. > Source/WebCore/Resources/pagepopups/calendarPicker.js:831 > + this.id = Animator.lastId++; > + this.from = 0; > + this.to = 0; > + this._delta = 0; > + this.duration = 100; > + this.step = null; > + this.lastStepTime = null; > + this.progress = 0.0; > + this.timingFunction = AnimationTimingFunction.Linear; Should these members be public? If they should not be updated by other objects, they should be private and should provide accessor functions. > Source/WebCore/Resources/pagepopups/calendarPicker.js:832 > +}; ; is not needed. > Source/WebCore/Resources/pagepopups/calendarPicker.js:860 > + this.dispatchEvent("didAnimationStart"); If the name "didAnimationStart" is used by other classes, this class should provide a constant symbol for it. > Source/WebCore/Resources/pagepopups/calendarPicker.js:870 > + this.dispatchEvent("didAnimationStop", this); If the name "didAnimationStop" is used by other classes, this class should provide a constant symbol for it. > Source/WebCore/Resources/pagepopups/calendarPicker.js:880 > + return this.stop(); confusing code. should be this.stop(); return; 838265 3 189491 keishi 2013-02-21 02:46:39 -0800 Created attachment 189491 Patch 838355 4 189491 tkent 2013-02-21 05:28:25 -0800 Comment on attachment 189491 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=189491&action=review > Source/WebCore/ChangeLog:14 > + (AnimationTimingFunction.Linear): Parameter t should be a number between 0 and 1. Such comment should be in the code, or the code should have console.assert. > Source/WebCore/Resources/pagepopups/calendarPicker.js:841 > +Animator.lastId = 0; I guess this should be private. 838365 5 189516 keishi 2013-02-21 06:05:00 -0800 Created attachment 189516 Patch 838394 6 189516 webkit.review.bot 2013-02-21 06:59:25 -0800 Comment on attachment 189516 Patch Clearing flags on attachment: 189516 Committed r143598: <http://trac.webkit.org/changeset/143598> 838395 7 webkit.review.bot 2013-02-21 06:59:28 -0800 All reviewed patches have been landed. Closing bug. 188910 2013-02-18 09:43:26 -0800 2013-02-21 02:46:36 -0800 Patch calanimation.diff text/plain 6799 keishi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA5NmFiMzg0Li4yZGE3ZTg3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIg QEAKKzIwMTMtMDItMTkgIEtlaXNoaSBIYXR0b3JpICA8a2Vpc2hpQHdlYmtpdC5vcmc+CisKKyAg ICAgICAgQWRkIGFuaW1hdGlvbiBjbGFzcyBmb3IgbmV3IGNhbGVuZGFyIHBpY2tlcgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEwMTMyCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBD b2RlIGlzIG5vdCB5ZXQgdXNlZC4KKworICAgICAgICAqIFJlc291cmNlcy9wYWdlcG9wdXBzL2Nh bGVuZGFyUGlja2VyLmpzOgorICAgICAgICAoQW5pbWF0aW9uVGltaW5nRnVuY3Rpb24uTGluZWFy KTogUGFyYW1ldGVyIHQgc2hvdWxkIGJlIGEgbnVtYmVyIGJldHdlZW4gMCBhbmQgMS4KKyAgICAg ICAgKEFuaW1hdGlvblRpbWluZ0Z1bmN0aW9uLkVhc2VJbk91dCk6IERpdHRvLgorICAgICAgICAo QW5pbWF0aW9uTWFuYWdlcik6IEFsbCBhbmltYXRvcnMgYXJlIG1hbmFnZWQgYnkgdGhpcyBjbGFz cyBzbyB3ZQorICAgICAgICBjYW4gZGlzcGF0Y2ggImFuaW1hdGlvbkZyYW1lV2lsbEZpbmlzaCIg ZXZlbnQgYWZ0ZXIgYWxsIHRoZSB1cGRhdGVzLgorICAgICAgICAoQW5pbWF0aW9uTWFuYWdlci5w cm90b3R5cGUuX3N0YXJ0QW5pbWF0aW9uKToKKyAgICAgICAgKEFuaW1hdGlvbk1hbmFnZXIucHJv dG90eXBlLl9zdG9wQW5pbWF0aW9uKToKKyAgICAgICAgKEFuaW1hdGlvbk1hbmFnZXIucHJvdG90 eXBlLmFkZCk6IEFkZHMgYW4gYW5pbWF0b3IgdG8gdGhlIGxpc3Qgb2YgcnVubmluZyBhbmltYXRv cnMuCisgICAgICAgIChBbmltYXRpb25NYW5hZ2VyLnByb3RvdHlwZS5yZW1vdmUpOiBSZW1vdmVz IGFuIGFuaW1hdG9yLgorICAgICAgICAoQW5pbWF0aW9uTWFuYWdlci5wcm90b3R5cGUuX2FuaW1h dGlvbkZyYW1lQ2FsbGJhY2spOiBDYWxsYmFjayBmb3IgcmVxdWVzdEFuaW1hdGlvbkZyYW1lLgor ICAgICAgICAoQW5pbWF0aW9uTWFuYWdlci5wcm90b3R5cGUuX25lZWRzQW5pbWF0aW9uRnJhbWUp OiBSZXR1cm5zIHRydWUgaWYgd2Ugc2hvdWxkIHJlcXVlc3QgdGhlIG5leHQgYW5pbWF0aW9uIGZy YW1lLgorICAgICAgICAoQW5pbWF0aW9uTWFuYWdlci5wcm90b3R5cGUub24pOiBJZiB3ZSBhZGQg YSBjYWxsYmFjaywgcmVxdWVzdCBhbmltYXRpb24gZnJhbWUuCisgICAgICAgIChBbmltYXRpb25N YW5hZ2VyLnByb3RvdHlwZS5yZW1vdmVMaXN0ZW5lcik6CisgICAgICAgIChBbmltYXRvcik6IEFu aW1hdGVzIGJldHdlZW4gdGhlIGZyb20gdmFsdWUgYW5kIHRvIHZhbHVlLgorICAgICAgICAoQW5p bWF0b3IucHJvdG90eXBlLnNldEZyb20pOiBTZXRzIHRoZSBmcm9tIHZhbHVlLgorICAgICAgICAo QW5pbWF0b3IucHJvdG90eXBlLnNldFRvKTogU2V0cyB0aGUgdG8gdmFsdWUuCisgICAgICAgIChB bmltYXRvci5wcm90b3R5cGUuc3RhcnQpOgorICAgICAgICAoQW5pbWF0b3IucHJvdG90eXBlLnN0 b3ApOgorICAgICAgICAoQW5pbWF0b3IucHJvdG90eXBlLm9uQW5pbWF0aW9uRnJhbWUpOiBDYWxs ZWQgYnkgQW5pbWF0aW9uTWFuYWdlci4KKwogMjAxMy0wMi0xOCAgS2Vpc2hpIEhhdHRvcmkgIDxr ZWlzaGlAd2Via2l0Lm9yZz4KIAogICAgICAgICBBZGQgZXZlbnQgZGlzcGF0Y2ggY2xhc3MgZm9y IHRoZSBuZXcgY2FsZW5kYXIgcGlja2VyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9SZXNv dXJjZXMvcGFnZXBvcHVwcy9jYWxlbmRhclBpY2tlci5qcyBiL1NvdXJjZS9XZWJDb3JlL1Jlc291 cmNlcy9wYWdlcG9wdXBzL2NhbGVuZGFyUGlja2VyLmpzCmluZGV4IDAxZWI3M2IuLjA5MDBjYjAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1Jlc291cmNlcy9wYWdlcG9wdXBzL2NhbGVuZGFy UGlja2VyLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL1Jlc291cmNlcy9wYWdlcG9wdXBzL2NhbGVu ZGFyUGlja2VyLmpzCkBAIC03MDgsNiArNzA4LDE4MiBAQCBFdmVudEVtaXR0ZXIucHJvdG90eXBl LmRpc3BhdGNoRXZlbnQgPSBmdW5jdGlvbih0eXBlKSB7CiAgICAgfQogfTsKIAordmFyIEFuaW1h dGlvblRpbWluZ0Z1bmN0aW9uID0geworICAgIExpbmVhcjogZnVuY3Rpb24odCl7CisgICAgICAg IHJldHVybiB0OworICAgIH0sCisgICAgRWFzZUluT3V0OiBmdW5jdGlvbih0KXsKKyAgICAgICAg dCAqPSAyOworICAgICAgICBpZiAodCA8IDEpCisgICAgICAgICAgICByZXR1cm4gTWF0aC5wb3co dCwgMykgLyAyOworICAgICAgICB0IC09IDI7CisgICAgICAgIHJldHVybiBNYXRoLnBvdyh0LCAz KSAvIDIgKyAxOworICAgIH0KK307CisKKy8qKgorICogQGNvbnN0cnVjdG9yCisgKiBAZXh0ZW5k cyBFdmVudEVtaXR0ZXIKKyAqLworZnVuY3Rpb24gQW5pbWF0aW9uTWFuYWdlcigpIHsKKyAgICBF dmVudEVtaXR0ZXIuY2FsbCh0aGlzKTsKKworICAgIHRoaXMuaXNSdW5uaW5nID0gZmFsc2U7Cisg ICAgdGhpcy5fcnVubmluZ0FuaW1hdG9yQ291bnQgPSAwOworICAgIHRoaXMuX3J1bm5pbmdBbmlt YXRvcnMgPSB7fTsKKyAgICB0aGlzLl9hbmltYXRpb25GcmFtZUNhbGxiYWNrQm91bmQgPSB0aGlz Ll9hbmltYXRpb25GcmFtZUNhbGxiYWNrLmJpbmQodGhpcyk7Cit9CisKK0FuaW1hdGlvbk1hbmFn ZXIucHJvdG90eXBlID0gT2JqZWN0LmNyZWF0ZShFdmVudEVtaXR0ZXIucHJvdG90eXBlKTsKKwor QW5pbWF0aW9uTWFuYWdlci5wcm90b3R5cGUuX3N0YXJ0QW5pbWF0aW9uID0gZnVuY3Rpb24oKSB7 CisgICAgaWYgKHRoaXMuaXNSdW5uaW5nKQorICAgICAgICByZXR1cm47CisgICAgdGhpcy5pc1J1 bm5pbmcgPSB0cnVlOworICAgIHdpbmRvdy53ZWJraXRSZXF1ZXN0QW5pbWF0aW9uRnJhbWUodGhp cy5fYW5pbWF0aW9uRnJhbWVDYWxsYmFja0JvdW5kKTsKK307CisKK0FuaW1hdGlvbk1hbmFnZXIu cHJvdG90eXBlLl9zdG9wQW5pbWF0aW9uID0gZnVuY3Rpb24oKSB7CisgICAgaWYgKCF0aGlzLmlz UnVubmluZykKKyAgICAgICAgcmV0dXJuOworICAgIHRoaXMuaXNSdW5uaW5nID0gZmFsc2U7Cit9 OworCisvKioKKyAqIEBwYXJhbSB7IUFuaW1hdG9yfSBhbmltYXRvcgorICovCitBbmltYXRpb25N YW5hZ2VyLnByb3RvdHlwZS5hZGQgPSBmdW5jdGlvbihhbmltYXRvcikgeworICAgIGlmICh0aGlz Ll9ydW5uaW5nQW5pbWF0b3JzW2FuaW1hdG9yLmlkXSkKKyAgICAgICAgcmV0dXJuOworICAgIHRo aXMuX3J1bm5pbmdBbmltYXRvcnNbYW5pbWF0b3IuaWRdID0gYW5pbWF0b3I7CisgICAgdGhpcy5f cnVubmluZ0FuaW1hdG9yQ291bnQrKzsKKyAgICBpZiAodGhpcy5fbmVlZHNBbmltYXRpb25GcmFt ZSgpKQorICAgICAgICB0aGlzLl9zdGFydEFuaW1hdGlvbigpOworfTsKKworLyoqCisgKiBAcGFy YW0geyFBbmltYXRvcn0gYW5pbWF0b3IKKyAqLworQW5pbWF0aW9uTWFuYWdlci5wcm90b3R5cGUu cmVtb3ZlID0gZnVuY3Rpb24oYW5pbWF0b3IpIHsKKyAgICBpZiAoIXRoaXMuX3J1bm5pbmdBbmlt YXRvcnNbYW5pbWF0b3IuaWRdKQorICAgICAgICByZXR1cm47CisgICAgZGVsZXRlIHRoaXMuX3J1 bm5pbmdBbmltYXRvcnNbYW5pbWF0b3IuaWRdOworICAgIHRoaXMuX3J1bm5pbmdBbmltYXRvckNv dW50LS07CisgICAgaWYgKCF0aGlzLl9uZWVkc0FuaW1hdGlvbkZyYW1lKCkpCisgICAgICAgIHRo aXMuX3N0b3BBbmltYXRpb24oKTsKK307CisKK0FuaW1hdGlvbk1hbmFnZXIucHJvdG90eXBlLl9h bmltYXRpb25GcmFtZUNhbGxiYWNrID0gZnVuY3Rpb24obm93KSB7CisgICAgaWYgKHRoaXMuX3J1 bm5pbmdBbmltYXRvckNvdW50ID4gMCkgeworICAgICAgICBmb3IgKHZhciBpZCBpbiB0aGlzLl9y dW5uaW5nQW5pbWF0b3JzKSB7CisgICAgICAgICAgICB0aGlzLl9ydW5uaW5nQW5pbWF0b3JzW2lk XS5vbkFuaW1hdGlvbkZyYW1lKG5vdyk7CisgICAgICAgIH0KKyAgICB9CisgICAgdGhpcy5kaXNw YXRjaEV2ZW50KCJhbmltYXRpb25GcmFtZVdpbGxGaW5pc2giKTsKKyAgICBpZiAodGhpcy5pc1J1 bm5pbmcpCisgICAgICAgIHdpbmRvdy53ZWJraXRSZXF1ZXN0QW5pbWF0aW9uRnJhbWUodGhpcy5f YW5pbWF0aW9uRnJhbWVDYWxsYmFja0JvdW5kKTsKK307CisKKy8qKgorICogQHJldHVybiB7IWJv b2xlYW59CisgKi8KK0FuaW1hdGlvbk1hbmFnZXIucHJvdG90eXBlLl9uZWVkc0FuaW1hdGlvbkZy YW1lID0gZnVuY3Rpb24oKSB7CisgICAgcmV0dXJuIHRoaXMuX3J1bm5pbmdBbmltYXRvckNvdW50 ID4gMCB8fCB0aGlzLmhhc0xpc3RlbmVyKCJhbmltYXRpb25GcmFtZVdpbGxGaW5pc2giKTsKK307 CisKKy8qKgorICogQHBhcmFtIHshc3RyaW5nfSB0eXBlCisgKiBAcGFyYW0geyFGdW5jdGlvbn0g Y2FsbGJhY2sKKyAqLworQW5pbWF0aW9uTWFuYWdlci5wcm90b3R5cGUub24gPSBmdW5jdGlvbih0 eXBlLCBjYWxsYmFjaykgeworICAgIEV2ZW50RW1pdHRlci5wcm90b3R5cGUub24uY2FsbCh0aGlz LCB0eXBlLCBjYWxsYmFjayk7CisgICAgaWYgKHRoaXMuX25lZWRzQW5pbWF0aW9uRnJhbWUoKSkK KyAgICAgICAgdGhpcy5fc3RhcnRBbmltYXRpb24oKTsKK307CisKKy8qKgorICogQHBhcmFtIHsh c3RyaW5nfSB0eXBlCisgKiBAcGFyYW0geyFGdW5jdGlvbn0gY2FsbGJhY2sKKyAqLworQW5pbWF0 aW9uTWFuYWdlci5wcm90b3R5cGUucmVtb3ZlTGlzdGVuZXIgPSBmdW5jdGlvbih0eXBlLCBjYWxs YmFjaykgeworICAgIEV2ZW50RW1pdHRlci5wcm90b3R5cGUucmVtb3ZlTGlzdGVuZXIuY2FsbCh0 aGlzLCB0eXBlLCBjYWxsYmFjayk7CisgICAgaWYgKCF0aGlzLl9uZWVkc0FuaW1hdGlvbkZyYW1l KCkpCisgICAgICAgIHRoaXMuX3N0b3BBbmltYXRpb24oKTsKK307CisKK0FuaW1hdGlvbk1hbmFn ZXIuc2hhcmVkID0gbmV3IEFuaW1hdGlvbk1hbmFnZXIoKTsKKworLyoqCisgKiBAY29uc3RydWN0 b3IKKyAqIEBleHRlbmRzIEV2ZW50RW1pdHRlcgorICovCitmdW5jdGlvbiBBbmltYXRvcigpIHsK KyAgICBFdmVudEVtaXR0ZXIuY2FsbCh0aGlzKTsKKworICAgIHRoaXMuaWQgPSBBbmltYXRvci5s YXN0SWQrKzsKKyAgICB0aGlzLmZyb20gPSAwOworICAgIHRoaXMudG8gPSAwOworICAgIHRoaXMu X2RlbHRhID0gMDsKKyAgICB0aGlzLmR1cmF0aW9uID0gMTAwOworICAgIHRoaXMuc3RlcCA9IG51 bGw7CisgICAgdGhpcy5sYXN0U3RlcFRpbWUgPSBudWxsOworICAgIHRoaXMucHJvZ3Jlc3MgPSAw LjA7CisgICAgdGhpcy50aW1pbmdGdW5jdGlvbiA9IEFuaW1hdGlvblRpbWluZ0Z1bmN0aW9uLkxp bmVhcjsKK307CisKK0FuaW1hdG9yLnByb3RvdHlwZSA9IE9iamVjdC5jcmVhdGUoRXZlbnRFbWl0 dGVyLnByb3RvdHlwZSk7CisKK0FuaW1hdG9yLmxhc3RJZCA9IDA7CisKKy8qKgorICogQHBhcmFt IHshbnVtYmVyfSB2YWx1ZQorICovCitBbmltYXRvci5wcm90b3R5cGUuc2V0RnJvbSA9IGZ1bmN0 aW9uKHZhbHVlKSB7CisgICAgdGhpcy5mcm9tID0gdmFsdWU7CisgICAgdGhpcy5fZGVsdGEgPSB0 aGlzLnRvIC0gdGhpcy5mcm9tOworfTsKKworLyoqCisgKiBAcGFyYW0geyFudW1iZXJ9IHZhbHVl CisgKi8KK0FuaW1hdG9yLnByb3RvdHlwZS5zZXRUbyA9IGZ1bmN0aW9uKHZhbHVlKSB7CisgICAg dGhpcy50byA9IHZhbHVlOworICAgIHRoaXMuX2RlbHRhID0gdGhpcy50byAtIHRoaXMuZnJvbTsK K307CisKK0FuaW1hdG9yLnByb3RvdHlwZS5zdGFydCA9IGZ1bmN0aW9uKCkgeworICAgIHRoaXMu bGFzdFN0ZXBUaW1lID0gRGF0ZS5ub3coKTsKKyAgICB0aGlzLnByb2dyZXNzID0gMC4wOworICAg IHRoaXMuaXNSdW5uaW5nID0gdHJ1ZTsKKyAgICB0aGlzLmN1cnJlbnRWYWx1ZSA9IHRoaXMuZnJv bTsKKyAgICBBbmltYXRpb25NYW5hZ2VyLnNoYXJlZC5hZGQodGhpcyk7CisgICAgdGhpcy5kaXNw YXRjaEV2ZW50KCJkaWRBbmltYXRpb25TdGFydCIpOworfTsKKworQW5pbWF0b3IucHJvdG90eXBl LnN0b3AgPSBmdW5jdGlvbigpIHsKKyAgICBpZiAoIXRoaXMuaXNSdW5uaW5nKQorICAgICAgICBy ZXR1cm47CisgICAgdGhpcy5pc1J1bm5pbmcgPSBmYWxzZTsKKyAgICB0aGlzLmN1cnJlbnRWYWx1 ZSA9IHRoaXMudG87CisgICAgdGhpcy5zdGVwKHRoaXMpOworICAgIEFuaW1hdGlvbk1hbmFnZXIu c2hhcmVkLnJlbW92ZSh0aGlzKTsKKyAgICB0aGlzLmRpc3BhdGNoRXZlbnQoImRpZEFuaW1hdGlv blN0b3AiLCB0aGlzKTsKK307CisKKy8qKgorICogQHBhcmFtIHshbnVtYmVyfSBub3cKKyAqLwor QW5pbWF0b3IucHJvdG90eXBlLm9uQW5pbWF0aW9uRnJhbWUgPSBmdW5jdGlvbihub3cpIHsKKyAg ICB0aGlzLnByb2dyZXNzICs9IChub3cgLSB0aGlzLmxhc3RTdGVwVGltZSkgLyB0aGlzLmR1cmF0 aW9uOworICAgIGlmICh0aGlzLnByb2dyZXNzID49IDEuMCkgeworICAgICAgICB0aGlzLnByb2dy ZXNzID0gMS4wOworICAgICAgICByZXR1cm4gdGhpcy5zdG9wKCk7CisgICAgfQorICAgIHRoaXMu Y3VycmVudFZhbHVlID0gdGhpcy50aW1pbmdGdW5jdGlvbih0aGlzLnByb2dyZXNzKSAqIHRoaXMu X2RlbHRhICsgdGhpcy5mcm9tOworICAgIHRoaXMuc3RlcCh0aGlzKTsKKyAgICB0aGlzLmxhc3RT dGVwVGltZSA9IG5vdzsKK307CisKIC8qKgogICogQGNvbnN0cnVjdG9yCiAgKiBAcGFyYW0geyFF bGVtZW50fSBlbGVtZW50Cg== 189491 2013-02-21 02:46:39 -0800 2013-02-21 06:04:56 -0800 Patch bug-110132-20130221194259.patch text/plain 7245 keishi U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzNTc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzBiYzA4ODM5Yjk0YTQ2 YTVkM2FmNjJlNDQ4MjA5YjkyMGVkMmI1NS4uMTI1NjFkN2FjOWQxMTZmYWE3NTA0MzY4ZTUwYTUx OGFlYTIzODU1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDEzLTAyLTIyICBLZWlz aGkgSGF0dG9yaSAgPGtlaXNoaUB3ZWJraXQub3JnPgorCisgICAgICAgIEFkZCBhbmltYXRpb24g Y2xhc3MgZm9yIG5ldyBjYWxlbmRhciBwaWNrZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTExMDEzMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEFkZGluZyBhbmltYXRpb24gcmVsYXRlZCBjbGFzc2VzIGFz IHBhcnQgb2YgdGhlIGNhbGVuZGFyIHBpY2tlcgorICAgICAgICByZWRlc2lnbihCdWcgMTA5NDM5 KS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIENvZGUgaXMgbm90IHVzZWQgeWV0LgorCisgICAg ICAgICogUmVzb3VyY2VzL3BhZ2Vwb3B1cHMvY2FsZW5kYXJQaWNrZXIuanM6CisgICAgICAgIChB bmltYXRpb25UaW1pbmdGdW5jdGlvbi5MaW5lYXIpOiBQYXJhbWV0ZXIgdCBzaG91bGQgYmUgYSBu dW1iZXIgYmV0d2VlbiAwIGFuZCAxLgorICAgICAgICAoQW5pbWF0aW9uVGltaW5nRnVuY3Rpb24u RWFzZUluT3V0KTogRGl0dG8uCisgICAgICAgIChBbmltYXRpb25NYW5hZ2VyKTogQWxsIGFuaW1h dG9ycyBhcmUgbWFuYWdlZCBieSB0aGlzIGNsYXNzIHNvIHdlCisgICAgICAgIGNhbiBkaXNwYXRj aCAiYW5pbWF0aW9uRnJhbWVXaWxsRmluaXNoIiBldmVudCBhZnRlciBhbGwgdGhlIHVwZGF0ZXMu CisgICAgICAgIChBbmltYXRpb25NYW5hZ2VyLnByb3RvdHlwZS5fc3RhcnRBbmltYXRpb24pOgor ICAgICAgICAoQW5pbWF0aW9uTWFuYWdlci5wcm90b3R5cGUuX3N0b3BBbmltYXRpb24pOgorICAg ICAgICAoQW5pbWF0aW9uTWFuYWdlci5wcm90b3R5cGUuYWRkKTogQWRkcyBhbiBhbmltYXRvciB0 byB0aGUgbGlzdCBvZiBydW5uaW5nIGFuaW1hdG9ycy4KKyAgICAgICAgKEFuaW1hdGlvbk1hbmFn ZXIucHJvdG90eXBlLnJlbW92ZSk6IFJlbW92ZXMgYW4gYW5pbWF0b3IuCisgICAgICAgIChBbmlt YXRpb25NYW5hZ2VyLnByb3RvdHlwZS5fYW5pbWF0aW9uRnJhbWVDYWxsYmFjayk6IENhbGxiYWNr IGZvciByZXF1ZXN0QW5pbWF0aW9uRnJhbWUuCisgICAgICAgIChBbmltYXRpb25NYW5hZ2VyLnBy b3RvdHlwZS5fbmVlZHNBbmltYXRpb25GcmFtZSk6IFJldHVybnMgdHJ1ZSBpZiB3ZSBzaG91bGQg cmVxdWVzdCB0aGUgbmV4dCBhbmltYXRpb24gZnJhbWUuCisgICAgICAgIChBbmltYXRpb25NYW5h Z2VyLnByb3RvdHlwZS5vbik6IElmIHdlIGFkZCBhIGNhbGxiYWNrLCByZXF1ZXN0IGFuaW1hdGlv biBmcmFtZS4KKyAgICAgICAgKEFuaW1hdGlvbk1hbmFnZXIucHJvdG90eXBlLnJlbW92ZUxpc3Rl bmVyKToKKyAgICAgICAgKEFuaW1hdG9yKTogQW5pbWF0ZXMgYmV0d2VlbiB0aGUgZnJvbSB2YWx1 ZSBhbmQgdG8gdmFsdWUuCisgICAgICAgIChBbmltYXRvci5wcm90b3R5cGUuc2V0RnJvbSk6IFNl dHMgdGhlIGZyb20gdmFsdWUuCisgICAgICAgIChBbmltYXRvci5wcm90b3R5cGUuc2V0VG8pOiBT ZXRzIHRoZSB0byB2YWx1ZS4KKyAgICAgICAgKEFuaW1hdG9yLnByb3RvdHlwZS5zdGFydCk6Cisg ICAgICAgIChBbmltYXRvci5wcm90b3R5cGUuc3RvcCk6CisgICAgICAgIChBbmltYXRvci5wcm90 b3R5cGUub25BbmltYXRpb25GcmFtZSk6IENhbGxlZCBieSBBbmltYXRpb25NYW5hZ2VyLgorCiAy MDEzLTAyLTIxICBLZWlzaGkgSGF0dG9yaSAgPGtlaXNoaUB3ZWJraXQub3JnPgogCiAgICAgICAg IEFkZCBldmVudCBkaXNwYXRjaCBjbGFzcyBmb3IgdGhlIG5ldyBjYWxlbmRhciBwaWNrZXIKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1Jlc291cmNlcy9wYWdlcG9wdXBzL2NhbGVuZGFyUGlj a2VyLmpzIGIvU291cmNlL1dlYkNvcmUvUmVzb3VyY2VzL3BhZ2Vwb3B1cHMvY2FsZW5kYXJQaWNr ZXIuanMKaW5kZXggMDFlYjczYjk1NGE1ODRkYzFlNzkyYWYwMmRiZTA0Yjk1ZTM0ZDUxZS4uOWRl Y2FjNWU0YmM5M2I1ODMxY2ViNGIxOGE3YmQxYTBmNTg4NjdlMiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvUmVzb3VyY2VzL3BhZ2Vwb3B1cHMvY2FsZW5kYXJQaWNrZXIuanMKKysrIGIvU291 cmNlL1dlYkNvcmUvUmVzb3VyY2VzL3BhZ2Vwb3B1cHMvY2FsZW5kYXJQaWNrZXIuanMKQEAgLTcw OCw2ICs3MDgsMTg5IEBAIEV2ZW50RW1pdHRlci5wcm90b3R5cGUuZGlzcGF0Y2hFdmVudCA9IGZ1 bmN0aW9uKHR5cGUpIHsKICAgICB9CiB9OwogCisKK3ZhciBBbmltYXRpb25UaW1pbmdGdW5jdGlv biA9IHsKKyAgICBMaW5lYXI6IGZ1bmN0aW9uKHQpeworICAgICAgICByZXR1cm4gdDsKKyAgICB9 LAorICAgIEVhc2VJbk91dDogZnVuY3Rpb24odCl7CisgICAgICAgIHQgKj0gMjsKKyAgICAgICAg aWYgKHQgPCAxKQorICAgICAgICAgICAgcmV0dXJuIE1hdGgucG93KHQsIDMpIC8gMjsKKyAgICAg ICAgdCAtPSAyOworICAgICAgICByZXR1cm4gTWF0aC5wb3codCwgMykgLyAyICsgMTsKKyAgICB9 Cit9OworCisvKioKKyAqIEBjb25zdHJ1Y3RvcgorICogQGV4dGVuZHMgRXZlbnRFbWl0dGVyCisg Ki8KK2Z1bmN0aW9uIEFuaW1hdGlvbk1hbmFnZXIoKSB7CisgICAgRXZlbnRFbWl0dGVyLmNhbGwo dGhpcyk7CisKKyAgICB0aGlzLl9pc1J1bm5pbmcgPSBmYWxzZTsKKyAgICB0aGlzLl9ydW5uaW5n QW5pbWF0b3JDb3VudCA9IDA7CisgICAgdGhpcy5fcnVubmluZ0FuaW1hdG9ycyA9IHt9OworICAg IHRoaXMuX2FuaW1hdGlvbkZyYW1lQ2FsbGJhY2tCb3VuZCA9IHRoaXMuX2FuaW1hdGlvbkZyYW1l Q2FsbGJhY2suYmluZCh0aGlzKTsKK30KKworQW5pbWF0aW9uTWFuYWdlci5wcm90b3R5cGUgPSBP YmplY3QuY3JlYXRlKEV2ZW50RW1pdHRlci5wcm90b3R5cGUpOworCitBbmltYXRpb25NYW5hZ2Vy LkV2ZW50VHlwZUFuaW1hdGlvbkZyYW1lV2lsbEZpbmlzaCA9ICJhbmltYXRpb25GcmFtZVdpbGxG aW5pc2giOworCitBbmltYXRpb25NYW5hZ2VyLnByb3RvdHlwZS5fc3RhcnRBbmltYXRpb24gPSBm dW5jdGlvbigpIHsKKyAgICBpZiAodGhpcy5faXNSdW5uaW5nKQorICAgICAgICByZXR1cm47Cisg ICAgdGhpcy5faXNSdW5uaW5nID0gdHJ1ZTsKKyAgICB3aW5kb3cud2Via2l0UmVxdWVzdEFuaW1h dGlvbkZyYW1lKHRoaXMuX2FuaW1hdGlvbkZyYW1lQ2FsbGJhY2tCb3VuZCk7Cit9OworCitBbmlt YXRpb25NYW5hZ2VyLnByb3RvdHlwZS5fc3RvcEFuaW1hdGlvbiA9IGZ1bmN0aW9uKCkgeworICAg IGlmICghdGhpcy5faXNSdW5uaW5nKQorICAgICAgICByZXR1cm47CisgICAgdGhpcy5faXNSdW5u aW5nID0gZmFsc2U7Cit9OworCisvKioKKyAqIEBwYXJhbSB7IUFuaW1hdG9yfSBhbmltYXRvcgor ICovCitBbmltYXRpb25NYW5hZ2VyLnByb3RvdHlwZS5hZGQgPSBmdW5jdGlvbihhbmltYXRvcikg eworICAgIGlmICh0aGlzLl9ydW5uaW5nQW5pbWF0b3JzW2FuaW1hdG9yLmlkXSkKKyAgICAgICAg cmV0dXJuOworICAgIHRoaXMuX3J1bm5pbmdBbmltYXRvcnNbYW5pbWF0b3IuaWRdID0gYW5pbWF0 b3I7CisgICAgdGhpcy5fcnVubmluZ0FuaW1hdG9yQ291bnQrKzsKKyAgICBpZiAodGhpcy5fbmVl ZHNUaW1lcigpKQorICAgICAgICB0aGlzLl9zdGFydEFuaW1hdGlvbigpOworfTsKKworLyoqCisg KiBAcGFyYW0geyFBbmltYXRvcn0gYW5pbWF0b3IKKyAqLworQW5pbWF0aW9uTWFuYWdlci5wcm90 b3R5cGUucmVtb3ZlID0gZnVuY3Rpb24oYW5pbWF0b3IpIHsKKyAgICBpZiAoIXRoaXMuX3J1bm5p bmdBbmltYXRvcnNbYW5pbWF0b3IuaWRdKQorICAgICAgICByZXR1cm47CisgICAgZGVsZXRlIHRo aXMuX3J1bm5pbmdBbmltYXRvcnNbYW5pbWF0b3IuaWRdOworICAgIHRoaXMuX3J1bm5pbmdBbmlt YXRvckNvdW50LS07CisgICAgaWYgKCF0aGlzLl9uZWVkc1RpbWVyKCkpCisgICAgICAgIHRoaXMu X3N0b3BBbmltYXRpb24oKTsKK307CisKK0FuaW1hdGlvbk1hbmFnZXIucHJvdG90eXBlLl9hbmlt YXRpb25GcmFtZUNhbGxiYWNrID0gZnVuY3Rpb24obm93KSB7CisgICAgaWYgKHRoaXMuX3J1bm5p bmdBbmltYXRvckNvdW50ID4gMCkgeworICAgICAgICBmb3IgKHZhciBpZCBpbiB0aGlzLl9ydW5u aW5nQW5pbWF0b3JzKSB7CisgICAgICAgICAgICB0aGlzLl9ydW5uaW5nQW5pbWF0b3JzW2lkXS5v bkFuaW1hdGlvbkZyYW1lKG5vdyk7CisgICAgICAgIH0KKyAgICB9CisgICAgdGhpcy5kaXNwYXRj aEV2ZW50KEFuaW1hdGlvbk1hbmFnZXIuRXZlbnRUeXBlQW5pbWF0aW9uRnJhbWVXaWxsRmluaXNo KTsKKyAgICBpZiAodGhpcy5faXNSdW5uaW5nKQorICAgICAgICB3aW5kb3cud2Via2l0UmVxdWVz dEFuaW1hdGlvbkZyYW1lKHRoaXMuX2FuaW1hdGlvbkZyYW1lQ2FsbGJhY2tCb3VuZCk7Cit9Owor CisvKioKKyAqIEByZXR1cm4geyFib29sZWFufQorICovCitBbmltYXRpb25NYW5hZ2VyLnByb3Rv dHlwZS5fbmVlZHNUaW1lciA9IGZ1bmN0aW9uKCkgeworICAgIHJldHVybiB0aGlzLl9ydW5uaW5n QW5pbWF0b3JDb3VudCA+IDAgfHwgdGhpcy5oYXNMaXN0ZW5lcihBbmltYXRpb25NYW5hZ2VyLkV2 ZW50VHlwZUFuaW1hdGlvbkZyYW1lV2lsbEZpbmlzaCk7Cit9OworCisvKioKKyAqIEBwYXJhbSB7 IXN0cmluZ30gdHlwZQorICogQHBhcmFtIHshRnVuY3Rpb259IGNhbGxiYWNrCisgKiBAb3ZlcnJp ZGUKKyAqLworQW5pbWF0aW9uTWFuYWdlci5wcm90b3R5cGUub24gPSBmdW5jdGlvbih0eXBlLCBj YWxsYmFjaykgeworICAgIEV2ZW50RW1pdHRlci5wcm90b3R5cGUub24uY2FsbCh0aGlzLCB0eXBl LCBjYWxsYmFjayk7CisgICAgaWYgKHRoaXMuX25lZWRzVGltZXIoKSkKKyAgICAgICAgdGhpcy5f c3RhcnRBbmltYXRpb24oKTsKK307CisKKy8qKgorICogQHBhcmFtIHshc3RyaW5nfSB0eXBlCisg KiBAcGFyYW0geyFGdW5jdGlvbn0gY2FsbGJhY2sKKyAqIEBvdmVycmlkZQorICovCitBbmltYXRp b25NYW5hZ2VyLnByb3RvdHlwZS5yZW1vdmVMaXN0ZW5lciA9IGZ1bmN0aW9uKHR5cGUsIGNhbGxi YWNrKSB7CisgICAgRXZlbnRFbWl0dGVyLnByb3RvdHlwZS5yZW1vdmVMaXN0ZW5lci5jYWxsKHRo aXMsIHR5cGUsIGNhbGxiYWNrKTsKKyAgICBpZiAoIXRoaXMuX25lZWRzVGltZXIoKSkKKyAgICAg ICAgdGhpcy5fc3RvcEFuaW1hdGlvbigpOworfTsKKworQW5pbWF0aW9uTWFuYWdlci5zaGFyZWQg PSBuZXcgQW5pbWF0aW9uTWFuYWdlcigpOworCisvKioKKyAqIEBjb25zdHJ1Y3RvcgorICogQGV4 dGVuZHMgRXZlbnRFbWl0dGVyCisgKi8KK2Z1bmN0aW9uIEFuaW1hdG9yKCkgeworICAgIEV2ZW50 RW1pdHRlci5jYWxsKHRoaXMpOworCisgICAgdGhpcy5pZCA9IEFuaW1hdG9yLmxhc3RJZCsrOwor ICAgIHRoaXMuX2Zyb20gPSAwOworICAgIHRoaXMuX3RvID0gMDsKKyAgICB0aGlzLl9kZWx0YSA9 IDA7CisgICAgdGhpcy5kdXJhdGlvbiA9IDEwMDsKKyAgICB0aGlzLnN0ZXAgPSBudWxsOworICAg IHRoaXMuX2xhc3RTdGVwVGltZSA9IG51bGw7CisgICAgdGhpcy5wcm9ncmVzcyA9IDAuMDsKKyAg ICB0aGlzLnRpbWluZ0Z1bmN0aW9uID0gQW5pbWF0aW9uVGltaW5nRnVuY3Rpb24uTGluZWFyOwor fQorCitBbmltYXRvci5wcm90b3R5cGUgPSBPYmplY3QuY3JlYXRlKEV2ZW50RW1pdHRlci5wcm90 b3R5cGUpOworCitBbmltYXRvci5sYXN0SWQgPSAwOworCitBbmltYXRvci5FdmVudFR5cGVEaWRB bmltYXRpb25TdG9wID0gImRpZEFuaW1hdGlvblN0b3AiOworCisvKioKKyAqIEBwYXJhbSB7IW51 bWJlcn0gdmFsdWUKKyAqLworQW5pbWF0b3IucHJvdG90eXBlLnNldEZyb20gPSBmdW5jdGlvbih2 YWx1ZSkgeworICAgIHRoaXMuX2Zyb20gPSB2YWx1ZTsKKyAgICB0aGlzLl9kZWx0YSA9IHRoaXMu X3RvIC0gdGhpcy5fZnJvbTsKK307CisKKy8qKgorICogQHBhcmFtIHshbnVtYmVyfSB2YWx1ZQor ICovCitBbmltYXRvci5wcm90b3R5cGUuc2V0VG8gPSBmdW5jdGlvbih2YWx1ZSkgeworICAgIHRo aXMuX3RvID0gdmFsdWU7CisgICAgdGhpcy5fZGVsdGEgPSB0aGlzLl90byAtIHRoaXMuX2Zyb207 Cit9OworCitBbmltYXRvci5wcm90b3R5cGUuc3RhcnQgPSBmdW5jdGlvbigpIHsKKyAgICB0aGlz Ll9sYXN0U3RlcFRpbWUgPSBEYXRlLm5vdygpOworICAgIHRoaXMucHJvZ3Jlc3MgPSAwLjA7Cisg ICAgdGhpcy5faXNSdW5uaW5nID0gdHJ1ZTsKKyAgICB0aGlzLmN1cnJlbnRWYWx1ZSA9IHRoaXMu X2Zyb207CisgICAgQW5pbWF0aW9uTWFuYWdlci5zaGFyZWQuYWRkKHRoaXMpOworfTsKKworQW5p bWF0b3IucHJvdG90eXBlLnN0b3AgPSBmdW5jdGlvbigpIHsKKyAgICBpZiAoIXRoaXMuX2lzUnVu bmluZykKKyAgICAgICAgcmV0dXJuOworICAgIHRoaXMuX2lzUnVubmluZyA9IGZhbHNlOworICAg IHRoaXMuY3VycmVudFZhbHVlID0gdGhpcy5fdG87CisgICAgdGhpcy5zdGVwKHRoaXMpOworICAg IEFuaW1hdGlvbk1hbmFnZXIuc2hhcmVkLnJlbW92ZSh0aGlzKTsKKyAgICB0aGlzLmRpc3BhdGNo RXZlbnQoQW5pbWF0b3IuRXZlbnRUeXBlRGlkQW5pbWF0aW9uU3RvcCwgdGhpcyk7Cit9OworCisv KioKKyAqIEBwYXJhbSB7IW51bWJlcn0gbm93CisgKi8KK0FuaW1hdG9yLnByb3RvdHlwZS5vbkFu aW1hdGlvbkZyYW1lID0gZnVuY3Rpb24obm93KSB7CisgICAgdGhpcy5wcm9ncmVzcyArPSAobm93 IC0gdGhpcy5fbGFzdFN0ZXBUaW1lKSAvIHRoaXMuZHVyYXRpb247CisgICAgaWYgKHRoaXMucHJv Z3Jlc3MgPj0gMS4wKSB7CisgICAgICAgIHRoaXMucHJvZ3Jlc3MgPSAxLjA7CisgICAgICAgIHRo aXMuc3RvcCgpOworICAgICAgICByZXR1cm47CisgICAgfQorICAgIHRoaXMuY3VycmVudFZhbHVl ID0gdGhpcy50aW1pbmdGdW5jdGlvbih0aGlzLnByb2dyZXNzKSAqIHRoaXMuX2RlbHRhICsgdGhp cy5fZnJvbTsKKyAgICB0aGlzLnN0ZXAodGhpcyk7CisgICAgdGhpcy5fbGFzdFN0ZXBUaW1lID0g bm93OworfTsKKwogLyoqCiAgKiBAY29uc3RydWN0b3IKICAqIEBwYXJhbSB7IUVsZW1lbnR9IGVs ZW1lbnQK 189516 2013-02-21 06:05:00 -0800 2013-02-21 06:59:25 -0800 Patch bug-110132-20130221230120.patch text/plain 7294 keishi U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzNTc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzBiYzA4ODM5Yjk0YTQ2 YTVkM2FmNjJlNDQ4MjA5YjkyMGVkMmI1NS4uODdkOTQ4NzNjMDFhZDA2ZTczNTk1ODlmN2FiMjk2 ZjI2MGU5YjFiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDEzLTAyLTIyICBLZWlz aGkgSGF0dG9yaSAgPGtlaXNoaUB3ZWJraXQub3JnPgorCisgICAgICAgIEFkZCBhbmltYXRpb24g Y2xhc3MgZm9yIG5ldyBjYWxlbmRhciBwaWNrZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTExMDEzMgorCisgICAgICAgIFJldmlld2VkIGJ5IEtlbnQg VGFtdXJhLgorCisgICAgICAgIEFkZGluZyBhbmltYXRpb24gcmVsYXRlZCBjbGFzc2VzIGFzIHBh cnQgb2YgdGhlIGNhbGVuZGFyIHBpY2tlcgorICAgICAgICByZWRlc2lnbihCdWcgMTA5NDM5KS4K KworICAgICAgICBObyBuZXcgdGVzdHMuIENvZGUgaXMgbm90IHVzZWQgeWV0LgorCisgICAgICAg ICogUmVzb3VyY2VzL3BhZ2Vwb3B1cHMvY2FsZW5kYXJQaWNrZXIuanM6CisgICAgICAgIChBbmlt YXRpb25UaW1pbmdGdW5jdGlvbi5MaW5lYXIpOiBQYXJhbWV0ZXIgdCBzaG91bGQgYmUgYSBudW1i ZXIgYmV0d2VlbiAwIGFuZCAxLgorICAgICAgICAoQW5pbWF0aW9uVGltaW5nRnVuY3Rpb24uRWFz ZUluT3V0KTogRGl0dG8uCisgICAgICAgIChBbmltYXRpb25NYW5hZ2VyKTogQWxsIGFuaW1hdG9y cyBhcmUgbWFuYWdlZCBieSB0aGlzIGNsYXNzIHNvIHdlCisgICAgICAgIGNhbiBkaXNwYXRjaCAi YW5pbWF0aW9uRnJhbWVXaWxsRmluaXNoIiBldmVudCBhZnRlciBhbGwgdGhlIHVwZGF0ZXMuCisg ICAgICAgIChBbmltYXRpb25NYW5hZ2VyLnByb3RvdHlwZS5fc3RhcnRBbmltYXRpb24pOgorICAg ICAgICAoQW5pbWF0aW9uTWFuYWdlci5wcm90b3R5cGUuX3N0b3BBbmltYXRpb24pOgorICAgICAg ICAoQW5pbWF0aW9uTWFuYWdlci5wcm90b3R5cGUuYWRkKTogQWRkcyBhbiBhbmltYXRvciB0byB0 aGUgbGlzdCBvZiBydW5uaW5nIGFuaW1hdG9ycy4KKyAgICAgICAgKEFuaW1hdGlvbk1hbmFnZXIu cHJvdG90eXBlLnJlbW92ZSk6IFJlbW92ZXMgYW4gYW5pbWF0b3IuCisgICAgICAgIChBbmltYXRp b25NYW5hZ2VyLnByb3RvdHlwZS5fYW5pbWF0aW9uRnJhbWVDYWxsYmFjayk6IENhbGxiYWNrIGZv ciByZXF1ZXN0QW5pbWF0aW9uRnJhbWUuCisgICAgICAgIChBbmltYXRpb25NYW5hZ2VyLnByb3Rv dHlwZS5fbmVlZHNBbmltYXRpb25GcmFtZSk6IFJldHVybnMgdHJ1ZSBpZiB3ZSBzaG91bGQgcmVx dWVzdCB0aGUgbmV4dCBhbmltYXRpb24gZnJhbWUuCisgICAgICAgIChBbmltYXRpb25NYW5hZ2Vy LnByb3RvdHlwZS5vbik6IElmIHdlIGFkZCBhIGNhbGxiYWNrLCByZXF1ZXN0IGFuaW1hdGlvbiBm cmFtZS4KKyAgICAgICAgKEFuaW1hdGlvbk1hbmFnZXIucHJvdG90eXBlLnJlbW92ZUxpc3RlbmVy KToKKyAgICAgICAgKEFuaW1hdG9yKTogQW5pbWF0ZXMgYmV0d2VlbiB0aGUgZnJvbSB2YWx1ZSBh bmQgdG8gdmFsdWUuCisgICAgICAgIChBbmltYXRvci5wcm90b3R5cGUuc2V0RnJvbSk6IFNldHMg dGhlIGZyb20gdmFsdWUuCisgICAgICAgIChBbmltYXRvci5wcm90b3R5cGUuc2V0VG8pOiBTZXRz IHRoZSB0byB2YWx1ZS4KKyAgICAgICAgKEFuaW1hdG9yLnByb3RvdHlwZS5zdGFydCk6CisgICAg ICAgIChBbmltYXRvci5wcm90b3R5cGUuc3RvcCk6CisgICAgICAgIChBbmltYXRvci5wcm90b3R5 cGUub25BbmltYXRpb25GcmFtZSk6IENhbGxlZCBieSBBbmltYXRpb25NYW5hZ2VyLgorCiAyMDEz LTAyLTIxICBLZWlzaGkgSGF0dG9yaSAgPGtlaXNoaUB3ZWJraXQub3JnPgogCiAgICAgICAgIEFk ZCBldmVudCBkaXNwYXRjaCBjbGFzcyBmb3IgdGhlIG5ldyBjYWxlbmRhciBwaWNrZXIKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL1Jlc291cmNlcy9wYWdlcG9wdXBzL2NhbGVuZGFyUGlja2Vy LmpzIGIvU291cmNlL1dlYkNvcmUvUmVzb3VyY2VzL3BhZ2Vwb3B1cHMvY2FsZW5kYXJQaWNrZXIu anMKaW5kZXggMDFlYjczYjk1NGE1ODRkYzFlNzkyYWYwMmRiZTA0Yjk1ZTM0ZDUxZS4uYzEyMjk1 Y2YzMWJiODlmZGFlZDdiOGE1MTc3ODVkZmQ2MjY4MGY5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvUmVzb3VyY2VzL3BhZ2Vwb3B1cHMvY2FsZW5kYXJQaWNrZXIuanMKKysrIGIvU291cmNl L1dlYkNvcmUvUmVzb3VyY2VzL3BhZ2Vwb3B1cHMvY2FsZW5kYXJQaWNrZXIuanMKQEAgLTcwOCw2 ICs3MDgsMTg5IEBAIEV2ZW50RW1pdHRlci5wcm90b3R5cGUuZGlzcGF0Y2hFdmVudCA9IGZ1bmN0 aW9uKHR5cGUpIHsKICAgICB9CiB9OwogCisvLyBQYXJhbWV0ZXIgdCBzaG91bGQgYmUgYSBudW1i ZXIgYmV0d2VlbiAwIGFuZCAxLgordmFyIEFuaW1hdGlvblRpbWluZ0Z1bmN0aW9uID0geworICAg IExpbmVhcjogZnVuY3Rpb24odCl7CisgICAgICAgIHJldHVybiB0OworICAgIH0sCisgICAgRWFz ZUluT3V0OiBmdW5jdGlvbih0KXsKKyAgICAgICAgdCAqPSAyOworICAgICAgICBpZiAodCA8IDEp CisgICAgICAgICAgICByZXR1cm4gTWF0aC5wb3codCwgMykgLyAyOworICAgICAgICB0IC09IDI7 CisgICAgICAgIHJldHVybiBNYXRoLnBvdyh0LCAzKSAvIDIgKyAxOworICAgIH0KK307CisKKy8q KgorICogQGNvbnN0cnVjdG9yCisgKiBAZXh0ZW5kcyBFdmVudEVtaXR0ZXIKKyAqLworZnVuY3Rp b24gQW5pbWF0aW9uTWFuYWdlcigpIHsKKyAgICBFdmVudEVtaXR0ZXIuY2FsbCh0aGlzKTsKKwor ICAgIHRoaXMuX2lzUnVubmluZyA9IGZhbHNlOworICAgIHRoaXMuX3J1bm5pbmdBbmltYXRvckNv dW50ID0gMDsKKyAgICB0aGlzLl9ydW5uaW5nQW5pbWF0b3JzID0ge307CisgICAgdGhpcy5fYW5p bWF0aW9uRnJhbWVDYWxsYmFja0JvdW5kID0gdGhpcy5fYW5pbWF0aW9uRnJhbWVDYWxsYmFjay5i aW5kKHRoaXMpOworfQorCitBbmltYXRpb25NYW5hZ2VyLnByb3RvdHlwZSA9IE9iamVjdC5jcmVh dGUoRXZlbnRFbWl0dGVyLnByb3RvdHlwZSk7CisKK0FuaW1hdGlvbk1hbmFnZXIuRXZlbnRUeXBl QW5pbWF0aW9uRnJhbWVXaWxsRmluaXNoID0gImFuaW1hdGlvbkZyYW1lV2lsbEZpbmlzaCI7CisK K0FuaW1hdGlvbk1hbmFnZXIucHJvdG90eXBlLl9zdGFydEFuaW1hdGlvbiA9IGZ1bmN0aW9uKCkg eworICAgIGlmICh0aGlzLl9pc1J1bm5pbmcpCisgICAgICAgIHJldHVybjsKKyAgICB0aGlzLl9p c1J1bm5pbmcgPSB0cnVlOworICAgIHdpbmRvdy53ZWJraXRSZXF1ZXN0QW5pbWF0aW9uRnJhbWUo dGhpcy5fYW5pbWF0aW9uRnJhbWVDYWxsYmFja0JvdW5kKTsKK307CisKK0FuaW1hdGlvbk1hbmFn ZXIucHJvdG90eXBlLl9zdG9wQW5pbWF0aW9uID0gZnVuY3Rpb24oKSB7CisgICAgaWYgKCF0aGlz Ll9pc1J1bm5pbmcpCisgICAgICAgIHJldHVybjsKKyAgICB0aGlzLl9pc1J1bm5pbmcgPSBmYWxz ZTsKK307CisKKy8qKgorICogQHBhcmFtIHshQW5pbWF0b3J9IGFuaW1hdG9yCisgKi8KK0FuaW1h dGlvbk1hbmFnZXIucHJvdG90eXBlLmFkZCA9IGZ1bmN0aW9uKGFuaW1hdG9yKSB7CisgICAgaWYg KHRoaXMuX3J1bm5pbmdBbmltYXRvcnNbYW5pbWF0b3IuaWRdKQorICAgICAgICByZXR1cm47Cisg ICAgdGhpcy5fcnVubmluZ0FuaW1hdG9yc1thbmltYXRvci5pZF0gPSBhbmltYXRvcjsKKyAgICB0 aGlzLl9ydW5uaW5nQW5pbWF0b3JDb3VudCsrOworICAgIGlmICh0aGlzLl9uZWVkc1RpbWVyKCkp CisgICAgICAgIHRoaXMuX3N0YXJ0QW5pbWF0aW9uKCk7Cit9OworCisvKioKKyAqIEBwYXJhbSB7 IUFuaW1hdG9yfSBhbmltYXRvcgorICovCitBbmltYXRpb25NYW5hZ2VyLnByb3RvdHlwZS5yZW1v dmUgPSBmdW5jdGlvbihhbmltYXRvcikgeworICAgIGlmICghdGhpcy5fcnVubmluZ0FuaW1hdG9y c1thbmltYXRvci5pZF0pCisgICAgICAgIHJldHVybjsKKyAgICBkZWxldGUgdGhpcy5fcnVubmlu Z0FuaW1hdG9yc1thbmltYXRvci5pZF07CisgICAgdGhpcy5fcnVubmluZ0FuaW1hdG9yQ291bnQt LTsKKyAgICBpZiAoIXRoaXMuX25lZWRzVGltZXIoKSkKKyAgICAgICAgdGhpcy5fc3RvcEFuaW1h dGlvbigpOworfTsKKworQW5pbWF0aW9uTWFuYWdlci5wcm90b3R5cGUuX2FuaW1hdGlvbkZyYW1l Q2FsbGJhY2sgPSBmdW5jdGlvbihub3cpIHsKKyAgICBpZiAodGhpcy5fcnVubmluZ0FuaW1hdG9y Q291bnQgPiAwKSB7CisgICAgICAgIGZvciAodmFyIGlkIGluIHRoaXMuX3J1bm5pbmdBbmltYXRv cnMpIHsKKyAgICAgICAgICAgIHRoaXMuX3J1bm5pbmdBbmltYXRvcnNbaWRdLm9uQW5pbWF0aW9u RnJhbWUobm93KTsKKyAgICAgICAgfQorICAgIH0KKyAgICB0aGlzLmRpc3BhdGNoRXZlbnQoQW5p bWF0aW9uTWFuYWdlci5FdmVudFR5cGVBbmltYXRpb25GcmFtZVdpbGxGaW5pc2gpOworICAgIGlm ICh0aGlzLl9pc1J1bm5pbmcpCisgICAgICAgIHdpbmRvdy53ZWJraXRSZXF1ZXN0QW5pbWF0aW9u RnJhbWUodGhpcy5fYW5pbWF0aW9uRnJhbWVDYWxsYmFja0JvdW5kKTsKK307CisKKy8qKgorICog QHJldHVybiB7IWJvb2xlYW59CisgKi8KK0FuaW1hdGlvbk1hbmFnZXIucHJvdG90eXBlLl9uZWVk c1RpbWVyID0gZnVuY3Rpb24oKSB7CisgICAgcmV0dXJuIHRoaXMuX3J1bm5pbmdBbmltYXRvckNv dW50ID4gMCB8fCB0aGlzLmhhc0xpc3RlbmVyKEFuaW1hdGlvbk1hbmFnZXIuRXZlbnRUeXBlQW5p bWF0aW9uRnJhbWVXaWxsRmluaXNoKTsKK307CisKKy8qKgorICogQHBhcmFtIHshc3RyaW5nfSB0 eXBlCisgKiBAcGFyYW0geyFGdW5jdGlvbn0gY2FsbGJhY2sKKyAqIEBvdmVycmlkZQorICovCitB bmltYXRpb25NYW5hZ2VyLnByb3RvdHlwZS5vbiA9IGZ1bmN0aW9uKHR5cGUsIGNhbGxiYWNrKSB7 CisgICAgRXZlbnRFbWl0dGVyLnByb3RvdHlwZS5vbi5jYWxsKHRoaXMsIHR5cGUsIGNhbGxiYWNr KTsKKyAgICBpZiAodGhpcy5fbmVlZHNUaW1lcigpKQorICAgICAgICB0aGlzLl9zdGFydEFuaW1h dGlvbigpOworfTsKKworLyoqCisgKiBAcGFyYW0geyFzdHJpbmd9IHR5cGUKKyAqIEBwYXJhbSB7 IUZ1bmN0aW9ufSBjYWxsYmFjaworICogQG92ZXJyaWRlCisgKi8KK0FuaW1hdGlvbk1hbmFnZXIu cHJvdG90eXBlLnJlbW92ZUxpc3RlbmVyID0gZnVuY3Rpb24odHlwZSwgY2FsbGJhY2spIHsKKyAg ICBFdmVudEVtaXR0ZXIucHJvdG90eXBlLnJlbW92ZUxpc3RlbmVyLmNhbGwodGhpcywgdHlwZSwg Y2FsbGJhY2spOworICAgIGlmICghdGhpcy5fbmVlZHNUaW1lcigpKQorICAgICAgICB0aGlzLl9z dG9wQW5pbWF0aW9uKCk7Cit9OworCitBbmltYXRpb25NYW5hZ2VyLnNoYXJlZCA9IG5ldyBBbmlt YXRpb25NYW5hZ2VyKCk7CisKKy8qKgorICogQGNvbnN0cnVjdG9yCisgKiBAZXh0ZW5kcyBFdmVu dEVtaXR0ZXIKKyAqLworZnVuY3Rpb24gQW5pbWF0b3IoKSB7CisgICAgRXZlbnRFbWl0dGVyLmNh bGwodGhpcyk7CisKKyAgICB0aGlzLmlkID0gQW5pbWF0b3IuX2xhc3RJZCsrOworICAgIHRoaXMu X2Zyb20gPSAwOworICAgIHRoaXMuX3RvID0gMDsKKyAgICB0aGlzLl9kZWx0YSA9IDA7CisgICAg dGhpcy5kdXJhdGlvbiA9IDEwMDsKKyAgICB0aGlzLnN0ZXAgPSBudWxsOworICAgIHRoaXMuX2xh c3RTdGVwVGltZSA9IG51bGw7CisgICAgdGhpcy5wcm9ncmVzcyA9IDAuMDsKKyAgICB0aGlzLnRp bWluZ0Z1bmN0aW9uID0gQW5pbWF0aW9uVGltaW5nRnVuY3Rpb24uTGluZWFyOworfQorCitBbmlt YXRvci5wcm90b3R5cGUgPSBPYmplY3QuY3JlYXRlKEV2ZW50RW1pdHRlci5wcm90b3R5cGUpOwor CitBbmltYXRvci5fbGFzdElkID0gMDsKKworQW5pbWF0b3IuRXZlbnRUeXBlRGlkQW5pbWF0aW9u U3RvcCA9ICJkaWRBbmltYXRpb25TdG9wIjsKKworLyoqCisgKiBAcGFyYW0geyFudW1iZXJ9IHZh bHVlCisgKi8KK0FuaW1hdG9yLnByb3RvdHlwZS5zZXRGcm9tID0gZnVuY3Rpb24odmFsdWUpIHsK KyAgICB0aGlzLl9mcm9tID0gdmFsdWU7CisgICAgdGhpcy5fZGVsdGEgPSB0aGlzLl90byAtIHRo aXMuX2Zyb207Cit9OworCisvKioKKyAqIEBwYXJhbSB7IW51bWJlcn0gdmFsdWUKKyAqLworQW5p bWF0b3IucHJvdG90eXBlLnNldFRvID0gZnVuY3Rpb24odmFsdWUpIHsKKyAgICB0aGlzLl90byA9 IHZhbHVlOworICAgIHRoaXMuX2RlbHRhID0gdGhpcy5fdG8gLSB0aGlzLl9mcm9tOworfTsKKwor QW5pbWF0b3IucHJvdG90eXBlLnN0YXJ0ID0gZnVuY3Rpb24oKSB7CisgICAgdGhpcy5fbGFzdFN0 ZXBUaW1lID0gRGF0ZS5ub3coKTsKKyAgICB0aGlzLnByb2dyZXNzID0gMC4wOworICAgIHRoaXMu X2lzUnVubmluZyA9IHRydWU7CisgICAgdGhpcy5jdXJyZW50VmFsdWUgPSB0aGlzLl9mcm9tOwor ICAgIEFuaW1hdGlvbk1hbmFnZXIuc2hhcmVkLmFkZCh0aGlzKTsKK307CisKK0FuaW1hdG9yLnBy b3RvdHlwZS5zdG9wID0gZnVuY3Rpb24oKSB7CisgICAgaWYgKCF0aGlzLl9pc1J1bm5pbmcpCisg ICAgICAgIHJldHVybjsKKyAgICB0aGlzLl9pc1J1bm5pbmcgPSBmYWxzZTsKKyAgICB0aGlzLmN1 cnJlbnRWYWx1ZSA9IHRoaXMuX3RvOworICAgIHRoaXMuc3RlcCh0aGlzKTsKKyAgICBBbmltYXRp b25NYW5hZ2VyLnNoYXJlZC5yZW1vdmUodGhpcyk7CisgICAgdGhpcy5kaXNwYXRjaEV2ZW50KEFu aW1hdG9yLkV2ZW50VHlwZURpZEFuaW1hdGlvblN0b3AsIHRoaXMpOworfTsKKworLyoqCisgKiBA cGFyYW0geyFudW1iZXJ9IG5vdworICovCitBbmltYXRvci5wcm90b3R5cGUub25BbmltYXRpb25G cmFtZSA9IGZ1bmN0aW9uKG5vdykgeworICAgIHRoaXMucHJvZ3Jlc3MgKz0gKG5vdyAtIHRoaXMu X2xhc3RTdGVwVGltZSkgLyB0aGlzLmR1cmF0aW9uOworICAgIGlmICh0aGlzLnByb2dyZXNzID49 IDEuMCkgeworICAgICAgICB0aGlzLnByb2dyZXNzID0gMS4wOworICAgICAgICB0aGlzLnN0b3Ao KTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKyAgICB0aGlzLmN1cnJlbnRWYWx1ZSA9IHRoaXMu dGltaW5nRnVuY3Rpb24odGhpcy5wcm9ncmVzcykgKiB0aGlzLl9kZWx0YSArIHRoaXMuX2Zyb207 CisgICAgdGhpcy5zdGVwKHRoaXMpOworICAgIHRoaXMuX2xhc3RTdGVwVGltZSA9IG5vdzsKK307 CisKIC8qKgogICogQGNvbnN0cnVjdG9yCiAgKiBAcGFyYW0geyFFbGVtZW50fSBlbGVtZW50Cg==