144832 2015-05-09 15:12:42 -0700 Page overlay action context override should indicate the source of the request 2015-05-11 10:42:01 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton andersca bdakin commit-queue oldest_to_newest 1093448 0 thorton 2015-05-09 15:12:42 -0700 Page overlay action context override should indicate the source of the request 1093449 1 252785 thorton 2015-05-09 15:13:22 -0700 Created attachment 252785 Patch 1093450 2 commit-queue 2015-05-09 15:15:18 -0700 Attachment 252785 did not pass style-queue: ERROR: Source/WebKit2/WebProcess/WebPage/WebPageOverlay.cpp:123: Declaration has space between type name and * in DDActionContext *WebPageOverlay [whitespace/declaration] [3] Total errors found: 1 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 1093567 3 252785 darin 2015-05-10 13:54:57 -0700 Comment on attachment 252785 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=252785&action=review > Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h:47 > +typedef uint32_t _WKBundlePageOverlayActionContextRequestType; Not sure I understand the rationale behind the leading underscore here. 1093796 4 thorton 2015-05-11 10:42:01 -0700 (In reply to comment #3) > Comment on attachment 252785 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=252785&action=review > > > Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h:47 > > +typedef uint32_t _WKBundlePageOverlayActionContextRequestType; > > Not sure I understand the rationale behind the leading underscore here. I think it's to avoid naming conflicts with potential future Modern API enum names (the enum values are similarly uniqified by the leading 'k'). Anders points out that this doesn't help if we want to add Modern SPI (because that would have a leading underscore as well), but we don't really have a plan for that yet. https://trac.webkit.org/changeset/184106 252785 2015-05-09 15:13:22 -0700 2015-05-10 13:54:57 -0700 Patch bug-144832-20150509151203.patch text/plain 14466 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTg0MDQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggY2IyYmFkY2RiZDk3MjRh NzAxYzhlNzIxMWU1MzUwMzIwOTljMjliMy4uM2QwMTNmYWYwZDJkMmIzZDU1ZTVkYjZjZmQ0ODY1 Y2M5MzJkMTJmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE1LTA1LTA5ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIFBhZ2Ugb3Zlcmxh eSBhY3Rpb24gY29udGV4dCBvdmVycmlkZSBzaG91bGQgaW5kaWNhdGUgdGhlIHNvdXJjZSBvZiB0 aGUgcmVxdWVzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTQ0ODMyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yMDU2MjU5ND4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0 ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlT3ZlcmxheS5jcHA6CisgICAgICAgICogV2ViUHJv Y2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVBhZ2VPdmVybGF5Lmg6CisgICAgICAg ICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2VPdmVybGF5LmNwcDoKKyAgICAgICAgKFdlYktp dDo6V2ViUGFnZU92ZXJsYXk6OmFjdGlvbkNvbnRleHRGb3JSZXN1bHRBdFBvaW50KToKKyAgICAg ICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZU92ZXJsYXkuaDoKKyAgICAgICAgKFdlYktp dDo6V2ViUGFnZU92ZXJsYXk6OkNsaWVudDo6YWN0aW9uQ29udGV4dEZvclJlc3VsdEF0UG9pbnQp OgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9tYWMvV2ViUGFnZU1hYy5tbToKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZTo6cGVyZm9ybUFjdGlvbk1lbnVIaXRUZXN0QXRMb2NhdGlvbik6 CisgICAgICAgIEFkZCBhIHBhcmFtZXRlciB0byBXS0J1bmRsZVBhZ2VPdmVybGF5QWN0aW9uQ29u dGV4dEZvclJlc3VsdEF0UG9pbnQgc28gdGhhdAorICAgICAgICBjbGllbnRzIGNhbiB0ZWxsIHdo ZXRoZXIgdGhlIHJlcXVlc3RlZCBhY3Rpb24gY29udGV4dCBzaG91bGQgYmUgdGFyZ2V0dGVkCisg ICAgICAgIGF0IGFuIGFjdGlvbiBtZW51IG9yIGltbWVkaWF0ZSBhY3Rpb24uCisKIDIwMTUtMDUt MDkgIFlvYXYgV2Vpc3MgIDx5b2F2QHlvYXYud3M+CiAKICAgICAgICAgUmVtb3ZlIHRoZSBQSUNU VVJFX1NJWkVTIGJ1aWxkIGZsYWcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlT3ZlcmxheS5jcHAgYi9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZU92ZXJs YXkuY3BwCmluZGV4IGFlNDVhYWYyOWRkNjExM2QwODg1MmQzOWViODAxMzIzMmQ0NzNkMzAuLmE4 YWM2OTJmNjYwMzk5Yjg3Y2E3NzdkODRmOTYwMmE2MjdmYTEzMDYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlT3Zl cmxheS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9B UEkvYy9XS0J1bmRsZVBhZ2VPdmVybGF5LmNwcApAQCAtNDQsNyArNDQsNyBAQAogbmFtZXNwYWNl IEFQSSB7CiAKIHRlbXBsYXRlPD4gc3RydWN0IENsaWVudFRyYWl0czxXS0J1bmRsZVBhZ2VPdmVy bGF5Q2xpZW50QmFzZT4gewotICAgIHR5cGVkZWYgc3RkOjp0dXBsZTxXS0J1bmRsZVBhZ2VPdmVy bGF5Q2xpZW50VjAsIFdLQnVuZGxlUGFnZU92ZXJsYXlDbGllbnRWMT4gVmVyc2lvbnM7CisgICAg dHlwZWRlZiBzdGQ6OnR1cGxlPFdLQnVuZGxlUGFnZU92ZXJsYXlDbGllbnRWMCwgV0tCdW5kbGVQ YWdlT3ZlcmxheUNsaWVudFYxLCBXS0J1bmRsZVBhZ2VPdmVybGF5Q2xpZW50VjI+IFZlcnNpb25z OwogfTsKIAogdGVtcGxhdGU8PiBzdHJ1Y3QgQ2xpZW50VHJhaXRzPFdLQnVuZGxlUGFnZU92ZXJs YXlBY2Nlc3NpYmlsaXR5Q2xpZW50QmFzZT4gewpAQCAtMTM1LDE4ICsxMzUsMjkgQEAgcHJpdmF0 ZToKICAgICB9CiAKICNpZiBQTEFURk9STShNQUMpCi0gICAgdmlydHVhbCBEREFjdGlvbkNvbnRl eHQgKmFjdGlvbkNvbnRleHRGb3JSZXN1bHRBdFBvaW50KFdlYlBhZ2VPdmVybGF5JiBwYWdlT3Zl cmxheSwgV2ViQ29yZTo6RmxvYXRQb2ludCBsb2NhdGlvbiwgUmVmUHRyPFdlYkNvcmU6OlJhbmdl PiYgcmFuZ2VIYW5kbGUpIG92ZXJyaWRlCisgICAgdmlydHVhbCBEREFjdGlvbkNvbnRleHQgKmFj dGlvbkNvbnRleHRGb3JSZXN1bHRBdFBvaW50KFdlYlBhZ2VPdmVybGF5JiBwYWdlT3ZlcmxheSwg V2ViQ29yZTo6RmxvYXRQb2ludCBsb2NhdGlvbiwgUmVmUHRyPFdlYkNvcmU6OlJhbmdlPiYgcmFu Z2VIYW5kbGUsIGJvb2wgZm9ySW1tZWRpYXRlQWN0aW9uKSBvdmVycmlkZQogICAgIHsKLSAgICAg ICAgaWYgKCFtX2NsaWVudC5hY3Rpb25Db250ZXh0Rm9yUmVzdWx0QXRQb2ludCkKLSAgICAgICAg ICAgIHJldHVybiBuaWw7CisgICAgICAgIGlmIChtX2NsaWVudC5hY3Rpb25Db250ZXh0Rm9yUmVz dWx0QXRQb2ludCkgeworICAgICAgICAgICAgV0tCdW5kbGVSYW5nZUhhbmRsZVJlZiBhcGlSYW5n ZSA9IG51bGxwdHI7CisgICAgICAgICAgICBEREFjdGlvbkNvbnRleHQgKmFjdGlvbkNvbnRleHQg PSAoRERBY3Rpb25Db250ZXh0ICopbV9jbGllbnQuYWN0aW9uQ29udGV4dEZvclJlc3VsdEF0UG9p bnQodG9BUEkoJnBhZ2VPdmVybGF5KSwgV0tQb2ludE1ha2UobG9jYXRpb24ueCgpLCBsb2NhdGlv bi55KCkpLCAmYXBpUmFuZ2UsIGZvckltbWVkaWF0ZUFjdGlvbiA/IGtXS0J1bmRsZVBhZ2VPdmVy bGF5QWN0aW9uQ29udGV4dEZvckltbWVkaWF0ZUFjdGlvblJlcXVlc3RUeXBlIDoga1dLQnVuZGxl UGFnZU92ZXJsYXlBY3Rpb25Db250ZXh0Rm9yQWN0aW9uTWVudVJlcXVlc3RUeXBlLCBtX2NsaWVu dC5iYXNlLmNsaWVudEluZm8pOwogCi0gICAgICAgIFdLQnVuZGxlUmFuZ2VIYW5kbGVSZWYgYXBp UmFuZ2UgPSBudWxscHRyOwotICAgICAgICBEREFjdGlvbkNvbnRleHQgKmFjdGlvbkNvbnRleHQg PSAoRERBY3Rpb25Db250ZXh0ICopbV9jbGllbnQuYWN0aW9uQ29udGV4dEZvclJlc3VsdEF0UG9p bnQodG9BUEkoJnBhZ2VPdmVybGF5KSwgV0tQb2ludE1ha2UobG9jYXRpb24ueCgpLCBsb2NhdGlv bi55KCkpLCAmYXBpUmFuZ2UsIG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbyk7CisgICAgICAgICAg ICBpZiAoYXBpUmFuZ2UpCisgICAgICAgICAgICAgICAgcmFuZ2VIYW5kbGUgPSB0b0ltcGwoYXBp UmFuZ2UpLT5jb3JlUmFuZ2UoKTsKIAotICAgICAgICBpZiAoYXBpUmFuZ2UpCi0gICAgICAgICAg ICByYW5nZUhhbmRsZSA9IHRvSW1wbChhcGlSYW5nZSktPmNvcmVSYW5nZSgpOworICAgICAgICAg ICAgcmV0dXJuIGFjdGlvbkNvbnRleHQ7CisgICAgICAgIH0KKworICAgICAgICBpZiAobV9jbGll bnQuYWN0aW9uQ29udGV4dEZvclJlc3VsdEF0UG9pbnRfZGVwcmVjYXRlZEZvclVzZVdpdGhWMSkg eworICAgICAgICAgICAgV0tCdW5kbGVSYW5nZUhhbmRsZVJlZiBhcGlSYW5nZSA9IG51bGxwdHI7 CisgICAgICAgICAgICBEREFjdGlvbkNvbnRleHQgKmFjdGlvbkNvbnRleHQgPSAoRERBY3Rpb25D b250ZXh0ICopbV9jbGllbnQuYWN0aW9uQ29udGV4dEZvclJlc3VsdEF0UG9pbnRfZGVwcmVjYXRl ZEZvclVzZVdpdGhWMSh0b0FQSSgmcGFnZU92ZXJsYXkpLCBXS1BvaW50TWFrZShsb2NhdGlvbi54 KCksIGxvY2F0aW9uLnkoKSksICZhcGlSYW5nZSwgbV9jbGllbnQuYmFzZS5jbGllbnRJbmZvKTsK KworICAgICAgICAgICAgaWYgKGFwaVJhbmdlKQorICAgICAgICAgICAgICAgIHJhbmdlSGFuZGxl ID0gdG9JbXBsKGFwaVJhbmdlKS0+Y29yZVJhbmdlKCk7CisKKyAgICAgICAgICAgIHJldHVybiBh Y3Rpb25Db250ZXh0OworICAgICAgICB9CiAKLSAgICAgICAgcmV0dXJuIGFjdGlvbkNvbnRleHQ7 CisgICAgICAgIHJldHVybiBuaWw7CiAgICAgfQogCiAgICAgdmlydHVhbCB2b2lkIGRhdGFEZXRl Y3RvcnNEaWRQcmVzZW50VUkoV2ViUGFnZU92ZXJsYXkmIHBhZ2VPdmVybGF5KSBvdmVycmlkZQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkv Yy9XS0J1bmRsZVBhZ2VPdmVybGF5LmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVj dGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZU92ZXJsYXkuaAppbmRleCA5ZTU2OGNjY2U2YTMx ZmVlZTAyNjhjN2IzYzJjZjYxYjAzMzcyNDhlLi5mY2ZiYjIwOTRhZWI2YmNlNmZmYzkzOGM1Nzll OTU0ZjNkNzExMGFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVj dGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZU92ZXJsYXkuaAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZU92ZXJsYXkuaApA QCAtNDAsNiArNDAsMTIgQEAKIGV4dGVybiAiQyIgewogI2VuZGlmCiAKK2VudW0geworICAgIGtX S0J1bmRsZVBhZ2VPdmVybGF5QWN0aW9uQ29udGV4dEZvckFjdGlvbk1lbnVSZXF1ZXN0VHlwZSA9 IDAsCisgICAga1dLQnVuZGxlUGFnZU92ZXJsYXlBY3Rpb25Db250ZXh0Rm9ySW1tZWRpYXRlQWN0 aW9uUmVxdWVzdFR5cGUsCit9OwordHlwZWRlZiB1aW50MzJfdCBfV0tCdW5kbGVQYWdlT3Zlcmxh eUFjdGlvbkNvbnRleHRSZXF1ZXN0VHlwZTsKKwogLy8gUGFnZSBvdmVybGF5IGNsaWVudC4KIHR5 cGVkZWYgdm9pZCAoKldLQnVuZGxlUGFnZU92ZXJsYXlXaWxsTW92ZVRvUGFnZUNhbGxiYWNrKShX S0J1bmRsZVBhZ2VPdmVybGF5UmVmIHBhZ2VPdmVybGF5LCBXS0J1bmRsZVBhZ2VSZWYgcGFnZSwg Y29uc3Qgdm9pZCogY2xpZW50SW5mbyk7CiB0eXBlZGVmIHZvaWQgKCpXS0J1bmRsZVBhZ2VPdmVy bGF5RGlkTW92ZVRvUGFnZUNhbGxiYWNrKShXS0J1bmRsZVBhZ2VPdmVybGF5UmVmIHBhZ2VPdmVy bGF5LCBXS0J1bmRsZVBhZ2VSZWYgcGFnZSwgY29uc3Qgdm9pZCogY2xpZW50SW5mbyk7CkBAIC00 OSwxMCArNTUsMTEgQEAgdHlwZWRlZiBib29sICgqV0tCdW5kbGVQYWdlT3ZlcmxheU1vdXNlVXBD YWxsYmFjaykoV0tCdW5kbGVQYWdlT3ZlcmxheVJlZiBwYWdlT3YKIHR5cGVkZWYgYm9vbCAoKldL QnVuZGxlUGFnZU92ZXJsYXlNb3VzZU1vdmVkQ2FsbGJhY2spKFdLQnVuZGxlUGFnZU92ZXJsYXlS ZWYgcGFnZU92ZXJsYXksIFdLUG9pbnQgcG9zaXRpb24sIGNvbnN0IHZvaWQqIGNsaWVudEluZm8p OwogdHlwZWRlZiBib29sICgqV0tCdW5kbGVQYWdlT3ZlcmxheU1vdXNlRHJhZ2dlZENhbGxiYWNr KShXS0J1bmRsZVBhZ2VPdmVybGF5UmVmIHBhZ2VPdmVybGF5LCBXS1BvaW50IHBvc2l0aW9uLCBX S0V2ZW50TW91c2VCdXR0b24gbW91c2VCdXR0b24sIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pOwog Ci10eXBlZGVmIHZvaWQqICgqV0tCdW5kbGVQYWdlT3ZlcmxheUFjdGlvbkNvbnRleHRGb3JSZXN1 bHRBdFBvaW50Q2FsbGJhY2spKFdLQnVuZGxlUGFnZU92ZXJsYXlSZWYgcGFnZU92ZXJsYXksIFdL UG9pbnQgcG9zaXRpb24sIFdLQnVuZGxlUmFuZ2VIYW5kbGVSZWYqIHJhbmdlSGFuZGxlLCBjb25z dCB2b2lkKiBjbGllbnRJbmZvKTsKLXR5cGVkZWYgdm9pZCAoKldLQnVuZGxlUGFnZU92ZXJsYXlE YXRhZGV0ZWN0b3JzRGlkUHJlc2VudFVJKShXS0J1bmRsZVBhZ2VPdmVybGF5UmVmIHBhZ2VPdmVy bGF5LCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKTsKLXR5cGVkZWYgdm9pZCAoKldLQnVuZGxlUGFn ZU92ZXJsYXlEYXRhZGV0ZWN0b3JzRGlkQ2hhbmdlVUkpKFdLQnVuZGxlUGFnZU92ZXJsYXlSZWYg cGFnZU92ZXJsYXksIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pOwotdHlwZWRlZiB2b2lkICgqV0tC dW5kbGVQYWdlT3ZlcmxheURhdGFkZXRlY3RvcnNEaWRIaWRlVUkpKFdLQnVuZGxlUGFnZU92ZXJs YXlSZWYgcGFnZU92ZXJsYXksIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pOwordHlwZWRlZiB2b2lk KiAoKldLQnVuZGxlUGFnZU92ZXJsYXlBY3Rpb25Db250ZXh0Rm9yUmVzdWx0QXRQb2ludENhbGxi YWNrX2RlcHJlY2F0ZWRGb3JVc2VXaXRoVjEpKFdLQnVuZGxlUGFnZU92ZXJsYXlSZWYgcGFnZU92 ZXJsYXksIFdLUG9pbnQgcG9zaXRpb24sIFdLQnVuZGxlUmFuZ2VIYW5kbGVSZWYqIHJhbmdlSGFu ZGxlLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKTsKK3R5cGVkZWYgdm9pZCogKCpXS0J1bmRsZVBh Z2VPdmVybGF5QWN0aW9uQ29udGV4dEZvclJlc3VsdEF0UG9pbnRDYWxsYmFjaykoV0tCdW5kbGVQ YWdlT3ZlcmxheVJlZiBwYWdlT3ZlcmxheSwgV0tQb2ludCBwb3NpdGlvbiwgV0tCdW5kbGVSYW5n ZUhhbmRsZVJlZiogcmFuZ2VIYW5kbGUsIF9XS0J1bmRsZVBhZ2VPdmVybGF5QWN0aW9uQ29udGV4 dFJlcXVlc3RUeXBlIHJlcXVlc3RUeXBlLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKTsKK3R5cGVk ZWYgdm9pZCAoKldLQnVuZGxlUGFnZU92ZXJsYXlEYXRhRGV0ZWN0b3JzRGlkUHJlc2VudFVJKShX S0J1bmRsZVBhZ2VPdmVybGF5UmVmIHBhZ2VPdmVybGF5LCBjb25zdCB2b2lkKiBjbGllbnRJbmZv KTsKK3R5cGVkZWYgdm9pZCAoKldLQnVuZGxlUGFnZU92ZXJsYXlEYXRhRGV0ZWN0b3JzRGlkQ2hh bmdlVUkpKFdLQnVuZGxlUGFnZU92ZXJsYXlSZWYgcGFnZU92ZXJsYXksIGNvbnN0IHZvaWQqIGNs aWVudEluZm8pOwordHlwZWRlZiB2b2lkICgqV0tCdW5kbGVQYWdlT3ZlcmxheURhdGFEZXRlY3Rv cnNEaWRIaWRlVUkpKFdLQnVuZGxlUGFnZU92ZXJsYXlSZWYgcGFnZU92ZXJsYXksIGNvbnN0IHZv aWQqIGNsaWVudEluZm8pOwogCiB0eXBlZGVmIHN0cnVjdCBXS0J1bmRsZVBhZ2VPdmVybGF5Q2xp ZW50QmFzZSB7CiAgICAgaW50ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICB2ZXJzaW9uOwpAQCAtODMsMTEgKzkwLDMwIEBAIHR5 cGVkZWYgc3RydWN0IFdLQnVuZGxlUGFnZU92ZXJsYXlDbGllbnRWMSB7CiAgICAgV0tCdW5kbGVQ YWdlT3ZlcmxheU1vdXNlRHJhZ2dlZENhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBtb3VzZURyYWdnZWQ7CiAKICAgICBXS0J1bmRsZVBhZ2VPdmVybGF5QWN0aW9uQ29udGV4dEZv clJlc3VsdEF0UG9pbnRDYWxsYmFjayAgICAgICAgICAgIGFjdGlvbkNvbnRleHRGb3JSZXN1bHRB dFBvaW50OwotICAgIFdLQnVuZGxlUGFnZU92ZXJsYXlEYXRhZGV0ZWN0b3JzRGlkUHJlc2VudFVJ ICAgICAgICAgICAgICAgICAgICAgICAgIGRhdGFEZXRlY3RvcnNEaWRQcmVzZW50VUk7Ci0gICAg V0tCdW5kbGVQYWdlT3ZlcmxheURhdGFkZXRlY3RvcnNEaWRDaGFuZ2VVSSAgICAgICAgICAgICAg ICAgICAgICAgICAgIGRhdGFEZXRlY3RvcnNEaWRDaGFuZ2VVSTsKLSAgICBXS0J1bmRsZVBhZ2VP dmVybGF5RGF0YWRldGVjdG9yc0RpZEhpZGVVSSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBkYXRhRGV0ZWN0b3JzRGlkSGlkZVVJOworICAgIFdLQnVuZGxlUGFnZU92ZXJsYXlEYXRhRGV0 ZWN0b3JzRGlkUHJlc2VudFVJICAgICAgICAgICAgICAgICAgICAgICAgZGF0YURldGVjdG9yc0Rp ZFByZXNlbnRVSTsKKyAgICBXS0J1bmRsZVBhZ2VPdmVybGF5RGF0YURldGVjdG9yc0RpZENoYW5n ZVVJICAgICAgICAgICAgICAgICAgICAgICAgIGRhdGFEZXRlY3RvcnNEaWRDaGFuZ2VVSTsKKyAg ICBXS0J1bmRsZVBhZ2VPdmVybGF5RGF0YURldGVjdG9yc0RpZEhpZGVVSSAgICAgICAgICAgICAg ICAgICAgICAgICAgIGRhdGFEZXRlY3RvcnNEaWRIaWRlVUk7CiB9IFdLQnVuZGxlUGFnZU92ZXJs YXlDbGllbnRWMTsKIAordHlwZWRlZiBzdHJ1Y3QgV0tCdW5kbGVQYWdlT3ZlcmxheUNsaWVudFYy IHsKKyAgICBXS0J1bmRsZVBhZ2VPdmVybGF5Q2xpZW50QmFzZSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGJhc2U7CisKKyAgICBXS0J1bmRsZVBhZ2VPdmVybGF5V2lsbE1v dmVUb1BhZ2VDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICAgIHdpbGxNb3ZlVG9QYWdl OworICAgIFdLQnVuZGxlUGFnZU92ZXJsYXlEaWRNb3ZlVG9QYWdlQ2FsbGJhY2sgICAgICAgICAg ICAgICAgICAgICAgICAgICAgZGlkTW92ZVRvUGFnZTsKKyAgICBXS0J1bmRsZVBhZ2VPdmVybGF5 RHJhd1JlY3RDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRyYXdSZWN0 OworICAgIFdLQnVuZGxlUGFnZU92ZXJsYXlNb3VzZURvd25DYWxsYmFjayAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgbW91c2VEb3duOworICAgIFdLQnVuZGxlUGFnZU92ZXJsYXlNb3Vz ZVVwQ2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbW91c2VVcDsKKyAg ICBXS0J1bmRsZVBhZ2VPdmVybGF5TW91c2VNb3ZlZENhbGxiYWNrICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIG1vdXNlTW92ZWQ7CisgICAgV0tCdW5kbGVQYWdlT3ZlcmxheU1vdXNlRHJh Z2dlZENhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtb3VzZURyYWdnZWQ7CisK KyAgICBXS0J1bmRsZVBhZ2VPdmVybGF5QWN0aW9uQ29udGV4dEZvclJlc3VsdEF0UG9pbnRDYWxs YmFja19kZXByZWNhdGVkRm9yVXNlV2l0aFYxIGFjdGlvbkNvbnRleHRGb3JSZXN1bHRBdFBvaW50 X2RlcHJlY2F0ZWRGb3JVc2VXaXRoVjE7CisgICAgV0tCdW5kbGVQYWdlT3ZlcmxheURhdGFEZXRl Y3RvcnNEaWRQcmVzZW50VUkgICAgICAgICAgICAgICAgICAgICAgICBkYXRhRGV0ZWN0b3JzRGlk UHJlc2VudFVJOworICAgIFdLQnVuZGxlUGFnZU92ZXJsYXlEYXRhRGV0ZWN0b3JzRGlkQ2hhbmdl VUkgICAgICAgICAgICAgICAgICAgICAgICAgZGF0YURldGVjdG9yc0RpZENoYW5nZVVJOworICAg IFdLQnVuZGxlUGFnZU92ZXJsYXlEYXRhRGV0ZWN0b3JzRGlkSGlkZVVJICAgICAgICAgICAgICAg ICAgICAgICAgICAgZGF0YURldGVjdG9yc0RpZEhpZGVVSTsKKworICAgIFdLQnVuZGxlUGFnZU92 ZXJsYXlBY3Rpb25Db250ZXh0Rm9yUmVzdWx0QXRQb2ludENhbGxiYWNrICAgICAgICAgICAgYWN0 aW9uQ29udGV4dEZvclJlc3VsdEF0UG9pbnQ7Cit9IFdLQnVuZGxlUGFnZU92ZXJsYXlDbGllbnRW MjsKKwogZW51bSB7IGtXS0J1bmRsZVBhZ2VPdmVybGF5Q2xpZW50Q3VycmVudFZlcnNpb24gV0tf RU5VTV9ERVBSRUNBVEVEKCJVc2UgYW4gZXhwbGljaXQgdmVyc2lvbiBudW1iZXIgaW5zdGVhZCIp ID0gMCB9OwogdHlwZWRlZiBzdHJ1Y3QgV0tCdW5kbGVQYWdlT3ZlcmxheUNsaWVudCB7CiAgICAg aW50ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICB2ZXJzaW9uOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2VPdmVybGF5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlT3ZlcmxheS5jcHAKaW5kZXggOWU0MDg2ZTljMjMyNjY2YjJhYjFkYWYx MWRkMzVhZDZkZDlmOGQyMy4uNDA1MjAzMGRkY2QyYzljZTI5YjQyY2VmMjNiYzk1N2FkZDU2Zjg0 MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2VP dmVybGF5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZU92ZXJsYXkuY3BwCkBAIC0xMjAsOSArMTIwLDkgQEAgdm9pZCBXZWJQYWdlT3ZlcmxheTo6ZGlk U2Nyb2xsRnJhbWUoUGFnZU92ZXJsYXkmLCBGcmFtZSYgZnJhbWUpCiB9CiAKICNpZiBQTEFURk9S TShNQUMpCi1EREFjdGlvbkNvbnRleHQgKldlYlBhZ2VPdmVybGF5OjphY3Rpb25Db250ZXh0Rm9y UmVzdWx0QXRQb2ludChGbG9hdFBvaW50IGxvY2F0aW9uLCBSZWZQdHI8V2ViQ29yZTo6UmFuZ2U+ JiByYW5nZUhhbmRsZSkKK0REQWN0aW9uQ29udGV4dCAqV2ViUGFnZU92ZXJsYXk6OmFjdGlvbkNv bnRleHRGb3JSZXN1bHRBdFBvaW50KEZsb2F0UG9pbnQgbG9jYXRpb24sIFJlZlB0cjxXZWJDb3Jl OjpSYW5nZT4mIHJhbmdlSGFuZGxlLCBib29sIGZvckltbWVkaWF0ZUFjdGlvbikKIHsKLSAgICBy ZXR1cm4gbV9jbGllbnQtPmFjdGlvbkNvbnRleHRGb3JSZXN1bHRBdFBvaW50KCp0aGlzLCBsb2Nh dGlvbiwgcmFuZ2VIYW5kbGUpOworICAgIHJldHVybiBtX2NsaWVudC0+YWN0aW9uQ29udGV4dEZv clJlc3VsdEF0UG9pbnQoKnRoaXMsIGxvY2F0aW9uLCByYW5nZUhhbmRsZSwgZm9ySW1tZWRpYXRl QWN0aW9uKTsKIH0KIAogdm9pZCBXZWJQYWdlT3ZlcmxheTo6ZGF0YURldGVjdG9yc0RpZFByZXNl bnRVSSgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi UGFnZU92ZXJsYXkuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl T3ZlcmxheS5oCmluZGV4IGZiYmU2MmEyYTI4NTFmMzY4OTZmNmYwNjI3Nzk4YThhNjYwN2YxYTku LmNmNzZlZjA2NjExMGVhODU3MGM4ZTVmNDE1OTY1MDI5MmEwYzM2N2QgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlT3ZlcmxheS5oCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlT3ZlcmxheS5oCkBAIC01NSw3 ICs1NSw3IEBAIHB1YmxpYzoKICAgICAgICAgdmlydHVhbCB2b2lkIGRpZFNjcm9sbEZyYW1lKFdl YlBhZ2VPdmVybGF5JiwgV2ViRnJhbWUqKSB7IH0KIAogI2lmIFBMQVRGT1JNKE1BQykKLSAgICAg ICAgdmlydHVhbCBEREFjdGlvbkNvbnRleHQgKmFjdGlvbkNvbnRleHRGb3JSZXN1bHRBdFBvaW50 KFdlYlBhZ2VPdmVybGF5JiwgV2ViQ29yZTo6RmxvYXRQb2ludCBsb2NhdGlvbiwgUmVmUHRyPFdl YkNvcmU6OlJhbmdlPiYgcmFuZ2VIYW5kbGUpIHsgcmV0dXJuIG51bGxwdHI7IH0KKyAgICAgICAg dmlydHVhbCBEREFjdGlvbkNvbnRleHQgKmFjdGlvbkNvbnRleHRGb3JSZXN1bHRBdFBvaW50KFdl YlBhZ2VPdmVybGF5JiwgV2ViQ29yZTo6RmxvYXRQb2ludCBsb2NhdGlvbiwgUmVmUHRyPFdlYkNv cmU6OlJhbmdlPiYgcmFuZ2VIYW5kbGUsIGJvb2wgZm9ySW1tZWRpYXRlQWN0aW9uKSB7IHJldHVy biBudWxscHRyOyB9CiAgICAgICAgIHZpcnR1YWwgdm9pZCBkYXRhRGV0ZWN0b3JzRGlkUHJlc2Vu dFVJKFdlYlBhZ2VPdmVybGF5JikgeyB9CiAgICAgICAgIHZpcnR1YWwgdm9pZCBkYXRhRGV0ZWN0 b3JzRGlkQ2hhbmdlVUkoV2ViUGFnZU92ZXJsYXkmKSB7IH0KICAgICAgICAgdmlydHVhbCB2b2lk IGRhdGFEZXRlY3RvcnNEaWRIaWRlVUkoV2ViUGFnZU92ZXJsYXkmKSB7IH0KQEAgLTc5LDcgKzc5 LDcgQEAgcHVibGljOgogICAgIENsaWVudCYgY2xpZW50KCkgY29uc3QgeyByZXR1cm4gKm1fY2xp ZW50OyB9CiAKICNpZiBQTEFURk9STShNQUMpCi0gICAgRERBY3Rpb25Db250ZXh0ICphY3Rpb25D b250ZXh0Rm9yUmVzdWx0QXRQb2ludChXZWJDb3JlOjpGbG9hdFBvaW50LCBSZWZQdHI8V2ViQ29y ZTo6UmFuZ2U+Jik7CisgICAgRERBY3Rpb25Db250ZXh0ICphY3Rpb25Db250ZXh0Rm9yUmVzdWx0 QXRQb2ludChXZWJDb3JlOjpGbG9hdFBvaW50LCBSZWZQdHI8V2ViQ29yZTo6UmFuZ2U+JiwgYm9v bCBmb3JJbW1lZGlhdGVBY3Rpb24pOwogICAgIHZvaWQgZGF0YURldGVjdG9yc0RpZFByZXNlbnRV SSgpOwogICAgIHZvaWQgZGF0YURldGVjdG9yc0RpZENoYW5nZVVJKCk7CiAgICAgdm9pZCBkYXRh RGV0ZWN0b3JzRGlkSGlkZVVJKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlBhZ2UvbWFjL1dlYlBhZ2VNYWMubW0gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvbWFjL1dlYlBhZ2VNYWMubW0KaW5kZXggNThiZGYwMTMzZTVjNGFiZWM4YTE1NmM3 MmUyMzc4Y2FiNDc5Njk5Yy4uZDc1ZWU2NTMxMDdiNTY3MGE2MTY1N2I4OGIzODVmZDA0YWJkZDIw ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJQ YWdlTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvV2Vi UGFnZU1hYy5tbQpAQCAtMTEzNCw3ICsxMTM0LDcgQEAgdm9pZCBXZWJQYWdlOjpwZXJmb3JtQWN0 aW9uTWVudUhpdFRlc3RBdExvY2F0aW9uKFdlYkNvcmU6OkZsb2F0UG9pbnQgbG9jYXRpb25JblYK ICAgICAgICAgICAgIGNvbnRpbnVlOwogCiAgICAgICAgIFJlZlB0cjxSYW5nZT4gbWFpblJlc3Vs dFJhbmdlOwotICAgICAgICBEREFjdGlvbkNvbnRleHQgKmFjdGlvbkNvbnRleHQgPSB3ZWJPdmVy bGF5LT5hY3Rpb25Db250ZXh0Rm9yUmVzdWx0QXRQb2ludChsb2NhdGlvbkluQ29udGVudENvb3Jk aW5hdGVzLCBtYWluUmVzdWx0UmFuZ2UpOworICAgICAgICBEREFjdGlvbkNvbnRleHQgKmFjdGlv bkNvbnRleHQgPSB3ZWJPdmVybGF5LT5hY3Rpb25Db250ZXh0Rm9yUmVzdWx0QXRQb2ludChsb2Nh dGlvbkluQ29udGVudENvb3JkaW5hdGVzLCBtYWluUmVzdWx0UmFuZ2UsIGZvckltbWVkaWF0ZUFj dGlvbik7CiAgICAgICAgIGlmICghYWN0aW9uQ29udGV4dCB8fCAhbWFpblJlc3VsdFJhbmdlKQog ICAgICAgICAgICAgY29udGludWU7CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rv b2xzL0NoYW5nZUxvZwppbmRleCBhOGFhZTA4ZDAyYzFhMGU2ZDA1YTU2OWZkYzc2OGRiMmQzNmMz ODNlLi4wM2MyMTMxYWIwYjY4OWJkNWYwMzAzMjc4NTJlZWQ0YTY0MDczZDYwIDEwMDY0NAotLS0g YS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAK KzIwMTUtMDUtMDkgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAg ICAgICAgUGFnZSBvdmVybGF5IGFjdGlvbiBjb250ZXh0IG92ZXJyaWRlIHNob3VsZCBpbmRpY2F0 ZSB0aGUgc291cmNlIG9mIHRoZSByZXF1ZXN0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNDQ4MzIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzIwNTYy NTk0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyT2JqQy9BY3Rpb25NZW51c0J1bmRsZS5tbToKKyAg ICAgICAgKFRlc3RXZWJLaXRBUEk6OkFjdGlvbk1lbnVUZXN0OjphY3Rpb25Db250ZXh0Rm9yUmVz dWx0QXRQb2ludCk6CisKIDIwMTUtMDUtMDkgIFlvYXYgV2Vpc3MgIDx5b2F2QHlvYXYud3M+CiAK ICAgICAgICAgUmVtb3ZlIHRoZSBQSUNUVVJFX1NJWkVTIGJ1aWxkIGZsYWcKZGlmZiAtLWdpdCBh L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mk9iakMvQWN0aW9uTWVudXNCdW5kbGUu bW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJPYmpDL0FjdGlvbk1lbnVzQnVu ZGxlLm1tCmluZGV4IDVlOGE5NDNjZTg4ZTUyMjU3NTEwMjVjYjJlMGU1YjJkZDZiNjQ4YzkuLjM0 N2JmODA5ZmU0NzYxM2U5MTVhZmMwMTgxZmZjMThlMDA5MDNhODAgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mk9iakMvQWN0aW9uTWVudXNCdW5kbGUubW0KKysr IGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyT2JqQy9BY3Rpb25NZW51c0J1bmRs ZS5tbQpAQCAtOTIsNyArOTIsNyBAQCBwdWJsaWM6CiAgICAgICAgICp1c2VyRGF0YSA9IFdLRGlj dGlvbmFyeUNyZWF0ZShrZXlzLCB2YWx1ZXMsIDEpOwogICAgIH0KIAotICAgIHN0YXRpYyB2b2lk KiBhY3Rpb25Db250ZXh0Rm9yUmVzdWx0QXRQb2ludChXS0J1bmRsZVBhZ2VPdmVybGF5UmVmIHBh Z2VPdmVybGF5LCBXS1BvaW50IHBvc2l0aW9uLCBXS0J1bmRsZVJhbmdlSGFuZGxlUmVmKiByYW5n ZUhhbmRsZSwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKKyAgICBzdGF0aWMgdm9pZCogYWN0aW9u Q29udGV4dEZvclJlc3VsdEF0UG9pbnQoV0tCdW5kbGVQYWdlT3ZlcmxheVJlZiBwYWdlT3Zlcmxh eSwgV0tQb2ludCBwb3NpdGlvbiwgV0tCdW5kbGVSYW5nZUhhbmRsZVJlZiogcmFuZ2VIYW5kbGUs IF9XS0J1bmRsZVBhZ2VPdmVybGF5QWN0aW9uQ29udGV4dFJlcXVlc3RUeXBlIHJlcXVlc3RUeXBl LCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQogICAgIHsKICAgICAgICAgaWYgKHBvc2l0aW9uLngg PiA3MDApIHsKICAgICAgICAgICAgIFJldGFpblB0cjxEREFjdGlvbkNvbnRleHQ+IGFjdGlvbkNv bnRleHQgPSBjcmVhdGVBY3Rpb25Db250ZXh0Rm9yUGhvbmVOdW1iZXIoKTsK