84512 2012-04-20 16:46:42 -0700 Repurpose ActiveDOMObject::WillShowDialog to WillDeferLoading 2012-04-20 17:07:33 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 beidson beidson ap eric.carlson feature-media-reviews jchaffraix webkit.review.bot yong.li.webkit oldest_to_newest 607048 0 beidson 2012-04-20 16:46:42 -0700 Repurpose ActiveDOMObject::WillShowDialog to WillDeferLoading All of the ActiveDOMObject ReasonForSuspensions are great, but only a *single* subclass does anything special for a particular Reason. And it's not WillShowDialog. WillShowDialog is used whenever we defer page loading and has no special meaning beyond that. We should rename it, then use it by default in all page load deferral cases without having to pass the argument around. Noticed while exploring https://bugs.webkit.org/show_bug.cgi?id=84488 607062 1 138199 beidson 2012-04-20 16:51:48 -0700 Created attachment 138199 Patch v1 - Do the rename and get rid of the unnecessary argument 607076 2 beidson 2012-04-20 17:07:33 -0700 http://trac.webkit.org/changeset/114802 138199 2012-04-20 16:51:48 -0700 2012-04-20 17:05:00 -0700 Patch v1 - Do the rename and get rid of the unnecessary argument patch.txt text/plain 12174 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjNjJjZTc5Li4zMWEyMzg5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzMg QEAKIDIwMTItMDQtMjAgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDUxMgorICAgICAg ICBSZXB1cnBvc2UgQWN0aXZlRE9NT2JqZWN0OjpXaWxsU2hvd0RpYWxvZyB0byBXaWxsRGVmZXJM b2FkaW5nCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg Tm8gbmV3IHRlc3RzLiAoUmVmYWN0b3IsIG5vIGJlaGF2aW9yIGNoYW5nZSkKKworICAgICAgICBS ZW5hbWUgV2lsbFNob3dEaWFsb2cgdG8gV2lsbERlZmVyTG9hZGluZzoKKyAgICAgICAgKiBkb20v QWN0aXZlRE9NT2JqZWN0Lmg6CisgICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnN1c3BlbmQpOgorCisgICAgICAg IERvbid0IHRha2UgYSBSZWFzb25Gb3JTdXNwZW5zaW9uIGFyZ3VtZW50IGFueW1vcmUsIGp1c3Qg dXNlIFdpbGxEZWZlckxvYWRpbmc6CisgICAgICAgICogcGFnZS9QYWdlR3JvdXBMb2FkRGVmZXJy ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGFnZUdyb3VwTG9hZERlZmVycmVyOjpQYWdlR3Jv dXBMb2FkRGVmZXJyZXIpOgorICAgICAgICAqIHBhZ2UvUGFnZUdyb3VwTG9hZERlZmVycmVyLmg6 CisKKyAgICAgICAgRG9uJ3QgcGFzcyBhIFJlYXNvbiBhbnltb3JlIGFzIFdpbGxEZWZlckxvYWRp bmcgaXMgdXNlZCBieSBkZWZhdWx0OgorICAgICAgICAqIHBhZ2UvQ2hyb21lLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkNocm9tZTo6cnVuTW9kYWwpOgorICAgICAgICAoV2ViQ29yZTo6Q2hyb21l OjpydW5CZWZvcmVVbmxvYWRDb25maXJtUGFuZWwpOgorICAgICAgICAoV2ViQ29yZTo6Q2hyb21l OjpydW5KYXZhU2NyaXB0QWxlcnQpOgorICAgICAgICAoV2ViQ29yZTo6Q2hyb21lOjpydW5KYXZh U2NyaXB0Q29uZmlybSk6CisgICAgICAgIChXZWJDb3JlOjpDaHJvbWU6OnJ1bkphdmFTY3JpcHRQ cm9tcHQpOgorICAgICAgICAoV2ViQ29yZTo6Q2hyb21lOjpzaG91bGRJbnRlcnJ1cHRKYXZhU2Ny aXB0KToKKworMjAxMi0wNC0yMCAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CisK ICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg0NDkwCiAg ICAgICAgIFBhZ2VHcm91cExvYWREZWZlcnJlciBuZWVkcyB0byB0YWtlIGEgUmVhc29uRm9yU3Vz cGVuc2lvbiBhcmd1bWVudAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vQWN0aXZl RE9NT2JqZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vQWN0aXZlRE9NT2JqZWN0LmgKaW5kZXgg MmE2YjFhZS4uYjRhYmRhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0FjdGl2ZURP TU9iamVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9BY3RpdmVET01PYmplY3QuaApAQCAt NTMsNyArNTMsNyBAQCBwdWJsaWM6CiAgICAgLy8gdG8gc3RvcCB0aGUgb2JqZWN0LiBFeGFjdCBz ZW1hbnRpY3Mgb2Ygc3VzcGVuZCBpcyB1cCB0byB0aGUgb2JqZWN0IHRoZW4uCiAgICAgZW51bSBS ZWFzb25Gb3JTdXNwZW5zaW9uIHsKICAgICAgICAgSmF2YVNjcmlwdERlYnVnZ2VyUGF1c2VkLAot ICAgICAgICBXaWxsU2hvd0RpYWxvZywKKyAgICAgICAgV2lsbERlZmVyTG9hZGluZywKICAgICAg ICAgRG9jdW1lbnRXaWxsQmVjb21lSW5hY3RpdmUsCiAgICAgICAgIFBhZ2VXaWxsQmVTdXNwZW5k ZWQKICAgICB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVt ZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKaW5kZXgg YWMzNzAwZi4uMmEyNzZhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVk aWFFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQu Y3BwCkBAIC0zNzE5LDcgKzM3MTksNyBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnN1c3BlbmQo UmVhc29uRm9yU3VzcGVuc2lvbiB3aHkpCiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2Fz ZSBQYWdlV2lsbEJlU3VzcGVuZGVkOgogICAgICAgICBjYXNlIEphdmFTY3JpcHREZWJ1Z2dlclBh dXNlZDoKLSAgICAgICAgY2FzZSBXaWxsU2hvd0RpYWxvZzoKKyAgICAgICAgY2FzZSBXaWxsRGVm ZXJMb2FkaW5nOgogICAgICAgICAgICAgLy8gRG8gbm90aGluZywgd2UgZG9uJ3QgcGF1c2UgbWVk aWEgcGxheWJhY2sgaW4gdGhlc2UgY2FzZXMuCiAgICAgICAgICAgICBicmVhazsKICAgICB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Nocm9tZS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0Nocm9tZS5jcHAKaW5kZXggODdhOGM4Yi4uMmEzMTkyYiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGFnZS9DaHJvbWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ2hy b21lLmNwcApAQCAtMjI3LDcgKzIyNyw3IEBAIHZvaWQgQ2hyb21lOjpydW5Nb2RhbCgpIGNvbnN0 CiB7CiAgICAgLy8gRGVmZXIgY2FsbGJhY2tzIGluIGFsbCB0aGUgb3RoZXIgcGFnZXMgaW4gdGhp cyBncm91cCwgc28gd2UgZG9uJ3QgdHJ5IHRvIHJ1biBKYXZhU2NyaXB0CiAgICAgLy8gaW4gYSB3 YXkgdGhhdCBjb3VsZCBpbnRlcmFjdCB3aXRoIHRoaXMgdmlldy4KLSAgICBQYWdlR3JvdXBMb2Fk RGVmZXJyZXIgZGVmZXJyZXIobV9wYWdlLCBmYWxzZSwgQWN0aXZlRE9NT2JqZWN0OjpXaWxsU2hv d0RpYWxvZyk7CisgICAgUGFnZUdyb3VwTG9hZERlZmVycmVyIGRlZmVycmVyKG1fcGFnZSwgZmFs c2UpOwogCiAgICAgVGltZXJCYXNlOjpmaXJlVGltZXJzSW5OZXN0ZWRFdmVudExvb3AoKTsKICAg ICBtX2NsaWVudC0+cnVuTW9kYWwoKTsKQEAgLTI4Nyw3ICsyODcsNyBAQCBib29sIENocm9tZTo6 cnVuQmVmb3JlVW5sb2FkQ29uZmlybVBhbmVsKGNvbnN0IFN0cmluZyYgbWVzc2FnZSwgRnJhbWUq IGZyYW1lKQogewogICAgIC8vIERlZmVyIGxvYWRzIGluIGNhc2UgdGhlIGNsaWVudCBtZXRob2Qg cnVucyBhIG5ldyBldmVudCBsb29wIHRoYXQgd291bGQKICAgICAvLyBvdGhlcndpc2UgY2F1c2Ug dGhlIGxvYWQgdG8gY29udGludWUgd2hpbGUgd2UncmUgaW4gdGhlIG1pZGRsZSBvZiBleGVjdXRp bmcgSmF2YVNjcmlwdC4KLSAgICBQYWdlR3JvdXBMb2FkRGVmZXJyZXIgZGVmZXJyZXIobV9wYWdl LCB0cnVlLCBBY3RpdmVET01PYmplY3Q6OldpbGxTaG93RGlhbG9nKTsKKyAgICBQYWdlR3JvdXBM b2FkRGVmZXJyZXIgZGVmZXJyZXIobV9wYWdlLCB0cnVlKTsKIAogICAgIHJldHVybiBtX2NsaWVu dC0+cnVuQmVmb3JlVW5sb2FkQ29uZmlybVBhbmVsKG1lc3NhZ2UsIGZyYW1lKTsKIH0KQEAgLTMw NCw3ICszMDQsNyBAQCB2b2lkIENocm9tZTo6cnVuSmF2YVNjcmlwdEFsZXJ0KEZyYW1lKiBmcmFt ZSwgY29uc3QgU3RyaW5nJiBtZXNzYWdlKQogCiAgICAgLy8gRGVmZXIgbG9hZHMgaW4gY2FzZSB0 aGUgY2xpZW50IG1ldGhvZCBydW5zIGEgbmV3IGV2ZW50IGxvb3AgdGhhdCB3b3VsZAogICAgIC8v IG90aGVyd2lzZSBjYXVzZSB0aGUgbG9hZCB0byBjb250aW51ZSB3aGlsZSB3ZSdyZSBpbiB0aGUg bWlkZGxlIG9mIGV4ZWN1dGluZyBKYXZhU2NyaXB0LgotICAgIFBhZ2VHcm91cExvYWREZWZlcnJl ciBkZWZlcnJlcihtX3BhZ2UsIHRydWUsIEFjdGl2ZURPTU9iamVjdDo6V2lsbFNob3dEaWFsb2cp OworICAgIFBhZ2VHcm91cExvYWREZWZlcnJlciBkZWZlcnJlcihtX3BhZ2UsIHRydWUpOwogCiAg ICAgQVNTRVJUKGZyYW1lKTsKICAgICBtX2NsaWVudC0+cnVuSmF2YVNjcmlwdEFsZXJ0KGZyYW1l LCBmcmFtZS0+ZGlzcGxheVN0cmluZ01vZGlmaWVkQnlFbmNvZGluZyhtZXNzYWdlKSk7CkBAIC0z MTcsNyArMzE3LDcgQEAgYm9vbCBDaHJvbWU6OnJ1bkphdmFTY3JpcHRDb25maXJtKEZyYW1lKiBm cmFtZSwgY29uc3QgU3RyaW5nJiBtZXNzYWdlKQogCiAgICAgLy8gRGVmZXIgbG9hZHMgaW4gY2Fz ZSB0aGUgY2xpZW50IG1ldGhvZCBydW5zIGEgbmV3IGV2ZW50IGxvb3AgdGhhdCB3b3VsZAogICAg IC8vIG90aGVyd2lzZSBjYXVzZSB0aGUgbG9hZCB0byBjb250aW51ZSB3aGlsZSB3ZSdyZSBpbiB0 aGUgbWlkZGxlIG9mIGV4ZWN1dGluZyBKYXZhU2NyaXB0LgotICAgIFBhZ2VHcm91cExvYWREZWZl cnJlciBkZWZlcnJlcihtX3BhZ2UsIHRydWUsIEFjdGl2ZURPTU9iamVjdDo6V2lsbFNob3dEaWFs b2cpOworICAgIFBhZ2VHcm91cExvYWREZWZlcnJlciBkZWZlcnJlcihtX3BhZ2UsIHRydWUpOwog CiAgICAgQVNTRVJUKGZyYW1lKTsKICAgICByZXR1cm4gbV9jbGllbnQtPnJ1bkphdmFTY3JpcHRD b25maXJtKGZyYW1lLCBmcmFtZS0+ZGlzcGxheVN0cmluZ01vZGlmaWVkQnlFbmNvZGluZyhtZXNz YWdlKSk7CkBAIC0zMzAsNyArMzMwLDcgQEAgYm9vbCBDaHJvbWU6OnJ1bkphdmFTY3JpcHRQcm9t cHQoRnJhbWUqIGZyYW1lLCBjb25zdCBTdHJpbmcmIHByb21wdCwgY29uc3QgU3RyaW4KIAogICAg IC8vIERlZmVyIGxvYWRzIGluIGNhc2UgdGhlIGNsaWVudCBtZXRob2QgcnVucyBhIG5ldyBldmVu dCBsb29wIHRoYXQgd291bGQKICAgICAvLyBvdGhlcndpc2UgY2F1c2UgdGhlIGxvYWQgdG8gY29u dGludWUgd2hpbGUgd2UncmUgaW4gdGhlIG1pZGRsZSBvZiBleGVjdXRpbmcgSmF2YVNjcmlwdC4K LSAgICBQYWdlR3JvdXBMb2FkRGVmZXJyZXIgZGVmZXJyZXIobV9wYWdlLCB0cnVlLCBBY3RpdmVE T01PYmplY3Q6OldpbGxTaG93RGlhbG9nKTsKKyAgICBQYWdlR3JvdXBMb2FkRGVmZXJyZXIgZGVm ZXJyZXIobV9wYWdlLCB0cnVlKTsKIAogICAgIEFTU0VSVChmcmFtZSk7CiAgICAgYm9vbCBvayA9 IG1fY2xpZW50LT5ydW5KYXZhU2NyaXB0UHJvbXB0KGZyYW1lLCBmcmFtZS0+ZGlzcGxheVN0cmlu Z01vZGlmaWVkQnlFbmNvZGluZyhwcm9tcHQpLCBmcmFtZS0+ZGlzcGxheVN0cmluZ01vZGlmaWVk QnlFbmNvZGluZyhkZWZhdWx0VmFsdWUpLCByZXN1bHQpOwpAQCAtMzUxLDcgKzM1MSw3IEBAIGJv b2wgQ2hyb21lOjpzaG91bGRJbnRlcnJ1cHRKYXZhU2NyaXB0KCkKIHsKICAgICAvLyBEZWZlciBs b2FkcyBpbiBjYXNlIHRoZSBjbGllbnQgbWV0aG9kIHJ1bnMgYSBuZXcgZXZlbnQgbG9vcCB0aGF0 IHdvdWxkCiAgICAgLy8gb3RoZXJ3aXNlIGNhdXNlIHRoZSBsb2FkIHRvIGNvbnRpbnVlIHdoaWxl IHdlJ3JlIGluIHRoZSBtaWRkbGUgb2YgZXhlY3V0aW5nIEphdmFTY3JpcHQuCi0gICAgUGFnZUdy b3VwTG9hZERlZmVycmVyIGRlZmVycmVyKG1fcGFnZSwgdHJ1ZSwgQWN0aXZlRE9NT2JqZWN0OjpX aWxsU2hvd0RpYWxvZyk7CisgICAgUGFnZUdyb3VwTG9hZERlZmVycmVyIGRlZmVycmVyKG1fcGFn ZSwgdHJ1ZSk7CiAKICAgICByZXR1cm4gbV9jbGllbnQtPnNob3VsZEludGVycnVwdEphdmFTY3Jp cHQoKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUdyb3VwTG9hZERl ZmVycmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUdyb3VwTG9hZERlZmVycmVyLmNw cAppbmRleCAwMjQ1YzQwLi43NTFhNzk4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L1BhZ2VHcm91cExvYWREZWZlcnJlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdl R3JvdXBMb2FkRGVmZXJyZXIuY3BwCkBAIC0zMyw3ICszMyw3IEBAIG5hbWVzcGFjZSBXZWJDb3Jl IHsKIAogdXNpbmcgbmFtZXNwYWNlIHN0ZDsKIAotUGFnZUdyb3VwTG9hZERlZmVycmVyOjpQYWdl R3JvdXBMb2FkRGVmZXJyZXIoUGFnZSogcGFnZSwgYm9vbCBkZWZlclNlbGYsIEFjdGl2ZURPTU9i amVjdDo6UmVhc29uRm9yU3VzcGVuc2lvbiByZWFzb24pCitQYWdlR3JvdXBMb2FkRGVmZXJyZXI6 OlBhZ2VHcm91cExvYWREZWZlcnJlcihQYWdlKiBwYWdlLCBib29sIGRlZmVyU2VsZikKIHsKICAg ICBjb25zdCBIYXNoU2V0PFBhZ2UqPiYgcGFnZXMgPSBwYWdlLT5ncm91cCgpLnBhZ2VzKCk7CiAK QEAgLTQ3LDcgKzQ3LDcgQEAgUGFnZUdyb3VwTG9hZERlZmVycmVyOjpQYWdlR3JvdXBMb2FkRGVm ZXJyZXIoUGFnZSogcGFnZSwgYm9vbCBkZWZlclNlbGYsIEFjdGl2ZUQKICAgICAgICAgICAgICAg ICAvLyBUaGlzIGNvZGUgaXMgbm90IGxvZ2ljYWxseSBwYXJ0IG9mIGxvYWQgZGVmZXJyaW5nLCBi dXQgd2UgZG8gbm90IHdhbnQgSlMgY29kZSBleGVjdXRlZCBiZW5lYXRoIG1vZGFsCiAgICAgICAg ICAgICAgICAgLy8gd2luZG93cyBvciBzaGVldHMsIHdoaWNoIGlzIGV4YWN0bHkgd2hlbiBQYWdl R3JvdXBMb2FkRGVmZXJyZXIgaXMgdXNlZC4KICAgICAgICAgICAgICAgICBmb3IgKEZyYW1lKiBm cmFtZSA9IG90aGVyUGFnZS0+bWFpbkZyYW1lKCk7IGZyYW1lOyBmcmFtZSA9IGZyYW1lLT50cmVl KCktPnRyYXZlcnNlTmV4dCgpKQotICAgICAgICAgICAgICAgICAgICBmcmFtZS0+ZG9jdW1lbnQo KS0+c3VzcGVuZFNjaGVkdWxlZFRhc2tzKHJlYXNvbik7CisgICAgICAgICAgICAgICAgICAgIGZy YW1lLT5kb2N1bWVudCgpLT5zdXNwZW5kU2NoZWR1bGVkVGFza3MoQWN0aXZlRE9NT2JqZWN0OjpX aWxsRGVmZXJMb2FkaW5nKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUdyb3VwTG9hZERlZmVycmVyLmggYi9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL1BhZ2VHcm91cExvYWREZWZlcnJlci5oCmluZGV4IGNiMGQ0NjAuLmY3 OTU2YzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUdyb3VwTG9hZERlZmVy cmVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlR3JvdXBMb2FkRGVmZXJyZXIuaApA QCAtMjAsNyArMjAsNiBAQAogI2lmbmRlZiBQYWdlR3JvdXBMb2FkRGVmZXJyZXJfaAogI2RlZmlu ZSBQYWdlR3JvdXBMb2FkRGVmZXJyZXJfaAogCi0jaW5jbHVkZSAiQWN0aXZlRE9NT2JqZWN0Lmgi CiAjaW5jbHVkZSA8d3RmL1JlZlB0ci5oPgogI2luY2x1ZGUgPHd0Zi9WZWN0b3IuaD4KIApAQCAt MzIsNyArMzEsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgY2xhc3MgUGFnZUdyb3VwTG9h ZERlZmVycmVyIHsKICAgICAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoUGFnZUdyb3VwTG9hZERl ZmVycmVyKTsKICAgICBwdWJsaWM6Ci0gICAgICAgIFBhZ2VHcm91cExvYWREZWZlcnJlcihQYWdl KiwgYm9vbCBkZWZlclNlbGYsIEFjdGl2ZURPTU9iamVjdDo6UmVhc29uRm9yU3VzcGVuc2lvbik7 CisgICAgICAgIFBhZ2VHcm91cExvYWREZWZlcnJlcihQYWdlKiwgYm9vbCBkZWZlclNlbGYpOwog ICAgICAgICB+UGFnZUdyb3VwTG9hZERlZmVycmVyKCk7CiAKICAgICBwcml2YXRlOgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlR3JvdXBMb2FkRGVmZXJy ZXIuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlR3JvdXBMb2FkRGVm ZXJyZXIuY3BwCmluZGV4IGY2ODJlM2IuLjA4NGYyZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZUdyb3VwTG9hZERlZmVycmVyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VHcm91cExvYWREZWZlcnJlci5jcHAKQEAg LTI5LDcgKzI5LDcgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiBXZWJQYWdlR3JvdXBMb2FkRGVmZXJy ZXI6OldlYlBhZ2VHcm91cExvYWREZWZlcnJlcihXZWJQYWdlKiB3ZWJQYWdlKQogewogICAgIFdl YkNvcmU6OlRpbWVyQmFzZTo6ZmlyZVRpbWVyc0luTmVzdGVkRXZlbnRMb29wKCk7Ci0gICAgbV9w YWdlR3JvdXBMb2FkRGVmZXJyZXIgPSBuZXcgV2ViQ29yZTo6UGFnZUdyb3VwTG9hZERlZmVycmVy KHdlYlBhZ2UtPmQtPm1fcGFnZSwgdHJ1ZSAvKiBkZWZlciB0aGUgcGFnZSBpdHNlbGYgKi8sIFdl YkNvcmU6OkFjdGl2ZURPTU9iamVjdDo6V2lsbFNob3dEaWFsb2cpOworICAgIG1fcGFnZUdyb3Vw TG9hZERlZmVycmVyID0gbmV3IFdlYkNvcmU6OlBhZ2VHcm91cExvYWREZWZlcnJlcih3ZWJQYWdl LT5kLT5tX3BhZ2UsIHRydWUgLyogZGVmZXIgdGhlIHBhZ2UgaXRzZWxmICovKTsKIH0KIAogV2Vi UGFnZUdyb3VwTG9hZERlZmVycmVyOjp+V2ViUGFnZUdyb3VwTG9hZERlZmVycmVyKCkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCmluZGV4IDJkYjk3ODQuLmYxYzY3ZDkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9i bGFja2JlcnJ5L0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIyIEBACiAyMDEyLTA0LTIwICBCcmFkeSBF aWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KIAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQ1MTIKKyAgICAgICAgUmVwdXJwb3NlIEFjdGl2ZURPTU9i amVjdDo6V2lsbFNob3dEaWFsb2cgdG8gV2lsbERlZmVyTG9hZGluZworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBhZ2VHcm91cExvYWREZWZlcnJlcidz IGRvbid0IHRha2UgYSBSZWFzb25Gb3JTdXNwZW5zaW9uIGFyZ3VtZW50IGFueW1vcmU7CisgICAg ICAgIFRoZXkganVzdCB1c2UgV2lsbERlZmVyTG9hZGluZyBieSBkZWZhdWx0LgorCisgICAgICAg ICogQXBpL1dlYlBhZ2VHcm91cExvYWREZWZlcnJlci5jcHA6CisgICAgICAgIChCbGFja0JlcnJ5 OjpXZWJLaXQ6OldlYlBhZ2VHcm91cExvYWREZWZlcnJlcjo6V2ViUGFnZUdyb3VwTG9hZERlZmVy cmVyKToKKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEJsYWNrQmVycnku Y3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2hyb21lQ2xpZW50QmxhY2tCZXJyeTo6Y3JlYXRlV2lu ZG93KToKKyAgICAgICAgKFdlYkNvcmU6OkNocm9tZUNsaWVudEJsYWNrQmVycnk6OnJ1bk9wZW5Q YW5lbCk6CisKKzIwMTItMDQtMjAgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgor CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDQ5MAog ICAgICAgICBQYWdlR3JvdXBMb2FkRGVmZXJyZXIgbmVlZHMgdG8gdGFrZSBhIFJlYXNvbkZvclN1 c3BlbnNpb24gYXJndW1lbnQKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5 L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEJsYWNrQmVycnkuY3BwIGIvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEJsYWNrQmVycnkuY3BwCmlu ZGV4IDM0NDAwYjQuLjIzMzY4ZDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJy eS9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRCbGFja0JlcnJ5LmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50QmxhY2tCZXJyeS5j cHAKQEAgLTIxNiw3ICsyMTYsNyBAQCBQYWdlKiBDaHJvbWVDbGllbnRCbGFja0JlcnJ5OjpjcmVh dGVXaW5kb3coRnJhbWUqLCBjb25zdCBGcmFtZUxvYWRSZXF1ZXN0JiByZXF1ZQogICAgICAgICBy ZXR1cm4gMDsKICNlbmRpZgogCi0gICAgUGFnZUdyb3VwTG9hZERlZmVycmVyIGRlZmVycmVyKG1f d2ViUGFnZVByaXZhdGUtPm1fcGFnZSwgdHJ1ZSwgQWN0aXZlRE9NT2JqZWN0OjpXaWxsU2hvd0Rp YWxvZyk7CisgICAgUGFnZUdyb3VwTG9hZERlZmVycmVyIGRlZmVycmVyKG1fd2ViUGFnZVByaXZh dGUtPm1fcGFnZSwgdHJ1ZSk7CiAgICAgVGltZXJCYXNlOjpmaXJlVGltZXJzSW5OZXN0ZWRFdmVu dExvb3AoKTsKIAogICAgIGludCB4ID0gZmVhdHVyZXMueFNldCA/IGZlYXR1cmVzLnggOiAwOwpA QCAtNDkwLDcgKzQ5MCw3IEBAIHZvaWQgQ2hyb21lQ2xpZW50QmxhY2tCZXJyeTo6cnVuT3BlblBh bmVsKEZyYW1lKiwgUGFzc1JlZlB0cjxGaWxlQ2hvb3Nlcj4gY2hvb3NlCiAgICAgdW5zaWduZWQg aW50IGNob3NlbkZpbGVTaXplOwogCiAgICAgewotICAgICAgICBQYWdlR3JvdXBMb2FkRGVmZXJy ZXIgZGVmZXJyZXIobV93ZWJQYWdlUHJpdmF0ZS0+bV9wYWdlLCB0cnVlLCBBY3RpdmVET01PYmpl Y3Q6OldpbGxTaG93RGlhbG9nKTsKKyAgICAgICAgUGFnZUdyb3VwTG9hZERlZmVycmVyIGRlZmVy cmVyKG1fd2ViUGFnZVByaXZhdGUtPm1fcGFnZSwgdHJ1ZSk7CiAgICAgICAgIFRpbWVyQmFzZTo6 ZmlyZVRpbWVyc0luTmVzdGVkRXZlbnRMb29wKCk7CiAKICAgICAgICAgLy8gRklYTUU6IFVzZSBj aG9vc2VyLT5zZXR0aW5ncygpLmFjY2VwdE1JTUVUeXBlcyBpbnN0ZWFkIG9mIFdlYlN0cmluZygp IGZvciB0aGUgc2Vjb25kIHBhcmFtZXRlci4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg MzExN2VjYi4uNzQ1NDNhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwx OCBAQAogMjAxMi0wNC0yMCAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg0NTEyCisgICAg ICAgIFJlcHVycG9zZSBBY3RpdmVET01PYmplY3Q6OldpbGxTaG93RGlhbG9nIHRvIFdpbGxEZWZl ckxvYWRpbmcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBQYWdlR3JvdXBMb2FkRGVmZXJyZXIncyBkb24ndCB0YWtlIGEgUmVhc29uRm9yU3VzcGVuc2lv biBhcmd1bWVudCBhbnltb3JlOworICAgICAgICBUaGV5IGp1c3QgdXNlIFdpbGxEZWZlckxvYWRp bmcgYnkgZGVmYXVsdC4KKworICAgICAgICAqIHNyYy9XZWJWaWV3SW1wbC5jcHA6CisgICAgICAg IChXZWJLaXQ6OldlYlZpZXc6OndpbGxFbnRlck1vZGFsTG9vcCk6CisKKzIwMTItMDQtMjAgIEJy YWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCiAgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDQ5MAogICAgICAgICBQYWdlR3JvdXBMb2FkRGVm ZXJyZXIgbmVlZHMgdG8gdGFrZSBhIFJlYXNvbkZvclN1c3BlbnNpb24gYXJndW1lbnQKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwIGIvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCmluZGV4IGUzNTAzZTEuLmRk Njg1MWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBs LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAg LTI3OSw3ICsyNzksNyBAQCB2b2lkIFdlYlZpZXc6OndpbGxFbnRlck1vZGFsTG9vcCgpCiAgICAg ICAgIHBhZ2VHcm91cExvYWREZWZlcnJlclN0YWNrKCkuYXBwZW5kKHN0YXRpY19jYXN0PFBhZ2VH cm91cExvYWREZWZlcnJlcio+KDApKTsKICAgICBlbHNlIHsKICAgICAgICAgLy8gUGljayBhbnkg cGFnZSBpbiB0aGUgcGFnZSBncm91cCBzaW5jZSB3ZSBhcmUgZGVmZXJyaW5nIGFsbCBwYWdlcy4K LSAgICAgICAgcGFnZUdyb3VwTG9hZERlZmVycmVyU3RhY2soKS5hcHBlbmQobmV3IFBhZ2VHcm91 cExvYWREZWZlcnJlcigqcGFnZUdyb3VwLT5wYWdlcygpLmJlZ2luKCksIHRydWUsIEFjdGl2ZURP TU9iamVjdDo6V2lsbFNob3dEaWFsb2cpKTsKKyAgICAgICAgcGFnZUdyb3VwTG9hZERlZmVycmVy U3RhY2soKS5hcHBlbmQobmV3IFBhZ2VHcm91cExvYWREZWZlcnJlcigqcGFnZUdyb3VwLT5wYWdl cygpLmJlZ2luKCksIHRydWUpKTsKICAgICB9CiB9CiAK