215850 2020-08-26 07:14:39 -0700 Code cleanup and consistent naming in AXIsolatedTree classes, no change in behavior. 2020-08-26 11:10:02 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 andresg_22 andresg_22 aboxhall apinheiro cfleizach darin dmazzoni ews-watchlist jcraig jdiggs samuel_white webkit-bug-importer oldest_to_newest 1682975 0 andresg_22 2020-08-26 07:14:39 -0700 Code cleanup and consistent naming in AXIsolatedTree classes, no change in behavior. 1682976 1 407295 andresg_22 2020-08-26 07:22:22 -0700 Created attachment 407295 Patch 1683023 2 ews-feeder 2020-08-26 10:24:45 -0700 Committed r266171: <https://trac.webkit.org/changeset/266171> All reviewed patches have been landed. Closing bug and clearing flags on attachment 407295. 1683024 3 webkit-bug-importer 2020-08-26 10:25:15 -0700 <rdar://problem/67813458> 1683047 4 407295 darin 2020-08-26 11:10:02 -0700 Comment on attachment 407295 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=407295&action=review > Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp:456 > + m_propertyMap.set(propertyName, value); We should return here and add a WTFMove to value. Would improve performance a bit. 407295 2020-08-26 07:22:22 -0700 2020-08-26 10:24:45 -0700 Patch bug-215850-20200826102220.patch text/plain 15009 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2MTY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWNhNGJhNTU0M2IwMDQy ZjVkNDFhNmE3YmNjN2Y5Y2Q0Njk5YTE4NC4uNGZhNTRiNjc5NDZkNTA4ZWNmZTk4MDY0NmE2OTkw NmI1ZjY4NDk5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQzIEBACisyMDIwLTA4LTI2ICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBDb2RlIGNsZWFu dXAgYW5kIGNvbnNpc3RlbnQgbmFtaW5nIGluIEFYSXNvbGF0ZWRUcmVlIGNsYXNzZXMsIG5vIGNo YW5nZSBpbiBiZWhhdmlvci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIxNTg1MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIC0gUmVuYW1lZCBBWElzb2xhdGVkT2JqZWN0OjptX2F0dHJpYnV0ZU1hcCB0byBt X3Byb3BlcnR5TWFwIGZvciBuYW1pbmcKKyAgICAgICAgY29uc3Npc3RlbmN5LgorICAgICAgICAt IHR5cGVkZWYgLT4gdXNpbmcKKyAgICAgICAgLSBSZW1vdmVkIEFYUHJvcGVydHlOYW1lOjpOb25l LCBub3QgdXNlZC4KKyAgICAgICAgLSBSZXBsYWNlZCBBY2Nlc3NpYmlsaXR5SXNvbGF0ZWRUcmVl TWF0aE11bHRpc2NyaXB0UGFpciBhbGlhcyB3aXRoIGl0cworICAgICAgICBkZWZpbml0aW9uLCBz aG9ydGVyLCBjbGVhcmVyLCBhbmQgY2FuIGJlIHVzZWQgZm9yIG90aGVyIHByb3BlcnR5IG9mIHRo ZQorICAgICAgICBzYW1lIHR5cGUuCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2lzb2xhdGVk dHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRP YmplY3Q6OnNldE1hdGhzY3JpcHRzKToKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRPYmpl Y3Q6OnNldFByb3BlcnR5KToKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRPYmplY3Q6Omlu c2VydE1hdGhQYWlycyk6CisgICAgICAgIChXZWJDb3JlOjpBWElzb2xhdGVkT2JqZWN0OjptYXRo UHJlc2NyaXB0cyk6CisgICAgICAgIChXZWJDb3JlOjpBWElzb2xhdGVkT2JqZWN0OjptYXRoUG9z dHNjcmlwdHMpOgorICAgICAgICAoV2ViQ29yZTo6QVhJc29sYXRlZE9iamVjdDo6aW50UG9pbnRB dHRyaWJ1dGVWYWx1ZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpBWElzb2xhdGVkT2JqZWN0 OjpvYmplY3RBdHRyaWJ1dGVWYWx1ZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpBWElzb2xh dGVkT2JqZWN0OjpyZWN0QXR0cmlidXRlVmFsdWUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6 QVhJc29sYXRlZE9iamVjdDo6dmVjdG9yQXR0cmlidXRlVmFsdWUgY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6QVhJc29sYXRlZE9iamVjdDo6b3B0aW9uU2V0QXR0cmlidXRlVmFsdWUgY29uc3Qp OgorICAgICAgICAoV2ViQ29yZTo6QVhJc29sYXRlZE9iamVjdDo6cGFpckF0dHJpYnV0ZVZhbHVl IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRPYmplY3Q6OnVpbnQ2NEF0dHJp YnV0ZVZhbHVlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRPYmplY3Q6OnVy bEF0dHJpYnV0ZVZhbHVlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRPYmpl Y3Q6OnBhdGhBdHRyaWJ1dGVWYWx1ZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpBWElzb2xh dGVkT2JqZWN0Ojpjb2xvckF0dHJpYnV0ZVZhbHVlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6 OkFYSXNvbGF0ZWRPYmplY3Q6OmZsb2F0QXR0cmlidXRlVmFsdWUgY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6QVhJc29sYXRlZE9iamVjdDo6ZG91YmxlQXR0cmlidXRlVmFsdWUgY29uc3QpOgor ICAgICAgICAoV2ViQ29yZTo6QVhJc29sYXRlZE9iamVjdDo6dW5zaWduZWRBdHRyaWJ1dGVWYWx1 ZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpBWElzb2xhdGVkT2JqZWN0Ojpib29sQXR0cmli dXRlVmFsdWUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6QVhJc29sYXRlZE9iamVjdDo6c3Ry aW5nQXR0cmlidXRlVmFsdWUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6QVhJc29sYXRlZE9i amVjdDo6aW50QXR0cmlidXRlVmFsdWUgY29uc3QpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkv aXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuaDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5 L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5oOgorCiAyMDIwLTA4LTI2ICBBbmRyZXMgR29u emFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KIAogICAgICAgICBXaGVuIGNhY2hpbmcgdGhl IEFjY2Vzc2liaWxpdHlUZXh0IHByb3BlcnR5IGluIEFYSXNvbGF0ZWRPYmplY3QsIHRoZSBTdHJp bmdzIG5lZWQgdG8gYmUgaXNvbGF0ZWRDb3BpZWQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3Bw CmluZGV4IDdmNGU4MjFhNWUwYzNkZmY2NjYxMjA0NmM3OWYwMDkzNzhkZmQ4OTUuLjNlY2YxYTYx MGRmMzBjODhkMDg2MDEwMjZhMjFmMGE2MjkzYzZjMGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmpl Y3QuY3BwCkBAIC00MTIsMTEgKzQxMiwxMSBAQCB2b2lkIEFYSXNvbGF0ZWRPYmplY3Q6OnNldE1h dGhzY3JpcHRzKEFYUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSwgQVhDb3JlT2JqZWN0JgogICAg IHNpemVfdCBtYXRoU2l6ZSA9IHBhaXJzLnNpemUoKTsKICAgICBpZiAoIW1hdGhTaXplKQogICAg ICAgICByZXR1cm47Ci0gICAgCi0gICAgVmVjdG9yPEFjY2Vzc2liaWxpdHlJc29sYXRlZFRyZWVN YXRoTXVsdGlzY3JpcHRQYWlyPiBpZFBhaXJzOworCisgICAgVmVjdG9yPHN0ZDo6cGFpcjxBWElE LCBBWElEPj4gaWRQYWlyczsKICAgICBpZFBhaXJzLnJlc2VydmVDYXBhY2l0eShtYXRoU2l6ZSk7 CiAgICAgZm9yIChhdXRvIG1hdGhQYWlyIDogcGFpcnMpIHsKLSAgICAgICAgQWNjZXNzaWJpbGl0 eUlzb2xhdGVkVHJlZU1hdGhNdWx0aXNjcmlwdFBhaXIgaWRQYWlyOworICAgICAgICBzdGQ6OnBh aXI8QVhJRCwgQVhJRD4gaWRQYWlyOwogICAgICAgICBpZiAobWF0aFBhaXIuZmlyc3QpCiAgICAg ICAgICAgICBpZFBhaXIuZmlyc3QgPSBtYXRoUGFpci5maXJzdC0+b2JqZWN0SUQoKTsKICAgICAg ICAgaWYgKG1hdGhQYWlyLnNlY29uZCkKQEAgLTQ1MSw5ICs0NTEsOSBAQCB2b2lkIEFYSXNvbGF0 ZWRPYmplY3Q6OnNldE9iamVjdFZlY3RvclByb3BlcnR5KEFYUHJvcGVydHlOYW1lIHByb3BlcnR5 TmFtZSwgY29ucwogdm9pZCBBWElzb2xhdGVkT2JqZWN0OjpzZXRQcm9wZXJ0eShBWFByb3BlcnR5 TmFtZSBwcm9wZXJ0eU5hbWUsIEFYUHJvcGVydHlWYWx1ZVZhcmlhbnQmJiB2YWx1ZSwgYm9vbCBz aG91bGRSZW1vdmUpCiB7CiAgICAgaWYgKHNob3VsZFJlbW92ZSkKLSAgICAgICAgbV9hdHRyaWJ1 dGVNYXAucmVtb3ZlKHByb3BlcnR5TmFtZSk7CisgICAgICAgIG1fcHJvcGVydHlNYXAucmVtb3Zl KHByb3BlcnR5TmFtZSk7CiAgICAgZWxzZQotICAgICAgICBtX2F0dHJpYnV0ZU1hcC5zZXQocHJv cGVydHlOYW1lLCB2YWx1ZSk7CisgICAgICAgIG1fcHJvcGVydHlNYXAuc2V0KHByb3BlcnR5TmFt ZSwgdmFsdWUpOwogfQogCiB2b2lkIEFYSXNvbGF0ZWRPYmplY3Q6OnNldFBhcmVudChBWElEIHBh cmVudCkKQEAgLTU1OSw3ICs1NTksNyBAQCBTdHJpbmcgQVhJc29sYXRlZE9iamVjdDo6ZG9jdW1l bnRFbmNvZGluZygpIGNvbnN0CiAgICAgcmV0dXJuIFN0cmluZygpOwogfQogCi12b2lkIEFYSXNv bGF0ZWRPYmplY3Q6Omluc2VydE1hdGhQYWlycyhWZWN0b3I8QWNjZXNzaWJpbGl0eUlzb2xhdGVk VHJlZU1hdGhNdWx0aXNjcmlwdFBhaXI+JiBpc29sYXRlZFBhaXJzLCBBY2Nlc3NpYmlsaXR5TWF0 aE11bHRpc2NyaXB0UGFpcnMmIHBhaXJzKQordm9pZCBBWElzb2xhdGVkT2JqZWN0OjppbnNlcnRN YXRoUGFpcnMoVmVjdG9yPHN0ZDo6cGFpcjxBWElELCBBWElEPj4mIGlzb2xhdGVkUGFpcnMsIEFj Y2Vzc2liaWxpdHlNYXRoTXVsdGlzY3JpcHRQYWlycyYgcGFpcnMpCiB7CiAgICAgZm9yIChjb25z dCBhdXRvJiBwYWlyIDogaXNvbGF0ZWRQYWlycykgewogICAgICAgICBBY2Nlc3NpYmlsaXR5TWF0 aE11bHRpc2NyaXB0UGFpciBwcmVzY3JpcHRQYWlyOwpAQCAtNTczLDEzICs1NzMsMTMgQEAgdm9p ZCBBWElzb2xhdGVkT2JqZWN0OjppbnNlcnRNYXRoUGFpcnMoVmVjdG9yPEFjY2Vzc2liaWxpdHlJ c29sYXRlZFRyZWVNYXRoTXVsdGkKIAogdm9pZCBBWElzb2xhdGVkT2JqZWN0OjptYXRoUHJlc2Ny aXB0cyhBY2Nlc3NpYmlsaXR5TWF0aE11bHRpc2NyaXB0UGFpcnMmIHBhaXJzKQogewotICAgIGF1 dG8gaXNvbGF0ZWRQYWlycyA9IHZlY3RvckF0dHJpYnV0ZVZhbHVlPEFjY2Vzc2liaWxpdHlJc29s YXRlZFRyZWVNYXRoTXVsdGlzY3JpcHRQYWlyPihBWFByb3BlcnR5TmFtZTo6TWF0aFByZXNjcmlw dHMpOworICAgIGF1dG8gaXNvbGF0ZWRQYWlycyA9IHZlY3RvckF0dHJpYnV0ZVZhbHVlPHN0ZDo6 cGFpcjxBWElELCBBWElEPj4oQVhQcm9wZXJ0eU5hbWU6Ok1hdGhQcmVzY3JpcHRzKTsKICAgICBp bnNlcnRNYXRoUGFpcnMoaXNvbGF0ZWRQYWlycywgcGFpcnMpOwogfQogCiB2b2lkIEFYSXNvbGF0 ZWRPYmplY3Q6Om1hdGhQb3N0c2NyaXB0cyhBY2Nlc3NpYmlsaXR5TWF0aE11bHRpc2NyaXB0UGFp cnMmIHBhaXJzKQogewotICAgIGF1dG8gaXNvbGF0ZWRQYWlycyA9IHZlY3RvckF0dHJpYnV0ZVZh bHVlPEFjY2Vzc2liaWxpdHlJc29sYXRlZFRyZWVNYXRoTXVsdGlzY3JpcHRQYWlyPihBWFByb3Bl cnR5TmFtZTo6TWF0aFBvc3RzY3JpcHRzKTsKKyAgICBhdXRvIGlzb2xhdGVkUGFpcnMgPSB2ZWN0 b3JBdHRyaWJ1dGVWYWx1ZTxzdGQ6OnBhaXI8QVhJRCwgQVhJRD4+KEFYUHJvcGVydHlOYW1lOjpN YXRoUG9zdHNjcmlwdHMpOwogICAgIGluc2VydE1hdGhQYWlycyhpc29sYXRlZFBhaXJzLCBwYWly cyk7CiB9CiAKQEAgLTcyMSw3ICs3MjEsNyBAQCBBWENvcmVPYmplY3QqIEFYSXNvbGF0ZWRPYmpl Y3Q6OmFjY2Vzc2liaWxpdHlIaXRUZXN0KGNvbnN0IEludFBvaW50JiBwb2ludCkgY29ucwogCiBJ bnRQb2ludCBBWElzb2xhdGVkT2JqZWN0OjppbnRQb2ludEF0dHJpYnV0ZVZhbHVlKEFYUHJvcGVy dHlOYW1lIHByb3BlcnR5TmFtZSkgY29uc3QKIHsKLSAgICBhdXRvIHZhbHVlID0gbV9hdHRyaWJ1 dGVNYXAuZ2V0KHByb3BlcnR5TmFtZSk7CisgICAgYXV0byB2YWx1ZSA9IG1fcHJvcGVydHlNYXAu Z2V0KHByb3BlcnR5TmFtZSk7CiAgICAgcmV0dXJuIFdURjo6c3dpdGNoT24odmFsdWUsCiAgICAg ICAgIFtdIChJbnRQb2ludCYgdHlwZWRWYWx1ZSkgeyByZXR1cm4gdHlwZWRWYWx1ZTsgfSwKICAg ICAgICAgW10gKGF1dG8mKSB7IHJldHVybiBJbnRQb2ludCgpOyB9CkBAIC03MzAsNyArNzMwLDcg QEAgSW50UG9pbnQgQVhJc29sYXRlZE9iamVjdDo6aW50UG9pbnRBdHRyaWJ1dGVWYWx1ZShBWFBy b3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUpIGMKIAogQVhDb3JlT2JqZWN0KiBBWElzb2xhdGVkT2Jq ZWN0OjpvYmplY3RBdHRyaWJ1dGVWYWx1ZShBWFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUpIGNv bnN0CiB7Ci0gICAgYXV0byB2YWx1ZSA9IG1fYXR0cmlidXRlTWFwLmdldChwcm9wZXJ0eU5hbWUp OworICAgIGF1dG8gdmFsdWUgPSBtX3Byb3BlcnR5TWFwLmdldChwcm9wZXJ0eU5hbWUpOwogICAg IEFYSUQgbm9kZUlEID0gV1RGOjpzd2l0Y2hPbih2YWx1ZSwKICAgICAgICAgW10gKEFYSUQmIHR5 cGVkVmFsdWUpIHsgcmV0dXJuIHR5cGVkVmFsdWU7IH0sCiAgICAgICAgIFtdIChhdXRvJikgeyBy ZXR1cm4gSW52YWxpZEFYSUQ7IH0KQEAgLTc0Miw3ICs3NDIsNyBAQCBBWENvcmVPYmplY3QqIEFY SXNvbGF0ZWRPYmplY3Q6Om9iamVjdEF0dHJpYnV0ZVZhbHVlKEFYUHJvcGVydHlOYW1lIHByb3Bl cnR5TmFtZQogdGVtcGxhdGU8dHlwZW5hbWUgVD4KIFQgQVhJc29sYXRlZE9iamVjdDo6cmVjdEF0 dHJpYnV0ZVZhbHVlKEFYUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSkgY29uc3QKIHsKLSAgICBh dXRvIHZhbHVlID0gbV9hdHRyaWJ1dGVNYXAuZ2V0KHByb3BlcnR5TmFtZSk7CisgICAgYXV0byB2 YWx1ZSA9IG1fcHJvcGVydHlNYXAuZ2V0KHByb3BlcnR5TmFtZSk7CiAgICAgcmV0dXJuIFdURjo6 c3dpdGNoT24odmFsdWUsCiAgICAgICAgIFtdIChUJiB0eXBlZFZhbHVlKSB7IHJldHVybiB0eXBl ZFZhbHVlOyB9LAogICAgICAgICBbXSAoYXV0byYpIHsgcmV0dXJuIFQgeyB9OyB9CkBAIC03NTIs NyArNzUyLDcgQEAgVCBBWElzb2xhdGVkT2JqZWN0OjpyZWN0QXR0cmlidXRlVmFsdWUoQVhQcm9w ZXJ0eU5hbWUgcHJvcGVydHlOYW1lKSBjb25zdAogdGVtcGxhdGU8dHlwZW5hbWUgVD4KIFZlY3Rv cjxUPiBBWElzb2xhdGVkT2JqZWN0Ojp2ZWN0b3JBdHRyaWJ1dGVWYWx1ZShBWFByb3BlcnR5TmFt ZSBwcm9wZXJ0eU5hbWUpIGNvbnN0CiB7Ci0gICAgYXV0byB2YWx1ZSA9IG1fYXR0cmlidXRlTWFw LmdldChwcm9wZXJ0eU5hbWUpOworICAgIGF1dG8gdmFsdWUgPSBtX3Byb3BlcnR5TWFwLmdldChw cm9wZXJ0eU5hbWUpOwogICAgIHJldHVybiBXVEY6OnN3aXRjaE9uKHZhbHVlLAogICAgICAgICBb XSAoVmVjdG9yPFQ+JiB0eXBlZFZhbHVlKSB7IHJldHVybiB0eXBlZFZhbHVlOyB9LAogICAgICAg ICBbXSAoYXV0byYpIHsgcmV0dXJuIFZlY3RvcjxUPigpOyB9CkBAIC03NjIsNyArNzYyLDcgQEAg VmVjdG9yPFQ+IEFYSXNvbGF0ZWRPYmplY3Q6OnZlY3RvckF0dHJpYnV0ZVZhbHVlKEFYUHJvcGVy dHlOYW1lIHByb3BlcnR5TmFtZSkgY28KIHRlbXBsYXRlPHR5cGVuYW1lIFQ+CiBPcHRpb25TZXQ8 VD4gQVhJc29sYXRlZE9iamVjdDo6b3B0aW9uU2V0QXR0cmlidXRlVmFsdWUoQVhQcm9wZXJ0eU5h bWUgcHJvcGVydHlOYW1lKSBjb25zdAogewotICAgIGF1dG8gdmFsdWUgPSBtX2F0dHJpYnV0ZU1h cC5nZXQocHJvcGVydHlOYW1lKTsKKyAgICBhdXRvIHZhbHVlID0gbV9wcm9wZXJ0eU1hcC5nZXQo cHJvcGVydHlOYW1lKTsKICAgICByZXR1cm4gV1RGOjpzd2l0Y2hPbih2YWx1ZSwKICAgICAgICAg W10gKFQmIHR5cGVkVmFsdWUpIHsgcmV0dXJuIHR5cGVkVmFsdWU7IH0sCiAgICAgICAgIFtdIChh dXRvJikgeyByZXR1cm4gT3B0aW9uU2V0PFQ+KCk7IH0KQEAgLTc3Miw3ICs3NzIsNyBAQCBPcHRp b25TZXQ8VD4gQVhJc29sYXRlZE9iamVjdDo6b3B0aW9uU2V0QXR0cmlidXRlVmFsdWUoQVhQcm9w ZXJ0eU5hbWUgcHJvcGVydHlOYQogdGVtcGxhdGU8dHlwZW5hbWUgVD4KIHN0ZDo6cGFpcjxULCBU PiBBWElzb2xhdGVkT2JqZWN0OjpwYWlyQXR0cmlidXRlVmFsdWUoQVhQcm9wZXJ0eU5hbWUgcHJv cGVydHlOYW1lKSBjb25zdAogewotICAgIGF1dG8gdmFsdWUgPSBtX2F0dHJpYnV0ZU1hcC5nZXQo cHJvcGVydHlOYW1lKTsKKyAgICBhdXRvIHZhbHVlID0gbV9wcm9wZXJ0eU1hcC5nZXQocHJvcGVy dHlOYW1lKTsKICAgICByZXR1cm4gV1RGOjpzd2l0Y2hPbih2YWx1ZSwKICAgICAgICAgW10gKHN0 ZDo6cGFpcjxULCBUPiYgdHlwZWRWYWx1ZSkgeyByZXR1cm4gdHlwZWRWYWx1ZTsgfSwKICAgICAg ICAgW10gKGF1dG8mKSB7IHJldHVybiBzdGQ6OnBhaXI8VCwgVD4oMCwgMSk7IH0KQEAgLTc4MSw3 ICs3ODEsNyBAQCBzdGQ6OnBhaXI8VCwgVD4gQVhJc29sYXRlZE9iamVjdDo6cGFpckF0dHJpYnV0 ZVZhbHVlKEFYUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZQogCiB1aW50NjRfdCBBWElzb2xhdGVk T2JqZWN0Ojp1aW50NjRBdHRyaWJ1dGVWYWx1ZShBWFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUp IGNvbnN0CiB7Ci0gICAgYXV0byB2YWx1ZSA9IG1fYXR0cmlidXRlTWFwLmdldChwcm9wZXJ0eU5h bWUpOworICAgIGF1dG8gdmFsdWUgPSBtX3Byb3BlcnR5TWFwLmdldChwcm9wZXJ0eU5hbWUpOwog ICAgIHJldHVybiBXVEY6OnN3aXRjaE9uKHZhbHVlLAogICAgICAgICBbXSAodWludDY0X3QmIHR5 cGVkVmFsdWUpIHsgcmV0dXJuIHR5cGVkVmFsdWU7IH0sCiAgICAgICAgIFtdIChhdXRvJikgeyBy ZXR1cm4gMDsgfQpAQCAtNzkwLDcgKzc5MCw3IEBAIHVpbnQ2NF90IEFYSXNvbGF0ZWRPYmplY3Q6 OnVpbnQ2NEF0dHJpYnV0ZVZhbHVlKEFYUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSkgY29uCiAK IFVSTCBBWElzb2xhdGVkT2JqZWN0Ojp1cmxBdHRyaWJ1dGVWYWx1ZShBWFByb3BlcnR5TmFtZSBw cm9wZXJ0eU5hbWUpIGNvbnN0CiB7Ci0gICAgYXV0byB2YWx1ZSA9IG1fYXR0cmlidXRlTWFwLmdl dChwcm9wZXJ0eU5hbWUpOworICAgIGF1dG8gdmFsdWUgPSBtX3Byb3BlcnR5TWFwLmdldChwcm9w ZXJ0eU5hbWUpOwogICAgIHJldHVybiBXVEY6OnN3aXRjaE9uKHZhbHVlLAogICAgICAgICBbXSAo VVJMJiB0eXBlZFZhbHVlKSB7IHJldHVybiB0eXBlZFZhbHVlOyB9LAogICAgICAgICBbXSAoYXV0 byYpIHsgcmV0dXJuIFVSTCgpOyB9CkBAIC03OTksNyArNzk5LDcgQEAgVVJMIEFYSXNvbGF0ZWRP YmplY3Q6OnVybEF0dHJpYnV0ZVZhbHVlKEFYUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSkgY29u c3QKIAogUGF0aCBBWElzb2xhdGVkT2JqZWN0OjpwYXRoQXR0cmlidXRlVmFsdWUoQVhQcm9wZXJ0 eU5hbWUgcHJvcGVydHlOYW1lKSBjb25zdAogewotICAgIGF1dG8gdmFsdWUgPSBtX2F0dHJpYnV0 ZU1hcC5nZXQocHJvcGVydHlOYW1lKTsKKyAgICBhdXRvIHZhbHVlID0gbV9wcm9wZXJ0eU1hcC5n ZXQocHJvcGVydHlOYW1lKTsKICAgICByZXR1cm4gV1RGOjpzd2l0Y2hPbih2YWx1ZSwKICAgICAg ICAgW10gKFBhdGgmIHR5cGVkVmFsdWUpIHsgcmV0dXJuIHR5cGVkVmFsdWU7IH0sCiAgICAgICAg IFtdIChhdXRvJikgeyByZXR1cm4gUGF0aCgpOyB9CkBAIC04MDgsNyArODA4LDcgQEAgUGF0aCBB WElzb2xhdGVkT2JqZWN0OjpwYXRoQXR0cmlidXRlVmFsdWUoQVhQcm9wZXJ0eU5hbWUgcHJvcGVy dHlOYW1lKSBjb25zdAogCiBDb2xvciBBWElzb2xhdGVkT2JqZWN0Ojpjb2xvckF0dHJpYnV0ZVZh bHVlKEFYUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSkgY29uc3QKIHsKLSAgICBhdXRvIHZhbHVl ID0gbV9hdHRyaWJ1dGVNYXAuZ2V0KHByb3BlcnR5TmFtZSk7CisgICAgYXV0byB2YWx1ZSA9IG1f cHJvcGVydHlNYXAuZ2V0KHByb3BlcnR5TmFtZSk7CiAgICAgcmV0dXJuIFdURjo6c3dpdGNoT24o dmFsdWUsCiAgICAgICAgIFtdIChDb2xvciYgdHlwZWRWYWx1ZSkgeyByZXR1cm4gdHlwZWRWYWx1 ZTsgfSwKICAgICAgICAgW10gKGF1dG8mKSB7IHJldHVybiBDb2xvcigpOyB9CkBAIC04MTcsNyAr ODE3LDcgQEAgQ29sb3IgQVhJc29sYXRlZE9iamVjdDo6Y29sb3JBdHRyaWJ1dGVWYWx1ZShBWFBy b3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUpIGNvbnN0CiAKIGZsb2F0IEFYSXNvbGF0ZWRPYmplY3Q6 OmZsb2F0QXR0cmlidXRlVmFsdWUoQVhQcm9wZXJ0eU5hbWUgcHJvcGVydHlOYW1lKSBjb25zdAog ewotICAgIGF1dG8gdmFsdWUgPSBtX2F0dHJpYnV0ZU1hcC5nZXQocHJvcGVydHlOYW1lKTsKKyAg ICBhdXRvIHZhbHVlID0gbV9wcm9wZXJ0eU1hcC5nZXQocHJvcGVydHlOYW1lKTsKICAgICByZXR1 cm4gV1RGOjpzd2l0Y2hPbih2YWx1ZSwKICAgICAgICAgW10gKGZsb2F0JiB0eXBlZFZhbHVlKSB7 IHJldHVybiB0eXBlZFZhbHVlOyB9LAogICAgICAgICBbXSAoYXV0byYpIHsgcmV0dXJuIDA7IH0K QEAgLTgyNiw3ICs4MjYsNyBAQCBmbG9hdCBBWElzb2xhdGVkT2JqZWN0OjpmbG9hdEF0dHJpYnV0 ZVZhbHVlKEFYUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSkgY29uc3QKIAogZG91YmxlIEFYSXNv bGF0ZWRPYmplY3Q6OmRvdWJsZUF0dHJpYnV0ZVZhbHVlKEFYUHJvcGVydHlOYW1lIHByb3BlcnR5 TmFtZSkgY29uc3QKIHsKLSAgICBhdXRvIHZhbHVlID0gbV9hdHRyaWJ1dGVNYXAuZ2V0KHByb3Bl cnR5TmFtZSk7CisgICAgYXV0byB2YWx1ZSA9IG1fcHJvcGVydHlNYXAuZ2V0KHByb3BlcnR5TmFt ZSk7CiAgICAgcmV0dXJuIFdURjo6c3dpdGNoT24odmFsdWUsCiAgICAgICAgIFtdIChkb3VibGUm IHR5cGVkVmFsdWUpIHsgcmV0dXJuIHR5cGVkVmFsdWU7IH0sCiAgICAgICAgIFtdIChhdXRvJikg eyByZXR1cm4gMDsgfQpAQCAtODM1LDcgKzgzNSw3IEBAIGRvdWJsZSBBWElzb2xhdGVkT2JqZWN0 Ojpkb3VibGVBdHRyaWJ1dGVWYWx1ZShBWFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUpIGNvbnN0 CiAKIHVuc2lnbmVkIEFYSXNvbGF0ZWRPYmplY3Q6OnVuc2lnbmVkQXR0cmlidXRlVmFsdWUoQVhQ cm9wZXJ0eU5hbWUgcHJvcGVydHlOYW1lKSBjb25zdAogewotICAgIGF1dG8gdmFsdWUgPSBtX2F0 dHJpYnV0ZU1hcC5nZXQocHJvcGVydHlOYW1lKTsKKyAgICBhdXRvIHZhbHVlID0gbV9wcm9wZXJ0 eU1hcC5nZXQocHJvcGVydHlOYW1lKTsKICAgICByZXR1cm4gV1RGOjpzd2l0Y2hPbih2YWx1ZSwK ICAgICAgICAgW10gKHVuc2lnbmVkJiB0eXBlZFZhbHVlKSB7IHJldHVybiB0eXBlZFZhbHVlOyB9 LAogICAgICAgICBbXSAoYXV0byYpIHsgcmV0dXJuIDA7IH0KQEAgLTg0NCw3ICs4NDQsNyBAQCB1 bnNpZ25lZCBBWElzb2xhdGVkT2JqZWN0Ojp1bnNpZ25lZEF0dHJpYnV0ZVZhbHVlKEFYUHJvcGVy dHlOYW1lIHByb3BlcnR5TmFtZSkgYwogCiBib29sIEFYSXNvbGF0ZWRPYmplY3Q6OmJvb2xBdHRy aWJ1dGVWYWx1ZShBWFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUpIGNvbnN0CiB7Ci0gICAgYXV0 byB2YWx1ZSA9IG1fYXR0cmlidXRlTWFwLmdldChwcm9wZXJ0eU5hbWUpOworICAgIGF1dG8gdmFs dWUgPSBtX3Byb3BlcnR5TWFwLmdldChwcm9wZXJ0eU5hbWUpOwogICAgIHJldHVybiBXVEY6OnN3 aXRjaE9uKHZhbHVlLAogICAgICAgICBbXSAoYm9vbCYgdHlwZWRWYWx1ZSkgeyByZXR1cm4gdHlw ZWRWYWx1ZTsgfSwKICAgICAgICAgW10gKGF1dG8mKSB7IHJldHVybiBmYWxzZTsgfQpAQCAtODUz LDcgKzg1Myw3IEBAIGJvb2wgQVhJc29sYXRlZE9iamVjdDo6Ym9vbEF0dHJpYnV0ZVZhbHVlKEFY UHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSkgY29uc3QKIAogU3RyaW5nIEFYSXNvbGF0ZWRPYmpl Y3Q6OnN0cmluZ0F0dHJpYnV0ZVZhbHVlKEFYUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSkgY29u c3QKIHsKLSAgICBhdXRvIHZhbHVlID0gbV9hdHRyaWJ1dGVNYXAuZ2V0KHByb3BlcnR5TmFtZSk7 CisgICAgYXV0byB2YWx1ZSA9IG1fcHJvcGVydHlNYXAuZ2V0KHByb3BlcnR5TmFtZSk7CiAgICAg cmV0dXJuIFdURjo6c3dpdGNoT24odmFsdWUsCiAgICAgICAgIFtdIChTdHJpbmcmIHR5cGVkVmFs dWUpIHsgcmV0dXJuIHR5cGVkVmFsdWU7IH0sCiAgICAgICAgIFtdIChhdXRvJikgeyByZXR1cm4g ZW1wdHlTdHJpbmcoKTsgfQpAQCAtODYyLDcgKzg2Miw3IEBAIFN0cmluZyBBWElzb2xhdGVkT2Jq ZWN0OjpzdHJpbmdBdHRyaWJ1dGVWYWx1ZShBWFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUpIGNv bnN0CiAKIGludCBBWElzb2xhdGVkT2JqZWN0OjppbnRBdHRyaWJ1dGVWYWx1ZShBWFByb3BlcnR5 TmFtZSBwcm9wZXJ0eU5hbWUpIGNvbnN0CiB7Ci0gICAgYXV0byB2YWx1ZSA9IG1fYXR0cmlidXRl TWFwLmdldChwcm9wZXJ0eU5hbWUpOworICAgIGF1dG8gdmFsdWUgPSBtX3Byb3BlcnR5TWFwLmdl dChwcm9wZXJ0eU5hbWUpOwogICAgIHJldHVybiBXVEY6OnN3aXRjaE9uKHZhbHVlLAogICAgICAg ICBbXSAoaW50JiB0eXBlZFZhbHVlKSB7IHJldHVybiB0eXBlZFZhbHVlOyB9LAogICAgICAgICBb XSAoYXV0byYpIHsgcmV0dXJuIDA7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuaCBiL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuaAppbmRleCA5Yjgx MmJjMWZiZTNmNTM0MDMyNzVmZWE1MGEyNGViODZkMjgyOGExLi5hNmY2MmI2YjIyZTVhNzEyYWNm MjdhZDRhMmQ1N2U1NjEyODg3ZjE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmgKKysrIGIvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oCkBAIC0xMTIs NyArMTEyLDcgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgZmlsbENoaWxkcmVuVmVjdG9yRm9yUHJv cGVydHkoQVhQcm9wZXJ0eU5hbWUsIEFjY2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvciYpIGNvbnN0 OwogICAgIHZvaWQgc2V0TWF0aHNjcmlwdHMoQVhQcm9wZXJ0eU5hbWUsIEFYQ29yZU9iamVjdCYp OwotICAgIHZvaWQgaW5zZXJ0TWF0aFBhaXJzKFZlY3RvcjxBY2Nlc3NpYmlsaXR5SXNvbGF0ZWRU cmVlTWF0aE11bHRpc2NyaXB0UGFpcj4mLCBBY2Nlc3NpYmlsaXR5TWF0aE11bHRpc2NyaXB0UGFp cnMmKTsKKyAgICB2b2lkIGluc2VydE1hdGhQYWlycyhWZWN0b3I8c3RkOjpwYWlyPEFYSUQsIEFY SUQ+PiYsIEFjY2Vzc2liaWxpdHlNYXRoTXVsdGlzY3JpcHRQYWlycyYpOwogICAgIHRlbXBsYXRl PHR5cGVuYW1lIFU+IHZvaWQgcGVyZm9ybUZ1bmN0aW9uT25NYWluVGhyZWFkKFUmJik7CiAKICAg ICAvLyBBdHRyaWJ1dGUgcmV0cmlldmFsIG92ZXJyaWRlcy4KQEAgLTY1MCw3ICs2NTAsNyBAQCBw cml2YXRlOgogICAgIEFYSUQgbV9pZCB7IEludmFsaWRBWElEIH07CiAgICAgVmVjdG9yPEFYSUQ+ IG1fY2hpbGRyZW5JRHM7CiAgICAgVmVjdG9yPFJlZlB0cjxBWENvcmVPYmplY3Q+PiBtX2NoaWxk cmVuOwotICAgIEFYUHJvcGVydHlNYXAgbV9hdHRyaWJ1dGVNYXA7CisgICAgQVhQcm9wZXJ0eU1h cCBtX3Byb3BlcnR5TWFwOwogCiAjaWYgUExBVEZPUk0oQ09DT0EpCiAgICAgUmV0YWluUHRyPE5T Vmlldz4gbV9wbGF0Zm9ybVdpZGdldDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmggYi9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5oCmluZGV4IDdlZTJkM2Jj NGIwM2Y1OGZjOWVkYmVmMDVkZDZiMGVjNzk5NzRlYTguLjJlM2JhM2E5NjZkNDJiY2Q2ZGMzZGZk ZDg4YWI3NDgxYTljMzc0NDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuaApAQCAtNDMsMTAgKzQzLDkg QEAgY2xhc3MgQVhJc29sYXRlZE9iamVjdDsKIGNsYXNzIEFYT2JqZWN0Q2FjaGU7CiBjbGFzcyBQ YWdlOwogCi10eXBlZGVmIHVuc2lnbmVkIEFYSXNvbGF0ZWRUcmVlSUQ7Cit1c2luZyBBWElzb2xh dGVkVHJlZUlEID0gdW5zaWduZWQ7CiAKIGVudW0gY2xhc3MgQVhQcm9wZXJ0eU5hbWUgOiB1aW50 MTZfdCB7Ci0gICAgTm9uZSA9IDAsCiAgICAgQVJJQUNvbnRyb2xzRWxlbWVudHMsCiAgICAgQVJJ QURldGFpbHNFbGVtZW50cywKICAgICBEcm9wRWZmZWN0cywKQEAgLTc5LDcgKzc4LDcgQEAgZW51 bSBjbGFzcyBBWFByb3BlcnR5TmFtZSA6IHVpbnQxNl90IHsKICAgICBDYW5TZXRUZXh0UmFuZ2VB dHRyaWJ1dGVzLAogICAgIENhblNldFZhbHVlQXR0cmlidXRlLAogICAgIENhbnZhc0hhc0ZhbGxi YWNrQ29udGVudCwKLSNpZiBQTEFURk9STShDT0NPQSkgJiYgIVBMQVRGT1JNKElPU19GQU1JTFkp CisjaWYgUExBVEZPUk0oTUFDKQogICAgIENhcmV0QnJvd3NpbmdFbmFibGVkLAogI2VuZGlmCiAg ICAgQ2VsbHMsCkBAIC0zMDcsMTAgKzMwNiw4IEBAIGVudW0gY2xhc3MgQVhQcm9wZXJ0eU5hbWUg OiB1aW50MTZfdCB7CiAgICAgV2ViQXJlYSwKIH07CiAKLXR5cGVkZWYgc3RkOjpwYWlyPEFYSUQs IEFYSUQ+IEFjY2Vzc2liaWxpdHlJc29sYXRlZFRyZWVNYXRoTXVsdGlzY3JpcHRQYWlyOwotCiB1 c2luZyBBWFByb3BlcnR5VmFsdWVWYXJpYW50ID0gVmFyaWFudDxzdGQ6Om51bGxwdHJfdCwgU3Ry aW5nLCBib29sLCBpbnQsIHVuc2lnbmVkLCBkb3VibGUsIGZsb2F0LCB1aW50NjRfdCwgQ29sb3Is IFVSTCwgTGF5b3V0UmVjdCwgRmxvYXRSZWN0LCBBWElELCBJbnRQb2ludCwgT3B0aW9uU2V0PFNw ZWFrQXM+LCBzdGQ6OnBhaXI8dW5zaWduZWQsIHVuc2lnbmVkPiwgVmVjdG9yPEFjY2Vzc2liaWxp dHlUZXh0PiwgVmVjdG9yPEFYSUQ+LCBWZWN0b3I8c3RkOjpwYWlyPEFYSUQsIEFYSUQ+PiwgVmVj dG9yPFN0cmluZz4sIFBhdGg+OwotdHlwZWRlZiBIYXNoTWFwPEFYUHJvcGVydHlOYW1lLCBBWFBy b3BlcnR5VmFsdWVWYXJpYW50LCBXVEY6OkludEhhc2g8QVhQcm9wZXJ0eU5hbWU+LCBXVEY6OlN0 cm9uZ0VudW1IYXNoVHJhaXRzPEFYUHJvcGVydHlOYW1lPj4gQVhQcm9wZXJ0eU1hcDsKK3VzaW5n IEFYUHJvcGVydHlNYXAgPSBIYXNoTWFwPEFYUHJvcGVydHlOYW1lLCBBWFByb3BlcnR5VmFsdWVW YXJpYW50LCBXVEY6OkludEhhc2g8QVhQcm9wZXJ0eU5hbWU+LCBXVEY6OlN0cm9uZ0VudW1IYXNo VHJhaXRzPEFYUHJvcGVydHlOYW1lPj47CiAKIHN0cnVjdCBBWFByb3BlcnR5Q2hhbmdlIHsKICAg ICBBWElEIGF4SUQgeyBJbnZhbGlkQVhJRCB9OyAvLyBJRCBvZiB0aGUgb2JqZWN0IHdob3NlIHBy b3BlcnRpZXMgY2hhbmdlZC4K