155326 2016-03-10 14:48:32 -0800 Add WebCore, WebKit, & WebKit2 preference/setting to enable Main Content heuristic. 2016-03-10 16:34:47 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jer.noble jer.noble bdakin webkit-bug-importer oldest_to_newest 1173357 0 jer.noble 2016-03-10 14:48:32 -0800 Add WebCore, WebKit, & WebKit2 preference/setting to enable Main Content heuristic. 1173358 1 webkit-bug-importer 2016-03-10 14:49:02 -0800 <rdar://problem/25095408> 1173401 2 273639 jer.noble 2016-03-10 15:41:37 -0800 Created attachment 273639 Patch 1173444 3 jer.noble 2016-03-10 16:34:47 -0800 Committed r197968: <http://trac.webkit.org/changeset/197968> 273639 2016-03-10 15:41:37 -0800 2016-03-10 16:32:02 -0800 Patch bug-155326-20160310154124.patch text/plain 13965 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTk3OTUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjlhOWM5MmNjZTM3MWI0 MDYxNWJlZTRjYzhjMTUxZWJkMmU0NTdkMi4uNTlkY2FkMjdmYzg5ZjNkOTZhYzJjZTY3MzE5ZGQ1 NjQ3ZWE1OTQ5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE2LTAzLTEwICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBXZWJDb3JlLCBXZWJL aXQsICYgV2ViS2l0MiBwcmVmZXJlbmNlL3NldHRpbmcgdG8gZW5hYmxlIE1haW4gQ29udGVudCBo ZXVyaXN0aWMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNTUzMjYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI1MDk1NDA4PgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVt ZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OkhUTUxNZWRpYUVs ZW1lbnQpOiBTZXQgdGhlIE92ZXJyaWRlVXNlckdlc3R1cmVSZXF1aXJlbWVudEZvck1haW5Db250 ZW50IGlmIHRoZSBuZXcgc2V0dGluZyBpcyBlbmFibGVkLgorICAgICAgICAqIHBhZ2UvU2V0dGlu Z3MuaW46CisKIDIwMTYtMDMtMDcgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAK ICAgICAgICAgQWRkIHNlcGFyYXRlIFdLIGFuZCBXSzIgcHJlZmVyZW5jZXMgZm9yIHJlcXVpcmlu ZyB1c2VyIGdlc3R1cmVzIGZvciB2aWRlbyBtZWRpYSwgZGlzdGluY3QgZnJvbSB1c2VyIGdlc3R1 cmVzIGZvciBtZWRpYSBnZW5lcmFsbHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwppbmRleCBiMGZmNzM3ZmYwZTY1 MjU2YzY3ZjRkMThkNDVhYjI2MTUzMjNkZTRiLi43NjA2MzI3ZDc4ZDk2NjQzYTY1MWM4MWVlMzQ3 OTUyZGIzYWQxMzJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTYtMDMt MTAgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIFdlYkNv cmUsIFdlYktpdCwgJiBXZWJLaXQyIHByZWZlcmVuY2Uvc2V0dGluZyB0byBlbmFibGUgTWFpbiBD b250ZW50IGhldXJpc3RpYy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE1NTMyNgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjUwOTU0MDg+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIFNQSSB0byBn ZXQgYW5kIHNldCB0aGUgbmV3IHByZWZlcmVuY2UuCisKKyAgICAgICAgKiBXZWJWaWV3L1dlYlBy ZWZlcmVuY2VLZXlzUHJpdmF0ZS5oOgorICAgICAgICAqIFdlYlZpZXcvV2ViUHJlZmVyZW5jZXMu bW06CisgICAgICAgICgtW1dlYlByZWZlcmVuY2VzIG92ZXJyaWRlVXNlckdlc3R1cmVSZXF1aXJl bWVudEZvck1haW5Db250ZW50XSk6CisgICAgICAgICgtW1dlYlByZWZlcmVuY2VzIHNldE92ZXJy aWRlVXNlckdlc3R1cmVSZXF1aXJlbWVudEZvck1haW5Db250ZW50Ol0pOgorICAgICAgICAqIFdl YlZpZXcvV2ViUHJlZmVyZW5jZXNQcml2YXRlLmg6CisgICAgICAgICogV2ViVmlldy9XZWJWaWV3 Lm1tOgorICAgICAgICAoLVtXZWJWaWV3IF9wcmVmZXJlbmNlc0NoYW5nZWQ6XSk6CisKIDIwMTYt MDMtMDcgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIHNl cGFyYXRlIFdLIGFuZCBXSzIgcHJlZmVyZW5jZXMgZm9yIHJlcXVpcmluZyB1c2VyIGdlc3R1cmVz IGZvciB2aWRlbyBtZWRpYSwgZGlzdGluY3QgZnJvbSB1c2VyIGdlc3R1cmVzIGZvciBtZWRpYSBn ZW5lcmFsbHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9X ZWJLaXQyL0NoYW5nZUxvZwppbmRleCBmZjI5M2I0OTFlMWExNWY3M2E1OWY1Y2QwNzNmOGVmMDRj MTIyMmFiLi4xN2JhOGJiOTNkOTc2YmY3NGJiZTQ5ODE1YTJlNjJiMjAwNTJmZWZlIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTYtMDMtMTAgIEplciBOb2JsZSAgPGplci5ub2JsZUBh cHBsZS5jb20+CisKKyAgICAgICAgQWRkIFdlYkNvcmUsIFdlYktpdCwgJiBXZWJLaXQyIHByZWZl cmVuY2Uvc2V0dGluZyB0byBlbmFibGUgTWFpbiBDb250ZW50IGhldXJpc3RpYy4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NTMyNgorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vMjUwOTU0MDg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQWRkIFNQSSB0byBnZXQgYW5kIHNldCB0aGUgbmV3IHByZWZlcmVu Y2UuCisKKyAgICAgICAgKiBTaGFyZWQvV2ViUHJlZmVyZW5jZXNEZWZpbml0aW9ucy5oOgorICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNwcDoKKyAgICAgICAgKFdLUHJl ZmVyZW5jZXNTZXRNYWluQ29udGVudFVzZXJHZXN0dXJlT3ZlcnJpZGVFbmFibGVkKToKKyAgICAg ICAgKFdLUHJlZmVyZW5jZXNHZXRNYWluQ29udGVudFVzZXJHZXN0dXJlT3ZlcnJpZGVFbmFibGVk KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlc1JlZlByaXZhdGUuaDoK KyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToKKyAgICAgICAgKC1b V0tXZWJWaWV3IF9pbml0aWFsaXplV2l0aENvbmZpZ3VyYXRpb246XSk6CisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdDb25maWd1cmF0aW9uLm1tOgorICAgICAgICAoLVtX S1dlYlZpZXdDb25maWd1cmF0aW9uIGluaXRdKToKKyAgICAgICAgKC1bV0tXZWJWaWV3Q29uZmln dXJhdGlvbiBjb3B5V2l0aFpvbmU6XSk6CisgICAgICAgICgtW1dLV2ViVmlld0NvbmZpZ3VyYXRp b24gX21haW5Db250ZW50VXNlckdlc3R1cmVPdmVycmlkZUVuYWJsZWRdKToKKyAgICAgICAgKC1b V0tXZWJWaWV3Q29uZmlndXJhdGlvbiBfc2V0TWFpbkNvbnRlbnRVc2VyR2VzdHVyZU92ZXJyaWRl RW5hYmxlZDpdKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0NvbmZp Z3VyYXRpb25Qcml2YXRlLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu Y3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjp1cGRhdGVQcmVmZXJlbmNlcyk6CisKIDIw MTYtMDMtMDcgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgQWRk IHNlcGFyYXRlIFdLIGFuZCBXSzIgcHJlZmVyZW5jZXMgZm9yIHJlcXVpcmluZyB1c2VyIGdlc3R1 cmVzIGZvciB2aWRlbyBtZWRpYSwgZGlzdGluY3QgZnJvbSB1c2VyIGdlc3R1cmVzIGZvciBtZWRp YSBnZW5lcmFsbHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxl bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCmluZGV4 IGVhOWM2ODBmMjY0Njg1ZjIxN2Y0YjcyYmI3MDVmNDQzZDc5MzlkNzkuLmU2Njg0NGNmMmQ2Y2Jl NTZjNjU4ZjUyMzRkM2M4YjQxZTI2YWY0MmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVk aWFFbGVtZW50LmNwcApAQCAtNDUwLDYgKzQ1MCw5IEBAIEhUTUxNZWRpYUVsZW1lbnQ6OkhUTUxN ZWRpYUVsZW1lbnQoY29uc3QgUXVhbGlmaWVkTmFtZSYgdGFnTmFtZSwgRG9jdW1lbnQmIGRvY3Vt CiAgICAgICAgIG1fY2FwdGlvbkRpc3BsYXlNb2RlID0gZG9jdW1lbnQucGFnZSgpLT5ncm91cCgp LmNhcHRpb25QcmVmZXJlbmNlcygpLmNhcHRpb25EaXNwbGF5TW9kZSgpOwogI2VuZGlmCiAKKyAg ICBpZiAoc2V0dGluZ3MgJiYgc2V0dGluZ3MtPm1haW5Db250ZW50VXNlckdlc3R1cmVPdmVycmlk ZUVuYWJsZWQoKSkKKyAgICAgICAgbV9tZWRpYVNlc3Npb24tPmFkZEJlaGF2aW9yUmVzdHJpY3Rp b24oTWVkaWFFbGVtZW50U2Vzc2lvbjo6T3ZlcnJpZGVVc2VyR2VzdHVyZVJlcXVpcmVtZW50Rm9y TWFpbkNvbnRlbnQpOworCiAjaWYgRU5BQkxFKE1FRElBX1NFU1NJT04pCiAgICAgbV9lbGVtZW50 SUQgPSBuZXh0RWxlbWVudElEKCk7CiAgICAgZWxlbWVudElEc1RvRWxlbWVudHMoKS5hZGQobV9l bGVtZW50SUQsIHRoaXMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5n cy5pbiBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaW4KaW5kZXggMzE3NmZhZTFhZWQ2 ZDRiZmUwZDUyNzUyMjhlOWQxODMyNzJkMzQxZi4uNmFiMjc0ZDVjODEzYTEyNjYxYzA1ZGE3NzE5 YWQwOTFjMDFmMjE3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5p bgorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmluCkBAIC0xMjcsNiArMTI3LDcg QEAgYWxsb3dEaXNwbGF5T2ZJbnNlY3VyZUNvbnRlbnQgaW5pdGlhbD1mYWxzZQogYWxsb3dSdW5u aW5nT2ZJbnNlY3VyZUNvbnRlbnQgaW5pdGlhbD1mYWxzZQogdmlkZW9QbGF5YmFja1JlcXVpcmVz VXNlckdlc3R1cmUgaW5pdGlhbD1kZWZhdWx0VmlkZW9QbGF5YmFja1JlcXVpcmVzVXNlckdlc3R1 cmUKIGF1ZGlvUGxheWJhY2tSZXF1aXJlc1VzZXJHZXN0dXJlIGluaXRpYWw9ZGVmYXVsdEF1ZGlv UGxheWJhY2tSZXF1aXJlc1VzZXJHZXN0dXJlCittYWluQ29udGVudFVzZXJHZXN0dXJlT3ZlcnJp ZGVFbmFibGVkIGluaXRpYWw9ZmFsc2UKIGFsbG93c0lubGluZU1lZGlhUGxheWJhY2sgaW5pdGlh bD1kZWZhdWx0QWxsb3dzSW5saW5lTWVkaWFQbGF5YmFjawogaW5saW5lTWVkaWFQbGF5YmFja1Jl cXVpcmVzUGxheXNJbmxpbmVBdHRyaWJ1dGUgaW5pdGlhbD1kZWZhdWx0SW5saW5lTWVkaWFQbGF5 YmFja1JlcXVpcmVzUGxheXNJbmxpbmVBdHRyaWJ1dGUKIGFsbG93c1BpY3R1cmVJblBpY3R1cmVN ZWRpYVBsYXliYWNrIGluaXRpYWw9ZGVmYXVsdEFsbG93c1BpY3R1cmVJblBpY3R1cmVNZWRpYVBs YXliYWNrCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVu Y2VLZXlzUHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNl S2V5c1ByaXZhdGUuaAppbmRleCA2YTU3ZjA1ODhhMzgyYjAxMGZiZTE3Zjc3ODIwMjkxMWFhZWRk YjkzLi44ZjhlODYxMjZhMGMwMDU0YTkzOWVlOWYyOWQwNmRmZTU2MDBjNTA3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VLZXlzUHJpdmF0ZS5oCisr KyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZUtleXNQcml2YXRlLmgK QEAgLTEyNCw2ICsxMjQsNyBAQAogI2RlZmluZSBXZWJLaXRSZXF1aXJlc1VzZXJHZXN0dXJlRm9y TWVkaWFQbGF5YmFja1ByZWZlcmVuY2VLZXkgQCJXZWJLaXRNZWRpYVBsYXliYWNrUmVxdWlyZXNV c2VyR2VzdHVyZSIKICNkZWZpbmUgV2ViS2l0UmVxdWlyZXNVc2VyR2VzdHVyZUZvclZpZGVvUGxh eWJhY2tQcmVmZXJlbmNlS2V5IEAiV2ViS2l0VmlkZW9QbGF5YmFja1JlcXVpcmVzVXNlckdlc3R1 cmUiCiAjZGVmaW5lIFdlYktpdFJlcXVpcmVzVXNlckdlc3R1cmVGb3JBdWRpb1BsYXliYWNrUHJl ZmVyZW5jZUtleSBAIldlYktpdEF1ZGlvUGxheWJhY2tSZXF1aXJlc1VzZXJHZXN0dXJlIgorI2Rl ZmluZSBXZWJLaXRNYWluQ29udGVudFVzZXJHZXN0dXJlT3ZlcnJpZGVFbmFibGVkUHJlZmVyZW5j ZUtleSBAIldlYktpdE1haW5Db250ZW50VXNlckdlc3R1cmVPdmVycmlkZUVuYWJsZWQiCiAjZGVm aW5lIFdlYktpdEFsbG93c0lubGluZU1lZGlhUGxheWJhY2tQcmVmZXJlbmNlS2V5IEAiV2ViS2l0 TWVkaWFQbGF5YmFja0FsbG93c0lubGluZSIKICNkZWZpbmUgV2ViS2l0SW5saW5lTWVkaWFQbGF5 YmFja1JlcXVpcmVzUGxheXNJbmxpbmVBdHRyaWJ1dGVLZXkgQCJJbmxpbmVNZWRpYVBsYXliYWNr UmVxdWlyZXNQbGF5c0lubGluZUF0dHJpYnV0ZSIKICNkZWZpbmUgV2ViS2l0SW52aXNpYmxlQXV0 b3BsYXlOb3RQZXJtaXR0ZWRLZXkgQCJJbnZpc2libGVBdXRvcGxheU5vdFBlcm1pdHRlZCIKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZXMubW0gYi9T b3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzLm1tCmluZGV4IDJhODIwMjJi NGU2NjRkNjA5Y2RjOTdjOGU2MTJiNWM0MDRiY2JjMjUuLjE3YzJkY2YyNWFiZmRjYzJhZjU5MGRm OGVjZmZiNmE0YWI4MjJlZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcv V2ViUHJlZmVyZW5jZXMubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVm ZXJlbmNlcy5tbQpAQCAtMjI0OCw2ICsyMjQ4LDE2IEBAIHN0YXRpYyBOU1N0cmluZyAqY2xhc3NJ QkNyZWF0b3JJRCA9IG5pbDsKICAgICBbc2VsZiBfc2V0Qm9vbFZhbHVlOmZsYWcgZm9yS2V5Oldl YktpdFJlcXVpcmVzVXNlckdlc3R1cmVGb3JBdWRpb1BsYXliYWNrUHJlZmVyZW5jZUtleV07CiB9 CiAKKy0gKEJPT0wpb3ZlcnJpZGVVc2VyR2VzdHVyZVJlcXVpcmVtZW50Rm9yTWFpbkNvbnRlbnQK K3sKKyAgICByZXR1cm4gW3NlbGYgX2Jvb2xWYWx1ZUZvcktleTpXZWJLaXRNYWluQ29udGVudFVz ZXJHZXN0dXJlT3ZlcnJpZGVFbmFibGVkUHJlZmVyZW5jZUtleV07Cit9CisKKy0gKHZvaWQpc2V0 T3ZlcnJpZGVVc2VyR2VzdHVyZVJlcXVpcmVtZW50Rm9yTWFpbkNvbnRlbnQ6KEJPT0wpZmxhZwor eworICAgIFtzZWxmIF9zZXRCb29sVmFsdWU6ZmxhZyBmb3JLZXk6V2ViS2l0TWFpbkNvbnRlbnRV c2VyR2VzdHVyZU92ZXJyaWRlRW5hYmxlZFByZWZlcmVuY2VLZXldOworfQorCiAtIChCT09MKW1l ZGlhUGxheWJhY2tBbGxvd3NJbmxpbmUKIHsKICAgICByZXR1cm4gW3NlbGYgX2Jvb2xWYWx1ZUZv cktleTpXZWJLaXRBbGxvd3NJbmxpbmVNZWRpYVBsYXliYWNrUHJlZmVyZW5jZUtleV07CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzUHJpdmF0ZS5o IGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlc1ByaXZhdGUuaAppbmRl eCA4NzBkNWFhMDFhMDU5MjYwOTEyNGJmZGExNjYzYTdkN2UyNzMzODMzLi4yMmI4OGI5MmU5NTJi ZmY3N2Y5YzA0NjcwM2ZhMjE4YWQxMDFkZmJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21h Yy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzUHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFj L1dlYlZpZXcvV2ViUHJlZmVyZW5jZXNQcml2YXRlLmgKQEAgLTI1OSw2ICsyNTksOSBAQCBleHRl cm4gTlNTdHJpbmcgKldlYlByZWZlcmVuY2VzQ2FjaGVNb2RlbENoYW5nZWRJbnRlcm5hbE5vdGlm aWNhdGlvbjsKIC0gKHZvaWQpc2V0QXVkaW9QbGF5YmFja1JlcXVpcmVzVXNlckdlc3R1cmU6KEJP T0wpZmxhZzsKIC0gKEJPT0wpYXVkaW9QbGF5YmFja1JlcXVpcmVzVXNlckdlc3R1cmU7CiAKKy0g KHZvaWQpc2V0T3ZlcnJpZGVVc2VyR2VzdHVyZVJlcXVpcmVtZW50Rm9yTWFpbkNvbnRlbnQ6KEJP T0wpZmxhZzsKKy0gKEJPT0wpb3ZlcnJpZGVVc2VyR2VzdHVyZVJlcXVpcmVtZW50Rm9yTWFpbkNv bnRlbnQ7CisKIC0gKHZvaWQpc2V0TWVkaWFQbGF5YmFja0FsbG93c0lubGluZTooQk9PTClmbGFn OwogLSAoQk9PTCltZWRpYVBsYXliYWNrQWxsb3dzSW5saW5lOwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJW aWV3L1dlYlZpZXcubW0KaW5kZXggNmMyOTRkNmVkMmI3ZmVmOGJjZWYzNjJiOTQ1OWM4ZGI5MGY3 YmNiMy4uOGUxMDNhZWM2MzJkNWIzZmEzZjI0MjMyNjFlNTA1MGEyYWJhOTFiOSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJL aXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQpAQCAtMjMzNCw2ICsyMzM0LDcgQEAgc3RhdGljIGJv b2wgbmVlZHNTZWxmUmV0YWluV2hpbGVMb2FkaW5nUXVpcmsoKQogICAgIEJPT0wgbWVkaWFQbGF5 YmFja1JlcXVpcmVzVXNlckdlc3R1cmUgPSBbcHJlZmVyZW5jZXMgbWVkaWFQbGF5YmFja1JlcXVp cmVzVXNlckdlc3R1cmVdOwogICAgIHNldHRpbmdzLnNldFZpZGVvUGxheWJhY2tSZXF1aXJlc1Vz ZXJHZXN0dXJlKG1lZGlhUGxheWJhY2tSZXF1aXJlc1VzZXJHZXN0dXJlIHx8IFtwcmVmZXJlbmNl cyB2aWRlb1BsYXliYWNrUmVxdWlyZXNVc2VyR2VzdHVyZV0pOwogICAgIHNldHRpbmdzLnNldEF1 ZGlvUGxheWJhY2tSZXF1aXJlc1VzZXJHZXN0dXJlKG1lZGlhUGxheWJhY2tSZXF1aXJlc1VzZXJH ZXN0dXJlIHx8IFtwcmVmZXJlbmNlcyBhdWRpb1BsYXliYWNrUmVxdWlyZXNVc2VyR2VzdHVyZV0p OworICAgIHNldHRpbmdzLnNldE1haW5Db250ZW50VXNlckdlc3R1cmVPdmVycmlkZUVuYWJsZWQo W3ByZWZlcmVuY2VzIG92ZXJyaWRlVXNlckdlc3R1cmVSZXF1aXJlbWVudEZvck1haW5Db250ZW50 XSk7CiAgICAgc2V0dGluZ3Muc2V0QWxsb3dzSW5saW5lTWVkaWFQbGF5YmFjayhbcHJlZmVyZW5j ZXMgbWVkaWFQbGF5YmFja0FsbG93c0lubGluZV0pOwogICAgIHNldHRpbmdzLnNldElubGluZU1l ZGlhUGxheWJhY2tSZXF1aXJlc1BsYXlzSW5saW5lQXR0cmlidXRlKFtwcmVmZXJlbmNlcyBpbmxp bmVNZWRpYVBsYXliYWNrUmVxdWlyZXNQbGF5c0lubGluZUF0dHJpYnV0ZV0pOwogICAgIHNldHRp bmdzLnNldEludmlzaWJsZUF1dG9wbGF5Tm90UGVybWl0dGVkKFtwcmVmZXJlbmNlcyBpbnZpc2li bGVBdXRvcGxheU5vdFBlcm1pdHRlZF0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hh cmVkL1dlYlByZWZlcmVuY2VzRGVmaW5pdGlvbnMuaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9X ZWJQcmVmZXJlbmNlc0RlZmluaXRpb25zLmgKaW5kZXggOWE2ODdhN2VkMGQxNTNhZDgwNmI0YWFh OTY1OWVjYjZkN2NlY2VjNS4uMDcyZTQzMDM2NDA5Y2VmYWFiNDlkNGJjNTYxODY2MTU5N2IyNGQ5 ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVuY2VzRGVmaW5p dGlvbnMuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJlZmVyZW5jZXNEZWZpbml0 aW9ucy5oCkBAIC0xNTEsNiArMTUxLDcgQEAKICAgICBtYWNybyhSZXF1aXJlc1VzZXJHZXN0dXJl Rm9yTWVkaWFQbGF5YmFjaywgcmVxdWlyZXNVc2VyR2VzdHVyZUZvck1lZGlhUGxheWJhY2ssIEJv b2wsIGJvb2wsIERFRkFVTFRfUkVRVUlSRVNfVVNFUl9HRVNUVVJFX0ZPUl9NRURJQV9QTEFZQkFD SykgXAogICAgIG1hY3JvKFJlcXVpcmVzVXNlckdlc3R1cmVGb3JWaWRlb1BsYXliYWNrLCByZXF1 aXJlc1VzZXJHZXN0dXJlRm9yVmlkZW9QbGF5YmFjaywgQm9vbCwgYm9vbCwgZmFsc2UpIFwKICAg ICBtYWNybyhSZXF1aXJlc1VzZXJHZXN0dXJlRm9yQXVkaW9QbGF5YmFjaywgcmVxdWlyZXNVc2Vy R2VzdHVyZUZvckF1ZGlvUGxheWJhY2ssIEJvb2wsIGJvb2wsIGZhbHNlKSBcCisgICAgbWFjcm8o TWFpbkNvbnRlbnRVc2VyR2VzdHVyZU92ZXJyaWRlRW5hYmxlZCwgbWFpbkNvbnRlbnRVc2VyR2Vz dHVyZU92ZXJyaWRlRW5hYmxlZCwgQm9vbCwgYm9vbCwgZmFsc2UpIFwKICAgICBtYWNybyhBbGxv d3NJbmxpbmVNZWRpYVBsYXliYWNrLCBhbGxvd3NJbmxpbmVNZWRpYVBsYXliYWNrLCBCb29sLCBi b29sLCBERUZBVUxUX0FMTE9XU19JTkxJTkVfTUVESUFfUExBWUJBQ0spIFwKICAgICBtYWNybyhJ bmxpbmVNZWRpYVBsYXliYWNrUmVxdWlyZXNQbGF5c0lubGluZUF0dHJpYnV0ZSwgaW5saW5lTWVk aWFQbGF5YmFja1JlcXVpcmVzUGxheXNJbmxpbmVBdHRyaWJ1dGUsIEJvb2wsIGJvb2wsIERFRkFV TFRfSU5MSU5FX01FRElBX1BMQVlCQUNLX1JFUVVJUkVTX1BMQVlTX0lOTElORV9BVFRSSUJVVEUp IFwKICAgICBtYWNybyhJbnZpc2libGVBdXRvcGxheU5vdFBlcm1pdHRlZCwgaW52aXNpYmxlQXV0 b3BsYXlOb3RQZXJtaXR0ZWQsIEJvb2wsIGJvb2wsIERFRkFVTFRfSU5WSVNJQkxFX0FVVE9QTEFZ X05PVF9QRVJNSVRURUQpIFwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvQy9XS1ByZWZlcmVuY2VzLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9X S1ByZWZlcmVuY2VzLmNwcAppbmRleCA0OGRjNjk5Y2IyNzBmMTBmN2ZkZmZlNDA1MjRmMTU5N2Rm MGUyMTc5Li44N2MyODA5YTM0OTQ2NzRlMTZhYTU5MmI2MThiMmZkYmFhZWQyNzE0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHAKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwCkBAIC03 NzgsNiArNzc4LDE2IEBAIGJvb2wgV0tQcmVmZXJlbmNlc0dldEF1ZGlvUGxheWJhY2tSZXF1aXJl c1VzZXJHZXN0dXJlKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jCiAgICAgcmV0dXJuIHRvSW1w bChwcmVmZXJlbmNlc1JlZiktPnJlcXVpcmVzVXNlckdlc3R1cmVGb3JBdWRpb1BsYXliYWNrKCk7 CiB9CiAKK3ZvaWQgV0tQcmVmZXJlbmNlc1NldE1haW5Db250ZW50VXNlckdlc3R1cmVPdmVycmlk ZUVuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZiwgYm9vbCBmbGFnKQorewor ICAgIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPnNldE1haW5Db250ZW50VXNlckdlc3R1cmVPdmVy cmlkZUVuYWJsZWQoZmxhZyk7Cit9CisKK2Jvb2wgV0tQcmVmZXJlbmNlc0dldE1haW5Db250ZW50 VXNlckdlc3R1cmVPdmVycmlkZUVuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1Jl ZikKK3sKKyAgICByZXR1cm4gdG9JbXBsKHByZWZlcmVuY2VzUmVmKS0+bWFpbkNvbnRlbnRVc2Vy R2VzdHVyZU92ZXJyaWRlRW5hYmxlZCgpOworfQorCiB2b2lkIFdLUHJlZmVyZW5jZXNTZXRNZWRp YVBsYXliYWNrQWxsb3dzSW5saW5lKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYsIGJv b2wgZmxhZykKIHsKICAgICB0b0ltcGwocHJlZmVyZW5jZXNSZWYpLT5zZXRBbGxvd3NJbmxpbmVN ZWRpYVBsYXliYWNrKGZsYWcpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9DL1dLUHJlZmVyZW5jZXNSZWZQcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL0MvV0tQcmVmZXJlbmNlc1JlZlByaXZhdGUuaAppbmRleCBiNjQ1MjZhNjliN2EzYzY5 MDFmM2VjODI3ODk0Y2I2Mzc4MWFmYTZmLi5jMmZiNDBhMGI2NmE1NWVkYWVlODk4NDE1NjY3ZDg5 YjlkNjNlZWVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQ cmVmZXJlbmNlc1JlZlByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L0MvV0tQcmVmZXJlbmNlc1JlZlByaXZhdGUuaApAQCAtMTg1LDYgKzE4NSwxMCBAQCBXS19FWFBP UlQgYm9vbCBXS1ByZWZlcmVuY2VzR2V0VmlkZW9QbGF5YmFja1JlcXVpcmVzVXNlckdlc3R1cmUo V0tQcmVmZXJlbmNlc1JlZgogV0tfRVhQT1JUIHZvaWQgV0tQcmVmZXJlbmNlc1NldEF1ZGlvUGxh eWJhY2tSZXF1aXJlc1VzZXJHZXN0dXJlKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYs IGJvb2wgZmxhZyk7CiBXS19FWFBPUlQgYm9vbCBXS1ByZWZlcmVuY2VzR2V0QXVkaW9QbGF5YmFj a1JlcXVpcmVzVXNlckdlc3R1cmUoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZik7CiAK Ky8vIERlZmF1bHRzIHRvIGZhbHNlLgorV0tfRVhQT1JUIHZvaWQgV0tQcmVmZXJlbmNlc1NldE1h aW5Db250ZW50VXNlckdlc3R1cmVPdmVycmlkZUVuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiBwcmVm ZXJlbmNlc1JlZiwgYm9vbCBmbGFnKTsKK1dLX0VYUE9SVCBib29sIFdLUHJlZmVyZW5jZXNHZXRN YWluQ29udGVudFVzZXJHZXN0dXJlT3ZlcnJpZGVFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYgcHJl ZmVyZW5jZXNSZWYpOworCiAvLyBEZWZhdWx0cyB0byB0cnVlLgogV0tfRVhQT1JUIHZvaWQgV0tQ cmVmZXJlbmNlc1NldE1lZGlhUGxheWJhY2tBbGxvd3NJbmxpbmUoV0tQcmVmZXJlbmNlc1JlZiBw cmVmZXJlbmNlc1JlZiwgYm9vbCBmbGFnKTsKIFdLX0VYUE9SVCBib29sIFdLUHJlZmVyZW5jZXNH ZXRNZWRpYVBsYXliYWNrQWxsb3dzSW5saW5lKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNS ZWYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh Z2UuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmlu ZGV4IDI5ZGE4MmI4ODczMzE0YjE2NmEyYjZjOWU3MTUxOGViNDg4NDQ2ZWEuLjhiYzFhMmQzMTg5 MjU0MWMwMzMzOGJjNDJkMTExNTUzMzI5NzA4NzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTI4OTgsNiArMjg5OCw3IEBAIHZvaWQgV2Vi UGFnZTo6dXBkYXRlUHJlZmVyZW5jZXMoY29uc3QgV2ViUHJlZmVyZW5jZXNTdG9yZSYgc3RvcmUp CiAgICAgYm9vbCByZXF1aXJlc1VzZXJHZXN0dXJlRm9yTWVkaWEgPSBzdG9yZS5nZXRCb29sVmFs dWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OnJlcXVpcmVzVXNlckdlc3R1cmVGb3JNZWRpYVBs YXliYWNrS2V5KCkpOwogICAgIHNldHRpbmdzLnNldFZpZGVvUGxheWJhY2tSZXF1aXJlc1VzZXJH ZXN0dXJlKHJlcXVpcmVzVXNlckdlc3R1cmVGb3JNZWRpYSB8fCBzdG9yZS5nZXRCb29sVmFsdWVG b3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OnJlcXVpcmVzVXNlckdlc3R1cmVGb3JWaWRlb1BsYXli YWNrS2V5KCkpKTsKICAgICBzZXR0aW5ncy5zZXRBdWRpb1BsYXliYWNrUmVxdWlyZXNVc2VyR2Vz dHVyZShyZXF1aXJlc1VzZXJHZXN0dXJlRm9yTWVkaWEgfHwgc3RvcmUuZ2V0Qm9vbFZhbHVlRm9y S2V5KFdlYlByZWZlcmVuY2VzS2V5OjpyZXF1aXJlc1VzZXJHZXN0dXJlRm9yQXVkaW9QbGF5YmFj a0tleSgpKSk7CisgICAgc2V0dGluZ3Muc2V0TWFpbkNvbnRlbnRVc2VyR2VzdHVyZU92ZXJyaWRl RW5hYmxlZChzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6Om1haW5D b250ZW50VXNlckdlc3R1cmVPdmVycmlkZUVuYWJsZWRLZXkoKSkpOwogICAgIHNldHRpbmdzLnNl dEFsbG93c0lubGluZU1lZGlhUGxheWJhY2soc3RvcmUuZ2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlBy ZWZlcmVuY2VzS2V5OjphbGxvd3NJbmxpbmVNZWRpYVBsYXliYWNrS2V5KCkpKTsKICAgICBzZXR0 aW5ncy5zZXRJbmxpbmVNZWRpYVBsYXliYWNrUmVxdWlyZXNQbGF5c0lubGluZUF0dHJpYnV0ZShz dG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OmlubGluZU1lZGlhUGxh eWJhY2tSZXF1aXJlc1BsYXlzSW5saW5lQXR0cmlidXRlS2V5KCkpKTsKICAgICBzZXR0aW5ncy5z ZXRJbnZpc2libGVBdXRvcGxheU5vdFBlcm1pdHRlZChzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXko V2ViUHJlZmVyZW5jZXNLZXk6OmludmlzaWJsZUF1dG9wbGF5Tm90UGVybWl0dGVkS2V5KCkpKTsK