114706 2013-04-16 15:24:36 -0700 Need a new layout milestone to notify bundle clients when the header has been flushed 2013-04-16 16:00:20 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bdakin bdakin bdakin commit-queue esprehn+autocc sam simon.fraser oldest_to_newest 876900 0 bdakin 2013-04-16 15:24:36 -0700 There is API to give a WKView a header, and we need a new layout milestone to notify bundle clients when that header has been flushed. <rdar://problem/13657284> 876907 1 198444 bdakin 2013-04-16 15:32:46 -0700 Created attachment 198444 Patch 876921 2 198444 simon.fraser 2013-04-16 15:45:16 -0700 Comment on attachment 198444 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=198444&action=review > Source/WebCore/rendering/RenderLayerCompositor.cpp:382 > + if (page->layoutMilestones() & DidFirstFlushForHeaderLayer) { Maybe we can rename Page::layoutMilestones() to Page::requestedLayoutMilestones() in a future patch to make its role clearer. > Source/WebKit2/Shared/API/c/WKPageLoadTypes.h:55 > + // Note that this enum has a fourth, private member that is defined in WKPageLoadTypesPrivate.h I think it would be better to add kWKReserved1 = 1 << 3 or something, so that future changes are less likely to break things. 876935 3 bdakin 2013-04-16 16:00:20 -0700 (In reply to comment #2) > (From update of attachment 198444 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=198444&action=review > > > Source/WebCore/rendering/RenderLayerCompositor.cpp:382 > > + if (page->layoutMilestones() & DidFirstFlushForHeaderLayer) { > > Maybe we can rename Page::layoutMilestones() to Page::requestedLayoutMilestones() in a future patch to make its role clearer. > Good idea. Will do. > > Source/WebKit2/Shared/API/c/WKPageLoadTypes.h:55 > > + // Note that this enum has a fourth, private member that is defined in WKPageLoadTypesPrivate.h > > I think it would be better to add > kWKReserved1 = 1 << 3 or something, so that future changes are less likely to break things. Changed this! http://trac.webkit.org/changeset/148564 198444 2013-04-16 15:32:46 -0700 2013-04-16 15:45:16 -0700 Patch for-review.txt text/plain 16020 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0ODU1MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM2IEBACisyMDEzLTA0LTE2ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBOZWVkIGEgbmV3IGxheW91dCBtaWxl c3RvbmUgdG8gbm90aWZ5IGJ1bmRsZSBjbGllbnRzIHdoZW4gdGhlIGhlYWRlciBoYXMgYmVlbiAK KyAgICAgICAgZmx1c2hlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTE0NzA2CisgICAgICAgIC1hbmQgY29ycmVzcG9uZGluZy0KKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzEzNjU3Mjg0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIE5ldyBMYXlvdXRNaWxlc3RvbmUgaXMgRGlkRmlyc3RGbHVzaEZvckhl YWRlckxheWVyLgorICAgICAgICAqIHBhZ2UvTGF5b3V0TWlsZXN0b25lcy5oOgorICAgICAgICAK KyAgICAgICAgTmV3IEFQSSB0byBhbGxvdyByZW1vdmluZyBhIExheW91dE1pbGVzdG9uZS4KKyAg ICAgICAgKiBXZWJDb3JlLmV4cC5pbjoKKyAgICAgICAgKiBwYWdlL1BhZ2UuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UGFnZTo6cmVtb3ZlTGF5b3V0TWlsZXN0b25lcyk6CisgICAgICAgICogcGFn ZS9QYWdlLmg6CisgICAgICAgIChQYWdlKToKKworICAgICAgICBOZXcgYm9vbGVhbiBtZW1iZXIg dmFyaWFibGUgbV9oZWFkZXJMYXllckF3YWl0aW5nRmlyc3RGbHVzaCBrZWVwcyB0cmFjayBvZiB3 aGV0aGVyIAorICAgICAgICB3ZSBuZWVkIHRvIHNlbmQgdGhlIERpZEZpcnN0Rmx1c2hGb3JIZWFk ZXJMYXllciBtaWxlc3RvbmUuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9z aXRvci5oOgorICAgICAgICAoUmVuZGVyTGF5ZXJDb21wb3NpdG9yKToKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckxheWVyQ29tcG9zaXRvcjo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yKToKKworICAgICAgICBTZW5k IHRoZSBtaWxlc3RvbmUgaWYgYXBwcm9wcmlhdGUuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJM YXllckNvbXBvc2l0b3I6OmZsdXNoUGVuZGluZ0xheWVyQ2hhbmdlcyk6CisKKyAgICAgICAgIFNl dCBtX2hlYWRlckxheWVyQXdhaXRpbmdGaXJzdEZsdXNoIHRvIHRydWUgZm9yIGEgbmV3bHkgY3Jl YXRlZCBsYXllci4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBk YXRlTGF5ZXJGb3JIZWFkZXIpOgorCiAyMDEzLTA0LTE2ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3 ZWJraXQub3JnPgogCiAgICAgICAgIE1vcmUgV2luZG93cyBidWlsZCBmaXhlcy4KSW5kZXg6IFNv dXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L1dlYkNvcmUuZXhwLmluCShyZXZpc2lvbiAxNDg1MzMpCisrKyBTb3VyY2UvV2ViQ29yZS9XZWJD b3JlLmV4cC5pbgkod29ya2luZyBjb3B5KQpAQCAtODM1LDYgKzgzNSw3IEBAIF9fWk43V2ViQ29y ZTRQYWdlMjB1bm1hcmtBbGxUZXh0TWF0Y2hlc0UKIF9fWk43V2ViQ29yZTRQYWdlMjFtYXJrQWxs TWF0Y2hlc0ZvclRleHRFUktOM1dURjZTdHJpbmdFamJqCiBfX1pON1dlYkNvcmU0UGFnZTIyYWxs VmlzaXRlZFN0YXRlQ2hhbmdlZEVQTlNfOVBhZ2VHcm91cEUKIF9fWk43V2ViQ29yZTRQYWdlMjJu b25GYXN0U2Nyb2xsYWJsZVJlY3RzRVBLTlNfNUZyYW1lRQorX19aTjdXZWJDb3JlNFBhZ2UyMnJl bW92ZUxheW91dE1pbGVzdG9uZXNFagogX19aTjdXZWJDb3JlNFBhZ2UyMnNldFJ1YmJlckJhbmRz QXRCb3R0b21FYgogX19aTjdXZWJDb3JlNFBhZ2UyM2NsZWFyVW5kb1JlZG9PcGVyYXRpb25zRXYK IF9fWk43V2ViQ29yZTRQYWdlMjRmaW5kU3RyaW5nTWF0Y2hpbmdSYW5nZXNFUktOM1dURjZTdHJp bmdFamlQTlMxXzZWZWN0b3JJTlMxXzZSZWZQdHJJTlNfNVJhbmdlRUVFTG0wRU5TMV8xNUNyYXNo T25PdmVyZmxvd0VFRVJpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL0xheW91dE1pbGVzdG9u ZXMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL0xheW91dE1pbGVzdG9uZXMu aAkocmV2aXNpb24gMTQ4NTMzKQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9MYXlvdXRNaWxlc3Rv bmVzLmgJKHdvcmtpbmcgY29weSkKQEAgLTMxLDcgKzMxLDggQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogZW51bSBMYXlvdXRNaWxlc3RvbmVGbGFnIHsKICAgICBEaWRGaXJzdExheW91dCA9IDEgPDwg MCwKICAgICBEaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQgPSAxIDw8IDEsCi0gICAgRGlk SGl0UmVsZXZhbnRSZXBhaW50ZWRPYmplY3RzQXJlYVRocmVzaG9sZCA9IDEgPDwgMgorICAgIERp ZEhpdFJlbGV2YW50UmVwYWludGVkT2JqZWN0c0FyZWFUaHJlc2hvbGQgPSAxIDw8IDIsCisgICAg RGlkRmlyc3RGbHVzaEZvckhlYWRlckxheWVyID0gMSA8PCAzCiB9OwogCiB0eXBlZGVmIHVuc2ln bmVkIExheW91dE1pbGVzdG9uZXM7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAJKHJldmlzaW9uIDE0 ODUzMykKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTEyNzIsNiArMTI3MiwxMSBAQCB2b2lkIFBhZ2U6OmFkZExheW91dE1pbGVzdG9uZXMoTGF5b3V0 TWlsCiAgICAgbV9sYXlvdXRNaWxlc3RvbmVzIHw9IG1pbGVzdG9uZXM7CiB9CiAKK3ZvaWQgUGFn ZTo6cmVtb3ZlTGF5b3V0TWlsZXN0b25lcyhMYXlvdXRNaWxlc3RvbmVzIG1pbGVzdG9uZXMpCit7 CisgICAgbV9sYXlvdXRNaWxlc3RvbmVzICY9IH5taWxlc3RvbmVzOworfQorCiAvLyBUaGVzZSBh cmUgbWFnaWNhbCBjb25zdGFudHMgdGhhdCBtaWdodCBiZSB0d2Vha2VkIG92ZXIgdGltZS4KIHN0 YXRpYyBkb3VibGUgZ01pbmltdW1QYWludGVkQXJlYVJhdGlvID0gMC4xOwogc3RhdGljIGRvdWJs ZSBnTWF4aW11bVVucGFpbnRlZEFyZWFSYXRpbyA9IDAuMDQ7CkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9wYWdlL1BhZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaAko cmV2aXNpb24gMTQ4NTMzKQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmgJKHdvcmtpbmcg Y29weSkKQEAgLTM1Miw2ICszNTIsNyBAQCBwdWJsaWM6CiAgICAgUGxhdGZvcm1EaXNwbGF5SUQg ZGlzcGxheUlEKCkgY29uc3QgeyByZXR1cm4gbV9kaXNwbGF5SUQ7IH0KIAogICAgIHZvaWQgYWRk TGF5b3V0TWlsZXN0b25lcyhMYXlvdXRNaWxlc3RvbmVzKTsKKyAgICB2b2lkIHJlbW92ZUxheW91 dE1pbGVzdG9uZXMoTGF5b3V0TWlsZXN0b25lcyk7CiAgICAgTGF5b3V0TWlsZXN0b25lcyBsYXlv dXRNaWxlc3RvbmVzKCkgY29uc3QgeyByZXR1cm4gbV9sYXlvdXRNaWxlc3RvbmVzOyB9CiAKICAg ICBib29sIGlzQ291bnRpbmdSZWxldmFudFJlcGFpbnRlZE9iamVjdHMoKSBjb25zdDsKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3Iu Y3BwCShyZXZpc2lvbiAxNDg1MzMpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TGF5ZXJDb21wb3NpdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjE3LDYgKzIxNyw3IEBAIFJl bmRlckxheWVyQ29tcG9zaXRvcjo6UmVuZGVyTGF5ZXJDb21wb3MKICAgICAsIG1fbGF5ZXJGbHVz aFRocm90dGxpbmdFbmFibGVkKGZhbHNlKQogICAgICwgbV9sYXllckZsdXNoVGhyb3R0bGluZ1Rl bXBvcmFyaWx5RGlzYWJsZWRGb3JJbnRlcmFjdGlvbihmYWxzZSkKICAgICAsIG1faGFzUGVuZGlu Z0xheWVyRmx1c2goZmFsc2UpCisgICAgLCBtX2hlYWRlckxheWVyQXdhaXRpbmdGaXJzdEZsdXNo KGZhbHNlKQogI2lmICFMT0dfRElTQUJMRUQKICAgICAsIG1fcm9vdExheWVyVXBkYXRlQ291bnQo MCkKICAgICAsIG1fb2JsaWdhdGVDb21wb3NpdGVkTGF5ZXJDb3VudCgwKQpAQCAtMzc1LDYgKzM3 NiwxNiBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6Zmx1c2hQZW5kaW5nCiAgICAgQVNT RVJUKG1fZmx1c2hpbmdMYXllcnMpOwogICAgIG1fZmx1c2hpbmdMYXllcnMgPSBmYWxzZTsKIAor ICAgIGlmIChtX2hlYWRlckxheWVyQXdhaXRpbmdGaXJzdEZsdXNoKSB7CisgICAgICAgIG1faGVh ZGVyTGF5ZXJBd2FpdGluZ0ZpcnN0Rmx1c2ggPSBmYWxzZTsKKyAgICAgICAgaWYgKFBhZ2UqIHBh Z2UgPSB0aGlzLT5wYWdlKCkpIHsKKyAgICAgICAgICAgIGlmIChwYWdlLT5sYXlvdXRNaWxlc3Rv bmVzKCkgJiBEaWRGaXJzdEZsdXNoRm9ySGVhZGVyTGF5ZXIpIHsKKyAgICAgICAgICAgICAgICBp ZiAoRnJhbWUqIGZyYW1lID0gcGFnZS0+bWFpbkZyYW1lKCkpCisgICAgICAgICAgICAgICAgICAg IGZyYW1lLT5sb2FkZXIoKS0+ZGlkTGF5b3V0KERpZEZpcnN0Rmx1c2hGb3JIZWFkZXJMYXllcik7 CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICB9CisKICAgICBpZiAoIW1fdmlld3BvcnRD b25zdHJhaW5lZExheWVyc05lZWRpbmdVcGRhdGUuaXNFbXB0eSgpKSB7CiAgICAgICAgIEhhc2hT ZXQ8UmVuZGVyTGF5ZXIqPjo6Y29uc3RfaXRlcmF0b3IgZW5kID0gbV92aWV3cG9ydENvbnN0cmFp bmVkTGF5ZXJzTmVlZGluZ1VwZGF0ZS5lbmQoKTsKICAgICAgICAgZm9yIChIYXNoU2V0PFJlbmRl ckxheWVyKj46OmNvbnN0X2l0ZXJhdG9yIGl0ID0gbV92aWV3cG9ydENvbnN0cmFpbmVkTGF5ZXJz TmVlZGluZ1VwZGF0ZS5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQpCkBAIC0yNTE0LDYgKzI1MjUs NyBAQCBHcmFwaGljc0xheWVyKiBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVwCiAgICAgICAgIG1f bGF5ZXJGb3JIZWFkZXItPnNldE5hbWUoImhlYWRlciIpOwogI2VuZGlmCiAgICAgICAgIG1fc2Ny b2xsTGF5ZXItPmFkZENoaWxkQmVsb3cobV9sYXllckZvckhlYWRlci5nZXQoKSwgbV9yb290Q29u dGVudExheWVyLmdldCgpKTsKKyAgICAgICAgbV9oZWFkZXJMYXllckF3YWl0aW5nRmlyc3RGbHVz aCA9IHRydWU7CiAgICAgfQogCiAgICAgbV9sYXllckZvckhlYWRlci0+c2V0UG9zaXRpb24oRmxv YXRQb2ludCgwLCAwKSk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5 ZXJDb21wb3NpdG9yLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyQ29tcG9zaXRvci5oCShyZXZpc2lvbiAxNDg1MzMpCisrKyBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ1 Myw2ICs0NTMsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9sYXllckZsdXNoVGhyb3R0bGluZ0Vu YWJsZWQ7CiAgICAgYm9vbCBtX2xheWVyRmx1c2hUaHJvdHRsaW5nVGVtcG9yYXJpbHlEaXNhYmxl ZEZvckludGVyYWN0aW9uOwogICAgIGJvb2wgbV9oYXNQZW5kaW5nTGF5ZXJGbHVzaDsKKyAgICBi b29sIG1faGVhZGVyTGF5ZXJBd2FpdGluZ0ZpcnN0Rmx1c2g7CiAKICNpZiAhTE9HX0RJU0FCTEVE CiAgICAgaW50IG1fcm9vdExheWVyVXBkYXRlQ291bnQ7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCShyZXZpc2lv biAxNDg1NTEpCisrKyBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAg LTEsMyArMSwzMCBAQAorMjAxMy0wNC0xNiAgQmV0aCBEYWtpbiAgPGJkYWtpbkBhcHBsZS5jb20+ CisKKyAgICAgICAgTmVlZCBhIG5ldyBsYXlvdXQgbWlsZXN0b25lIHRvIG5vdGlmeSBidW5kbGUg Y2xpZW50cyB3aGVuIHRoZSBoZWFkZXIgaGFzIGJlZW4gCisgICAgICAgIGZsdXNoZWQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNDcwNgorICAgICAg ICAtYW5kIGNvcnJlc3BvbmRpbmctCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xMzY1NzI4ND4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIHRo aXMgbmV3IExheW91dE1pbGVzdG9uZSBwcml2YXRlIGF0IHRoZSBBUEkgbGF5ZXIuIAorICAgICAg ICAqIFNoYXJlZC9BUEkvYy9XS1BhZ2VMb2FkVHlwZXMuaDoKKyAgICAgICAgKiBTaGFyZWQvQVBJ L2MvV0tQYWdlTG9hZFR5cGVzUHJpdmF0ZS5oOiBBZGRlZC4KKworICAgICAgICBIYW5kbGUgdGhl IG5ldyBtaWxlc3RvbmUuCisgICAgICAgICogU2hhcmVkL0FQSS9jL1dLU2hhcmVkQVBJQ2FzdC5o OgorICAgICAgICAoV2ViS2l0Ojp0b1dLTGF5b3V0TWlsZXN0b25lcyk6CisgICAgICAgIChXZWJL aXQ6OnRvTGF5b3V0TWlsZXN0b25lcyk6CisKKyAgICAgICAgTmV3IGZpbGUgdG8gbWFrZSB0aGUg bWlsZXN0b25lIHByaXZhdGUuCisgICAgICAgICogV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5w Ynhwcm9qOgorCisgICAgICAgIEFkZCBvciByZW1vdmUgdGhlIERpZEZpcnN0Rmx1c2hGb3JIZWFk ZXJMYXllciBtaWxsc3RvbmUgYmFzZWQgb24gd2hldGhlciB3ZSBqdXN0IAorICAgICAgICBhZGRl ZCBvciByZW1vdmVkIGEgaGVhZGVyLgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9tYWMv V2ViUGFnZU1hYy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6c2V0SGVhZGVyTGF5ZXJX aXRoSGVpZ2h0KToKKwogMjAxMy0wNC0xNSAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgog CiAgICAgICAgIFJlbW92ZSBtb3JlICNpbmNsdWRlcyBmcm9tIEZyYW1lLmgKSW5kZXg6IFNvdXJj ZS9XZWJLaXQyL1NoYXJlZC9BUEkvYy9XS1BhZ2VMb2FkVHlwZXMuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJL2MvV0tQYWdlTG9hZFR5cGVzLmgJKHJldmlzaW9uIDE0 ODUzMykKKysrIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9BUEkvYy9XS1BhZ2VMb2FkVHlwZXMuaAko d29ya2luZyBjb3B5KQpAQCAtNTIsNiArNTIsNyBAQCBlbnVtIHsKICAgICBrV0tEaWRGaXJzdExh eW91dCA9IDEgPDwgMCwKICAgICBrV0tEaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQgPSAx IDw8IDEsCiAgICAga1dLRGlkSGl0UmVsZXZhbnRSZXBhaW50ZWRPYmplY3RzQXJlYVRocmVzaG9s ZCA9IDEgPDwgMgorICAgIC8vIE5vdGUgdGhhdCB0aGlzIGVudW0gaGFzIGEgZm91cnRoLCBwcml2 YXRlIG1lbWJlciB0aGF0IGlzIGRlZmluZWQgaW4gV0tQYWdlTG9hZFR5cGVzUHJpdmF0ZS5oCiB9 OwogdHlwZWRlZiB1aW50MzJfdCBXS0xheW91dE1pbGVzdG9uZXM7CiAKSW5kZXg6IFNvdXJjZS9X ZWJLaXQyL1NoYXJlZC9BUEkvYy9XS1BhZ2VMb2FkVHlwZXNQcml2YXRlLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvU2hhcmVkL0FQSS9jL1dLUGFnZUxvYWRUeXBlc1ByaXZhdGUuaAko cmV2aXNpb24gMCkKKysrIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9BUEkvYy9XS1BhZ2VMb2FkVHlw ZXNQcml2YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSw0MiBAQAorLyoKKyAqIENvcHly aWdodCAoQykgMjAxMyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVk aXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3 aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUg Zm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMg b2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90 aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVy LgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRo ZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMg YW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24g YW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisg KgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09O VFJJQlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFO VElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJS QU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisg KiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9S IElUUyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1Qs IElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFN QUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBT VUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklU UzsgT1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFO WSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJ QUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICog QVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4g SUYgQURWSVNFRCBPRgorICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisK KyNpZm5kZWYgV0tQYWdlTG9hZFR5cGVzUHJpdmF0ZV9oCisjZGVmaW5lIFdLUGFnZUxvYWRUeXBl c1ByaXZhdGVfaAorCisjaWZkZWYgX19jcGx1c3BsdXMKK2V4dGVybiAiQyIgeworI2VuZGlmCisK Ky8vIFRoaXMgaXMgYW4gZXh0ZW5zaW9uIG9mIHRoZSBXS0xheW91dE1pbGVzdG9uZXMgZW51bSBk ZWZpbmVkIGluIFdLUGFnZUxvYWRUeXBlcy5oCitlbnVtIHsKKyAgICBrV0tEaWRGaXJzdEZsdXNo Rm9ySGVhZGVyTGF5ZXIgPSAxIDw8IDMKK307CisKKyNpZmRlZiBfX2NwbHVzcGx1cworfQorI2Vu ZGlmCisKKyNlbmRpZiAvKiBXS1BhZ2VMb2FkVHlwZXNQcml2YXRlX2ggKi8KSW5kZXg6IFNvdXJj ZS9XZWJLaXQyL1NoYXJlZC9BUEkvYy9XS1NoYXJlZEFQSUNhc3QuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJL2MvV0tTaGFyZWRBUElDYXN0LmgJKHJldmlzaW9uIDE0 ODUzMykKKysrIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9BUEkvYy9XS1NoYXJlZEFQSUNhc3QuaAko d29ya2luZyBjb3B5KQpAQCAtMzUsNiArMzUsNyBAQAogI2luY2x1ZGUgIldLR2VvbWV0cnkuaCIK ICNpbmNsdWRlICJXS0ltYWdlLmgiCiAjaW5jbHVkZSAiV0tQYWdlTG9hZFR5cGVzLmgiCisjaW5j bHVkZSAiV0tQYWdlTG9hZFR5cGVzUHJpdmF0ZS5oIgogI2luY2x1ZGUgIldLUGFnZVZpc2liaWxp dHlUeXBlcy5oIgogI2luY2x1ZGUgIldlYkVycm9yLmgiCiAjaW5jbHVkZSAiV2ViRXZlbnQuaCIK QEAgLTc5OSw2ICs4MDAsOCBAQCBpbmxpbmUgV0tMYXlvdXRNaWxlc3RvbmVzIHRvV0tMYXlvdXRN aWxlCiAgICAgICAgIHdrTWlsZXN0b25lcyB8PSBrV0tEaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlM YXlvdXQ7CiAgICAgaWYgKG1pbGVzdG9uZXMgJiBXZWJDb3JlOjpEaWRIaXRSZWxldmFudFJlcGFp bnRlZE9iamVjdHNBcmVhVGhyZXNob2xkKQogICAgICAgICB3a01pbGVzdG9uZXMgfD0ga1dLRGlk SGl0UmVsZXZhbnRSZXBhaW50ZWRPYmplY3RzQXJlYVRocmVzaG9sZDsKKyAgICBpZiAobWlsZXN0 b25lcyAmIFdlYkNvcmU6OkRpZEZpcnN0Rmx1c2hGb3JIZWFkZXJMYXllcikKKyAgICAgICAgd2tN aWxlc3RvbmVzIHw9IGtXS0RpZEZpcnN0Rmx1c2hGb3JIZWFkZXJMYXllcjsKICAgICAKICAgICBy ZXR1cm4gd2tNaWxlc3RvbmVzOwogfQpAQCAtODEzLDYgKzgxNiw4IEBAIGlubGluZSBXZWJDb3Jl OjpMYXlvdXRNaWxlc3RvbmVzIHRvTGF5b3UKICAgICAgICAgbWlsZXN0b25lcyB8PSBXZWJDb3Jl OjpEaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQ7CiAgICAgaWYgKHdrTWlsZXN0b25lcyAm IGtXS0RpZEhpdFJlbGV2YW50UmVwYWludGVkT2JqZWN0c0FyZWFUaHJlc2hvbGQpCiAgICAgICAg IG1pbGVzdG9uZXMgfD0gV2ViQ29yZTo6RGlkSGl0UmVsZXZhbnRSZXBhaW50ZWRPYmplY3RzQXJl YVRocmVzaG9sZDsKKyAgICBpZiAod2tNaWxlc3RvbmVzICYga1dLRGlkRmlyc3RGbHVzaEZvckhl YWRlckxheWVyKQorICAgICAgICBtaWxlc3RvbmVzIHw9IFdlYkNvcmU6OkRpZEZpcnN0Rmx1c2hG b3JIZWFkZXJMYXllcjsKICAgICAKICAgICByZXR1cm4gbWlsZXN0b25lczsKIH0KSW5kZXg6IFNv dXJjZS9XZWJLaXQyL1dlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvago9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oJKHJl dmlzaW9uIDE0ODUzMykKKysrIFNvdXJjZS9XZWJLaXQyL1dlYktpdDIueGNvZGVwcm9qL3Byb2pl Y3QucGJ4cHJvagkod29ya2luZyBjb3B5KQpAQCAtNTg3LDYgKzU4Nyw3IEBACiAJCTkzOTRBRTQ0 MTcwMkIyNUIwMDM0NDIzMiAvKiBXS0J1bmRsZVBhZ2VQcml2YXRlTWFjLmggaW4gSGVhZGVycyAq LyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA5Mzk0QUU0MjE3MDJCMjVCMDAzNDQy MzIgLyogV0tCdW5kbGVQYWdlUHJpdmF0ZU1hYy5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVT ID0gKFByaXZhdGUsICk7IH07IH07CiAJCTkzOTRBRTQ1MTcwMkIyNUIwMDM0NDIzMiAvKiBXS0J1 bmRsZVBhZ2VQcml2YXRlTWFjLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxl OyBmaWxlUmVmID0gOTM5NEFFNDMxNzAyQjI1QjAwMzQ0MjMyIC8qIFdLQnVuZGxlUGFnZVByaXZh dGVNYWMubW0gKi87IH07CiAJCTkzOUFFNzY2MTMxNkU5OUMwMEFFMDZBNiAvKiBXZWJDb3JlQXJn dW1lbnRDb2RlcnMuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl UmVmID0gOTM5QUU3NjUxMzE2RTk5QzAwQUUwNkE2IC8qIFdlYkNvcmVBcmd1bWVudENvZGVycy5j cHAgKi87IH07CisJCTkzQkRFQjAxMTcxREQ3QUYwMEJGRUUxQiAvKiBXS1BhZ2VMb2FkVHlwZXNQ cml2YXRlLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA5 M0JERUIwMDE3MUREN0FGMDBCRkVFMUIgLyogV0tQYWdlTG9hZFR5cGVzUHJpdmF0ZS5oICovOyBz ZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCTkzRkM2N0JEMTJE M0NDRjIwMEE2MDYxMCAvKiBEZWNvZGVyQWRhcHRlci5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA5M0ZDNjc5RDEyRDNDQzc0MDBBNjA2MTAgLyogRGVj b2RlckFkYXB0ZXIuY3BwICovOyB9OwogCQk5M0ZDNjdCRTEyRDNDQ0YyMDBBNjA2MTAgLyogRGVj b2RlckFkYXB0ZXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl ZiA9IDkzRkM2NzlFMTJEM0NDNzQwMEE2MDYxMCAvKiBEZWNvZGVyQWRhcHRlci5oICovOyB9Owog CQk5M0ZDNjdCRjEyRDNDQ0YyMDBBNjA2MTAgLyogRW5jb2RlckFkYXB0ZXIuY3BwIGluIFNvdXJj ZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gOTNGQzY3OUYxMkQzQ0M3NDAw QTYwNjEwIC8qIEVuY29kZXJBZGFwdGVyLmNwcCAqLzsgfTsKQEAgLTIwMTIsNiArMjAxMyw3IEBA CiAJCTkzOTRBRTQyMTcwMkIyNUIwMDM0NDIzMiAvKiBXS0J1bmRsZVBhZ2VQcml2YXRlTWFjLmgg Ki8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3du RmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFdLQnVuZGxlUGFnZVByaXZhdGVNYWMu aDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJOTM5NEFFNDMxNzAyQjI1QjAwMzQ0MjMy IC8qIFdLQnVuZGxlUGFnZVByaXZhdGVNYWMubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5j ZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5v YmpjcHA7IHBhdGggPSBXS0J1bmRsZVBhZ2VQcml2YXRlTWFjLm1tOyBzb3VyY2VUcmVlID0gIjxn cm91cD4iOyB9OwogCQk5MzlBRTc2NTEzMTZFOTlDMDBBRTA2QTYgLyogV2ViQ29yZUFyZ3VtZW50 Q29kZXJzLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0 OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFdlYkNvcmVB cmd1bWVudENvZGVycy5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTkzQkRFQjAw MTcxREQ3QUYwMEJGRUUxQiAvKiBXS1BhZ2VMb2FkVHlwZXNQcml2YXRlLmggKi8gPSB7aXNhID0g UEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBz b3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFdLUGFnZUxvYWRUeXBlc1ByaXZhdGUuaDsgc291cmNlVHJl ZSA9ICI8Z3JvdXA+IjsgfTsKIAkJOTNGQzY3OUQxMkQzQ0M3NDAwQTYwNjEwIC8qIERlY29kZXJB ZGFwdGVyLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0 OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IERlY29kZXJB ZGFwdGVyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJOTNGQzY3OUUxMkQzQ0M3 NDAwQTYwNjEwIC8qIERlY29kZXJBZGFwdGVyLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5j ZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsg cGF0aCA9IERlY29kZXJBZGFwdGVyLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTkz RkM2NzlGMTJEM0NDNzQwMEE2MDYxMCAvKiBFbmNvZGVyQWRhcHRlci5jcHAgKi8gPSB7aXNhID0g UEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBz b3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBFbmNvZGVyQWRhcHRlci5jcHA7IHNvdXJjZVRyZWUg PSAiPGdyb3VwPiI7IH07CkBAIC00ODI5LDYgKzQ4MzEsNyBAQAogCQkJCUJDNDA3NUU1MTI0RkYw MjcwMDY4RjIwQSAvKiBXS051bWJlci5jcHAgKi8sCiAJCQkJQkM0MDc1RTYxMjRGRjAyNzAwNjhG MjBBIC8qIFdLTnVtYmVyLmggKi8sCiAJCQkJQkMyRDAyMTgxMkFDNDI2QzAwRTczMkEzIC8qIFdL UGFnZUxvYWRUeXBlcy5oICovLAorCQkJCTkzQkRFQjAwMTcxREQ3QUYwMEJGRUUxQiAvKiBXS1Bh Z2VMb2FkVHlwZXNQcml2YXRlLmggKi8sCiAJCQkJQTVFRkQzOEIxNkIwRTg4QzAwQjJGMEU4IC8q IFdLUGFnZVZpc2liaWxpdHlUeXBlcy5oICovLAogCQkJCTM3OTQ4NDA2MTUwQzRCOTYwMEU1MkNF OSAvKiBXS1JlbmRlckxheWVyLmNwcCAqLywKIAkJCQkzNzk0ODQwNzE1MEM0Qjk2MDBFNTJDRTkg LyogV0tSZW5kZXJMYXllci5oICovLApAQCAtNTIxOSw2ICs1MjIyLDcgQEAKIAkJCQlCQ0E4QzZB OTExRTNCQTVGMDA4MTJGQjcgLyogSW5qZWN0ZWRCdW5kbGVQYWdlTG9hZGVyQ2xpZW50LmggaW4g SGVhZGVycyAqLywKIAkJCQlCQzgxNDdBOTEyRjY0Q0RBMDA3QjJDMzIgLyogSW5qZWN0ZWRCdW5k bGVQYWdlUG9saWN5Q2xpZW50LmggaW4gSGVhZGVycyAqLywKIAkJCQlCQ0E4QzZCMDExRTNDMDg3 MDA4MTJGQjcgLyogSW5qZWN0ZWRCdW5kbGVQYWdlVUlDbGllbnQuaCBpbiBIZWFkZXJzICovLAor CQkJCTkzQkRFQjAxMTcxREQ3QUYwMEJGRUUxQiAvKiBXS1BhZ2VMb2FkVHlwZXNQcml2YXRlLmgg aW4gSGVhZGVycyAqLywKIAkJCQlCQzMzRTBEMTEyNDA4RTg2MDAzNjBGM0YgLyogSW5qZWN0ZWRC dW5kbGVSYW5nZUhhbmRsZS5oIGluIEhlYWRlcnMgKi8sCiAJCQkJQkMxNERGNzcxMjBCNUI3OTAw ODI2QzBDIC8qIEluamVjdGVkQnVuZGxlU2NyaXB0V29ybGQuaCBpbiBIZWFkZXJzICovLAogCQkJ CUJDQjBCMERFMTIzMDVBOEMwMEIxMzQxRSAvKiBJbmplY3RlZEJ1bmRsZVVzZXJNZXNzYWdlQ29k ZXJzLmggaW4gSGVhZGVycyAqLywKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9tYWMvV2ViUGFnZU1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvbWFjL1dlYlBhZ2VNYWMubW0JKHJldmlzaW9uIDE0ODUzMykKKysrIFNv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvV2ViUGFnZU1hYy5tbQkod29ya2lu ZyBjb3B5KQpAQCAtODM2LDggKzgzNiwxMiBAQCB2b2lkIFdlYlBhZ2U6OnNldEhlYWRlckxheWVy V2l0aEhlaWdodChDCiAKICAgICBtX2hlYWRlckxheWVyID0gbGF5ZXI7CiAgICAgR3JhcGhpY3NM YXllciogcGFyZW50TGF5ZXIgPSBmcmFtZVZpZXctPnNldFdhbnRzTGF5ZXJGb3JIZWFkZXIobV9o ZWFkZXJMYXllcik7Ci0gICAgaWYgKCFwYXJlbnRMYXllcikKKyAgICBpZiAoIXBhcmVudExheWVy KSB7CisgICAgICAgIG1fcGFnZS0+cmVtb3ZlTGF5b3V0TWlsZXN0b25lcyhEaWRGaXJzdEZsdXNo Rm9ySGVhZGVyTGF5ZXIpOwogICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgbV9wYWdlLT5h ZGRMYXlvdXRNaWxlc3RvbmVzKERpZEZpcnN0Rmx1c2hGb3JIZWFkZXJMYXllcik7CiAKICAgICBt X2hlYWRlckxheWVyLmdldCgpLmJvdW5kcyA9IENHUmVjdE1ha2UoMCwgMCwgcGFyZW50TGF5ZXIt PnNpemUoKS53aWR0aCgpLCBwYXJlbnRMYXllci0+c2l6ZSgpLmhlaWdodCgpKTsKICAgICBbcGFy ZW50TGF5ZXItPnBsYXRmb3JtTGF5ZXIoKSBhZGRTdWJsYXllcjptX2hlYWRlckxheWVyLmdldCgp XTsK