126917 2014-01-13 10:43:13 -0800 Map RootInlineBox to containing region via bit+hashmap. 2014-01-13 14:29:07 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling commit-queue esprehn+autocc glenn kondapallykalyan WebkitBugTracker oldest_to_newest 967403 0 kling 2014-01-13 10:43:13 -0800 Map RootInlineBox to containing region via bit+hashmap. 967405 1 221062 kling 2014-01-13 10:46:27 -0800 Created attachment 221062 Patch 967408 2 221062 koivisto 2014-01-13 10:53:10 -0800 Comment on attachment 221062 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=221062&action=review > Source/WebCore/rendering/RootInlineBox.cpp:279 > void RootInlineBox::setContainingRegion(RenderRegion* region) > { > ASSERT(!isDirty()); > ASSERT(blockFlow().flowThreadContainingBlock()); > - m_containingRegion = region; > + > + if (!region && !m_hasContainingRegion) > + return; > + > + if (region) > + containingRegionMap().set(this, region); > + else > + containingRegionMap().remove(this); > + > + m_hasContainingRegion = !!region; > } It would be nicer to have setContainingRegion(RenderRegion&) and clearContainingRegion() separately. 967432 3 221067 kling 2014-01-13 11:49:31 -0800 Created attachment 221067 Moon lander 967482 4 221067 commit-queue 2014-01-13 14:29:04 -0800 Comment on attachment 221067 Moon lander Clearing flags on attachment: 221067 Committed r161909: <http://trac.webkit.org/changeset/161909> 967483 5 commit-queue 2014-01-13 14:29:07 -0800 All reviewed patches have been landed. Closing bug. 221062 2014-01-13 10:46:27 -0800 2014-01-13 11:49:31 -0800 Patch bug-126917.diff text/plain 6689 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1ZDIxMzNjLi4zNzUyNGIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNDMg QEAKIDIwMTQtMDEtMTMgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCisgICAg ICAgIE1hcCBSb290SW5saW5lQm94IHRvIGNvbnRhaW5pbmcgcmVnaW9uIHZpYSBiaXQraGFzaG1h cC4KKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzEyNjkxNz4KKworICAgICAgICBUaGUg dmFzIG1ham9yaXR5IG9mIFJvb3RJbmxpbmVCb3ggb2JqZWN0cyBkb24ndCBoYXZlIGEgY29udGFp bmluZworICAgICAgICBSZW5kZXJSZWdpb24sIHNvIGxldCdzIHN0b3JlIHRoYXQgaW4gYSBiaXQr aGFzaG1hcCBjb25maWd1cmF0aW9uCisgICAgICAgIGluc3RlYWQgb2YgaGF2aW5nIGEgZGVkaWNh dGVkIHBvaW50ZXIgbWVtYmVyIGZvciBpdC4KKworICAgICAgICAxNDgga0IgcHJvZ3Jlc3Npb24g b24gTWVtYnVzdGVyMy4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIHJlbmRlcmluZy9JbmxpbmVGbG93Qm94Lmg6CisgICAgICAgIChXZWJDb3JlOjpJ bmxpbmVGbG93Qm94OjpJbmxpbmVGbG93Qm94KToKKyAgICAgICAgKiByZW5kZXJpbmcvUm9vdElu bGluZUJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSb290SW5saW5lQm94OjpSb290SW5saW5l Qm94KToKKworICAgICAgICAgICAgQWRkZWQgbV9oYXNDb250YWluaW5nUmVnaW9uIGJpdC4KKwor ICAgICAgICAoV2ViQ29yZTo6Y29udGFpbmluZ1JlZ2lvbk1hcCk6CisKKyAgICAgICAgICAgIEds b2JhbCBtYXAgYmV0d2VlbiBSb290SW5saW5lQm94IGFuZCBSZW5kZXJSZWdpb24uCisKKyAgICAg ICAgKFdlYkNvcmU6OlJvb3RJbmxpbmVCb3g6On5Sb290SW5saW5lQm94KToKKworICAgICAgICAg ICAgUmVtb3ZlIHNlbGYgZnJvbSBhZm9yZW1lbnRpb25lZCBnbG9iYWwgbWFwIGlmIG5lZWRlZC4K KworICAgICAgICAoV2ViQ29yZTo6Um9vdElubGluZUJveDo6cGFpbnQpOgorCisgICAgICAgICAg ICBUd2VhayBhIGNvbmRpdGlvbiB0byBhdm9pZCBkb3VibGUgaGFzaCBsb29rdXAuCisKKyAgICAg ICAgKiByZW5kZXJpbmcvUm9vdElubGluZUJveC5oOgorICAgICAgICAoV2ViQ29yZTo6Um9vdElu bGluZUJveDo6Y29udGFpbmluZ1JlZ2lvbik6CisgICAgICAgIChXZWJDb3JlOjpSb290SW5saW5l Qm94OjpzZXRDb250YWluaW5nUmVnaW9uKToKKworICAgICAgICAgICAgU3RvcmUgdGhlIGNvbnRh aW5pbmcgcmVnaW9uIGluIGEgYml0K2hhc2htYXAuCisKKzIwMTQtMDEtMTMgIEFuZHJlYXMgS2xp bmcgIDxha2xpbmdAYXBwbGUuY29tPgorCiAgICAgICAgIENUVEU6IEF1dG9zY3JvbGwgcmVuZGVy ZXIgaXMgYWx3YXlzIGEgUmVuZGVyQm94LgogICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2Iv MTI2ODg0PgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lRmxv d0JveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUZsb3dCb3guaAppbmRleCBj ODQ2ZDNjLi5mMTI4YzE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5s aW5lRmxvd0JveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVGbG93Qm94 LmgKQEAgLTUzLDYgKzUzLDcgQEAgcHVibGljOgogICAgICAgICAsIG1faGFzQW5ub3RhdGlvbnNC ZWZvcmUoZmFsc2UpCiAgICAgICAgICwgbV9oYXNBbm5vdGF0aW9uc0FmdGVyKGZhbHNlKQogICAg ICAgICAsIG1faXNGaXJzdEFmdGVyUGFnZUJyZWFrKGZhbHNlKQorICAgICAgICAsIG1faGFzQ29u dGFpbmluZ1JlZ2lvbihmYWxzZSkKICNpZiAhQVNTRVJUX1dJVEhfU0VDVVJJVFlfSU1QTElDQVRJ T05fRElTQUJMRUQKICAgICAgICAgLCBtX2hhc0JhZENoaWxkTGlzdChmYWxzZSkKICNlbmRpZgpA QCAtMzQwLDYgKzM0MSw4IEBAIHByb3RlY3RlZDoKIAogICAgIHVuc2lnbmVkIG1faXNGaXJzdEFm dGVyUGFnZUJyZWFrIDogMTsKIAorICAgIHVuc2lnbmVkIG1faGFzQ29udGFpbmluZ1JlZ2lvbiA6 IDE7CisKICAgICAvLyBFbmQgb2YgUm9vdElubGluZUJveC1zcGVjaWZpYyBtZW1iZXJzLgogCiAj aWYgIUFTU0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OX0RJU0FCTEVECmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUm9vdElubGluZUJveC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUm9vdElubGluZUJveC5jcHAKaW5kZXggZDZiYWNiYy4uYTAwY2QwZTUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9Sb290SW5saW5lQm94LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUm9vdElubGluZUJveC5jcHAKQEAgLTM1LDEz ICszNSwxNCBAQAogI2luY2x1ZGUgIlJlbmRlckZsb3dUaHJlYWQuaCIKICNpbmNsdWRlICJSZW5k ZXJWaWV3LmgiCiAjaW5jbHVkZSAiVmVydGljYWxQb3NpdGlvbkNhY2hlLmgiCisjaW5jbHVkZSA8 d3RmL05ldmVyRGVzdHJveWVkLmg+CiAjaW5jbHVkZSA8d3RmL3VuaWNvZGUvVW5pY29kZS5oPgog CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgCiBzdHJ1Y3QgU2FtZVNpemVBc1Jvb3RJbmxpbmVC b3ggOiBwdWJsaWMgSW5saW5lRmxvd0JveCB7CiAgICAgdW5zaWduZWQgdmFyaWFibGVzWzddOwot ICAgIHZvaWQqIHBvaW50ZXJzWzRdOworICAgIHZvaWQqIHBvaW50ZXJzWzNdOwogfTsKIAogQ09N UElMRV9BU1NFUlQoc2l6ZW9mKFJvb3RJbmxpbmVCb3gpID09IHNpemVvZihTYW1lU2l6ZUFzUm9v dElubGluZUJveCksIFJvb3RJbmxpbmVCb3hfc2hvdWxkX3N0YXlfc21hbGwpOwpAQCAtNDksMTEg KzUwLDE3IEBAIENPTVBJTEVfQVNTRVJUKHNpemVvZihSb290SW5saW5lQm94KSA9PSBzaXplb2Yo U2FtZVNpemVBc1Jvb3RJbmxpbmVCb3gpLCBSb290SW5sCiB0eXBlZGVmIFdURjo6SGFzaE1hcDxj b25zdCBSb290SW5saW5lQm94Kiwgc3RkOjp1bmlxdWVfcHRyPEVsbGlwc2lzQm94Pj4gRWxsaXBz aXNCb3hNYXA7CiBzdGF0aWMgRWxsaXBzaXNCb3hNYXAqIGdFbGxpcHNpc0JveE1hcCA9IDA7CiAK K3R5cGVkZWYgSGFzaE1hcDxjb25zdCBSb290SW5saW5lQm94KiwgUmVuZGVyUmVnaW9uKj4gQ29u dGFpbmluZ1JlZ2lvbk1hcDsKK3N0YXRpYyBDb250YWluaW5nUmVnaW9uTWFwJiBjb250YWluaW5n UmVnaW9uTWFwKCkKK3sKKyAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8Q29udGFpbmluZ1JlZ2lv bk1hcD4gbWFwOworICAgIHJldHVybiBtYXA7Cit9CisKIFJvb3RJbmxpbmVCb3g6OlJvb3RJbmxp bmVCb3goUmVuZGVyQmxvY2tGbG93JiBibG9jaykKICAgICA6IElubGluZUZsb3dCb3goYmxvY2sp CiAgICAgLCBtX2xpbmVCcmVha1BvcygwKQogICAgICwgbV9saW5lQnJlYWtPYmoobnVsbHB0cikK LSAgICAsIG1fY29udGFpbmluZ1JlZ2lvbihudWxscHRyKQogewogICAgIHNldElzSG9yaXpvbnRh bChibG9jay5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpKTsKIH0KQEAgLTYxLDYgKzY4LDkgQEAg Um9vdElubGluZUJveDo6Um9vdElubGluZUJveChSZW5kZXJCbG9ja0Zsb3cmIGJsb2NrKQogUm9v dElubGluZUJveDo6flJvb3RJbmxpbmVCb3goKQogewogICAgIGRldGFjaEVsbGlwc2lzQm94KCk7 CisKKyAgICBpZiAobV9oYXNDb250YWluaW5nUmVnaW9uKQorICAgICAgICBjb250YWluaW5nUmVn aW9uTWFwKCkucmVtb3ZlKHRoaXMpOwogfQogCiB2b2lkIFJvb3RJbmxpbmVCb3g6OmRldGFjaEVs bGlwc2lzQm94KCkKQEAgLTE5NCw3ICsyMDQsNyBAQCB2b2lkIFJvb3RJbmxpbmVCb3g6OnBhaW50 Q3VzdG9tSGlnaGxpZ2h0KFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBMYXlvdXRQb2ludAog dm9pZCBSb290SW5saW5lQm94OjpwYWludChQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgTGF5 b3V0UG9pbnQmIHBhaW50T2Zmc2V0LCBMYXlvdXRVbml0IGxpbmVUb3AsIExheW91dFVuaXQgbGlu ZUJvdHRvbSkKIHsKICAgICAvLyBDaGVjayBpZiB3ZSBhcmUgaW4gdGhlIGNvcnJlY3QgcmVnaW9u LgotICAgIGlmIChwYWludEluZm8ucmVuZGVyUmVnaW9uICYmIGNvbnRhaW5pbmdSZWdpb24oKSAm JiBjb250YWluaW5nUmVnaW9uKCkgIT0gcGFpbnRJbmZvLnJlbmRlclJlZ2lvbikKKyAgICBpZiAo cGFpbnRJbmZvLnJlbmRlclJlZ2lvbiAmJiBtX2hhc0NvbnRhaW5pbmdSZWdpb24gJiYgY29udGFp bmluZ1JlZ2lvbigpICE9IHBhaW50SW5mby5yZW5kZXJSZWdpb24pCiAgICAgICAgIHJldHVybjsK ICAgICAKICAgICBJbmxpbmVGbG93Qm94OjpwYWludChwYWludEluZm8sIHBhaW50T2Zmc2V0LCBs aW5lVG9wLCBsaW5lQm90dG9tKTsKQEAgLTI0MywyMSArMjUzLDI5IEBAIHZvaWQgUm9vdElubGlu ZUJveDo6Y2hpbGRSZW1vdmVkKElubGluZUJveCogYm94KQogUmVuZGVyUmVnaW9uKiBSb290SW5s aW5lQm94Ojpjb250YWluaW5nUmVnaW9uKCkgY29uc3QKIHsKICNpZm5kZWYgTkRFQlVHCi0gICAg aWYgKG1fY29udGFpbmluZ1JlZ2lvbikgeworICAgIGlmIChtX2hhc0NvbnRhaW5pbmdSZWdpb24p IHsKICAgICAgICAgUmVuZGVyRmxvd1RocmVhZCogZmxvd1RocmVhZCA9IGJsb2NrRmxvdygpLmZs b3dUaHJlYWRDb250YWluaW5nQmxvY2soKTsKICAgICAgICAgY29uc3QgUmVuZGVyUmVnaW9uTGlz dCYgcmVnaW9uTGlzdCA9IGZsb3dUaHJlYWQtPnJlbmRlclJlZ2lvbkxpc3QoKTsKLSAgICAgICAg QVNTRVJUKHJlZ2lvbkxpc3QuY29udGFpbnMobV9jb250YWluaW5nUmVnaW9uKSk7CisgICAgICAg IEFTU0VSVChyZWdpb25MaXN0LmNvbnRhaW5zKGNvbnRhaW5pbmdSZWdpb25NYXAoKS5nZXQodGhp cykpKTsKICAgICB9CiAjZW5kaWYKLQotICAgIHJldHVybiBtX2NvbnRhaW5pbmdSZWdpb247Cisg ICAgcmV0dXJuIG1faGFzQ29udGFpbmluZ1JlZ2lvbiA/IGNvbnRhaW5pbmdSZWdpb25NYXAoKS5n ZXQodGhpcykgOiBudWxscHRyOwogfQogCiB2b2lkIFJvb3RJbmxpbmVCb3g6OnNldENvbnRhaW5p bmdSZWdpb24oUmVuZGVyUmVnaW9uKiByZWdpb24pCiB7CiAgICAgQVNTRVJUKCFpc0RpcnR5KCkp OwogICAgIEFTU0VSVChibG9ja0Zsb3coKS5mbG93VGhyZWFkQ29udGFpbmluZ0Jsb2NrKCkpOwot ICAgIG1fY29udGFpbmluZ1JlZ2lvbiA9IHJlZ2lvbjsKKworICAgIGlmICghcmVnaW9uICYmICFt X2hhc0NvbnRhaW5pbmdSZWdpb24pCisgICAgICAgIHJldHVybjsKKworICAgIGlmIChyZWdpb24p CisgICAgICAgIGNvbnRhaW5pbmdSZWdpb25NYXAoKS5zZXQodGhpcywgcmVnaW9uKTsKKyAgICBl bHNlCisgICAgICAgIGNvbnRhaW5pbmdSZWdpb25NYXAoKS5yZW1vdmUodGhpcyk7CisKKyAgICBt X2hhc0NvbnRhaW5pbmdSZWdpb24gPSAhIXJlZ2lvbjsKIH0KIAogTGF5b3V0VW5pdCBSb290SW5s aW5lQm94OjphbGlnbkJveGVzSW5CbG9ja0RpcmVjdGlvbihMYXlvdXRVbml0IGhlaWdodE9mQmxv Y2ssIEdseXBoT3ZlcmZsb3dBbmRGYWxsYmFja0ZvbnRzTWFwJiB0ZXh0Qm94RGF0YU1hcCwgVmVy dGljYWxQb3NpdGlvbkNhY2hlJiB2ZXJ0aWNhbFBvc2l0aW9uQ2FjaGUpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUm9vdElubGluZUJveC5oIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1Jvb3RJbmxpbmVCb3guaAppbmRleCBhYjRjMTRmLi4zN2NiZjI1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUm9vdElubGluZUJveC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9Sb290SW5saW5lQm94LmgKQEAgLTY0LDYgKzY0LDggQEAgcHVi bGljOgogICAgIExheW91dFVuaXQgcGFnaW5hdGVkTGluZVdpZHRoKCkgY29uc3QgeyByZXR1cm4g bV9wYWdpbmF0ZWRMaW5lV2lkdGg7IH0KICAgICB2b2lkIHNldFBhZ2luYXRlZExpbmVXaWR0aChM YXlvdXRVbml0IHdpZHRoKSB7IG1fcGFnaW5hdGVkTGluZVdpZHRoID0gd2lkdGg7IH0KIAorICAg IC8vIEl0IHNob3VsZCBub3QgYmUgYXNzdW1lZCB0aGUgY29udGFpbmluZ1JlZ2lvbigpIGlzIGFs d2F5cyB2YWxpZC4KKyAgICAvLyBJdCBjYW4gYWxzbyBiZSBudWxscHRyIGlmIHRoZSBmbG93IGhh cyBubyByZWdpb24gY2hhaW4uCiAgICAgUmVuZGVyUmVnaW9uKiBjb250YWluaW5nUmVnaW9uKCkg Y29uc3Q7CiAgICAgdm9pZCBzZXRDb250YWluaW5nUmVnaW9uKFJlbmRlclJlZ2lvbiopOwogCkBA IC0yMTgsMTAgKzIyMCw2IEBAIHByaXZhdGU6CiAgICAgTGF5b3V0VW5pdCBtX2xpbmVUb3BXaXRo TGVhZGluZzsKICAgICBMYXlvdXRVbml0IG1fbGluZUJvdHRvbVdpdGhMZWFkaW5nOwogCi0gICAg Ly8gSXQgc2hvdWxkIG5vdCBiZSBhc3N1bWVkIHRoZSB8Y29udGFpbmluZ1JlZ2lvbnwgaXMgYWx3 YXlzIHZhbGlkLgotICAgIC8vIEl0IGNhbiBhbHNvIGJlIG51bGxwdHIgaWYgdGhlIGZsb3cgaGFz IG5vIHJlZ2lvbiBjaGFpbi4KLSAgICBSZW5kZXJSZWdpb24qIG1fY29udGFpbmluZ1JlZ2lvbjsK LQogICAgIExheW91dFVuaXQgbV9wYWdpbmF0aW9uU3RydXQ7CiAgICAgTGF5b3V0VW5pdCBtX3Bh Z2luYXRlZExpbmVXaWR0aDsKIAo= 221067 2014-01-13 11:49:31 -0800 2014-01-13 14:29:04 -0800 Moon lander land-126917.diff text/plain 7917 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1ZDIxMzNjLi4xOTQ0ZDk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNDQg QEAKIDIwMTQtMDEtMTMgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCisgICAg ICAgIE1hcCBSb290SW5saW5lQm94IHRvIGNvbnRhaW5pbmcgcmVnaW9uIHZpYSBiaXQraGFzaG1h cC4KKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzEyNjkxNz4KKworICAgICAgICBUaGUg dmFzIG1ham9yaXR5IG9mIFJvb3RJbmxpbmVCb3ggb2JqZWN0cyBkb24ndCBoYXZlIGEgY29udGFp bmluZworICAgICAgICBSZW5kZXJSZWdpb24sIHNvIGxldCdzIHN0b3JlIHRoYXQgaW4gYSBiaXQr aGFzaG1hcCBjb25maWd1cmF0aW9uCisgICAgICAgIGluc3RlYWQgb2YgaGF2aW5nIGEgZGVkaWNh dGVkIHBvaW50ZXIgbWVtYmVyIGZvciBpdC4KKworICAgICAgICAxNDgga0IgcHJvZ3Jlc3Npb24g b24gTWVtYnVzdGVyMy4KKworICAgICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KKwor ICAgICAgICAqIHJlbmRlcmluZy9JbmxpbmVGbG93Qm94Lmg6CisgICAgICAgIChXZWJDb3JlOjpJ bmxpbmVGbG93Qm94OjpJbmxpbmVGbG93Qm94KToKKyAgICAgICAgKiByZW5kZXJpbmcvUm9vdElu bGluZUJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSb290SW5saW5lQm94OjpSb290SW5saW5l Qm94KToKKworICAgICAgICAgICAgQWRkZWQgbV9oYXNDb250YWluaW5nUmVnaW9uIGJpdC4KKwor ICAgICAgICAoV2ViQ29yZTo6Y29udGFpbmluZ1JlZ2lvbk1hcCk6CisKKyAgICAgICAgICAgIEds b2JhbCBtYXAgYmV0d2VlbiBSb290SW5saW5lQm94IGFuZCBSZW5kZXJSZWdpb24uCisKKyAgICAg ICAgKFdlYkNvcmU6OlJvb3RJbmxpbmVCb3g6On5Sb290SW5saW5lQm94KToKKworICAgICAgICAg ICAgUmVtb3ZlIHNlbGYgZnJvbSBhZm9yZW1lbnRpb25lZCBnbG9iYWwgbWFwIGlmIG5lZWRlZC4K KworICAgICAgICAoV2ViQ29yZTo6Um9vdElubGluZUJveDo6cGFpbnQpOgorCisgICAgICAgICAg ICBUd2VhayBhIGNvbmRpdGlvbiB0byBhdm9pZCBkb3VibGUgaGFzaCBsb29rdXAuCisKKyAgICAg ICAgKiByZW5kZXJpbmcvUm9vdElubGluZUJveC5oOgorICAgICAgICAoV2ViQ29yZTo6Um9vdElu bGluZUJveDo6Y29udGFpbmluZ1JlZ2lvbik6CisgICAgICAgIChXZWJDb3JlOjpSb290SW5saW5l Qm94OjpjbGVhckNvbnRhaW5pbmdSZWdpb24pOgorICAgICAgICAoV2ViQ29yZTo6Um9vdElubGlu ZUJveDo6c2V0Q29udGFpbmluZ1JlZ2lvbik6CisKKyAgICAgICAgICAgIFN0b3JlIHRoZSBjb250 YWluaW5nIHJlZ2lvbiBpbiBhIGJpdCtoYXNobWFwLgorCisyMDE0LTAxLTEzICBBbmRyZWFzIEts aW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KKwogICAgICAgICBDVFRFOiBBdXRvc2Nyb2xsIHJlbmRl cmVyIGlzIGFsd2F5cyBhIFJlbmRlckJveC4KICAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9i LzEyNjg4ND4KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUZs b3dCb3guaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVGbG93Qm94LmgKaW5kZXgg Yzg0NmQzYy4uZjEyOGMxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lu bGluZUZsb3dCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lRmxvd0Jv eC5oCkBAIC01Myw2ICs1Myw3IEBAIHB1YmxpYzoKICAgICAgICAgLCBtX2hhc0Fubm90YXRpb25z QmVmb3JlKGZhbHNlKQogICAgICAgICAsIG1faGFzQW5ub3RhdGlvbnNBZnRlcihmYWxzZSkKICAg ICAgICAgLCBtX2lzRmlyc3RBZnRlclBhZ2VCcmVhayhmYWxzZSkKKyAgICAgICAgLCBtX2hhc0Nv bnRhaW5pbmdSZWdpb24oZmFsc2UpCiAjaWYgIUFTU0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FU SU9OX0RJU0FCTEVECiAgICAgICAgICwgbV9oYXNCYWRDaGlsZExpc3QoZmFsc2UpCiAjZW5kaWYK QEAgLTM0MCw2ICszNDEsOCBAQCBwcm90ZWN0ZWQ6CiAKICAgICB1bnNpZ25lZCBtX2lzRmlyc3RB ZnRlclBhZ2VCcmVhayA6IDE7CiAKKyAgICB1bnNpZ25lZCBtX2hhc0NvbnRhaW5pbmdSZWdpb24g OiAxOworCiAgICAgLy8gRW5kIG9mIFJvb3RJbmxpbmVCb3gtc3BlY2lmaWMgbWVtYmVycy4KIAog I2lmICFBU1NFUlRfV0lUSF9TRUNVUklUWV9JTVBMSUNBVElPTl9ESVNBQkxFRApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcAppbmRleCAw NTY3N2U2Li42NWVjNzY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQmxvY2tMaW5lTGF5b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQmxvY2tMaW5lTGF5b3V0LmNwcApAQCAtMjE1Nyw3ICsyMTU3LDExIEBAIExheW91dFVuaXQg UmVuZGVyQmxvY2tGbG93OjpzdGFydEFsaWduZWRPZmZzZXRGb3JMaW5lKExheW91dFVuaXQgcG9z aXRpb24sIGJvb2wKIHZvaWQgUmVuZGVyQmxvY2tGbG93Ojp1cGRhdGVSZWdpb25Gb3JMaW5lKFJv b3RJbmxpbmVCb3gqIGxpbmVCb3gpIGNvbnN0CiB7CiAgICAgQVNTRVJUKGxpbmVCb3gpOwotICAg IGxpbmVCb3gtPnNldENvbnRhaW5pbmdSZWdpb24ocmVnaW9uQXRCbG9ja09mZnNldChsaW5lQm94 LT5saW5lVG9wV2l0aExlYWRpbmcoKSkpOworCisgICAgaWYgKGF1dG8gY29udGFpbmluZ1JlZ2lv biA9IHJlZ2lvbkF0QmxvY2tPZmZzZXQobGluZUJveC0+bGluZVRvcFdpdGhMZWFkaW5nKCkpKQor ICAgICAgICBsaW5lQm94LT5zZXRDb250YWluaW5nUmVnaW9uKCpjb250YWluaW5nUmVnaW9uKTsK KyAgICBlbHNlCisgICAgICAgIGxpbmVCb3gtPmNsZWFyQ29udGFpbmluZ1JlZ2lvbigpOwogCiAg ICAgUm9vdElubGluZUJveCogcHJldkxpbmVCb3ggPSBsaW5lQm94LT5wcmV2Um9vdEJveCgpOwog ICAgIGlmICghcHJldkxpbmVCb3gpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUm9vdElubGluZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUm9vdElubGlu ZUJveC5jcHAKaW5kZXggZDZiYWNiYy4uZDUxOWZhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1Jvb3RJbmxpbmVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9Sb290SW5saW5lQm94LmNwcApAQCAtMzUsMTMgKzM1LDE0IEBACiAjaW5jbHVkZSAiUmVu ZGVyRmxvd1RocmVhZC5oIgogI2luY2x1ZGUgIlJlbmRlclZpZXcuaCIKICNpbmNsdWRlICJWZXJ0 aWNhbFBvc2l0aW9uQ2FjaGUuaCIKKyNpbmNsdWRlIDx3dGYvTmV2ZXJEZXN0cm95ZWQuaD4KICNp bmNsdWRlIDx3dGYvdW5pY29kZS9Vbmljb2RlLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAg ICAKIHN0cnVjdCBTYW1lU2l6ZUFzUm9vdElubGluZUJveCA6IHB1YmxpYyBJbmxpbmVGbG93Qm94 IHsKICAgICB1bnNpZ25lZCB2YXJpYWJsZXNbN107Ci0gICAgdm9pZCogcG9pbnRlcnNbNF07Cisg ICAgdm9pZCogcG9pbnRlcnNbM107CiB9OwogCiBDT01QSUxFX0FTU0VSVChzaXplb2YoUm9vdElu bGluZUJveCkgPT0gc2l6ZW9mKFNhbWVTaXplQXNSb290SW5saW5lQm94KSwgUm9vdElubGluZUJv eF9zaG91bGRfc3RheV9zbWFsbCk7CkBAIC00OSwxMSArNTAsMTcgQEAgQ09NUElMRV9BU1NFUlQo c2l6ZW9mKFJvb3RJbmxpbmVCb3gpID09IHNpemVvZihTYW1lU2l6ZUFzUm9vdElubGluZUJveCks IFJvb3RJbmwKIHR5cGVkZWYgV1RGOjpIYXNoTWFwPGNvbnN0IFJvb3RJbmxpbmVCb3gqLCBzdGQ6 OnVuaXF1ZV9wdHI8RWxsaXBzaXNCb3g+PiBFbGxpcHNpc0JveE1hcDsKIHN0YXRpYyBFbGxpcHNp c0JveE1hcCogZ0VsbGlwc2lzQm94TWFwID0gMDsKIAordHlwZWRlZiBIYXNoTWFwPGNvbnN0IFJv b3RJbmxpbmVCb3gqLCBSZW5kZXJSZWdpb24qPiBDb250YWluaW5nUmVnaW9uTWFwOworc3RhdGlj IENvbnRhaW5pbmdSZWdpb25NYXAmIGNvbnRhaW5pbmdSZWdpb25NYXAoKQoreworICAgIHN0YXRp YyBOZXZlckRlc3Ryb3llZDxDb250YWluaW5nUmVnaW9uTWFwPiBtYXA7CisgICAgcmV0dXJuIG1h cDsKK30KKwogUm9vdElubGluZUJveDo6Um9vdElubGluZUJveChSZW5kZXJCbG9ja0Zsb3cmIGJs b2NrKQogICAgIDogSW5saW5lRmxvd0JveChibG9jaykKICAgICAsIG1fbGluZUJyZWFrUG9zKDAp CiAgICAgLCBtX2xpbmVCcmVha09iaihudWxscHRyKQotICAgICwgbV9jb250YWluaW5nUmVnaW9u KG51bGxwdHIpCiB7CiAgICAgc2V0SXNIb3Jpem9udGFsKGJsb2NrLmlzSG9yaXpvbnRhbFdyaXRp bmdNb2RlKCkpOwogfQpAQCAtNjEsNiArNjgsOSBAQCBSb290SW5saW5lQm94OjpSb290SW5saW5l Qm94KFJlbmRlckJsb2NrRmxvdyYgYmxvY2spCiBSb290SW5saW5lQm94Ojp+Um9vdElubGluZUJv eCgpCiB7CiAgICAgZGV0YWNoRWxsaXBzaXNCb3goKTsKKworICAgIGlmIChtX2hhc0NvbnRhaW5p bmdSZWdpb24pCisgICAgICAgIGNvbnRhaW5pbmdSZWdpb25NYXAoKS5yZW1vdmUodGhpcyk7CiB9 CiAKIHZvaWQgUm9vdElubGluZUJveDo6ZGV0YWNoRWxsaXBzaXNCb3goKQpAQCAtMTk0LDcgKzIw NCw3IEBAIHZvaWQgUm9vdElubGluZUJveDo6cGFpbnRDdXN0b21IaWdobGlnaHQoUGFpbnRJbmZv JiBwYWludEluZm8sIGNvbnN0IExheW91dFBvaW50CiB2b2lkIFJvb3RJbmxpbmVCb3g6OnBhaW50 KFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBMYXlvdXRQb2ludCYgcGFpbnRPZmZzZXQsIExh eW91dFVuaXQgbGluZVRvcCwgTGF5b3V0VW5pdCBsaW5lQm90dG9tKQogewogICAgIC8vIENoZWNr IGlmIHdlIGFyZSBpbiB0aGUgY29ycmVjdCByZWdpb24uCi0gICAgaWYgKHBhaW50SW5mby5yZW5k ZXJSZWdpb24gJiYgY29udGFpbmluZ1JlZ2lvbigpICYmIGNvbnRhaW5pbmdSZWdpb24oKSAhPSBw YWludEluZm8ucmVuZGVyUmVnaW9uKQorICAgIGlmIChwYWludEluZm8ucmVuZGVyUmVnaW9uICYm IG1faGFzQ29udGFpbmluZ1JlZ2lvbiAmJiBjb250YWluaW5nUmVnaW9uKCkgIT0gcGFpbnRJbmZv LnJlbmRlclJlZ2lvbikKICAgICAgICAgcmV0dXJuOwogICAgIAogICAgIElubGluZUZsb3dCb3g6 OnBhaW50KHBhaW50SW5mbywgcGFpbnRPZmZzZXQsIGxpbmVUb3AsIGxpbmVCb3R0b20pOwpAQCAt MjQzLDIxICsyNTMsMzQgQEAgdm9pZCBSb290SW5saW5lQm94OjpjaGlsZFJlbW92ZWQoSW5saW5l Qm94KiBib3gpCiBSZW5kZXJSZWdpb24qIFJvb3RJbmxpbmVCb3g6OmNvbnRhaW5pbmdSZWdpb24o KSBjb25zdAogewogI2lmbmRlZiBOREVCVUcKLSAgICBpZiAobV9jb250YWluaW5nUmVnaW9uKSB7 CisgICAgaWYgKG1faGFzQ29udGFpbmluZ1JlZ2lvbikgewogICAgICAgICBSZW5kZXJGbG93VGhy ZWFkKiBmbG93VGhyZWFkID0gYmxvY2tGbG93KCkuZmxvd1RocmVhZENvbnRhaW5pbmdCbG9jaygp OwogICAgICAgICBjb25zdCBSZW5kZXJSZWdpb25MaXN0JiByZWdpb25MaXN0ID0gZmxvd1RocmVh ZC0+cmVuZGVyUmVnaW9uTGlzdCgpOwotICAgICAgICBBU1NFUlQocmVnaW9uTGlzdC5jb250YWlu cyhtX2NvbnRhaW5pbmdSZWdpb24pKTsKKyAgICAgICAgQVNTRVJUKHJlZ2lvbkxpc3QuY29udGFp bnMoY29udGFpbmluZ1JlZ2lvbk1hcCgpLmdldCh0aGlzKSkpOwogICAgIH0KICNlbmRpZgorICAg IHJldHVybiBtX2hhc0NvbnRhaW5pbmdSZWdpb24gPyBjb250YWluaW5nUmVnaW9uTWFwKCkuZ2V0 KHRoaXMpIDogbnVsbHB0cjsKK30KKwordm9pZCBSb290SW5saW5lQm94OjpjbGVhckNvbnRhaW5p bmdSZWdpb24oKQoreworICAgIEFTU0VSVCghaXNEaXJ0eSgpKTsKKyAgICBBU1NFUlQoYmxvY2tG bG93KCkuZmxvd1RocmVhZENvbnRhaW5pbmdCbG9jaygpKTsKIAotICAgIHJldHVybiBtX2NvbnRh aW5pbmdSZWdpb247CisgICAgaWYgKCFtX2hhc0NvbnRhaW5pbmdSZWdpb24pCisgICAgICAgIHJl dHVybjsKKworICAgIGNvbnRhaW5pbmdSZWdpb25NYXAoKS5yZW1vdmUodGhpcyk7CisgICAgbV9o YXNDb250YWluaW5nUmVnaW9uID0gZmFsc2U7CiB9CiAKLXZvaWQgUm9vdElubGluZUJveDo6c2V0 Q29udGFpbmluZ1JlZ2lvbihSZW5kZXJSZWdpb24qIHJlZ2lvbikKK3ZvaWQgUm9vdElubGluZUJv eDo6c2V0Q29udGFpbmluZ1JlZ2lvbihSZW5kZXJSZWdpb24mIHJlZ2lvbikKIHsKICAgICBBU1NF UlQoIWlzRGlydHkoKSk7CiAgICAgQVNTRVJUKGJsb2NrRmxvdygpLmZsb3dUaHJlYWRDb250YWlu aW5nQmxvY2soKSk7Ci0gICAgbV9jb250YWluaW5nUmVnaW9uID0gcmVnaW9uOworCisgICAgY29u dGFpbmluZ1JlZ2lvbk1hcCgpLnNldCh0aGlzLCAmcmVnaW9uKTsKKyAgICBtX2hhc0NvbnRhaW5p bmdSZWdpb24gPSB0cnVlOwogfQogCiBMYXlvdXRVbml0IFJvb3RJbmxpbmVCb3g6OmFsaWduQm94 ZXNJbkJsb2NrRGlyZWN0aW9uKExheW91dFVuaXQgaGVpZ2h0T2ZCbG9jaywgR2x5cGhPdmVyZmxv d0FuZEZhbGxiYWNrRm9udHNNYXAmIHRleHRCb3hEYXRhTWFwLCBWZXJ0aWNhbFBvc2l0aW9uQ2Fj aGUmIHZlcnRpY2FsUG9zaXRpb25DYWNoZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9Sb290SW5saW5lQm94LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUm9vdElu bGluZUJveC5oCmluZGV4IGFiNGMxNGYuLmRlMDg2YTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9Sb290SW5saW5lQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1Jvb3RJbmxpbmVCb3guaApAQCAtNjQsOCArNjQsMTEgQEAgcHVibGljOgogICAgIExheW91 dFVuaXQgcGFnaW5hdGVkTGluZVdpZHRoKCkgY29uc3QgeyByZXR1cm4gbV9wYWdpbmF0ZWRMaW5l V2lkdGg7IH0KICAgICB2b2lkIHNldFBhZ2luYXRlZExpbmVXaWR0aChMYXlvdXRVbml0IHdpZHRo KSB7IG1fcGFnaW5hdGVkTGluZVdpZHRoID0gd2lkdGg7IH0KIAorICAgIC8vIEl0IHNob3VsZCBu b3QgYmUgYXNzdW1lZCB0aGUgY29udGFpbmluZ1JlZ2lvbigpIGlzIGFsd2F5cyB2YWxpZC4KKyAg ICAvLyBJdCBjYW4gYWxzbyBiZSBudWxscHRyIGlmIHRoZSBmbG93IGhhcyBubyByZWdpb24gY2hh aW4uCiAgICAgUmVuZGVyUmVnaW9uKiBjb250YWluaW5nUmVnaW9uKCkgY29uc3Q7Ci0gICAgdm9p ZCBzZXRDb250YWluaW5nUmVnaW9uKFJlbmRlclJlZ2lvbiopOworICAgIHZvaWQgc2V0Q29udGFp bmluZ1JlZ2lvbihSZW5kZXJSZWdpb24mKTsKKyAgICB2b2lkIGNsZWFyQ29udGFpbmluZ1JlZ2lv bigpOwogCiAgICAgTGF5b3V0VW5pdCBzZWxlY3Rpb25Ub3AoKSBjb25zdDsKICAgICBMYXlvdXRV bml0IHNlbGVjdGlvbkJvdHRvbSgpIGNvbnN0OwpAQCAtMjE4LDEwICsyMjEsNiBAQCBwcml2YXRl OgogICAgIExheW91dFVuaXQgbV9saW5lVG9wV2l0aExlYWRpbmc7CiAgICAgTGF5b3V0VW5pdCBt X2xpbmVCb3R0b21XaXRoTGVhZGluZzsKIAotICAgIC8vIEl0IHNob3VsZCBub3QgYmUgYXNzdW1l ZCB0aGUgfGNvbnRhaW5pbmdSZWdpb258IGlzIGFsd2F5cyB2YWxpZC4KLSAgICAvLyBJdCBjYW4g YWxzbyBiZSBudWxscHRyIGlmIHRoZSBmbG93IGhhcyBubyByZWdpb24gY2hhaW4uCi0gICAgUmVu ZGVyUmVnaW9uKiBtX2NvbnRhaW5pbmdSZWdpb247Ci0KICAgICBMYXlvdXRVbml0IG1fcGFnaW5h dGlvblN0cnV0OwogICAgIExheW91dFVuaXQgbV9wYWdpbmF0ZWRMaW5lV2lkdGg7CiAK