128425 2014-02-07 17:44:45 -0800 Simplify web page creation 2014-02-07 17:52:04 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 978205 0 andersca 2014-02-07 17:44:45 -0800 Simplify web page creation 978206 1 223527 andersca 2014-02-07 17:45:52 -0800 Created attachment 223527 Patch 978209 2 223527 kling 2014-02-07 17:49:19 -0800 Comment on attachment 223527 Patch Otay! r=me 978212 3 andersca 2014-02-07 17:52:04 -0800 Committed r163671: <http://trac.webkit.org/changeset/163671> 223527 2014-02-07 17:45:52 -0800 2014-02-07 17:49:19 -0800 Patch bug-128425-20140207174552.patch text/plain 13631 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTYzNjYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZjllMzhlOTZlYWIwM2U2 ZDZjMGUzMTQ1YWY4NDM0NmYwMzAwZjQxNi4uNTY3ZGQzODA3OTEwZGYyNjhjMzQxOGY2YWRmNzA0 ZGRhNmE4OGFhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMzIEBACiAyMDE0LTAyLTA3ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgU2ltcGxpZnkgd2Vi IHBhZ2UgY3JlYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEyODQyNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEFkZCBhIFdlYlBhZ2VDb25maWd1cmF0aW9uIGNsYXNzIGFuZCBzdGljayB0aGUgcGFn ZSBncm91cCwgcHJlZmVyZW5jZXMsIHNlc3Npb24gZXRjIHRoZXJlCisgICAgICAgIGluc3RlYWQg b2YgYWRkaW5nIG1vcmUgYW5kIG1vcmUgcGFyYW1ldGVycyB0byB0aGUgV2ViUGFnZVByb3h5IGNv bnN0cnVjdG9yLgorCisgICAgICAgIE1ha2UgV2ViQ29udGV4dDo6Y3JlYXRlV2ViUGFnZSBmaWxs IGluIHRoZSBtaXNzaW5nIHBpZWNlcyBpbiB0aGUgV2ViUGFnZUNvbmZpZ3VyYXRpb24gb2JqZWN0 LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9pb3MvV0tDb250ZW50Vmlldy5tbToKKyAgICAg ICAgKC1bV0tDb250ZW50VmlldyBpbml0V2l0aEZyYW1lOmNvbmZpZ3VyYXRpb246XSk6CisgICAg ICAgICgtW1dLQ29udGVudFZpZXcgX2NvbW1vbkluaXRpYWxpemF0aW9uV2l0aENvbnRleHRSZWY6 cGFnZUdyb3VwUmVmOnJlbGF0ZWRUb1BhZ2U6XSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9t YWMvV0tWaWV3Lm1tOgorICAgICAgICAoLVtXS1ZpZXcgaW5pdFdpdGhGcmFtZTpjb250ZXh0UmVm OnBhZ2VHcm91cFJlZjpyZWxhdGVkVG9QYWdlOl0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJD b250ZXh0LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4dDo6Y3JlYXRlV2ViUGFnZSk6 CisgICAgICAgICogVUlQcm9jZXNzL1dlYkNvbnRleHQuaDoKKyAgICAgICAgKiBVSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpjcmVhdGUp OgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OldlYlBhZ2VQcm94eSk6CisgICAgICAg ICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9j ZXNzUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6OmNyZWF0ZVdl YlBhZ2UpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaDoKKworMjAxNC0w Mi0wNyAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIElt cGxlbWVudCBtb3JlIG9mIFdLUHJlZmVyZW5jZXMKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEyODQxMQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2lvcy9XS0NvbnRlbnRWaWV3Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9pb3MvV0tDb250ZW50Vmlldy5tbQppbmRleCBmZTFlOGE3YzUxMjk5NzY1NjBm NjYwOWRmODY0ZjUwMDk4NDdjYjBmLi5kNWJjYWZkMjg4NDhlZmQ3ZjRjYmFkYzNkMzBjYzRjZDg3 ZWVkNmU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2lvcy9XS0Nv bnRlbnRWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvaW9zL1dLQ29u dGVudFZpZXcubW0KQEAgLTk5LDcgKzk5LDkgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIAog ICAgIF9wYWdlQ2xpZW50ID0gc3RkOjptYWtlX3VuaXF1ZTxQYWdlQ2xpZW50SW1wbD4oc2VsZik7 CiAKLSAgICBfcGFnZSA9IGNvbmZpZ3VyYXRpb24ucHJvY2Vzc0NsYXNzLT5fY29udGV4dC0+Y3Jl YXRlV2ViUGFnZSgqX3BhZ2VDbGllbnQsIG51bGxwdHIpOworICAgIFdlYlBhZ2VDb25maWd1cmF0 aW9uIHdlYlBhZ2VDb25maWd1cmF0aW9uOworCisgICAgX3BhZ2UgPSBjb25maWd1cmF0aW9uLnBy b2Nlc3NDbGFzcy0+X2NvbnRleHQtPmNyZWF0ZVdlYlBhZ2UoKl9wYWdlQ2xpZW50LCBzdGQ6Om1v dmUod2ViUGFnZUNvbmZpZ3VyYXRpb24pKTsKICAgICBfcGFnZS0+aW5pdGlhbGl6ZVdlYlBhZ2Uo KTsKICAgICBfcGFnZS0+c2V0SW50cmluc2ljRGV2aWNlU2NhbGVGYWN0b3IoW1VJU2NyZWVuIG1h aW5TY3JlZW5dLnNjYWxlKTsKICAgICBfcGFnZS0+c2V0VXNlRml4ZWRMYXlvdXQodHJ1ZSk7CkBA IC0yNDYsNyArMjQ4LDEyIEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAgICAgSW5pdGlhbGl6 ZVdlYktpdDIoKTsKIAogICAgIF9wYWdlQ2xpZW50ID0gc3RkOjptYWtlX3VuaXF1ZTxQYWdlQ2xp ZW50SW1wbD4oc2VsZik7Ci0gICAgX3BhZ2UgPSB0b0ltcGwoY29udGV4dFJlZiktPmNyZWF0ZVdl YlBhZ2UoKl9wYWdlQ2xpZW50LCB0b0ltcGwocGFnZUdyb3VwUmVmKSwgdG9JbXBsKHJlbGF0ZWRQ YWdlKSk7CisKKyAgICBXZWJQYWdlQ29uZmlndXJhdGlvbiB3ZWJQYWdlQ29uZmlndXJhdGlvbjsK KyAgICB3ZWJQYWdlQ29uZmlndXJhdGlvbi5ncm91cCA9IHRvSW1wbChwYWdlR3JvdXBSZWYpOwor ICAgIHdlYlBhZ2VDb25maWd1cmF0aW9uLnJlbGF0ZWRQYWdlID0gdG9JbXBsKHJlbGF0ZWRQYWdl KTsKKworICAgIF9wYWdlID0gdG9JbXBsKGNvbnRleHRSZWYpLT5jcmVhdGVXZWJQYWdlKCpfcGFn ZUNsaWVudCwgc3RkOjptb3ZlKHdlYlBhZ2VDb25maWd1cmF0aW9uKSk7CiAgICAgX3BhZ2UtPmlu aXRpYWxpemVXZWJQYWdlKCk7CiAgICAgX3BhZ2UtPnNldEludHJpbnNpY0RldmljZVNjYWxlRmFj dG9yKFtVSVNjcmVlbiBtYWluU2NyZWVuXS5zY2FsZSk7CiAgICAgX3BhZ2UtPnNldFVzZUZpeGVk TGF5b3V0KHRydWUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9t YWMvV0tWaWV3Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1t CmluZGV4IDJmYmZhMTE2NDU1OTZlZjUyNTg5NmRlYmYxNTA2NmZjMWI2MWRkYmEuLmY3ZmUxYzNm MjZiMjA2NmExZTUwNjRiMjE1NjMwMTY3YTk0YTZkYzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KQEAgLTI5MzQsOCArMjkzNCwxMiBAQCBzdGF0aWMgTlNT dHJpbmcgKnBhdGhXaXRoVW5pcXVlRmlsZW5hbWVGb3JQYXRoKE5TU3RyaW5nICpwYXRoKQogCiAg ICAgX2RhdGEgPSBbW1dLVmlld0RhdGEgYWxsb2NdIGluaXRdOwogCisgICAgV2ViUGFnZUNvbmZp Z3VyYXRpb24gd2ViUGFnZUNvbmZpZ3VyYXRpb247CisgICAgd2ViUGFnZUNvbmZpZ3VyYXRpb24u cGFnZUdyb3VwID0gdG9JbXBsKHBhZ2VHcm91cFJlZik7CisgICAgd2ViUGFnZUNvbmZpZ3VyYXRp b24ucmVsYXRlZFBhZ2UgPSB0b0ltcGwocmVsYXRlZFBhZ2UpOworCiAgICAgX2RhdGEtPl9wYWdl Q2xpZW50ID0gc3RkOjptYWtlX3VuaXF1ZTxQYWdlQ2xpZW50SW1wbD4oc2VsZik7Ci0gICAgX2Rh dGEtPl9wYWdlID0gdG9JbXBsKGNvbnRleHRSZWYpLT5jcmVhdGVXZWJQYWdlKCpfZGF0YS0+X3Bh Z2VDbGllbnQsIHRvSW1wbChwYWdlR3JvdXBSZWYpLCB0b0ltcGwocmVsYXRlZFBhZ2UpKTsKKyAg ICBfZGF0YS0+X3BhZ2UgPSB0b0ltcGwoY29udGV4dFJlZiktPmNyZWF0ZVdlYlBhZ2UoKl9kYXRh LT5fcGFnZUNsaWVudCwgc3RkOjptb3ZlKHdlYlBhZ2VDb25maWd1cmF0aW9uKSk7CiAgICAgX2Rh dGEtPl9wYWdlLT5zZXRJbnRyaW5zaWNEZXZpY2VTY2FsZUZhY3Rvcihbc2VsZiBfaW50cmluc2lj RGV2aWNlU2NhbGVGYWN0b3JdKTsKICAgICBfZGF0YS0+X3BhZ2UtPmluaXRpYWxpemVXZWJQYWdl KCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmNw cCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmNwcAppbmRleCBjMTMyYjI5 ODcxMTRjY2IxY2Y2NzhmNGMzODEyZmQ3NjBlMDUzMWE1Li5iMGM4YmI4MjNhNmI4NDk0YTZjMTI4 MjQyMzMwNWNhN2E1MzU2NGJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQu Y3BwCkBAIC03NjMsOCArNzYzLDE1IEBAIFdlYlByb2Nlc3NQcm94eSYgV2ViQ29udGV4dDo6Y3Jl YXRlTmV3V2ViUHJvY2Vzc1Jlc3BlY3RpbmdQcm9jZXNzQ291bnRMaW1pdCgpCiAgICAgcmV0dXJu ICpyZXN1bHQ7CiB9CiAKLVBhc3NSZWZQdHI8V2ViUGFnZVByb3h5PiBXZWJDb250ZXh0OjpjcmVh dGVXZWJQYWdlKFBhZ2VDbGllbnQmIHBhZ2VDbGllbnQsIFdlYlBhZ2VHcm91cCogcGFnZUdyb3Vw LCBBUEk6OlNlc3Npb24mIHNlc3Npb24sIFdlYlBhZ2VQcm94eSogcmVsYXRlZFBhZ2UpCitQYXNz UmVmUHRyPFdlYlBhZ2VQcm94eT4gV2ViQ29udGV4dDo6Y3JlYXRlV2ViUGFnZShQYWdlQ2xpZW50 JiBwYWdlQ2xpZW50LCBXZWJQYWdlQ29uZmlndXJhdGlvbiBjb25maWd1cmF0aW9uKQogeworICAg IGlmICghY29uZmlndXJhdGlvbi5wYWdlR3JvdXApCisgICAgICAgIGNvbmZpZ3VyYXRpb24ucGFn ZUdyb3VwID0gJm1fZGVmYXVsdFBhZ2VHcm91cC5nZXQoKTsKKyAgICBpZiAoIWNvbmZpZ3VyYXRp b24ucHJlZmVyZW5jZXMpCisgICAgICAgIGNvbmZpZ3VyYXRpb24ucHJlZmVyZW5jZXMgPSAmY29u ZmlndXJhdGlvbi5wYWdlR3JvdXAtPnByZWZlcmVuY2VzKCk7CisgICAgaWYgKCFjb25maWd1cmF0 aW9uLnNlc3Npb24pCisgICAgICAgIGNvbmZpZ3VyYXRpb24uc2Vzc2lvbiA9IGNvbmZpZ3VyYXRp b24ucHJlZmVyZW5jZXMtPnByaXZhdGVCcm93c2luZ0VuYWJsZWQoKSA/ICZBUEk6OlNlc3Npb246 OmxlZ2FjeVByaXZhdGVTZXNzaW9uKCkgOiAmQVBJOjpTZXNzaW9uOjpkZWZhdWx0U2Vzc2lvbigp OworCiAgICAgUmVmUHRyPFdlYlByb2Nlc3NQcm94eT4gcHJvY2VzczsKICAgICBpZiAobV9wcm9j ZXNzTW9kZWwgPT0gUHJvY2Vzc01vZGVsU2hhcmVkU2Vjb25kYXJ5UHJvY2VzcykgewogICAgICAg ICBwcm9jZXNzID0gJmVuc3VyZVNoYXJlZFdlYlByb2Nlc3MoKTsKQEAgLTc3MiwyMCArNzc5LDE0 IEBAIFBhc3NSZWZQdHI8V2ViUGFnZVByb3h5PiBXZWJDb250ZXh0OjpjcmVhdGVXZWJQYWdlKFBh Z2VDbGllbnQmIHBhZ2VDbGllbnQsIFdlYlBhCiAgICAgICAgIGlmIChtX2hhdmVJbml0aWFsRW1w dHlQcm9jZXNzKSB7CiAgICAgICAgICAgICBwcm9jZXNzID0gbV9wcm9jZXNzZXMubGFzdCgpOwog ICAgICAgICAgICAgbV9oYXZlSW5pdGlhbEVtcHR5UHJvY2VzcyA9IGZhbHNlOwotICAgICAgICB9 IGVsc2UgaWYgKHJlbGF0ZWRQYWdlKSB7CisgICAgICAgIH0gZWxzZSBpZiAoY29uZmlndXJhdGlv bi5yZWxhdGVkUGFnZSkgewogICAgICAgICAgICAgLy8gU2hhcmluZyBwcm9jZXNzZXMsIGUuZy4g d2hlbiBjcmVhdGluZyB0aGUgcGFnZSB2aWEgd2luZG93Lm9wZW4oKS4KLSAgICAgICAgICAgIHBy b2Nlc3MgPSAmcmVsYXRlZFBhZ2UtPnByb2Nlc3MoKTsKKyAgICAgICAgICAgIHByb2Nlc3MgPSAm Y29uZmlndXJhdGlvbi5yZWxhdGVkUGFnZS0+cHJvY2VzcygpOwogICAgICAgICB9IGVsc2UKICAg ICAgICAgICAgIHByb2Nlc3MgPSAmY3JlYXRlTmV3V2ViUHJvY2Vzc1Jlc3BlY3RpbmdQcm9jZXNz Q291bnRMaW1pdCgpOwogICAgIH0KIAotICAgIHJldHVybiBwcm9jZXNzLT5jcmVhdGVXZWJQYWdl KHBhZ2VDbGllbnQsIHBhZ2VHcm91cCA/ICpwYWdlR3JvdXAgOiBtX2RlZmF1bHRQYWdlR3JvdXAu Z2V0KCksIHNlc3Npb24pOwotfQotCi1QYXNzUmVmUHRyPFdlYlBhZ2VQcm94eT4gV2ViQ29udGV4 dDo6Y3JlYXRlV2ViUGFnZShQYWdlQ2xpZW50JiBwYWdlQ2xpZW50LCBXZWJQYWdlR3JvdXAqIHBh Z2VHcm91cCwgV2ViUGFnZVByb3h5KiByZWxhdGVkUGFnZSkKLXsKLSAgICBXZWJQYWdlR3JvdXAq IGdyb3VwID0gcGFnZUdyb3VwID8gcGFnZUdyb3VwIDogJm1fZGVmYXVsdFBhZ2VHcm91cC5nZXQo KTsKLSAgICByZXR1cm4gY3JlYXRlV2ViUGFnZShwYWdlQ2xpZW50LCBncm91cCwgZ3JvdXAtPnBy ZWZlcmVuY2VzKCkucHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCgpID8gQVBJOjpTZXNzaW9uOjpsZWdh Y3lQcml2YXRlU2Vzc2lvbigpIDogQVBJOjpTZXNzaW9uOjpkZWZhdWx0U2Vzc2lvbigpLCByZWxh dGVkUGFnZSk7CisgICAgcmV0dXJuIHByb2Nlc3MtPmNyZWF0ZVdlYlBhZ2UocGFnZUNsaWVudCwg c3RkOjptb3ZlKGNvbmZpZ3VyYXRpb24pKTsKIH0KIAogRG93bmxvYWRQcm94eSogV2ViQ29udGV4 dDo6ZG93bmxvYWQoV2ViUGFnZVByb3h5KiBpbml0aWF0aW5nUGFnZSwgY29uc3QgUmVzb3VyY2VS ZXF1ZXN0JiByZXF1ZXN0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YkNvbnRleHQuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmgKaW5kZXgg NzY0ODYwZTc5MmQyMmQzOGJiZGE0NTI4MzQyMzVjZGJlNmI4OWRmNy4uNTVlYzNhOWRlYjRkOTM5 OGRhMDdiNzk3MTZhNjFkZjY4OTk1NGNlYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYkNvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29u dGV4dC5oCkBAIC03NCw2ICs3NCw3IEBAIGNsYXNzIFdlYkljb25EYXRhYmFzZTsKIGNsYXNzIFdl YlBhZ2VHcm91cDsKIGNsYXNzIFdlYlBhZ2VQcm94eTsKIHN0cnVjdCBTdGF0aXN0aWNzRGF0YTsK K3N0cnVjdCBXZWJQYWdlQ29uZmlndXJhdGlvbjsKIHN0cnVjdCBXZWJQcm9jZXNzQ3JlYXRpb25Q YXJhbWV0ZXJzOwogICAgIAogdHlwZWRlZiBHZW5lcmljQ2FsbGJhY2s8V0tEaWN0aW9uYXJ5UmVm PiBEaWN0aW9uYXJ5Q2FsbGJhY2s7CkBAIC0xNTYsOCArMTU3LDcgQEAgcHVibGljOgogCiAgICAg U3RvcmFnZU1hbmFnZXImIHN0b3JhZ2VNYW5hZ2VyKCkgY29uc3QgeyByZXR1cm4gKm1fc3RvcmFn ZU1hbmFnZXI7IH0KIAotICAgIFBhc3NSZWZQdHI8V2ViUGFnZVByb3h5PiBjcmVhdGVXZWJQYWdl KFBhZ2VDbGllbnQmLCBXZWJQYWdlR3JvdXAqLCBBUEk6OlNlc3Npb24mLCBXZWJQYWdlUHJveHkq IHJlbGF0ZWRQYWdlID0gMCk7Ci0gICAgUGFzc1JlZlB0cjxXZWJQYWdlUHJveHk+IGNyZWF0ZVdl YlBhZ2UoUGFnZUNsaWVudCYsIFdlYlBhZ2VHcm91cCosIFdlYlBhZ2VQcm94eSogcmVsYXRlZFBh Z2UgPSAwKTsKKyAgICBQYXNzUmVmUHRyPFdlYlBhZ2VQcm94eT4gY3JlYXRlV2ViUGFnZShQYWdl Q2xpZW50JiwgV2ViUGFnZUNvbmZpZ3VyYXRpb24pOwogCiAgICAgY29uc3QgU3RyaW5nJiBpbmpl Y3RlZEJ1bmRsZVBhdGgoKSBjb25zdCB7IHJldHVybiBtX2luamVjdGVkQnVuZGxlUGF0aDsgfQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IDljMmZjYjZh ZDU1MmU5NGU1MGEwMWEyYjM4NjFmZmM5MmZhNDdiOGQuLmVhMWQ4NjEyYWNlMTYwYWFlZGNjYmFk ODJhN2JhODdmMmY1NjhhMjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuY3BwCkBAIC0yNDYsMTkgKzI0NiwxOSBAQCBzdGF0aWMgY29uc3QgY2hhciogd2ViS2V5Ym9h cmRFdmVudFR5cGVTdHJpbmcoV2ViRXZlbnQ6OlR5cGUgdHlwZSkKIH0KICNlbmRpZiAvLyAhTE9H X0RJU0FCTEVECiAKLVBhc3NSZWZQdHI8V2ViUGFnZVByb3h5PiBXZWJQYWdlUHJveHk6OmNyZWF0 ZShQYWdlQ2xpZW50JiBwYWdlQ2xpZW50LCBXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MsIFdlYlBh Z2VHcm91cCYgcGFnZUdyb3VwLCBXZWJQcmVmZXJlbmNlcyYgcHJlZmVyZW5jZXMsIEFQSTo6U2Vz c2lvbiYgc2Vzc2lvbiwgdWludDY0X3QgcGFnZUlEKQorUGFzc1JlZlB0cjxXZWJQYWdlUHJveHk+ IFdlYlBhZ2VQcm94eTo6Y3JlYXRlKFBhZ2VDbGllbnQmIHBhZ2VDbGllbnQsIFdlYlByb2Nlc3NQ cm94eSYgcHJvY2VzcywgdWludDY0X3QgcGFnZUlELCBjb25zdCBXZWJQYWdlQ29uZmlndXJhdGlv biYgY29uZmlndXJhdGlvbikKIHsKLSAgICByZXR1cm4gYWRvcHRSZWYobmV3IFdlYlBhZ2VQcm94 eShwYWdlQ2xpZW50LCBwcm9jZXNzLCBwYWdlR3JvdXAsIHByZWZlcmVuY2VzLCBzZXNzaW9uLCBw YWdlSUQpKTsKKyAgICByZXR1cm4gYWRvcHRSZWYobmV3IFdlYlBhZ2VQcm94eShwYWdlQ2xpZW50 LCBwcm9jZXNzLCBwYWdlSUQsIGNvbmZpZ3VyYXRpb24pKTsKIH0KIAotV2ViUGFnZVByb3h5OjpX ZWJQYWdlUHJveHkoUGFnZUNsaWVudCYgcGFnZUNsaWVudCwgV2ViUHJvY2Vzc1Byb3h5JiBwcm9j ZXNzLCBXZWJQYWdlR3JvdXAmIHBhZ2VHcm91cCwgV2ViUHJlZmVyZW5jZXMmIHByZWZlcmVuY2Vz LCBBUEk6OlNlc3Npb24mIHNlc3Npb24sIHVpbnQ2NF90IHBhZ2VJRCkKK1dlYlBhZ2VQcm94eTo6 V2ViUGFnZVByb3h5KFBhZ2VDbGllbnQmIHBhZ2VDbGllbnQsIFdlYlByb2Nlc3NQcm94eSYgcHJv Y2VzcywgdWludDY0X3QgcGFnZUlELCBjb25zdCBXZWJQYWdlQ29uZmlndXJhdGlvbiYgY29uZmln dXJhdGlvbikKICAgICA6IG1fcGFnZUNsaWVudChwYWdlQ2xpZW50KQogICAgICwgbV9sb2FkZXJD bGllbnQoc3RkOjptYWtlX3VuaXF1ZTxBUEk6OkxvYWRlckNsaWVudD4oKSkKICAgICAsIG1fcG9s aWN5Q2xpZW50KHN0ZDo6bWFrZV91bmlxdWU8QVBJOjpQb2xpY3lDbGllbnQ+KCkpCiAgICAgLCBt X3VpQ2xpZW50KHN0ZDo6bWFrZV91bmlxdWU8QVBJOjpVSUNsaWVudD4oKSkKICAgICAsIG1fcHJv Y2Vzcyhwcm9jZXNzKQotICAgICwgbV9wYWdlR3JvdXAocGFnZUdyb3VwKQotICAgICwgbV9wcmVm ZXJlbmNlcyhwcmVmZXJlbmNlcykKKyAgICAsIG1fcGFnZUdyb3VwKCpjb25maWd1cmF0aW9uLnBh Z2VHcm91cCkKKyAgICAsIG1fcHJlZmVyZW5jZXMoKmNvbmZpZ3VyYXRpb24ucHJlZmVyZW5jZXMp CiAgICAgLCBtX21haW5GcmFtZShudWxscHRyKQogICAgICwgbV91c2VyQWdlbnQoc3RhbmRhcmRV c2VyQWdlbnQoKSkKICAgICAsIG1fZ2VvbG9jYXRpb25QZXJtaXNzaW9uUmVxdWVzdE1hbmFnZXIo KnRoaXMpCkBAIC0zMDEsNyArMzAxLDcgQEAgV2ViUGFnZVByb3h5OjpXZWJQYWdlUHJveHkoUGFn ZUNsaWVudCYgcGFnZUNsaWVudCwgV2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNzLCBXZWIKICAgICAs IG1faXNUcmFja2luZ1RvdWNoRXZlbnRzKGZhbHNlKQogI2VuZGlmCiAgICAgLCBtX3BhZ2VJRChw YWdlSUQpCi0gICAgLCBtX3Nlc3Npb24oc2Vzc2lvbikKKyAgICAsIG1fc2Vzc2lvbigqY29uZmln dXJhdGlvbi5zZXNzaW9uKQogICAgICwgbV9pc1BhZ2VTdXNwZW5kZWQoZmFsc2UpCiAjaWYgUExB VEZPUk0oTUFDKQogICAgICwgbV9pc1NtYXJ0SW5zZXJ0RGVsZXRlRW5hYmxlZChUZXh0Q2hlY2tl cjo6aXNTbWFydEluc2VydERlbGV0ZUVuYWJsZWQoKSkKQEAgLTM2OSw3ICszNjksNyBAQCBXZWJQ YWdlUHJveHk6OldlYlBhZ2VQcm94eShQYWdlQ2xpZW50JiBwYWdlQ2xpZW50LCBXZWJQcm9jZXNz UHJveHkmIHByb2Nlc3MsIFdlYgogCiAgICAgLy8gRklYTUU6IElmIHdlIGV2ZXIgZXhwb3NlIHRo ZSBzZXNzaW9uIHN0b3JhZ2Ugc2l6ZSBhcyBhIHByZWZlcmVuY2UsIHdlIG5lZWQgdG8gcGFzcyBp dCBoZXJlLgogICAgIG1fcHJvY2Vzcy0+Y29udGV4dCgpLnN0b3JhZ2VNYW5hZ2VyKCkuY3JlYXRl U2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UobV9wYWdlSUQsIG1fcHJvY2Vzcy0+aXNWYWxpZCgpID8g bV9wcm9jZXNzLT5jb25uZWN0aW9uKCkgOiAwLCBzdGQ6Om51bWVyaWNfbGltaXRzPHVuc2lnbmVk Pjo6bWF4KCkpOwotICAgIHNldFNlc3Npb24oc2Vzc2lvbik7CisgICAgc2V0U2Vzc2lvbigqY29u ZmlndXJhdGlvbi5zZXNzaW9uKTsKIH0KIAogV2ViUGFnZVByb3h5Ojp+V2ViUGFnZVByb3h5KCkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCA5MjAxNzU0YTczMTMw ZDEwZWMzYTIzMjYzMGU3NTE0NzcxYjQ0MWVhLi4wZmM0MmY2Nzg1YzYyZTExMGVkYTI4MjAwMmRm NjY4Y2FiMDhlMTBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBA IC0zMjMsNiArMzIzLDEzIEBAIHByaXZhdGU6CiB9OwogI2VuZGlmCiAKK3N0cnVjdCBXZWJQYWdl Q29uZmlndXJhdGlvbiB7CisgICAgV2ViUGFnZUdyb3VwKiBwYWdlR3JvdXAgPSBudWxscHRyOwor ICAgIFdlYlByZWZlcmVuY2VzKiBwcmVmZXJlbmNlcyA9IG51bGxwdHI7CisgICAgQVBJOjpTZXNz aW9uKiBzZXNzaW9uID0gbnVsbHB0cjsKKyAgICBXZWJQYWdlUHJveHkqIHJlbGF0ZWRQYWdlID0g bnVsbHB0cjsKK307CisKIGNsYXNzIFdlYlBhZ2VQcm94eSA6IHB1YmxpYyBBUEk6Ok9iamVjdElt cGw8QVBJOjpPYmplY3Q6OlR5cGU6OlBhZ2U+CiAjaWYgRU5BQkxFKElOUFVUX1RZUEVfQ09MT1Ip CiAgICAgLCBwdWJsaWMgV2ViQ29sb3JQaWNrZXI6OkNsaWVudApAQCAtMzMxLDcgKzMzOCw3IEBA IGNsYXNzIFdlYlBhZ2VQcm94eSA6IHB1YmxpYyBBUEk6Ok9iamVjdEltcGw8QVBJOjpPYmplY3Q6 OlR5cGU6OlBhZ2U+CiAgICAgLCBwdWJsaWMgSVBDOjpNZXNzYWdlUmVjZWl2ZXIKICAgICAsIHB1 YmxpYyBJUEM6Ok1lc3NhZ2VTZW5kZXIgewogcHVibGljOgotICAgIHN0YXRpYyBQYXNzUmVmUHRy PFdlYlBhZ2VQcm94eT4gY3JlYXRlKFBhZ2VDbGllbnQmLCBXZWJQcm9jZXNzUHJveHkmLCBXZWJQ YWdlR3JvdXAmLCBXZWJQcmVmZXJlbmNlcyYsIEFQSTo6U2Vzc2lvbiYsIHVpbnQ2NF90IHBhZ2VJ RCk7CisgICAgc3RhdGljIFBhc3NSZWZQdHI8V2ViUGFnZVByb3h5PiBjcmVhdGUoUGFnZUNsaWVu dCYsIFdlYlByb2Nlc3NQcm94eSYsIHVpbnQ2NF90IHBhZ2VJRCwgY29uc3QgV2ViUGFnZUNvbmZp Z3VyYXRpb24mKTsKICAgICB2aXJ0dWFsIH5XZWJQYWdlUHJveHkoKTsKIAogICAgIHZvaWQgc2V0 U2Vzc2lvbihBUEk6OlNlc3Npb24mKTsKQEAgLTg3OSw3ICs4ODYsNyBAQCBwdWJsaWM6CiAjZW5k aWYKIAogcHJpdmF0ZToKLSAgICBXZWJQYWdlUHJveHkoUGFnZUNsaWVudCYsIFdlYlByb2Nlc3NQ cm94eSYsIFdlYlBhZ2VHcm91cCYsIFdlYlByZWZlcmVuY2VzJiwgQVBJOjpTZXNzaW9uJiwgdWlu dDY0X3QgcGFnZUlEKTsKKyAgICBXZWJQYWdlUHJveHkoUGFnZUNsaWVudCYsIFdlYlByb2Nlc3NQ cm94eSYsIHVpbnQ2NF90IHBhZ2VJRCwgY29uc3QgV2ViUGFnZUNvbmZpZ3VyYXRpb24mKTsKICAg ICB2b2lkIHBsYXRmb3JtSW5pdGlhbGl6ZSgpOwogCiAgICAgdm9pZCB1cGRhdGVWaWV3U3RhdGUo V2ViQ29yZTo6Vmlld1N0YXRlOjpGbGFncyBmbGFnc1RvVXBkYXRlID0gV2ViQ29yZTo6Vmlld1N0 YXRlOjpBbGxGbGFncyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UHJvY2Vzc1Byb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJv eHkuY3BwCmluZGV4IDNmMGZhOTc1ZjMzZmZjMzVhYWIwMTE4ZTUyMjY1YzhhODEzZmNmYzQuLjA1 ZmQzZGM5Y2I4YjYwZmZiNmY0NTc1MTM2YTJmMGEwZjE3MjdlMzQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCkBAIC0xNjgsMTAgKzE2OCwxMCBAQCBX ZWJQYWdlUHJveHkqIFdlYlByb2Nlc3NQcm94eTo6d2ViUGFnZSh1aW50NjRfdCBwYWdlSUQpCiAg ICAgcmV0dXJuIGdsb2JhbFBhZ2VNYXAoKS5nZXQocGFnZUlEKTsKIH0KIAotUGFzc1JlZlB0cjxX ZWJQYWdlUHJveHk+IFdlYlByb2Nlc3NQcm94eTo6Y3JlYXRlV2ViUGFnZShQYWdlQ2xpZW50JiBw YWdlQ2xpZW50LCBXZWJQYWdlR3JvdXAmIHBhZ2VHcm91cCwgQVBJOjpTZXNzaW9uJiBzZXNzaW9u KQorUGFzc1JlZlB0cjxXZWJQYWdlUHJveHk+IFdlYlByb2Nlc3NQcm94eTo6Y3JlYXRlV2ViUGFn ZShQYWdlQ2xpZW50JiBwYWdlQ2xpZW50LCBjb25zdCBXZWJQYWdlQ29uZmlndXJhdGlvbiYgY29u ZmlndXJhdGlvbikKIHsKICAgICB1aW50NjRfdCBwYWdlSUQgPSBnZW5lcmF0ZVBhZ2VJRCgpOwot ICAgIFJlZlB0cjxXZWJQYWdlUHJveHk+IHdlYlBhZ2UgPSBXZWJQYWdlUHJveHk6OmNyZWF0ZShw YWdlQ2xpZW50LCAqdGhpcywgcGFnZUdyb3VwLCBwYWdlR3JvdXAucHJlZmVyZW5jZXMoKSwgc2Vz c2lvbiwgcGFnZUlEKTsKKyAgICBSZWZQdHI8V2ViUGFnZVByb3h5PiB3ZWJQYWdlID0gV2ViUGFn ZVByb3h5OjpjcmVhdGUocGFnZUNsaWVudCwgKnRoaXMsIHBhZ2VJRCwgY29uZmlndXJhdGlvbik7 CiAgICAgbV9wYWdlTWFwLnNldChwYWdlSUQsIHdlYlBhZ2UuZ2V0KCkpOwogICAgIGdsb2JhbFBh Z2VNYXAoKS5zZXQocGFnZUlELCB3ZWJQYWdlLmdldCgpKTsKICNpZiBQTEFURk9STShNQUMpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmggYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmgKaW5kZXggYzU0NTI3MmFj NDYwMTNhZGU3NDRlOGE2ZjlhNDY3MGNkOTg0ZWNkYy4uYTdjYThmODZlZmNhYzI5NTQ0MjRjN2Uw Yjk0NjVkODkyNjNkMjdlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YlByb2Nlc3NQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNz UHJveHkuaApAQCAtNzgsNyArNzgsNyBAQCBwdWJsaWM6CiAgICAgV2ViQ29udGV4dCYgY29udGV4 dCgpIHsgcmV0dXJuIG1fY29udGV4dC5nZXQoKTsgfQogCiAgICAgc3RhdGljIFdlYlBhZ2VQcm94 eSogd2ViUGFnZSh1aW50NjRfdCBwYWdlSUQpOwotICAgIFBhc3NSZWZQdHI8V2ViUGFnZVByb3h5 PiBjcmVhdGVXZWJQYWdlKFBhZ2VDbGllbnQmLCBXZWJQYWdlR3JvdXAmLCBBUEk6OlNlc3Npb24m KTsKKyAgICBQYXNzUmVmUHRyPFdlYlBhZ2VQcm94eT4gY3JlYXRlV2ViUGFnZShQYWdlQ2xpZW50 JiwgY29uc3QgV2ViUGFnZUNvbmZpZ3VyYXRpb24mKTsKICAgICB2b2lkIGFkZEV4aXN0aW5nV2Vi UGFnZShXZWJQYWdlUHJveHkqLCB1aW50NjRfdCBwYWdlSUQpOwogICAgIHZvaWQgcmVtb3ZlV2Vi UGFnZSh1aW50NjRfdCBwYWdlSUQpOwogICAgIFZlY3RvcjxXZWJQYWdlUHJveHkqPiBwYWdlcygp IGNvbnN0Owo=