128977 2014-02-18 08:53:54 -0800 Simplify HTML tokenizer parameterization down to what is used 2014-02-18 10:53:34 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam commit-queue esprehn+autocc gyuyoung.kim oldest_to_newest 981950 0 sam 2014-02-18 08:53:54 -0800 Simplify HTML tokenizer parameterization down to what is used 981954 1 224519 sam 2014-02-18 08:57:21 -0800 Created attachment 224519 Patch 981984 2 sam 2014-02-18 10:53:34 -0800 Committed r164297: <http://trac.webkit.org/changeset/164297> 224519 2014-02-18 08:57:21 -0800 2014-02-18 09:41:41 -0800 Patch bug-128977-20140218085720.patch text/plain 10196 sam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NDI5MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDE0LTAyLTE4ICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgU2ltcGxpZnkgSFRNTCB0b2tlbml6ZXIg cGFyYW1ldGVyaXphdGlvbiBkb3duIHRvIHdoYXQgaXMgdXNlZAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI4OTc3CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgLSBSZW1vdmVzIHN1cHBvcnQgZm9yIEN1c3Rv bUhUTUxUb2tlbml6ZXJDaHVua1NpemUuCisgICAgICAgIC0gQ29uc29saWRhdGVzIEN1c3RvbUhU TUxUb2tlbml6ZXJUaW1lRGVsYXkgZG93biB0byBvbmUgaW1wbGVtZW50YXRpb24sIHVzaW5nIFNl dHRpbmdzOjptYXhQYXJzZUR1cmF0aW9uCisKKyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjoKKyAg ICAgICAgKiBodG1sL3BhcnNlci9IVE1MUGFyc2VyU2NoZWR1bGVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkhUTUxQYXJzZXJTY2hlZHVsZXI6OkhUTUxQYXJzZXJTY2hlZHVsZXIpOgorICAgICAg ICAqIHBhZ2UvUGFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjpQYWdlKToKKyAgICAg ICAgKFdlYkNvcmU6OlBhZ2U6Omhhc0N1c3RvbUhUTUxUb2tlbml6ZXJUaW1lRGVsYXkpOgorICAg ICAgICAoV2ViQ29yZTo6UGFnZTo6Y3VzdG9tSFRNTFRva2VuaXplclRpbWVEZWxheSk6CisgICAg ICAgICogcGFnZS9QYWdlLmg6CisKIDIwMTQtMDItMTggIE1paG5lYSBPdmlkZW5pZSAgPG1paG5l YUBhZG9iZS5jb20+CiAKICAgICAgICAgW0NTU1JlZ2lvbnNdIENvbXB1dGUgcmVnaW9uIHJhbmdl cyBmb3IgaW5saW5lIHJlcGxhY2VkIGVsZW1lbnRzCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9XZWJD b3JlLmV4cC5pbgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgko cmV2aXNpb24gMTY0MjYyKQorKysgU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4JKHdvcmtp bmcgY29weSkKQEAgLTEwMjksOCArMTAyOSw2IEBAIF9fWk43V2ViQ29yZTRQYWdlMjRmaW5kU3Ry aW5nTWF0Y2hpbmdSYW4KIF9fWk43V2ViQ29yZTRQYWdlMjRyZXN1bWVTY3JpcHRlZEFuaW1hdGlv bnNFdgogX19aTjdXZWJDb3JlNFBhZ2UyNHNjcm9sbGluZ1N0YXRlVHJlZUFzVGV4dEV2CiBfX1pO N1dlYkNvcmU0UGFnZTI1c3VzcGVuZFNjcmlwdGVkQW5pbWF0aW9uc0V2Ci1fX1pON1dlYkNvcmU0 UGFnZTMxc2V0Q3VzdG9tSFRNTFRva2VuaXplckNodW5rU2l6ZUVpCi1fX1pON1dlYkNvcmU0UGFn ZTMxc2V0Q3VzdG9tSFRNTFRva2VuaXplclRpbWVEZWxheUVkCiBfX1pON1dlYkNvcmU0UGFnZTMz c3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb25zQXNUZXh0RXYKIF9fWk43V2ViQ29yZTRQYWdlMzJz ZXRNZW1vcnlDYWNoZUNsaWVudENhbGxzRW5hYmxlZEViCiBfX1pON1dlYkNvcmU0UGFnZTM1cmVz dW1lQWN0aXZlRE9NT2JqZWN0c0FuZEFuaW1hdGlvbnNFdgpJbmRleDogU291cmNlL1dlYkNvcmUv aHRtbC9wYXJzZXIvSFRNTFBhcnNlclNjaGVkdWxlci5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFBhcnNlclNjaGVkdWxlci5jcHAJKHJldmlzaW9uIDE2 NDI1OCkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxQYXJzZXJTY2hlZHVsZXIu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MiwxNiArNTIsNiBAQCBzdGF0aWMgZG91YmxlIHBhcnNl clRpbWVMaW1pdChQYWdlKiBwYWdlCiAgICAgcmV0dXJuIGRlZmF1bHRQYXJzZXJUaW1lTGltaXQ7 CiB9CiAKLXN0YXRpYyBpbnQgcGFyc2VyQ2h1bmtTaXplKFBhZ2UqIHBhZ2UpCi17Ci0gICAgLy8g RklYTUU6IFdlIG1heSBuZWVkIHRvIGRpdmlkZSB0aGUgdmFsdWUgZnJvbSBjdXN0b21IVE1MVG9r ZW5pemVyQ2h1bmtTaXplCi0gICAgLy8gYnkgc29tZSBjb25zdGFudCB0byB0cmFuc2xhdGUgZnJv bSB0aGUgImNoYXJhY3RlciIgYmFzZWQgYmVoYXZpb3Igb2YgdGhlCi0gICAgLy8gb2xkIExlZ2Fj eUhUTUxEb2N1bWVudFBhcnNlciB0byB0aGUgdG9rZW4tYmFzZWQgYmVoYXZpb3Igb2YgdGhpcyBw YXJzZXIuCi0gICAgaWYgKHBhZ2UgJiYgcGFnZS0+aGFzQ3VzdG9tSFRNTFRva2VuaXplckNodW5r U2l6ZSgpKQotICAgICAgICByZXR1cm4gcGFnZS0+Y3VzdG9tSFRNTFRva2VuaXplckNodW5rU2l6 ZSgpOwotICAgIHJldHVybiBkZWZhdWx0UGFyc2VyQ2h1bmtTaXplOwotfQotCiBBY3RpdmVQYXJz ZXJTZXNzaW9uOjpBY3RpdmVQYXJzZXJTZXNzaW9uKERvY3VtZW50KiBkb2N1bWVudCkKICAgICA6 IG1fZG9jdW1lbnQoZG9jdW1lbnQpCiB7CkBAIC05Nyw3ICs4Nyw3IEBAIFB1bXBTZXNzaW9uOjp+ UHVtcFNlc3Npb24oKQogSFRNTFBhcnNlclNjaGVkdWxlcjo6SFRNTFBhcnNlclNjaGVkdWxlcihI VE1MRG9jdW1lbnRQYXJzZXImIHBhcnNlcikKICAgICA6IG1fcGFyc2VyKHBhcnNlcikKICAgICAs IG1fcGFyc2VyVGltZUxpbWl0KHBhcnNlclRpbWVMaW1pdChtX3BhcnNlci5kb2N1bWVudCgpLT5w YWdlKCkpKQotICAgICwgbV9wYXJzZXJDaHVua1NpemUocGFyc2VyQ2h1bmtTaXplKG1fcGFyc2Vy LmRvY3VtZW50KCktPnBhZ2UoKSkpCisgICAgLCBtX3BhcnNlckNodW5rU2l6ZShkZWZhdWx0UGFy c2VyQ2h1bmtTaXplKQogICAgICwgbV9jb250aW51ZU5leHRDaHVua1RpbWVyKHRoaXMsICZIVE1M UGFyc2VyU2NoZWR1bGVyOjpjb250aW51ZU5leHRDaHVua1RpbWVyRmlyZWQpCiAgICAgLCBtX2lz U3VzcGVuZGVkV2l0aEFjdGl2ZVRpbWVyKGZhbHNlKQogI2lmICFBU1NFUlRfRElTQUJMRUQKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcGFnZS9QYWdlLmNwcAkocmV2aXNpb24gMTY0MjU4KQorKysgU291cmNlL1dlYkNvcmUv cGFnZS9QYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTY1LDggKzE2NSw2IEBAIFBhZ2U6OlBh Z2UoUGFnZUNsaWVudHMmIHBhZ2VDbGllbnRzKQogICAgICwgbV91c2VyU3R5bGVTaGVldE1vZGlm aWNhdGlvblRpbWUoMCkKICAgICAsIG1fZ3JvdXAoMCkKICAgICAsIG1fZGVidWdnZXIoMCkKLSAg ICAsIG1fY3VzdG9tSFRNTFRva2VuaXplclRpbWVEZWxheSgtMSkKLSAgICAsIG1fY3VzdG9tSFRN TFRva2VuaXplckNodW5rU2l6ZSgtMSkKICAgICAsIG1fY2FuU3RhcnRNZWRpYSh0cnVlKQogI2lm IEVOQUJMRShWSUVXX01PREVfQ1NTX01FRElBKQogICAgICwgbV92aWV3TW9kZShWaWV3TW9kZVdp bmRvd2VkKQpAQCAtOTk4LDIyICs5OTYsMTUgQEAgdm9pZCBQYWdlOjpzZXRTZXNzaW9uU3RvcmFn ZShQYXNzUmVmUHRyPAogICAgIG1fc2Vzc2lvblN0b3JhZ2UgPSBuZXdTdG9yYWdlOwogfQogCi12 b2lkIFBhZ2U6OnNldEN1c3RvbUhUTUxUb2tlbml6ZXJUaW1lRGVsYXkoZG91YmxlIGN1c3RvbUhU TUxUb2tlbml6ZXJUaW1lRGVsYXkpCitib29sIFBhZ2U6Omhhc0N1c3RvbUhUTUxUb2tlbml6ZXJU aW1lRGVsYXkoKSBjb25zdAogewotICAgIGlmIChjdXN0b21IVE1MVG9rZW5pemVyVGltZURlbGF5 IDwgMCkgewotICAgICAgICBtX2N1c3RvbUhUTUxUb2tlbml6ZXJUaW1lRGVsYXkgPSAtMTsKLSAg ICAgICAgcmV0dXJuOwotICAgIH0KLSAgICBtX2N1c3RvbUhUTUxUb2tlbml6ZXJUaW1lRGVsYXkg PSBjdXN0b21IVE1MVG9rZW5pemVyVGltZURlbGF5OworICAgIHJldHVybiBtX3NldHRpbmdzLT5t YXhQYXJzZUR1cmF0aW9uKCkgIT0gLTE7CiB9CiAKLXZvaWQgUGFnZTo6c2V0Q3VzdG9tSFRNTFRv a2VuaXplckNodW5rU2l6ZShpbnQgY3VzdG9tSFRNTFRva2VuaXplckNodW5rU2l6ZSkKK2RvdWJs ZSBQYWdlOjpjdXN0b21IVE1MVG9rZW5pemVyVGltZURlbGF5KCkgY29uc3QKIHsKLSAgICBpZiAo Y3VzdG9tSFRNTFRva2VuaXplckNodW5rU2l6ZSA8IDApIHsKLSAgICAgICAgbV9jdXN0b21IVE1M VG9rZW5pemVyQ2h1bmtTaXplID0gLTE7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0gICAgbV9j dXN0b21IVE1MVG9rZW5pemVyQ2h1bmtTaXplID0gY3VzdG9tSFRNTFRva2VuaXplckNodW5rU2l6 ZTsKKyAgICBBU1NFUlQobV9zZXR0aW5ncy0+bWF4UGFyc2VEdXJhdGlvbigpICE9IC0xKTsKKyAg ICByZXR1cm4gbV9zZXR0aW5ncy0+bWF4UGFyc2VEdXJhdGlvbigpOwogfQogCiB2b2lkIFBhZ2U6 OnNldE1lbW9yeUNhY2hlQ2xpZW50Q2FsbHNFbmFibGVkKGJvb2wgZW5hYmxlZCkKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Bh Z2UvUGFnZS5oCShyZXZpc2lvbiAxNjQyNTgpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2Uu aAkod29ya2luZyBjb3B5KQpAQCAtMzIyLDIwICszMjIsOCBAQCBwdWJsaWM6CiAgICAgU3RvcmFn ZU5hbWVzcGFjZSogc2Vzc2lvblN0b3JhZ2UoYm9vbCBvcHRpb25hbENyZWF0ZSA9IHRydWUpOwog ICAgIHZvaWQgc2V0U2Vzc2lvblN0b3JhZ2UoUGFzc1JlZlB0cjxTdG9yYWdlTmFtZXNwYWNlPik7 CiAKLSAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIG1ha2UgU2V0dGluZ3M6Om1heFBhcnNlRHVyYXRp b24oKSBwbGF0Zm9ybS1pbmRlcGVuZGVudCwgcmVtb3ZlIHtoYXMsIHNldH1DdXN0b21IVE1MVG9r ZW5pemVyVGltZURlbGF5KCkKLSAgICAvLyBhbmQgY3VzdG9tSFRNTFRva2VuaXplclRpbWVEZWxh eSgpIGFuZCBtb2RpZnkgdGhlaXJzIGNhbGxlcnMgdG8gdXBkYXRlIG9yIHF1ZXJ5IFNldHRpbmdz OjptYXhQYXJzZUR1cmF0aW9uKCkuCi0gICAgdm9pZCBzZXRDdXN0b21IVE1MVG9rZW5pemVyVGlt ZURlbGF5KGRvdWJsZSk7Ci0jaWYgUExBVEZPUk0oSU9TKQotICAgIGJvb2wgaGFzQ3VzdG9tSFRN TFRva2VuaXplclRpbWVEZWxheSgpIGNvbnN0IHsgcmV0dXJuIG1fc2V0dGluZ3MtPm1heFBhcnNl RHVyYXRpb24oKSAhPSAtMTsgfQotICAgIGRvdWJsZSBjdXN0b21IVE1MVG9rZW5pemVyVGltZURl bGF5KCkgY29uc3QgeyBBU1NFUlQobV9zZXR0aW5ncy0+bWF4UGFyc2VEdXJhdGlvbigpICE9IC0x KTsgcmV0dXJuIG1fc2V0dGluZ3MtPm1heFBhcnNlRHVyYXRpb24oKTsgfQotI2Vsc2UKLSAgICBi b29sIGhhc0N1c3RvbUhUTUxUb2tlbml6ZXJUaW1lRGVsYXkoKSBjb25zdCB7IHJldHVybiBtX2N1 c3RvbUhUTUxUb2tlbml6ZXJUaW1lRGVsYXkgIT0gLTE7IH0KLSAgICBkb3VibGUgY3VzdG9tSFRN TFRva2VuaXplclRpbWVEZWxheSgpIGNvbnN0IHsgQVNTRVJUKG1fY3VzdG9tSFRNTFRva2VuaXpl clRpbWVEZWxheSAhPSAtMSk7IHJldHVybiBtX2N1c3RvbUhUTUxUb2tlbml6ZXJUaW1lRGVsYXk7 IH0KLSNlbmRpZgotCi0gICAgdm9pZCBzZXRDdXN0b21IVE1MVG9rZW5pemVyQ2h1bmtTaXplKGlu dCk7Ci0gICAgYm9vbCBoYXNDdXN0b21IVE1MVG9rZW5pemVyQ2h1bmtTaXplKCkgY29uc3QgeyBy ZXR1cm4gbV9jdXN0b21IVE1MVG9rZW5pemVyQ2h1bmtTaXplICE9IC0xOyB9Ci0gICAgaW50IGN1 c3RvbUhUTUxUb2tlbml6ZXJDaHVua1NpemUoKSBjb25zdCB7IEFTU0VSVChtX2N1c3RvbUhUTUxU b2tlbml6ZXJDaHVua1NpemUgIT0gLTEpOyByZXR1cm4gbV9jdXN0b21IVE1MVG9rZW5pemVyQ2h1 bmtTaXplOyB9CisgICAgYm9vbCBoYXNDdXN0b21IVE1MVG9rZW5pemVyVGltZURlbGF5KCkgY29u c3Q7CisgICAgZG91YmxlIGN1c3RvbUhUTUxUb2tlbml6ZXJUaW1lRGVsYXkoKSBjb25zdDsKIAog ICAgIHZvaWQgc2V0TWVtb3J5Q2FjaGVDbGllbnRDYWxsc0VuYWJsZWQoYm9vbCk7CiAgICAgYm9v bCBhcmVNZW1vcnlDYWNoZUNsaWVudENhbGxzRW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJuIG1fYXJl TWVtb3J5Q2FjaGVDbGllbnRDYWxsc0VuYWJsZWQ7IH0KQEAgLTUwNCw5ICs0OTIsNiBAQCBwcml2 YXRlOgogCiAgICAgSlNDOjpEZWJ1Z2dlciogbV9kZWJ1Z2dlcjsKIAotICAgIGRvdWJsZSBtX2N1 c3RvbUhUTUxUb2tlbml6ZXJUaW1lRGVsYXk7Ci0gICAgaW50IG1fY3VzdG9tSFRNTFRva2VuaXpl ckNodW5rU2l6ZTsKLQogICAgIGJvb2wgbV9jYW5TdGFydE1lZGlhOwogCiAgICAgUmVmUHRyPFN0 b3JhZ2VOYW1lc3BhY2U+IG1fc2Vzc2lvblN0b3JhZ2U7CkluZGV4OiBTb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCShy ZXZpc2lvbiAxNjQyOTIpCisrKyBTb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHdvcmtpbmcg Y29weSkKQEAgLTEsMyArMSwxNSBAQAorMjAxNC0wMi0xOCAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJr aXQub3JnPgorCisgICAgICAgIFNpbXBsaWZ5IEhUTUwgdG9rZW5pemVyIHBhcmFtZXRlcml6YXRp b24gZG93biB0byB3aGF0IGlzIHVzZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEyODk3NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFJlbW92ZSB1bnVzZWQgX3NldEN1c3RvbUhUTUxUb2tlbml6ZXJUaW1l RGVsYXkgYW5kIF9zZXRDdXN0b21IVE1MVG9rZW5pemVyQ2h1bmtTaXplIFNQSS4KKworICAgICAg ICAqIFdlYlZpZXcvV2ViVmlldy5tbToKKyAgICAgICAgKiBXZWJWaWV3L1dlYlZpZXdQcml2YXRl Lmg6CisKIDIwMTQtMDItMTcgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4K IAogICAgICAgICBSZW1vdmUgdmlldyBzb3VyY2UgY29kZQpJbmRleDogU291cmNlL1dlYktpdC9t YWMvV2ViVmlldy9XZWJWaWV3Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvbWFjL1dl YlZpZXcvV2ViVmlldy5tbQkocmV2aXNpb24gMTY0MjYxKQorKysgU291cmNlL1dlYktpdC9tYWMv V2ViVmlldy9XZWJWaWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zODA4LDIwICszODA4LDYgQEAg LSAodm9pZClfZXhlY3V0ZUNvcmVDb21tYW5kQnlOYW1lOihOU1N0cgogICAgIGNvcmVGcmFtZS0+ ZWRpdG9yKCkuY29tbWFuZChuYW1lKS5leGVjdXRlKHZhbHVlKTsKIH0KIAotLSAodm9pZClfc2V0 Q3VzdG9tSFRNTFRva2VuaXplclRpbWVEZWxheTooZG91YmxlKXRpbWVEZWxheQotewotICAgIGlm ICghX3ByaXZhdGUtPnBhZ2UpCi0gICAgICAgIHJldHVybjsKLSAgICByZXR1cm4gX3ByaXZhdGUt PnBhZ2UtPnNldEN1c3RvbUhUTUxUb2tlbml6ZXJUaW1lRGVsYXkodGltZURlbGF5KTsKLX0KLQot LSAodm9pZClfc2V0Q3VzdG9tSFRNTFRva2VuaXplckNodW5rU2l6ZTooaW50KWNodW5rU2l6ZQot ewotICAgIGlmICghX3ByaXZhdGUtPnBhZ2UpCi0gICAgICAgIHJldHVybjsKLSAgICByZXR1cm4g X3ByaXZhdGUtPnBhZ2UtPnNldEN1c3RvbUhUTUxUb2tlbml6ZXJDaHVua1NpemUoY2h1bmtTaXpl KTsKLX0KLQogLSAodm9pZClfY2xlYXJNYWluRnJhbWVOYW1lCiB7CiAgICAgX3ByaXZhdGUtPnBh Z2UtPm1haW5GcmFtZSgpLnRyZWUoKS5jbGVhck5hbWUoKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQv bWFjL1dlYlZpZXcvV2ViVmlld1ByaXZhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L21hYy9XZWJWaWV3L1dlYlZpZXdQcml2YXRlLmgJKHJldmlzaW9uIDE2NDI2MSkKKysrIFNvdXJj ZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlld1ByaXZhdGUuaAkod29ya2luZyBjb3B5KQpAQCAt NzUxLDkgKzc1MSw2IEBAIENvdWxkIGJlIHdvcnRoIGFkZGluZyB0byB0aGUgQVBJLgogLSAodm9p ZClfZXhlY3V0ZUNvcmVDb21tYW5kQnlOYW1lOihOU1N0cmluZyAqKW5hbWUgdmFsdWU6KE5TU3Ry aW5nICopdmFsdWU7CiAtICh2b2lkKV9jbGVhck1haW5GcmFtZU5hbWU7CiAKLS0gKHZvaWQpX3Nl dEN1c3RvbUhUTUxUb2tlbml6ZXJUaW1lRGVsYXk6KGRvdWJsZSl0aW1lRGVsYXk7Ci0tICh2b2lk KV9zZXRDdXN0b21IVE1MVG9rZW5pemVyQ2h1bmtTaXplOihpbnQpY2h1bmtTaXplOwotCiAtICh2 b2lkKXNldFNlbGVjdFRyYWlsaW5nV2hpdGVzcGFjZUVuYWJsZWQ6KEJPT0wpZmxhZzsKIC0gKEJP T0wpaXNTZWxlY3RUcmFpbGluZ1doaXRlc3BhY2VFbmFibGVkOwogCkluZGV4OiBTb3VyY2UvV2Vi S2l0L3dpbi9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC93aW4vQ2hhbmdl TG9nCShyZXZpc2lvbiAxNjQyOTIpCisrKyBTb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cJKHdv cmtpbmcgY29weSkKQEAgLTEsMyArMSwxNiBAQAorMjAxNC0wMi0xOCAgU2FtIFdlaW5pZyAgPHNh bUB3ZWJraXQub3JnPgorCisgICAgICAgIFNpbXBsaWZ5IEhUTUwgdG9rZW5pemVyIHBhcmFtZXRl cml6YXRpb24gZG93biB0byB3aGF0IGlzIHVzZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEyODk3NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSB1bnVzZWQgU1BJLgorCisgICAgICAgICogV2Vi Vmlldy5jcHA6CisgICAgICAgIChXZWJWaWV3OjpzZXRDdXN0b21IVE1MVG9rZW5pemVyVGltZURl bGF5KToKKyAgICAgICAgKFdlYlZpZXc6OnNldEN1c3RvbUhUTUxUb2tlbml6ZXJDaHVua1NpemUp OgorCiAyMDE0LTAyLTE3ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAK ICAgICAgICAgUmVtb3ZlIHZpZXcgc291cmNlIGNvZGUKSW5kZXg6IFNvdXJjZS9XZWJLaXQvd2lu L1dlYlZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvd2luL1dlYlZpZXcuY3Bw CShyZXZpc2lvbiAxNjQyNjEpCisrKyBTb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcAkod29y a2luZyBjb3B5KQpAQCAtNTk3NiwyMSArNTk3NiwxNSBAQCBIUkVTVUxUIFNURE1FVEhPRENBTExU WVBFIFdlYlZpZXc6OmVsZW1lCiBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIFdlYlZpZXc6OnNl dEN1c3RvbUhUTUxUb2tlbml6ZXJUaW1lRGVsYXkoCiAgICAgLyogW2luXSAqLyBkb3VibGUgdGlt ZURlbGF5KQogewotICAgIGlmICghbV9wYWdlKQotICAgICAgICByZXR1cm4gRV9GQUlMOwotCi0g ICAgbV9wYWdlLT5zZXRDdXN0b21IVE1MVG9rZW5pemVyVGltZURlbGF5KHRpbWVEZWxheSk7Ci0g ICAgcmV0dXJuIFNfT0s7CisgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgcmV0dXJuIEVf RkFJTDsKIH0KIAogSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBXZWJWaWV3OjpzZXRDdXN0b21I VE1MVG9rZW5pemVyQ2h1bmtTaXplKAogICAgIC8qIFtpbl0gKi8gaW50IGNodW5rU2l6ZSkKIHsK LSAgICBpZiAoIW1fcGFnZSkKLSAgICAgICAgcmV0dXJuIEVfRkFJTDsKLQotICAgIG1fcGFnZS0+ c2V0Q3VzdG9tSFRNTFRva2VuaXplckNodW5rU2l6ZShjaHVua1NpemUpOwotICAgIHJldHVybiBT X09LOworICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgIHJldHVybiBFX0ZBSUw7CiB9CiAK IEhSRVNVTFQgU1RETUVUSE9EQ0FMTFRZUEUgV2ViVmlldzo6YmFja2luZ1N0b3JlKAo=