84490 2012-04-20 13:50:18 -0700 PageGroupLoadDeferrer needs to take a ReasonForSuspension argument 2012-04-20 14:29:31 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 84488 1 beidson beidson ap jchaffraix yong.li.webkit oldest_to_newest 606867 0 beidson 2012-04-20 13:50:18 -0700 PageGroupLoadDeferrer needs to take a ReasonForSuspension argument There's a long standing comment: // NOTE: if PageGroupLoadDeferrer is ever used for tasks other than showing a modal window or sheet, // the constructor will need to take a ActiveDOMObject::ReasonForSuspension. As we resolve https://bugs.webkit.org/show_bug.cgi?id=84488 that comment is no longer a suggestion towards some vague future. Also relevant to radar <rdar://problem/10484294> 606891 1 138162 beidson 2012-04-20 14:15:11 -0700 Created attachment 138162 Patch v1 - Refactor to add a ReasonForSuspension argument 606899 2 138162 andersca 2012-04-20 14:18:27 -0700 Comment on attachment 138162 Patch v1 - Refactor to add a ReasonForSuspension argument View in context: https://bugs.webkit.org/attachment.cgi?id=138162&action=review > Source/WebCore/dom/Document.h:1486 > + bool m_suspendedScheduledTasks; m_suspendedScheduledTasks sounds like it would be a container for suspended scheduled tasks. Maybe m_scheduledTasksAreSuspended or something that indicates that it's a boolean? 606901 3 beidson 2012-04-20 14:19:03 -0700 (In reply to comment #2) > (From update of attachment 138162 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=138162&action=review > > > Source/WebCore/dom/Document.h:1486 > > + bool m_suspendedScheduledTasks; > > m_suspendedScheduledTasks sounds like it would be a container for suspended scheduled tasks. Maybe m_scheduledTasksAreSuspended or something that indicates that it's a boolean? Sounds good. Thanks! 606911 4 beidson 2012-04-20 14:29:31 -0700 http://trac.webkit.org/changeset/114782 138162 2012-04-20 14:15:11 -0700 2012-04-20 14:18:26 -0700 Patch v1 - Refactor to add a ReasonForSuspension argument patch.txt text/plain 13786 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3ZmY4NzUyLi5hOThhOWY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzYg QEAKKzIwMTItMDQtMjAgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDQ5MAorICAgICAg ICBQYWdlR3JvdXBMb2FkRGVmZXJyZXIgbmVlZHMgdG8gdGFrZSBhIFJlYXNvbkZvclN1c3BlbnNp b24gYXJndW1lbnQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBObyBuZXcgdGVzdHMuIChSZWZhY3Rvciwgbm8gY2hhbmdlIGluIGJlaGF2aW9yKQorCisg ICAgICAgIC0gTWFrZSBQYWdlR3JvdXBMb2FkRGVmZXJyZXIgdGFrZSBhIFJlYXNvbkZvclN1c3Bl bnNpb24gYXJndW1lbnQgc28gaXQgY2FuIHBhc3MgaXQgYWxvbmcuCisgICAgICAgICogcGFnZS9Q YWdlR3JvdXBMb2FkRGVmZXJyZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGFnZUdyb3VwTG9h ZERlZmVycmVyOjpQYWdlR3JvdXBMb2FkRGVmZXJyZXIpOgorICAgICAgICAqIHBhZ2UvUGFnZUdy b3VwTG9hZERlZmVycmVyLmg6CisKKyAgICAgICAgLSBDaGFuZ2Ugc3VzcGVuZFNjaGVkdWxlZFRh c2tzIHRvIHRha2UgYSBSZWFzb25Gb3JTdXNwZW5zaW9uLgorICAgICAgICAtIEFzIGxvbmcgYXMg d2UncmUgY2hhbmdpbmcgRG9jdW1lbnQuaCwgYWRkIGEgbV9zdXNwZW5kZWRTY2hlZHVsZWRUYXNr cyBmbGFnIGFuZCBzb21lCisgICAgICAgICAgQVNTRVJUcyB0byBjYXRjaCB3aGF0IHdvdWxkIGJl IGVwaWNhbGx5IHdyb25nIGJlaGF2aW9yIGluIHRoZSBmdXR1cmUuCisgICAgICAgICogZG9tL0Rv Y3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50OjpEb2N1bWVudCk6CisgICAg ICAgIChXZWJDb3JlOjpEb2N1bWVudDo6c3VzcGVuZFNjaGVkdWxlZFRhc2tzKToKKyAgICAgICAg KFdlYkNvcmU6OkRvY3VtZW50OjpyZXN1bWVTY2hlZHVsZWRUYXNrcyk6CisgICAgICAgICogZG9t L0RvY3VtZW50Lmg6CisKKyAgICAgICAgLSBQYXNzIEFjdGl2ZURPTU9iamVjdDo6V2lsbFNob3dE aWFsb2cgYWxvbmcgdG8gYWxsIFBhZ2VHcm91cExvYWREZWZlcnJlcnMsIGFzIGl0IHVzZWQKKyAg ICAgICAgICB0byBiZSB0aGUgZGVmYXVsdCBiZWhhdmlvcgorICAgICAgICAqIHBhZ2UvQ2hyb21l LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNocm9tZTo6cnVuTW9kYWwpOgorICAgICAgICAoV2Vi Q29yZTo6Q2hyb21lOjpydW5CZWZvcmVVbmxvYWRDb25maXJtUGFuZWwpOgorICAgICAgICAoV2Vi Q29yZTo6Q2hyb21lOjpydW5KYXZhU2NyaXB0QWxlcnQpOgorICAgICAgICAoV2ViQ29yZTo6Q2hy b21lOjpydW5KYXZhU2NyaXB0Q29uZmlybSk6CisgICAgICAgIChXZWJDb3JlOjpDaHJvbWU6OnJ1 bkphdmFTY3JpcHRQcm9tcHQpOgorICAgICAgICAoV2ViQ29yZTo6Q2hyb21lOjpzaG91bGRJbnRl cnJ1cHRKYXZhU2NyaXB0KToKKwogMjAxMi0wNC0yMCAgRW1pbCBBIEVrbHVuZCAgPGVhZUBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgRml4IHVzZSBvZiBMYXlvdXRVbml0cyBpbiBET01Ob2RlSGln aGxpZ2h0ZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCmluZGV4IGFkODRlMTEuLmUwNjMyOGIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvZG9tL0RvY3VtZW50LmNwcApAQCAtNDc4LDYgKzQ3OCw3IEBAIERvY3VtZW50OjpEb2N1 bWVudChGcmFtZSogZnJhbWUsIGNvbnN0IEtVUkwmIHVybCwgYm9vbCBpc1hIVE1MLCBib29sIGlz SFRNTCkKICAgICAsIG1fd2hlZWxFdmVudEhhbmRsZXJDb3VudCgwKQogICAgICwgbV90b3VjaEV2 ZW50SGFuZGxlckNvdW50KDApCiAgICAgLCBtX3BlbmRpbmdUYXNrc1RpbWVyKHRoaXMsICZEb2N1 bWVudDo6cGVuZGluZ1Rhc2tzVGltZXJGaXJlZCkKKyAgICAsIG1fc3VzcGVuZGVkU2NoZWR1bGVk VGFza3MoZmFsc2UpCiB7CiAgICAgbV9kb2N1bWVudCA9IHRoaXM7CiAKQEAgLTUwNzYsMTggKzUw NzcsMjQgQEAgdm9pZCBEb2N1bWVudDo6cGVuZGluZ1Rhc2tzVGltZXJGaXJlZChUaW1lcjxEb2N1 bWVudD4qKQogICAgIH0KIH0KIAotdm9pZCBEb2N1bWVudDo6c3VzcGVuZFNjaGVkdWxlZFRhc2tz KCkKK3ZvaWQgRG9jdW1lbnQ6OnN1c3BlbmRTY2hlZHVsZWRUYXNrcyhBY3RpdmVET01PYmplY3Q6 OlJlYXNvbkZvclN1c3BlbnNpb24gcmVhc29uKQogeworICAgIEFTU0VSVCghbV9zdXNwZW5kZWRT Y2hlZHVsZWRUYXNrcyk7CisKICAgICBzdXNwZW5kU2NyaXB0ZWRBbmltYXRpb25Db250cm9sbGVy Q2FsbGJhY2tzKCk7Ci0gICAgc3VzcGVuZEFjdGl2ZURPTU9iamVjdHMoQWN0aXZlRE9NT2JqZWN0 OjpXaWxsU2hvd0RpYWxvZyk7CisgICAgc3VzcGVuZEFjdGl2ZURPTU9iamVjdHMocmVhc29uKTsK ICAgICBzY3JpcHRSdW5uZXIoKS0+c3VzcGVuZCgpOwogICAgIG1fcGVuZGluZ1Rhc2tzVGltZXIu c3RvcCgpOwogICAgIGlmIChtX3BhcnNlcikKICAgICAgICAgbV9wYXJzZXItPnN1c3BlbmRTY2hl ZHVsZWRUYXNrcygpOworCisgICAgbV9zdXNwZW5kZWRTY2hlZHVsZWRUYXNrcyA9IHRydWU7CiB9 CiAKIHZvaWQgRG9jdW1lbnQ6OnJlc3VtZVNjaGVkdWxlZFRhc2tzKCkKIHsKKyAgICBBU1NFUlQo bV9zdXNwZW5kZWRTY2hlZHVsZWRUYXNrcyk7CisKICAgICBpZiAobV9wYXJzZXIpCiAgICAgICAg IG1fcGFyc2VyLT5yZXN1bWVTY2hlZHVsZWRUYXNrcygpOwogICAgIGlmICghbV9wZW5kaW5nVGFz a3MuaXNFbXB0eSgpKQpAQCAtNTA5NSw2ICs1MTAyLDggQEAgdm9pZCBEb2N1bWVudDo6cmVzdW1l U2NoZWR1bGVkVGFza3MoKQogICAgIHNjcmlwdFJ1bm5lcigpLT5yZXN1bWUoKTsKICAgICByZXN1 bWVBY3RpdmVET01PYmplY3RzKCk7CiAgICAgcmVzdW1lU2NyaXB0ZWRBbmltYXRpb25Db250cm9s bGVyQ2FsbGJhY2tzKCk7CisgICAgCisgICAgbV9zdXNwZW5kZWRTY2hlZHVsZWRUYXNrcyA9IGZh bHNlOwogfQogCiB2b2lkIERvY3VtZW50OjpzdXNwZW5kU2NyaXB0ZWRBbmltYXRpb25Db250cm9s bGVyQ2FsbGJhY2tzKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5o IGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmgKaW5kZXggOGE5YzYwNC4uYThkMzc5NSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmgKKysrIGIvU291cmNlL1dl YkNvcmUvZG9tL0RvY3VtZW50LmgKQEAgLTExNDEsNyArMTE0MSw3IEBAIHB1YmxpYzoKICAgICAK ICAgICBib29sIGlzSW5Eb2N1bWVudFdyaXRlKCkgeyByZXR1cm4gbV93cml0ZVJlY3Vyc2lvbkRl cHRoID4gMDsgfQogCi0gICAgdm9pZCBzdXNwZW5kU2NoZWR1bGVkVGFza3MoKTsKKyAgICB2b2lk IHN1c3BlbmRTY2hlZHVsZWRUYXNrcyhBY3RpdmVET01PYmplY3Q6OlJlYXNvbkZvclN1c3BlbnNp b24pOwogICAgIHZvaWQgcmVzdW1lU2NoZWR1bGVkVGFza3MoKTsKIAogICAgIEludFNpemUgdmll d3BvcnRTaXplKCkgY29uc3Q7CkBAIC0xNDgyLDcgKzE0ODIsOCBAQCBwcml2YXRlOgogI2VuZGlm CiAKICAgICBUaW1lcjxEb2N1bWVudD4gbV9wZW5kaW5nVGFza3NUaW1lcjsKLSAgICBWZWN0b3I8 T3duUHRyPFRhc2s+ID4gbV9wZW5kaW5nVGFza3M7ICAgIAorICAgIFZlY3RvcjxPd25QdHI8VGFz az4gPiBtX3BlbmRpbmdUYXNrczsKKyAgICBib29sIG1fc3VzcGVuZGVkU2NoZWR1bGVkVGFza3M7 CiB9OwogCiAvLyBQdXQgdGhlc2UgbWV0aG9kcyBoZXJlLCBiZWNhdXNlIHRoZXkgcmVxdWlyZSB0 aGUgRG9jdW1lbnQgZGVmaW5pdGlvbiwgYnV0IHdlIHJlYWxseSB3YW50IHRvIGlubGluZSB0aGVt LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9DaHJvbWUuY3BwIGIvU291cmNlL1dl YkNvcmUvcGFnZS9DaHJvbWUuY3BwCmluZGV4IDJhMzE5MmIuLjg3YThjOGIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ2hyb21lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L0Nocm9tZS5jcHAKQEAgLTIyNyw3ICsyMjcsNyBAQCB2b2lkIENocm9tZTo6cnVuTW9kYWwoKSBj b25zdAogewogICAgIC8vIERlZmVyIGNhbGxiYWNrcyBpbiBhbGwgdGhlIG90aGVyIHBhZ2VzIGlu IHRoaXMgZ3JvdXAsIHNvIHdlIGRvbid0IHRyeSB0byBydW4gSmF2YVNjcmlwdAogICAgIC8vIGlu IGEgd2F5IHRoYXQgY291bGQgaW50ZXJhY3Qgd2l0aCB0aGlzIHZpZXcuCi0gICAgUGFnZUdyb3Vw TG9hZERlZmVycmVyIGRlZmVycmVyKG1fcGFnZSwgZmFsc2UpOworICAgIFBhZ2VHcm91cExvYWRE ZWZlcnJlciBkZWZlcnJlcihtX3BhZ2UsIGZhbHNlLCBBY3RpdmVET01PYmplY3Q6OldpbGxTaG93 RGlhbG9nKTsKIAogICAgIFRpbWVyQmFzZTo6ZmlyZVRpbWVyc0luTmVzdGVkRXZlbnRMb29wKCk7 CiAgICAgbV9jbGllbnQtPnJ1bk1vZGFsKCk7CkBAIC0yODcsNyArMjg3LDcgQEAgYm9vbCBDaHJv bWU6OnJ1bkJlZm9yZVVubG9hZENvbmZpcm1QYW5lbChjb25zdCBTdHJpbmcmIG1lc3NhZ2UsIEZy YW1lKiBmcmFtZSkKIHsKICAgICAvLyBEZWZlciBsb2FkcyBpbiBjYXNlIHRoZSBjbGllbnQgbWV0 aG9kIHJ1bnMgYSBuZXcgZXZlbnQgbG9vcCB0aGF0IHdvdWxkCiAgICAgLy8gb3RoZXJ3aXNlIGNh dXNlIHRoZSBsb2FkIHRvIGNvbnRpbnVlIHdoaWxlIHdlJ3JlIGluIHRoZSBtaWRkbGUgb2YgZXhl Y3V0aW5nIEphdmFTY3JpcHQuCi0gICAgUGFnZUdyb3VwTG9hZERlZmVycmVyIGRlZmVycmVyKG1f cGFnZSwgdHJ1ZSk7CisgICAgUGFnZUdyb3VwTG9hZERlZmVycmVyIGRlZmVycmVyKG1fcGFnZSwg dHJ1ZSwgQWN0aXZlRE9NT2JqZWN0OjpXaWxsU2hvd0RpYWxvZyk7CiAKICAgICByZXR1cm4gbV9j bGllbnQtPnJ1bkJlZm9yZVVubG9hZENvbmZpcm1QYW5lbChtZXNzYWdlLCBmcmFtZSk7CiB9CkBA IC0zMDQsNyArMzA0LDcgQEAgdm9pZCBDaHJvbWU6OnJ1bkphdmFTY3JpcHRBbGVydChGcmFtZSog ZnJhbWUsIGNvbnN0IFN0cmluZyYgbWVzc2FnZSkKIAogICAgIC8vIERlZmVyIGxvYWRzIGluIGNh c2UgdGhlIGNsaWVudCBtZXRob2QgcnVucyBhIG5ldyBldmVudCBsb29wIHRoYXQgd291bGQKICAg ICAvLyBvdGhlcndpc2UgY2F1c2UgdGhlIGxvYWQgdG8gY29udGludWUgd2hpbGUgd2UncmUgaW4g dGhlIG1pZGRsZSBvZiBleGVjdXRpbmcgSmF2YVNjcmlwdC4KLSAgICBQYWdlR3JvdXBMb2FkRGVm ZXJyZXIgZGVmZXJyZXIobV9wYWdlLCB0cnVlKTsKKyAgICBQYWdlR3JvdXBMb2FkRGVmZXJyZXIg ZGVmZXJyZXIobV9wYWdlLCB0cnVlLCBBY3RpdmVET01PYmplY3Q6OldpbGxTaG93RGlhbG9nKTsK IAogICAgIEFTU0VSVChmcmFtZSk7CiAgICAgbV9jbGllbnQtPnJ1bkphdmFTY3JpcHRBbGVydChm cmFtZSwgZnJhbWUtPmRpc3BsYXlTdHJpbmdNb2RpZmllZEJ5RW5jb2RpbmcobWVzc2FnZSkpOwpA QCAtMzE3LDcgKzMxNyw3IEBAIGJvb2wgQ2hyb21lOjpydW5KYXZhU2NyaXB0Q29uZmlybShGcmFt ZSogZnJhbWUsIGNvbnN0IFN0cmluZyYgbWVzc2FnZSkKIAogICAgIC8vIERlZmVyIGxvYWRzIGlu IGNhc2UgdGhlIGNsaWVudCBtZXRob2QgcnVucyBhIG5ldyBldmVudCBsb29wIHRoYXQgd291bGQK ICAgICAvLyBvdGhlcndpc2UgY2F1c2UgdGhlIGxvYWQgdG8gY29udGludWUgd2hpbGUgd2UncmUg aW4gdGhlIG1pZGRsZSBvZiBleGVjdXRpbmcgSmF2YVNjcmlwdC4KLSAgICBQYWdlR3JvdXBMb2Fk RGVmZXJyZXIgZGVmZXJyZXIobV9wYWdlLCB0cnVlKTsKKyAgICBQYWdlR3JvdXBMb2FkRGVmZXJy ZXIgZGVmZXJyZXIobV9wYWdlLCB0cnVlLCBBY3RpdmVET01PYmplY3Q6OldpbGxTaG93RGlhbG9n KTsKIAogICAgIEFTU0VSVChmcmFtZSk7CiAgICAgcmV0dXJuIG1fY2xpZW50LT5ydW5KYXZhU2Ny aXB0Q29uZmlybShmcmFtZSwgZnJhbWUtPmRpc3BsYXlTdHJpbmdNb2RpZmllZEJ5RW5jb2Rpbmco bWVzc2FnZSkpOwpAQCAtMzMwLDcgKzMzMCw3IEBAIGJvb2wgQ2hyb21lOjpydW5KYXZhU2NyaXB0 UHJvbXB0KEZyYW1lKiBmcmFtZSwgY29uc3QgU3RyaW5nJiBwcm9tcHQsIGNvbnN0IFN0cmluCiAK ICAgICAvLyBEZWZlciBsb2FkcyBpbiBjYXNlIHRoZSBjbGllbnQgbWV0aG9kIHJ1bnMgYSBuZXcg ZXZlbnQgbG9vcCB0aGF0IHdvdWxkCiAgICAgLy8gb3RoZXJ3aXNlIGNhdXNlIHRoZSBsb2FkIHRv IGNvbnRpbnVlIHdoaWxlIHdlJ3JlIGluIHRoZSBtaWRkbGUgb2YgZXhlY3V0aW5nIEphdmFTY3Jp cHQuCi0gICAgUGFnZUdyb3VwTG9hZERlZmVycmVyIGRlZmVycmVyKG1fcGFnZSwgdHJ1ZSk7Cisg ICAgUGFnZUdyb3VwTG9hZERlZmVycmVyIGRlZmVycmVyKG1fcGFnZSwgdHJ1ZSwgQWN0aXZlRE9N T2JqZWN0OjpXaWxsU2hvd0RpYWxvZyk7CiAKICAgICBBU1NFUlQoZnJhbWUpOwogICAgIGJvb2wg b2sgPSBtX2NsaWVudC0+cnVuSmF2YVNjcmlwdFByb21wdChmcmFtZSwgZnJhbWUtPmRpc3BsYXlT dHJpbmdNb2RpZmllZEJ5RW5jb2RpbmcocHJvbXB0KSwgZnJhbWUtPmRpc3BsYXlTdHJpbmdNb2Rp ZmllZEJ5RW5jb2RpbmcoZGVmYXVsdFZhbHVlKSwgcmVzdWx0KTsKQEAgLTM1MSw3ICszNTEsNyBA QCBib29sIENocm9tZTo6c2hvdWxkSW50ZXJydXB0SmF2YVNjcmlwdCgpCiB7CiAgICAgLy8gRGVm ZXIgbG9hZHMgaW4gY2FzZSB0aGUgY2xpZW50IG1ldGhvZCBydW5zIGEgbmV3IGV2ZW50IGxvb3Ag dGhhdCB3b3VsZAogICAgIC8vIG90aGVyd2lzZSBjYXVzZSB0aGUgbG9hZCB0byBjb250aW51ZSB3 aGlsZSB3ZSdyZSBpbiB0aGUgbWlkZGxlIG9mIGV4ZWN1dGluZyBKYXZhU2NyaXB0LgotICAgIFBh Z2VHcm91cExvYWREZWZlcnJlciBkZWZlcnJlcihtX3BhZ2UsIHRydWUpOworICAgIFBhZ2VHcm91 cExvYWREZWZlcnJlciBkZWZlcnJlcihtX3BhZ2UsIHRydWUsIEFjdGl2ZURPTU9iamVjdDo6V2ls bFNob3dEaWFsb2cpOwogCiAgICAgcmV0dXJuIG1fY2xpZW50LT5zaG91bGRJbnRlcnJ1cHRKYXZh U2NyaXB0KCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VHcm91cExv YWREZWZlcnJlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VHcm91cExvYWREZWZlcnJl ci5jcHAKaW5kZXggZTg1ZDQwZS4uMDI0NWM0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGFnZS9QYWdlR3JvdXBMb2FkRGVmZXJyZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv UGFnZUdyb3VwTG9hZERlZmVycmVyLmNwcApAQCAtMzMsNyArMzMsNyBAQCBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAKIHVzaW5nIG5hbWVzcGFjZSBzdGQ7CiAKLVBhZ2VHcm91cExvYWREZWZlcnJlcjo6 UGFnZUdyb3VwTG9hZERlZmVycmVyKFBhZ2UqIHBhZ2UsIGJvb2wgZGVmZXJTZWxmKQorUGFnZUdy b3VwTG9hZERlZmVycmVyOjpQYWdlR3JvdXBMb2FkRGVmZXJyZXIoUGFnZSogcGFnZSwgYm9vbCBk ZWZlclNlbGYsIEFjdGl2ZURPTU9iamVjdDo6UmVhc29uRm9yU3VzcGVuc2lvbiByZWFzb24pCiB7 CiAgICAgY29uc3QgSGFzaFNldDxQYWdlKj4mIHBhZ2VzID0gcGFnZS0+Z3JvdXAoKS5wYWdlcygp OwogCkBAIC00NiwxMCArNDYsOCBAQCBQYWdlR3JvdXBMb2FkRGVmZXJyZXI6OlBhZ2VHcm91cExv YWREZWZlcnJlcihQYWdlKiBwYWdlLCBib29sIGRlZmVyU2VsZikKIAogICAgICAgICAgICAgICAg IC8vIFRoaXMgY29kZSBpcyBub3QgbG9naWNhbGx5IHBhcnQgb2YgbG9hZCBkZWZlcnJpbmcsIGJ1 dCB3ZSBkbyBub3Qgd2FudCBKUyBjb2RlIGV4ZWN1dGVkIGJlbmVhdGggbW9kYWwKICAgICAgICAg ICAgICAgICAvLyB3aW5kb3dzIG9yIHNoZWV0cywgd2hpY2ggaXMgZXhhY3RseSB3aGVuIFBhZ2VH cm91cExvYWREZWZlcnJlciBpcyB1c2VkLgotICAgICAgICAgICAgICAgIC8vIE5PVEU6IGlmIFBh Z2VHcm91cExvYWREZWZlcnJlciBpcyBldmVyIHVzZWQgZm9yIHRhc2tzIG90aGVyIHRoYW4gc2hv d2luZyBhIG1vZGFsIHdpbmRvdyBvciBzaGVldCwKLSAgICAgICAgICAgICAgICAvLyB0aGUgY29u c3RydWN0b3Igd2lsbCBuZWVkIHRvIHRha2UgYSBBY3RpdmVET01PYmplY3Q6OlJlYXNvbkZvclN1 c3BlbnNpb24uCiAgICAgICAgICAgICAgICAgZm9yIChGcmFtZSogZnJhbWUgPSBvdGhlclBhZ2Ut Pm1haW5GcmFtZSgpOyBmcmFtZTsgZnJhbWUgPSBmcmFtZS0+dHJlZSgpLT50cmF2ZXJzZU5leHQo KSkKLSAgICAgICAgICAgICAgICAgICAgZnJhbWUtPmRvY3VtZW50KCktPnN1c3BlbmRTY2hlZHVs ZWRUYXNrcygpOworICAgICAgICAgICAgICAgICAgICBmcmFtZS0+ZG9jdW1lbnQoKS0+c3VzcGVu ZFNjaGVkdWxlZFRhc2tzKHJlYXNvbik7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VHcm91cExvYWREZWZlcnJlci5o IGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlR3JvdXBMb2FkRGVmZXJyZXIuaAppbmRleCBmNzk1 NmM0Li5jYjBkNDYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VHcm91cExv YWREZWZlcnJlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUdyb3VwTG9hZERlZmVy cmVyLmgKQEAgLTIwLDYgKzIwLDcgQEAKICNpZm5kZWYgUGFnZUdyb3VwTG9hZERlZmVycmVyX2gK ICNkZWZpbmUgUGFnZUdyb3VwTG9hZERlZmVycmVyX2gKIAorI2luY2x1ZGUgIkFjdGl2ZURPTU9i amVjdC5oIgogI2luY2x1ZGUgPHd0Zi9SZWZQdHIuaD4KICNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+ CiAKQEAgLTMxLDcgKzMyLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgIGNsYXNzIFBhZ2VH cm91cExvYWREZWZlcnJlciB7CiAgICAgICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKFBhZ2VHcm91 cExvYWREZWZlcnJlcik7CiAgICAgcHVibGljOgotICAgICAgICBQYWdlR3JvdXBMb2FkRGVmZXJy ZXIoUGFnZSosIGJvb2wgZGVmZXJTZWxmKTsKKyAgICAgICAgUGFnZUdyb3VwTG9hZERlZmVycmVy KFBhZ2UqLCBib29sIGRlZmVyU2VsZiwgQWN0aXZlRE9NT2JqZWN0OjpSZWFzb25Gb3JTdXNwZW5z aW9uKTsKICAgICAgICAgflBhZ2VHcm91cExvYWREZWZlcnJlcigpOwogCiAgICAgcHJpdmF0ZToK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZUdyb3VwTG9h ZERlZmVycmVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZUdyb3Vw TG9hZERlZmVycmVyLmNwcAppbmRleCAwODRmMmY0Li5mNjgyZTNiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VHcm91cExvYWREZWZlcnJlci5jcHAKKysr IGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlR3JvdXBMb2FkRGVmZXJyZXIu Y3BwCkBAIC0yOSw3ICsyOSw3IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogV2ViUGFnZUdyb3VwTG9h ZERlZmVycmVyOjpXZWJQYWdlR3JvdXBMb2FkRGVmZXJyZXIoV2ViUGFnZSogd2ViUGFnZSkKIHsK ICAgICBXZWJDb3JlOjpUaW1lckJhc2U6OmZpcmVUaW1lcnNJbk5lc3RlZEV2ZW50TG9vcCgpOwot ICAgIG1fcGFnZUdyb3VwTG9hZERlZmVycmVyID0gbmV3IFdlYkNvcmU6OlBhZ2VHcm91cExvYWRE ZWZlcnJlcih3ZWJQYWdlLT5kLT5tX3BhZ2UsIHRydWUgLyogZGVmZXIgdGhlIHBhZ2UgaXRzZWxm ICovKTsKKyAgICBtX3BhZ2VHcm91cExvYWREZWZlcnJlciA9IG5ldyBXZWJDb3JlOjpQYWdlR3Jv dXBMb2FkRGVmZXJyZXIod2ViUGFnZS0+ZC0+bV9wYWdlLCB0cnVlIC8qIGRlZmVyIHRoZSBwYWdl IGl0c2VsZiAqLywgV2ViQ29yZTo6QWN0aXZlRE9NT2JqZWN0OjpXaWxsU2hvd0RpYWxvZyk7CiB9 CiAKIFdlYlBhZ2VHcm91cExvYWREZWZlcnJlcjo6fldlYlBhZ2VHcm91cExvYWREZWZlcnJlcigp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwppbmRleCAyOGVmMTlkLi44ZDMwODEyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMi0wNC0yMCAg QnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg0NDkwCisgICAgICAgIFBhZ2VHcm91cExvYWRE ZWZlcnJlciBuZWVkcyB0byB0YWtlIGEgUmVhc29uRm9yU3VzcGVuc2lvbiBhcmd1bWVudAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogQXBpL1dlYlBh Z2VHcm91cExvYWREZWZlcnJlci5jcHA6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6Oldl YlBhZ2VHcm91cExvYWREZWZlcnJlcjo6V2ViUGFnZUdyb3VwTG9hZERlZmVycmVyKTogUGFzcyBh bG9uZyBBY3RpdmVET01PYmplY3Q6OldpbGxTaG93RGlhbG9nLAorICAgICAgICAgIHdoaWNoIHVz ZWQgdG8gYmUgdGhlIGRlZmF1bHQKKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0Nocm9tZUNs aWVudEJsYWNrQmVycnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2hyb21lQ2xpZW50QmxhY2tC ZXJyeTo6Y3JlYXRlV2luZG93KTogUGFzcyBhbG9uZyBBY3RpdmVET01PYmplY3Q6OldpbGxTaG93 RGlhbG9nLCB3aGljaCB1c2VkIHRvIGJlIHRoZSBkZWZhdWx0LgorICAgICAgICAoV2ViQ29yZTo6 Q2hyb21lQ2xpZW50QmxhY2tCZXJyeTo6cnVuT3BlblBhbmVsKTogRGl0dG8uCisKIDIwMTItMDQt MTkgIEFydmlkIE5pbHNzb24gIDxhbmlsc3NvbkByaW0uY29tPgogCiAgICAgICAgIFtCbGFja0Jl cnJ5XSBBbHdheXMgdXNlIHRoZSBBbmltYXRpb25GcmFtZVJhdGVDb250cm9sbGVyIGZvciBhY2Nl bGVyYXRlZCBhbmltYXRpb25zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkv V2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50QmxhY2tCZXJyeS5jcHAgYi9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50QmxhY2tCZXJyeS5jcHAKaW5k ZXggMjMzNjhkNS4uMzQ0MDBiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5 L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEJsYWNrQmVycnkuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRCbGFja0JlcnJ5LmNw cApAQCAtMjE2LDcgKzIxNiw3IEBAIFBhZ2UqIENocm9tZUNsaWVudEJsYWNrQmVycnk6OmNyZWF0 ZVdpbmRvdyhGcmFtZSosIGNvbnN0IEZyYW1lTG9hZFJlcXVlc3QmIHJlcXVlCiAgICAgICAgIHJl dHVybiAwOwogI2VuZGlmCiAKLSAgICBQYWdlR3JvdXBMb2FkRGVmZXJyZXIgZGVmZXJyZXIobV93 ZWJQYWdlUHJpdmF0ZS0+bV9wYWdlLCB0cnVlKTsKKyAgICBQYWdlR3JvdXBMb2FkRGVmZXJyZXIg ZGVmZXJyZXIobV93ZWJQYWdlUHJpdmF0ZS0+bV9wYWdlLCB0cnVlLCBBY3RpdmVET01PYmplY3Q6 OldpbGxTaG93RGlhbG9nKTsKICAgICBUaW1lckJhc2U6OmZpcmVUaW1lcnNJbk5lc3RlZEV2ZW50 TG9vcCgpOwogCiAgICAgaW50IHggPSBmZWF0dXJlcy54U2V0ID8gZmVhdHVyZXMueCA6IDA7CkBA IC00OTAsNyArNDkwLDcgQEAgdm9pZCBDaHJvbWVDbGllbnRCbGFja0JlcnJ5OjpydW5PcGVuUGFu ZWwoRnJhbWUqLCBQYXNzUmVmUHRyPEZpbGVDaG9vc2VyPiBjaG9vc2UKICAgICB1bnNpZ25lZCBp bnQgY2hvc2VuRmlsZVNpemU7CiAKICAgICB7Ci0gICAgICAgIFBhZ2VHcm91cExvYWREZWZlcnJl ciBkZWZlcnJlcihtX3dlYlBhZ2VQcml2YXRlLT5tX3BhZ2UsIHRydWUpOworICAgICAgICBQYWdl R3JvdXBMb2FkRGVmZXJyZXIgZGVmZXJyZXIobV93ZWJQYWdlUHJpdmF0ZS0+bV9wYWdlLCB0cnVl LCBBY3RpdmVET01PYmplY3Q6OldpbGxTaG93RGlhbG9nKTsKICAgICAgICAgVGltZXJCYXNlOjpm aXJlVGltZXJzSW5OZXN0ZWRFdmVudExvb3AoKTsKIAogICAgICAgICAvLyBGSVhNRTogVXNlIGNo b29zZXItPnNldHRpbmdzKCkuYWNjZXB0TUlNRVR5cGVzIGluc3RlYWQgb2YgV2ViU3RyaW5nKCkg Zm9yIHRoZSBzZWNvbmQgcGFyYW1ldGVyLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCA2 MTUxZDE4Li40Zjk1ZjhiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0 IEBACisyMDEyLTA0LTIwICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KKworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQ0OTAKKyAgICAg ICAgUGFnZUdyb3VwTG9hZERlZmVycmVyIG5lZWRzIHRvIHRha2UgYSBSZWFzb25Gb3JTdXNwZW5z aW9uIGFyZ3VtZW50CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBzcmMvV2ViVmlld0ltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3Ojp3 aWxsRW50ZXJNb2RhbExvb3ApOiBQYXNzIGFsb25nIEFjdGl2ZURPTU9iamVjdDo6V2lsbFNob3dE aWFsb2csIHdoaWNoIHVzZWQKKyAgICAgICAgICB0byBiZSB0aGUgZGVmYXVsdC4KKwogMjAxMi0w NC0yMCAgRGFuYSBKYW5zZW5zICA8ZGFuYWtqQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hy b21pdW1dIFNvbWUgZmlsdGVycyByZXF1aXJlIGluZmxhdGluZyBkYW1hZ2UgcmVjdCBpbiBDQ0Rh bWFnZVRyYWNrZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZp ZXdJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcApp bmRleCBkZDY4NTFlLi5lMzUwM2UxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJWaWV3SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi Vmlld0ltcGwuY3BwCkBAIC0yNzksNyArMjc5LDcgQEAgdm9pZCBXZWJWaWV3Ojp3aWxsRW50ZXJN b2RhbExvb3AoKQogICAgICAgICBwYWdlR3JvdXBMb2FkRGVmZXJyZXJTdGFjaygpLmFwcGVuZChz dGF0aWNfY2FzdDxQYWdlR3JvdXBMb2FkRGVmZXJyZXIqPigwKSk7CiAgICAgZWxzZSB7CiAgICAg ICAgIC8vIFBpY2sgYW55IHBhZ2UgaW4gdGhlIHBhZ2UgZ3JvdXAgc2luY2Ugd2UgYXJlIGRlZmVy cmluZyBhbGwgcGFnZXMuCi0gICAgICAgIHBhZ2VHcm91cExvYWREZWZlcnJlclN0YWNrKCkuYXBw ZW5kKG5ldyBQYWdlR3JvdXBMb2FkRGVmZXJyZXIoKnBhZ2VHcm91cC0+cGFnZXMoKS5iZWdpbigp LCB0cnVlKSk7CisgICAgICAgIHBhZ2VHcm91cExvYWREZWZlcnJlclN0YWNrKCkuYXBwZW5kKG5l dyBQYWdlR3JvdXBMb2FkRGVmZXJyZXIoKnBhZ2VHcm91cC0+cGFnZXMoKS5iZWdpbigpLCB0cnVl LCBBY3RpdmVET01PYmplY3Q6OldpbGxTaG93RGlhbG9nKSk7CiAgICAgfQogfQogCg==