67550 2011-09-02 19:40:49 -0700 split overrideSize into overrideHeight and overrideWidth 2011-09-07 13:17:15 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ojan ojan bdakin hyatt jamesr tony oldest_to_newest 461703 0 ojan 2011-09-02 19:40:49 -0700 split overrideSize into overrideHeight and overrideWidth 461707 1 106241 ojan 2011-09-02 19:51:02 -0700 Created attachment 106241 Patch 462651 2 106241 tony 2011-09-06 10:51:58 -0700 Comment on attachment 106241 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=106241&action=review > Source/WebCore/rendering/RenderBox.cpp:1593 > #if ENABLE(CSS3_FLEXBOX) > // FIXME: Check direction once flex-direction is implemented. > - if (hasOverrideSize() && parent()->isFlexibleBox()) { > + if (hasOverrideWidth() && parent()->isFlexibleBox()) { > setLogicalWidth(overrideWidth()); > return; We can get rid of this #if block and use: if (hasOverrideWidth() && isFlexibleBoxIncludingDeprecated()) > Source/WebCore/rendering/RenderBox.h:250 > + void setOverrideHeight(const LayoutUnit); > + void setOverrideWidth(const LayoutUnit); Nit: I would drop the const here. 463605 3 ojan 2011-09-07 13:17:15 -0700 Committed r94706: <http://trac.webkit.org/changeset/94706> 106241 2011-09-02 19:51:02 -0700 2011-09-06 10:51:58 -0700 Patch bug-67550-20110902195101.patch text/plain 17030 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogOTQ0MzMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA4MWZjMzQ5OWMwZGE3NjA4 ODIxMWNhMmVjMTc5ZWIwZWRkYTg4OWIyLi5hYjZlY2RlYWRmZTMyNTBiMWIxZTIyNmU2ODJmZjc1 ZmFlZmQ2Y2ZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDcgQEAKKzIwMTEtMDktMDIgIE9qYW4g VmFmYWkgIDxvamFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBzcGxpdCBvdmVycmlkZVNpemUg aW50byBvdmVycmlkZUhlaWdodCBhbmQgb3ZlcnJpZGVXaWR0aAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Njc1NTAKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbGwgdXNlcyBvZiBvdmVycmlkZVNpemUgb25s eSBzZXQgb25lIG9mIHRoZSB3aWR0aCBvciB0aGUgaGVpZ2h0LgorICAgICAgICBUaGlzIGNoYW5n ZSByZW1vdmVzIGEgYm9vbCBmcm9tIFJlbmRlck9iamVjdCBhbmQgcmVtb3ZlcyBzb21lCisgICAg ICAgIGZsZXhib3ggc3BlY2lmaWMgbG9naWMgZnJvbSBSZW5kZXJCb3guCisKKyAgICAgICAgVGhl IG9ubHkgZG93bnNpZGUgaXMgdGhhdCB3ZSBoYXZlIHR3byBnbG9iYWwgbWFwcyB3aGVyZSB3ZSB1 c2VkCisgICAgICAgIHRvIGhhdmUgb25lLgorCisgICAgICAgIE5vIGZ1bmN0aW9uYWwgY2hhbmdl cyBzbyBleGlzdGluZyB0ZXN0cyBhcmUgc3VmZmljaWVudC4KKworICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjpoYXNPdmVycmlk ZUhlaWdodCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6Omhhc092ZXJyaWRlV2lkdGgp OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjpzZXRPdmVycmlkZUhlaWdodCk6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OnNldE92ZXJyaWRlV2lkdGgpOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyQm94OjpjbGVhck92ZXJyaWRlU2l6ZSk6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJCb3g6Om92ZXJyaWRlV2lkdGgpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpv dmVycmlkZUhlaWdodCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVMb2dp Y2FsV2lkdGgpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlTG9naWNhbEhl aWdodCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVQZXJjZW50YWdlTG9n aWNhbEhlaWdodCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5oOgorICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3guY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94OjpsYXlvdXRIb3Jpem9udGFsQm94KToK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveDo6bGF5b3V0VmVy dGljYWxCb3gpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94 OjphcHBseUxpbmVDbGFtcCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpsYXlvdXRBbmRQbGFj ZUNoaWxkcmVuSG9yaXpvbnRhbCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6OlJlbmRlck9iamVjdCk6CisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5k ZXJUYWJsZUNlbGwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGFibGVDZWxsOjpzZXRP dmVycmlkZUhlaWdodEZyb21Sb3dIZWlnaHQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJU YWJsZUNlbGwuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGFibGVTZWN0aW9uLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRhYmxlU2VjdGlvbjo6Y2FsY1Jvd0xvZ2ljYWxIZWln aHQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGFibGVTZWN0aW9uOjpsYXlvdXRSb3dzKToK KwogMjAxMS0wOS0wMiAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgogCiAgICAgICAgIFJl bW92ZSBCZWZvcmVQcm9jZXNzRXZlbnQsIGl0IHdhcyBuZXZlciBtZWFudCB0byBiZQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCA3YTAyNjlkMDA2MWNhZTE4OWFhYjI5 ODkwZGYxNmNlYWZmOTJhNjE5Li4zNTE3MWFmZDZkMDEyZjY3YTc5ZmQxNDgzYjZiZDRiOTcwZGYw YTMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcApAQCAtNjEsOCArNjEs OSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiB1c2luZyBuYW1lc3BhY2UgSFRNTE5hbWVzOwogCiAv LyBVc2VkIGJ5IGZsZXhpYmxlIGJveGVzIHdoZW4gZmxleGluZyB0aGlzIGVsZW1lbnQgYW5kIGJ5 IHRhYmxlIGNlbGxzLgotdHlwZWRlZiBXVEY6Okhhc2hNYXA8Y29uc3QgUmVuZGVyQm94KiwgTGF5 b3V0U2l6ZT4gT3ZlcnJpZGVTaXplTWFwOwotc3RhdGljIE92ZXJyaWRlU2l6ZU1hcCogZ092ZXJy aWRlU2l6ZU1hcCA9IDA7Cit0eXBlZGVmIFdURjo6SGFzaE1hcDxjb25zdCBSZW5kZXJCb3gqLCBM YXlvdXRVbml0PiBPdmVycmlkZVNpemVNYXA7CitzdGF0aWMgT3ZlcnJpZGVTaXplTWFwKiBnT3Zl cnJpZGVIZWlnaHRNYXAgPSAwOworc3RhdGljIE92ZXJyaWRlU2l6ZU1hcCogZ092ZXJyaWRlV2lk dGhNYXAgPSAwOwogCiBib29sIFJlbmRlckJveDo6c19oYWRPdmVyZmxvd0NsaXAgPSBmYWxzZTsK IApAQCAtNjkyLDM3ICs2OTMsNDYgQEAgTGF5b3V0VW5pdCBSZW5kZXJCb3g6Om1heFByZWZlcnJl ZExvZ2ljYWxXaWR0aCgpIGNvbnN0CiAgICAgcmV0dXJuIG1fbWF4UHJlZmVycmVkTG9naWNhbFdp ZHRoOwogfQogCi1MYXlvdXRTaXplIFJlbmRlckJveDo6b3ZlcnJpZGVTaXplKCkgY29uc3QKK2Jv b2wgUmVuZGVyQm94OjpoYXNPdmVycmlkZUhlaWdodCgpIGNvbnN0CiB7Ci0gICAgaWYgKCFoYXNP dmVycmlkZVNpemUoKSkKLSAgICAgICAgcmV0dXJuIExheW91dFNpemUoLTEsIC0xKTsKLSAgICBy ZXR1cm4gZ092ZXJyaWRlU2l6ZU1hcC0+Z2V0KHRoaXMpOworICAgIHJldHVybiBnT3ZlcnJpZGVI ZWlnaHRNYXAgJiYgZ092ZXJyaWRlSGVpZ2h0TWFwLT5jb250YWlucyh0aGlzKTsKIH0KIAotdm9p ZCBSZW5kZXJCb3g6OnNldE92ZXJyaWRlU2l6ZShjb25zdCBMYXlvdXRTaXplJiBzaXplKQorYm9v bCBSZW5kZXJCb3g6Omhhc092ZXJyaWRlV2lkdGgoKSBjb25zdAogewotICAgIGlmICghZ092ZXJy aWRlU2l6ZU1hcCkKLSAgICAgICAgZ092ZXJyaWRlU2l6ZU1hcCA9IG5ldyBPdmVycmlkZVNpemVN YXAoKTsKLSAgICBzZXRIYXNPdmVycmlkZVNpemUodHJ1ZSk7Ci0gICAgZ092ZXJyaWRlU2l6ZU1h cC0+c2V0KHRoaXMsIHNpemUpOworICAgIHJldHVybiBnT3ZlcnJpZGVXaWR0aE1hcCAmJiBnT3Zl cnJpZGVXaWR0aE1hcC0+Y29udGFpbnModGhpcyk7Cit9CisKK3ZvaWQgUmVuZGVyQm94OjpzZXRP dmVycmlkZUhlaWdodChjb25zdCBMYXlvdXRVbml0IGhlaWdodCkKK3sKKyAgICBpZiAoIWdPdmVy cmlkZUhlaWdodE1hcCkKKyAgICAgICAgZ092ZXJyaWRlSGVpZ2h0TWFwID0gbmV3IE92ZXJyaWRl U2l6ZU1hcCgpOworICAgIGdPdmVycmlkZUhlaWdodE1hcC0+c2V0KHRoaXMsIGhlaWdodCk7Cit9 CisKK3ZvaWQgUmVuZGVyQm94OjpzZXRPdmVycmlkZVdpZHRoKGNvbnN0IExheW91dFVuaXQgd2lk dGgpCit7CisgICAgaWYgKCFnT3ZlcnJpZGVXaWR0aE1hcCkKKyAgICAgICAgZ092ZXJyaWRlV2lk dGhNYXAgPSBuZXcgT3ZlcnJpZGVTaXplTWFwKCk7CisgICAgZ092ZXJyaWRlV2lkdGhNYXAtPnNl dCh0aGlzLCB3aWR0aCk7CiB9CiAKIHZvaWQgUmVuZGVyQm94OjpjbGVhck92ZXJyaWRlU2l6ZSgp CiB7Ci0gICAgaWYgKCFoYXNPdmVycmlkZVNpemUoKSkKLSAgICAgICAgcmV0dXJuOwotICAgIHNl dEhhc092ZXJyaWRlU2l6ZShmYWxzZSk7Ci0gICAgZ092ZXJyaWRlU2l6ZU1hcC0+cmVtb3ZlKHRo aXMpOworICAgIGlmIChoYXNPdmVycmlkZUhlaWdodCgpKQorICAgICAgICBnT3ZlcnJpZGVIZWln aHRNYXAtPnJlbW92ZSh0aGlzKTsKKyAgICBpZiAoaGFzT3ZlcnJpZGVXaWR0aCgpKQorICAgICAg ICBnT3ZlcnJpZGVXaWR0aE1hcC0+cmVtb3ZlKHRoaXMpOwogfQogCiBMYXlvdXRVbml0IFJlbmRl ckJveDo6b3ZlcnJpZGVXaWR0aCgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIGhhc092ZXJyaWRlU2l6 ZSgpID8gb3ZlcnJpZGVTaXplKCkud2lkdGgoKSA6IHdpZHRoKCk7CisgICAgcmV0dXJuIGhhc092 ZXJyaWRlV2lkdGgoKSA/IGdPdmVycmlkZVdpZHRoTWFwLT5nZXQodGhpcykgOiB3aWR0aCgpOwog fQogCiBMYXlvdXRVbml0IFJlbmRlckJveDo6b3ZlcnJpZGVIZWlnaHQoKSBjb25zdAogewotICAg IHJldHVybiBoYXNPdmVycmlkZVNpemUoKSA/IG92ZXJyaWRlU2l6ZSgpLmhlaWdodCgpIDogaGVp Z2h0KCk7CisgICAgcmV0dXJuIGhhc092ZXJyaWRlSGVpZ2h0KCkgPyBnT3ZlcnJpZGVIZWlnaHRN YXAtPmdldCh0aGlzKSA6IGhlaWdodCgpOwogfQogCiBMYXlvdXRVbml0IFJlbmRlckJveDo6Y29t cHV0ZUJvcmRlckJveExvZ2ljYWxXaWR0aChMYXlvdXRVbml0IHdpZHRoKSBjb25zdApAQCAtMTU3 MiwxNCArMTU4MiwxMyBAQCB2b2lkIFJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxXaWR0aCgpCiAg ICAgLy8gd2lkdGguICBVc2UgdGhlIHdpZHRoIGZyb20gdGhlIHN0eWxlIGNvbnRleHQuCiAgICAg Ly8gRklYTUU6IEFjY291bnQgZm9yIGJsb2NrLWZsb3cgaW4gZmxleGlibGUgYm94ZXMuCiAgICAg Ly8gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2NDE4Ci0gICAgaWYg KGhhc092ZXJyaWRlU2l6ZSgpICYmICBwYXJlbnQoKS0+c3R5bGUoKS0+Ym94T3JpZW50KCkgPT0g SE9SSVpPTlRBTAotICAgICAgICAgICAgJiYgcGFyZW50KCktPmlzRGVwcmVjYXRlZEZsZXhpYmxl Qm94KCkgJiYgcGFyZW50KCktPmlzRmxleGluZ0NoaWxkcmVuKCkpIHsKKyAgICBpZiAoaGFzT3Zl cnJpZGVXaWR0aCgpICYmIHBhcmVudCgpLT5pc0RlcHJlY2F0ZWRGbGV4aWJsZUJveCgpKSB7CiAg ICAgICAgIHNldExvZ2ljYWxXaWR0aChvdmVycmlkZVdpZHRoKCkpOwogICAgICAgICByZXR1cm47 CiAgICAgfQogI2lmIEVOQUJMRShDU1MzX0ZMRVhCT1gpCiAgICAgLy8gRklYTUU6IENoZWNrIGRp cmVjdGlvbiBvbmNlIGZsZXgtZGlyZWN0aW9uIGlzIGltcGxlbWVudGVkLgotICAgIGlmIChoYXNP dmVycmlkZVNpemUoKSAmJiBwYXJlbnQoKS0+aXNGbGV4aWJsZUJveCgpKSB7CisgICAgaWYgKGhh c092ZXJyaWRlV2lkdGgoKSAmJiBwYXJlbnQoKS0+aXNGbGV4aWJsZUJveCgpKSB7CiAgICAgICAg IHNldExvZ2ljYWxXaWR0aChvdmVycmlkZVdpZHRoKCkpOwogICAgICAgICByZXR1cm47CiAgICAg fQpAQCAtMTgwMCw4ICsxODA5LDcgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsSGVp Z2h0KCkKICAgICAgICAgLy8gZ3JhYiBvdXIgY2FjaGVkIGZsZXhpYmxlIGhlaWdodC4KICAgICAg ICAgLy8gRklYTUU6IEFjY291bnQgZm9yIGJsb2NrLWZsb3cgaW4gZmxleGlibGUgYm94ZXMuCiAg ICAgICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NjQxOAot ICAgICAgICBpZiAoaGFzT3ZlcnJpZGVTaXplKCkgJiYgcGFyZW50KCktPmlzRGVwcmVjYXRlZEZs ZXhpYmxlQm94KCkgJiYgcGFyZW50KCktPnN0eWxlKCktPmJveE9yaWVudCgpID09IFZFUlRJQ0FM Ci0gICAgICAgICAgICAgICAgJiYgcGFyZW50KCktPmlzRmxleGluZ0NoaWxkcmVuKCkpCisgICAg ICAgIGlmIChoYXNPdmVycmlkZUhlaWdodCgpICYmIHBhcmVudCgpLT5pc0RlcHJlY2F0ZWRGbGV4 aWJsZUJveCgpKQogICAgICAgICAgICAgaCA9IExlbmd0aChvdmVycmlkZUhlaWdodCgpIC0gYm9y ZGVyQW5kUGFkZGluZ0xvZ2ljYWxIZWlnaHQoKSwgRml4ZWQpOwogICAgICAgICBlbHNlIGlmICh0 cmVhdEFzUmVwbGFjZWQpCiAgICAgICAgICAgICBoID0gTGVuZ3RoKGNvbXB1dGVSZXBsYWNlZExv Z2ljYWxIZWlnaHQoKSwgRml4ZWQpOwpAQCAtMTkyMiw3ICsxOTMwLDcgQEAgTGF5b3V0VW5pdCBS ZW5kZXJCb3g6OmNvbXB1dGVQZXJjZW50YWdlTG9naWNhbEhlaWdodChjb25zdCBMZW5ndGgmIGhl aWdodCkKICAgICAvLyBiZSBhIHBlcmNlbnRhZ2Ugb2YgdGhlIGNlbGwncyBjdXJyZW50IGNvbnRl bnQgaGVpZ2h0LgogICAgIGlmIChjYi0+aXNUYWJsZUNlbGwoKSkgewogICAgICAgICBpZiAoIXNr aXBwZWRBdXRvSGVpZ2h0Q29udGFpbmluZ0Jsb2NrKSB7Ci0gICAgICAgICAgICBpZiAoIWNiLT5o YXNPdmVycmlkZVNpemUoKSkgeworICAgICAgICAgICAgaWYgKCFjYi0+aGFzT3ZlcnJpZGVIZWln aHQoKSkgewogICAgICAgICAgICAgICAgIC8vIE5vcm1hbGx5IHdlIHdvdWxkIGxldCB0aGUgY2Vs bCBzaXplIGludHJpbnNpY2FsbHksIGJ1dCBzY3JvbGxpbmcgb3ZlcmZsb3cgaGFzIHRvIGJlCiAg ICAgICAgICAgICAgICAgLy8gdHJlYXRlZCBkaWZmZXJlbnRseSwgc2luY2UgV2luSUUgbGV0cyBz Y3JvbGxlZCBvdmVyZmxvdyByZWdpb25zIHNocmluayBhcyBuZWVkZWQuCiAgICAgICAgICAgICAg ICAgLy8gV2hpbGUgd2UgY2FuJ3QgZ2V0IGFsbCBjYXNlcyByaWdodCwgd2UgY2FuIGF0IGxlYXN0 IGRldGVjdCB3aGVuIHRoZSBjZWxsIGhhcyBhIHNwZWNpZmllZApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJveC5oCmluZGV4IGY2ZjM0ZmNhMTNjYWRiMjY0M2M3MDIwZjUyOTlkMDAzZTI2MDNk NTIuLmQyNTk4YzRkZmM2YzYwZjdkNjM4YjE4ODU3MmFjYzAxMTgwNzQyZTYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKQEAgLTI0MiwxMCArMjQyLDEyIEBAIHB1YmxpYzoKICAg ICB2aXJ0dWFsIExheW91dFVuaXQgbWluUHJlZmVycmVkTG9naWNhbFdpZHRoKCkgY29uc3Q7CiAg ICAgdmlydHVhbCBMYXlvdXRVbml0IG1heFByZWZlcnJlZExvZ2ljYWxXaWR0aCgpIGNvbnN0Owog Ci0gICAgTGF5b3V0U2l6ZSBvdmVycmlkZVNpemUoKSBjb25zdDsKICAgICBMYXlvdXRVbml0IG92 ZXJyaWRlV2lkdGgoKSBjb25zdDsKICAgICBMYXlvdXRVbml0IG92ZXJyaWRlSGVpZ2h0KCkgY29u c3Q7Ci0gICAgdm9pZCBzZXRPdmVycmlkZVNpemUoY29uc3QgTGF5b3V0U2l6ZSYpOworICAgIGJv b2wgaGFzT3ZlcnJpZGVIZWlnaHQoKSBjb25zdDsKKyAgICBib29sIGhhc092ZXJyaWRlV2lkdGgo KSBjb25zdDsKKyAgICB2b2lkIHNldE92ZXJyaWRlSGVpZ2h0KGNvbnN0IExheW91dFVuaXQpOwor ICAgIHZvaWQgc2V0T3ZlcnJpZGVXaWR0aChjb25zdCBMYXlvdXRVbml0KTsKICAgICB2b2lkIGNs ZWFyT3ZlcnJpZGVTaXplKCk7CiAKICAgICB2aXJ0dWFsIExheW91dFNpemUgb2Zmc2V0RnJvbUNv bnRhaW5lcihSZW5kZXJPYmplY3QqLCBjb25zdCBMYXlvdXRQb2ludCYpIGNvbnN0OwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJv eC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxl Qm94LmNwcAppbmRleCA4MTZjNmJjZjM1NDk2MDUxOGYwMDA4NmJkMDNkNDhmYTg1NDU5MTgxLi5m ODE4ZGJmYWMzOTNiZGIxOTc5NmNkNThiZjJmZmYzZTlhZTRhZGNhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94LmNw cApAQCAtNTE2LDcgKzUxNiw3IEBAIHZvaWQgUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94Ojps YXlvdXRIb3Jpem9udGFsQm94KGJvb2wgcmVsYXlvdXRDaGlsZHJlbikKICAgICAgICAgICAgICAg ICAgICAgICAgIGlmIChhbGxvd2VkQ2hpbGRGbGV4KGNoaWxkLCBleHBhbmRpbmcsIGkpKSB7CiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgTGF5b3V0VW5pdCBzcGFjZUFkZCA9IHN0YXRpY19j YXN0PExheW91dFVuaXQ+KHNwYWNlQXZhaWxhYmxlVGhpc1Bhc3MgKiAoY2hpbGQtPnN0eWxlKCkt PmJveEZsZXgoKSAvIHRvdGFsRmxleCkpOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlm IChzcGFjZUFkZCkgewotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjaGlsZC0+c2V0 T3ZlcnJpZGVTaXplKExheW91dFNpemUoY2hpbGQtPm92ZXJyaWRlV2lkdGgoKSArIHNwYWNlQWRk LCAwKSk7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNoaWxkLT5zZXRPdmVycmlk ZVdpZHRoKGNoaWxkLT5vdmVycmlkZVdpZHRoKCkgKyBzcGFjZUFkZCk7CiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIG1fZmxleGluZ0NoaWxkcmVuID0gdHJ1ZTsKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgcmVsYXlvdXRDaGlsZHJlbiA9IHRydWU7CiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgfQpAQCAtNTMzLDcgKzUzMyw3IEBAIHZvaWQgUmVuZGVyRGVwcmVj YXRlZEZsZXhpYmxlQm94OjpsYXlvdXRIb3Jpem9udGFsQm94KGJvb2wgcmVsYXlvdXRDaGlsZHJl bikKICAgICAgICAgICAgICAgICAgICAgICAgIExheW91dFVuaXQgc3BhY2VBZGQgPSBncm91cFJl bWFpbmluZ1NwYWNlID4gMCA/IDEgOiAtMTsKICAgICAgICAgICAgICAgICAgICAgICAgIGZvciAo UmVuZGVyQm94KiBjaGlsZCA9IGl0ZXJhdG9yLmZpcnN0KCk7IGNoaWxkICYmIGdyb3VwUmVtYWlu aW5nU3BhY2U7IGNoaWxkID0gaXRlcmF0b3IubmV4dCgpKSB7CiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgaWYgKGFsbG93ZWRDaGlsZEZsZXgoY2hpbGQsIGV4cGFuZGluZywgaSkpIHsKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY2hpbGQtPnNldE92ZXJyaWRlU2l6ZShMYXlv dXRTaXplKGNoaWxkLT5vdmVycmlkZVdpZHRoKCkgKyBzcGFjZUFkZCwgMCkpOworICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBjaGlsZC0+c2V0T3ZlcnJpZGVXaWR0aChjaGlsZC0+b3Zl cnJpZGVXaWR0aCgpICsgc3BhY2VBZGQpOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBtX2ZsZXhpbmdDaGlsZHJlbiA9IHRydWU7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHJlbGF5b3V0Q2hpbGRyZW4gPSB0cnVlOwogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICByZW1haW5pbmdTcGFjZSAtPSBzcGFjZUFkZDsKQEAgLTc2Miw3ICs3NjIsNyBAQCB2b2lk IFJlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveDo6bGF5b3V0VmVydGljYWxCb3goYm9vbCByZWxh eW91dENoaWxkcmVuKQogICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGFsbG93ZWRDaGlsZEZs ZXgoY2hpbGQsIGV4cGFuZGluZywgaSkpIHsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBM YXlvdXRVbml0IHNwYWNlQWRkID0gc3RhdGljX2Nhc3Q8TGF5b3V0VW5pdD4oc3BhY2VBdmFpbGFi bGVUaGlzUGFzcyAqIChjaGlsZC0+c3R5bGUoKS0+Ym94RmxleCgpIC8gdG90YWxGbGV4KSk7CiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKHNwYWNlQWRkKSB7Ci0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGNoaWxkLT5zZXRPdmVycmlkZVNpemUoTGF5b3V0U2l6ZSgwLCBj aGlsZC0+b3ZlcnJpZGVIZWlnaHQoKSArIHNwYWNlQWRkKSk7CisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGNoaWxkLT5zZXRPdmVycmlkZUhlaWdodChjaGlsZC0+b3ZlcnJpZGVIZWln aHQoKSArIHNwYWNlQWRkKTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9mbGV4 aW5nQ2hpbGRyZW4gPSB0cnVlOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZWxh eW91dENoaWxkcmVuID0gdHJ1ZTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICB9CkBAIC03 NzksNyArNzc5LDcgQEAgdm9pZCBSZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3g6OmxheW91dFZl cnRpY2FsQm94KGJvb2wgcmVsYXlvdXRDaGlsZHJlbikKICAgICAgICAgICAgICAgICAgICAgICAg IExheW91dFVuaXQgc3BhY2VBZGQgPSBncm91cFJlbWFpbmluZ1NwYWNlID4gMCA/IDEgOiAtMTsK ICAgICAgICAgICAgICAgICAgICAgICAgIGZvciAoUmVuZGVyQm94KiBjaGlsZCA9IGl0ZXJhdG9y LmZpcnN0KCk7IGNoaWxkICYmIGdyb3VwUmVtYWluaW5nU3BhY2U7IGNoaWxkID0gaXRlcmF0b3Iu bmV4dCgpKSB7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGFsbG93ZWRDaGlsZEZs ZXgoY2hpbGQsIGV4cGFuZGluZywgaSkpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgY2hpbGQtPnNldE92ZXJyaWRlU2l6ZShMYXlvdXRTaXplKDAsIGNoaWxkLT5vdmVycmlkZUhl aWdodCgpICsgc3BhY2VBZGQpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY2hp bGQtPnNldE92ZXJyaWRlSGVpZ2h0KGNoaWxkLT5vdmVycmlkZUhlaWdodCgpICsgc3BhY2VBZGQp OwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX2ZsZXhpbmdDaGlsZHJlbiA9IHRy dWU7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlbGF5b3V0Q2hpbGRyZW4gPSB0 cnVlOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZW1haW5pbmdTcGFjZSAtPSBz cGFjZUFkZDsKQEAgLTg5Myw3ICs4OTMsNyBAQCB2b2lkIFJlbmRlckRlcHJlY2F0ZWRGbGV4aWJs ZUJveDo6YXBwbHlMaW5lQ2xhbXAoRmxleEJveEl0ZXJhdG9yJiBpdGVyYXRvciwgYm9vbAogICAg ICAgICAgICAgY29udGludWU7CiAKICAgICAgICAgY2hpbGQtPnNldENoaWxkTmVlZHNMYXlvdXQo dHJ1ZSwgZmFsc2UpOwotICAgICAgICBjaGlsZC0+c2V0T3ZlcnJpZGVTaXplKExheW91dFNpemUo MCwgbmV3SGVpZ2h0KSk7CisgICAgICAgIGNoaWxkLT5zZXRPdmVycmlkZUhlaWdodChuZXdIZWln aHQpOwogICAgICAgICBtX2ZsZXhpbmdDaGlsZHJlbiA9IHRydWU7CiAgICAgICAgIGNoaWxkLT5s YXlvdXRJZk5lZWRlZCgpOwogICAgICAgICBtX2ZsZXhpbmdDaGlsZHJlbiA9IGZhbHNlOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKaW5kZXggOGZj YTUxYWUwYjg1MGYzODc4ZTk0MDNlYjFhNDM4N2IxNzNiOTA5MC4uMGE0MDRkYTRmMTdlMWFiOGM4 NzA5MWU5OTgyZTAyZDQwMjcyZGY1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyRmxleGlibGVCb3guY3BwCkBAIC0yNTIsNyArMjUyLDcgQEAgdm9pZCBSZW5kZXJGbGV4 aWJsZUJveDo6bGF5b3V0QW5kUGxhY2VDaGlsZHJlbkhvcml6b250YWwoY29uc3QgV1RGOjpWZWN0 b3I8TGF5b3UKICAgICBmb3IgKFJlbmRlckJveCogY2hpbGQgPSBpdGVyYXRvci5maXJzdCgpOyBj aGlsZDsgY2hpbGQgPSBpdGVyYXRvci5uZXh0KCksICsraSkgewogICAgICAgICBMYXlvdXRVbml0 IGNoaWxkUHJlZmVycmVkU2l6ZSA9IGNoaWxkLT5ib3JkZXJMZWZ0KCkgKyBjaGlsZC0+cGFkZGlu Z0xlZnQoKSArIGNoaWxkU2l6ZXNbaV0gKyBjaGlsZC0+cGFkZGluZ1JpZ2h0KCkgKyBjaGlsZC0+ Ym9yZGVyUmlnaHQoKTsKICAgICAgICAgLy8gRklYTUU6IEhhbmRsZSB2ZXJ0aWNhbCB3cml0aW5n IG1vZGVzIHdpdGggaG9yaXpvbnRhbCBmbGV4aW5nLgotICAgICAgICBjaGlsZC0+c2V0T3ZlcnJp ZGVTaXplKExheW91dFNpemUoY2hpbGRQcmVmZXJyZWRTaXplLCAwKSk7CisgICAgICAgIGNoaWxk LT5zZXRPdmVycmlkZVdpZHRoKGNoaWxkUHJlZmVycmVkU2l6ZSk7CiAgICAgICAgIGNoaWxkLT5z ZXRDaGlsZE5lZWRzTGF5b3V0KHRydWUpOwogICAgICAgICBjaGlsZC0+bGF5b3V0SWZOZWVkZWQo KTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAppbmRleCBhZDM1 YmU1NGUzNjdkYTM0OGZiNzJiYjEwODMzNzM0MjE4YWY3MWVmLi45OTk1YjFkYmM3M2U0MTRkZDYx MzZhNjUzZDA5YjExYzA4NmQzZGI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy T2JqZWN0LmNwcApAQCAtMjE1LDcgKzIxNSw2IEBAIFJlbmRlck9iamVjdDo6UmVuZGVyT2JqZWN0 KE5vZGUqIG5vZGUpCiAgICAgLCBtX2hhc092ZXJmbG93Q2xpcChmYWxzZSkKICAgICAsIG1faGFz VHJhbnNmb3JtKGZhbHNlKQogICAgICwgbV9oYXNSZWZsZWN0aW9uKGZhbHNlKQotICAgICwgbV9o YXNPdmVycmlkZVNpemUoZmFsc2UpCiAgICAgLCBtX2hhc0NvdW50ZXJOb2RlTWFwKGZhbHNlKQog ICAgICwgbV9ldmVySGFkTGF5b3V0KGZhbHNlKQogICAgICwgbV9jaGlsZHJlbklubGluZShmYWxz ZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaAppbmRleCBkMzY5YmRhNDMw MjgxOGIyYTJjYjIxMmFiYWFkZmM3NjlkMWU5YjE4Li4wNDUyYTg5NzRmMWIyOGI4NjM4ZmNlNjll NGUwNWZkMmNkMWI2NGE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyT2JqZWN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5o CkBAIC03NzgsOSArNzc4LDYgQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCB3aWxsUmVuZGVy SW1hZ2UoQ2FjaGVkSW1hZ2UqKTsKIAogICAgIHZvaWQgc2VsZWN0aW9uU3RhcnRFbmQoaW50JiBz cG9zLCBpbnQmIGVwb3MpIGNvbnN0OwotCi0gICAgYm9vbCBoYXNPdmVycmlkZVNpemUoKSBjb25z dCB7IHJldHVybiBtX2hhc092ZXJyaWRlU2l6ZTsgfQotICAgIHZvaWQgc2V0SGFzT3ZlcnJpZGVT aXplKGJvb2wgYikgeyBtX2hhc092ZXJyaWRlU2l6ZSA9IGI7IH0KICAgICAKICAgICB2b2lkIHJl bW92ZSgpIHsgaWYgKHBhcmVudCgpKSBwYXJlbnQoKS0+cmVtb3ZlQ2hpbGQodGhpcyk7IH0KIApA QCAtODcwLDggKzg2Nyw2IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2hhc092ZXJmbG93Q2xpcCAg ICAgICAgICAgOiAxOyAvLyBTZXQgaW4gdGhlIGNhc2Ugb2Ygb3ZlcmZsb3c6YXV0by9zY3JvbGwv aGlkZGVuCiAgICAgYm9vbCBtX2hhc1RyYW5zZm9ybSAgICAgICAgICAgICAgOiAxOwogICAgIGJv b2wgbV9oYXNSZWZsZWN0aW9uICAgICAgICAgICAgIDogMTsKLQotICAgIGJvb2wgbV9oYXNPdmVy cmlkZVNpemUgICAgICAgICAgIDogMTsKICAgICAKIHB1YmxpYzoKICAgICBib29sIG1faGFzQ291 bnRlck5vZGVNYXAgICAgICAgICA6IDE7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVGFibGVDZWxsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJUYWJsZUNlbGwuY3BwCmluZGV4IDc2OTVmOTYyOGM1MDRiZjJkYjM3MGY5NDRlNTI5OGFjMmRk ODgzMTkuLjI4YzFmZjE0OWMwMDFmZjc1MWI4YzM5YzkwOTkzYjEwNjgzOGQ5YzIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZUNlbGwuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZUNlbGwuY3BwCkBAIC0yMTIsMTAgKzIx MiwxMCBAQCBMYXlvdXRVbml0IFJlbmRlclRhYmxlQ2VsbDo6cGFkZGluZ0FmdGVyKGJvb2wgaW5j bHVkZUludHJpbnNpY1BhZGRpbmcpIGNvbnN0CiAgICAgcmV0dXJuIHJlc3VsdCArIGludHJpbnNp Y1BhZGRpbmdBZnRlcigpOwogfQogCi12b2lkIFJlbmRlclRhYmxlQ2VsbDo6c2V0T3ZlcnJpZGVT aXplRnJvbVJvd0hlaWdodChpbnQgcm93SGVpZ2h0KQordm9pZCBSZW5kZXJUYWJsZUNlbGw6OnNl dE92ZXJyaWRlSGVpZ2h0RnJvbVJvd0hlaWdodChpbnQgcm93SGVpZ2h0KQogewogICAgIGNsZWFy SW50cmluc2ljUGFkZGluZygpOwotICAgIFJlbmRlckJsb2NrOjpzZXRPdmVycmlkZVNpemUoTGF5 b3V0U2l6ZSgwLCBtYXg8TGF5b3V0VW5pdD4oMCwgcm93SGVpZ2h0IC0gYm9yZGVyQmVmb3JlKCkg LSBwYWRkaW5nQmVmb3JlKCkgLSBib3JkZXJBZnRlcigpIC0gcGFkZGluZ0FmdGVyKCkpKSk7Cisg ICAgUmVuZGVyQmxvY2s6OnNldE92ZXJyaWRlSGVpZ2h0KG1heDxMYXlvdXRVbml0PigwLCByb3dI ZWlnaHQgLSBib3JkZXJCZWZvcmUoKSAtIHBhZGRpbmdCZWZvcmUoKSAtIGJvcmRlckFmdGVyKCkg LSBwYWRkaW5nQWZ0ZXIoKSkpOwogfQogCiBMYXlvdXRTaXplIFJlbmRlclRhYmxlQ2VsbDo6b2Zm c2V0RnJvbUNvbnRhaW5lcihSZW5kZXJPYmplY3QqIG8sIGNvbnN0IExheW91dFBvaW50JiBwb2lu dCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJs ZUNlbGwuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZUNlbGwuaAppbmRl eCA5MDhmNjQ5NDNjMDEyZWI4YmFiMTUyNGFjZWZkZTY5YjgxOWI0ZDNlLi5hNjA2MWM0MmJhOGRj ZjY2OTgyNTRlOTNiOWIyYWNjOTBkYjkzZWY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyVGFibGVDZWxsLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclRhYmxlQ2VsbC5oCkBAIC0xMTksNyArMTE5LDcgQEAgcHVibGljOgogICAgIHZpcnR1 YWwgTGF5b3V0VW5pdCBwYWRkaW5nQmVmb3JlKGJvb2wgaW5jbHVkZUludHJpbnNpY1BhZGRpbmcg PSB0cnVlKSBjb25zdDsKICAgICB2aXJ0dWFsIExheW91dFVuaXQgcGFkZGluZ0FmdGVyKGJvb2wg aW5jbHVkZUludHJpbnNpY1BhZGRpbmcgPSB0cnVlKSBjb25zdDsKIAotICAgIHZvaWQgc2V0T3Zl cnJpZGVTaXplRnJvbVJvd0hlaWdodChpbnQpOworICAgIHZvaWQgc2V0T3ZlcnJpZGVIZWlnaHRG cm9tUm93SGVpZ2h0KGludCk7CiAKICAgICBib29sIGhhc1Zpc3VhbE92ZXJmbG93KCkgY29uc3Qg eyByZXR1cm4gbV9vdmVyZmxvdyAmJiAhYm9yZGVyQm94UmVjdCgpLmNvbnRhaW5zKG1fb3ZlcmZs b3ctPnZpc3VhbE92ZXJmbG93UmVjdCgpKTsgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVTZWN0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJUYWJsZVNlY3Rpb24uY3BwCmluZGV4IGM2NTY3MGNlNjQzOWVhNDI3MTZiZjJk MGNjNjExMDFlYjIyNTU1NDQuLjBhYzhlMzE2M2JkOGMzNjQxNzcyMmZlNDFkNGQzYzg1NTNiOWFl MjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZVNlY3Rp b24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZVNlY3Rpb24u Y3BwCkBAIC0zMzgsNyArMzM4LDcgQEAgTGF5b3V0VW5pdCBSZW5kZXJUYWJsZVNlY3Rpb246OmNh bGNSb3dMb2dpY2FsSGVpZ2h0KCkKIAogICAgICAgICAgICAgaW50IGluZHggPSBtYXgociAtIGNl bGwtPnJvd1NwYW4oKSArIDEsIDApOwogCi0gICAgICAgICAgICBpZiAoY2VsbC0+aGFzT3ZlcnJp ZGVTaXplKCkpIHsKKyAgICAgICAgICAgIGlmIChjZWxsLT5oYXNPdmVycmlkZUhlaWdodCgpKSB7 CiAgICAgICAgICAgICAgICAgaWYgKCFzdGF0ZVB1c2hlci5kaWRQdXNoKCkpIHsKICAgICAgICAg ICAgICAgICAgICAgLy8gVGVjaG5pY2FsbHksIHdlIHNob3VsZCBhbHNvIHB1c2ggc3RhdGUgZm9y IHRoZSByb3csIGJ1dCBzaW5jZQogICAgICAgICAgICAgICAgICAgICAvLyByb3dzIGRvbid0IHB1 c2ggYSBjb29yZGluYXRlIHRyYW5zZm9ybSwgdGhhdCdzIG5vdCBuZWNlc3NhcnkuCkBAIC01NjYs NyArNTY2LDcgQEAgTGF5b3V0VW5pdCBSZW5kZXJUYWJsZVNlY3Rpb246OmxheW91dFJvd3MoTGF5 b3V0VW5pdCB0b0FkZCkKICAgICAgICAgICAgICAgICAvLyBBbGlnbm1lbnQgd2l0aGluIGEgY2Vs bCBpcyBiYXNlZCBvZmYgdGhlIGNhbGN1bGF0ZWQKICAgICAgICAgICAgICAgICAvLyBoZWlnaHQs IHdoaWNoIGJlY29tZXMgaXJyZWxldmFudCBvbmNlIHRoZSBjZWxsIGhhcwogICAgICAgICAgICAg ICAgIC8vIGJlZW4gcmVzaXplZCBiYXNlZCBvZmYgaXRzIHBlcmNlbnRhZ2UuCi0gICAgICAgICAg ICAgICAgY2VsbC0+c2V0T3ZlcnJpZGVTaXplRnJvbVJvd0hlaWdodChySGVpZ2h0KTsKKyAgICAg ICAgICAgICAgICBjZWxsLT5zZXRPdmVycmlkZUhlaWdodEZyb21Sb3dIZWlnaHQockhlaWdodCk7 CiAgICAgICAgICAgICAgICAgY2VsbC0+bGF5b3V0SWZOZWVkZWQoKTsKIAogICAgICAgICAgICAg ICAgIC8vIElmIHRoZSBiYXNlbGluZSBtb3ZlZCwgd2UgbWF5IGhhdmUgdG8gdXBkYXRlIHRoZSBk YXRhIGZvciBvdXIgcm93LiBGaW5kIG91dCB0aGUgbmV3IGJhc2VsaW5lLgo=