131740 2014-04-16 10:15:23 -0700 [New Multicolumn] columnNumberForOffset isn't patched yet 2014-04-17 11:48:49 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hyatt hyatt commit-queue esprehn+autocc glenn kangil.han kondapallykalyan oldest_to_newest 1001184 0 hyatt 2014-04-16 10:15:23 -0700 There is code for iOS selection that passes in the "page number" to selection to try to improve selection in vertical books. This hasn't been patched for the new multi-column layout. We should take the opportunity to clean this code up at the same time, i.e., move the function to RenderView, rename it to pageNumberForOffset, and make it clear it's not necessary for generic multi-column. 1001617 1 229563 hyatt 2014-04-17 11:17:34 -0700 Created attachment 229563 Patch 1001618 2 commit-queue 2014-04-17 11:20:05 -0700 Attachment 229563 did not pass style-queue: ERROR: Source/WebCore/rendering/RenderView.cpp:38: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 1 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 1001632 3 229563 enrica 2014-04-17 11:45:09 -0700 Comment on attachment 229563 Patch Looks good to me. 1001633 4 hyatt 2014-04-17 11:48:49 -0700 Fix landed in r167444. 229563 2014-04-17 11:17:34 -0700 2014-04-17 11:45:09 -0700 Patch patch.txt text/plain 13464 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NzQ0MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQxIEBACisyMDE0LTA0LTE3ICBEYXZpZCBI eWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KKworICAgICAgICBbTmV3IE11bHRpY29sdW1uXSBjb2x1 bW5OdW1iZXJGb3JPZmZzZXQgaXMgbm90IHBhdGNoZWQgZm9yIG5ldyBtdWx0aWNvbHVtbiBjb2Rl IHlldC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEz MTc0MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAg ICAgICAgSSB0b29rIHRoZSBvcHBvcnR1bml0eSB0byBjbGVhbiB0aGlzIGNvZGUgdXAgd2hpbGUg YWRkaW5nIHN1cHBvcnQgZm9yIHRoZSBuZXcgY29sdW1ucy4KKyAgICAgICAgY29sdW1uTnVtYmVy Rm9yT2Zmc2V0IG9ubHkgYXBwbGllZCBmb3IgcGFnaW5hdGVkIFJlbmRlclZpZXdzIGFuZCB3YXMg cmVhbGx5IGFib3V0CisgICAgICAgIHBhZ2VzIGFuZCBub3QgY29sdW1ucy4gSXQgYWxzbyBvbmx5 IHJldHVybnMgYW4gYWN0dWFsIHBhZ2UgbnVtYmVyIGlmIHRoZSBjb2x1bW5zIGFyZQorICAgICAg ICBibG9jayBwcm9ncmVzc2VkIChlLmcuLCByaWdodC10by1sZWZ0IHZlcnRpY2FsIEphcGFuZXNl IGJvb2tzKS4KKyAgICAgICAgCisgICAgICAgIFRoZXJlZm9yZSBJIHJlbmFtZWQgY29sdW1uTnVt YmVyRm9yT2Zmc2V0IHRvIHBhZ2VOdW1iZXJGb3JCbG9ja1Byb2dyZXNzaW9uT2Zmc2V0IGFuZAor ICAgICAgICBtb3ZlZCBpdCB0byBSZW5kZXJWaWV3LgorICAgICAgICAKKyAgICAgICAgSSBhbHNv IHJlbmFtZWQgdGhlIG1lbWJlciB2YXJpYWJsZSBvZiBTZWxlY3Rpb25SZWN0IHRvIGJlIHBhZ2VO dW1iZXIgaW5zdGVhZCBvZgorICAgICAgICBjb2x1bW5OdW1iZXIgaW4gb3JkZXIgdG8gbWFrZSBp dCBtb3JlIG9idmlvdXMgdGhhdCB0aGlzIGlzbid0IGFib3V0IGNvbHVtbnMgcGVyIHNlCisgICAg ICAgIChzaW5jZSB0aGUgZmFjdCB0aGF0IHdlIGltcGxlbWVudGVkIFJlbmRlclZpZXcncyBwYWdp bmF0aW9uIG1vZGUgdXNpbmcgY29sdW1ucyBpcyBhbgorICAgICAgICBpbXBsZW1lbnRhdGlvbiBk ZXRhaWwpLgorICAgICAgICAKKyAgICAgICAgKiBkb20vUmFuZ2UuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6Y29hbGVzY2VTZWxlY3Rpb25SZWN0cyk6CisgICAgICAgIChXZWJDb3JlOjpSYW5nZTo6 Y29sbGVjdFNlbGVjdGlvblJlY3RzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9pb3MvU2VsZWN0aW9u UmVjdC5oOgorICAgICAgICAoV2ViQ29yZTo6U2VsZWN0aW9uUmVjdDo6cGFnZU51bWJlcik6Cisg ICAgICAgIChXZWJDb3JlOjpTZWxlY3Rpb25SZWN0Ojpjb2x1bW5OdW1iZXIpOiBEZWxldGVkLgor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJJbWFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJJbWFnZTo6Y29sbGVjdFNlbGVjdGlvblJlY3RzKToKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6Y29sbGVj dFNlbGVjdGlvblJlY3RzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6Y29sdW1u TnVtYmVyRm9yT2Zmc2V0KTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyT2Jq ZWN0Lmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRleHQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyVGV4dDo6Y29sbGVjdFNlbGVjdGlvblJlY3RzKToKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJWaWV3OjpwYWdl TnVtYmVyRm9yQmxvY2tQcm9ncmVzc2lvbk9mZnNldCk6CisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlclZpZXcuaDoKKwogMjAxNC0wNC0xNSAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNv bT4KIAogICAgICAgICBGdWxsc2NyZWVuIG1lZGlhIGNvbnRyb2xzIGFyZSB1bnVzYWJsZSBpbiBw YWdpbmF0aW9uIG1vZGUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9SYW5nZS5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL1JhbmdlLmNwcAkocmV2aXNpb24gMTY3NDAzKQor KysgU291cmNlL1dlYkNvcmUvZG9tL1JhbmdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTcxMSw3 ICsxNzExLDcgQEAgc3RhdGljIGlubGluZSB2b2lkIGFkanVzdExpbmVIZWlnaHRPZlNlbAogCiBz dGF0aWMgU2VsZWN0aW9uUmVjdCBjb2FsZXNjZVNlbGVjdGlvblJlY3RzKGNvbnN0IFNlbGVjdGlv blJlY3QmIG9yaWdpbmFsLCBjb25zdCBTZWxlY3Rpb25SZWN0JiBwcmV2aW91cykKIHsKLSAgICBT ZWxlY3Rpb25SZWN0IHJlc3VsdCh1bmlvblJlY3QocHJldmlvdXMucmVjdCgpLCBvcmlnaW5hbC5y ZWN0KCkpLCBvcmlnaW5hbC5pc0hvcml6b250YWwoKSwgb3JpZ2luYWwuY29sdW1uTnVtYmVyKCkp OworICAgIFNlbGVjdGlvblJlY3QgcmVzdWx0KHVuaW9uUmVjdChwcmV2aW91cy5yZWN0KCksIG9y aWdpbmFsLnJlY3QoKSksIG9yaWdpbmFsLmlzSG9yaXpvbnRhbCgpLCBvcmlnaW5hbC5wYWdlTnVt YmVyKCkpOwogICAgIHJlc3VsdC5zZXREaXJlY3Rpb24ob3JpZ2luYWwuY29udGFpbnNTdGFydCgp IHx8IG9yaWdpbmFsLmNvbnRhaW5zRW5kKCkgPyBvcmlnaW5hbC5kaXJlY3Rpb24oKSA6IHByZXZp b3VzLmRpcmVjdGlvbigpKTsKICAgICByZXN1bHQuc2V0Q29udGFpbnNTdGFydChwcmV2aW91cy5j b250YWluc1N0YXJ0KCkgfHwgb3JpZ2luYWwuY29udGFpbnNTdGFydCgpKTsKICAgICByZXN1bHQu c2V0Q29udGFpbnNFbmQocHJldmlvdXMuY29udGFpbnNFbmQoKSB8fCBvcmlnaW5hbC5jb250YWlu c0VuZCgpKTsKQEAgLTE4MjMsNyArMTgyMyw3IEBAIHZvaWQgUmFuZ2U6OmNvbGxlY3RTZWxlY3Rp b25SZWN0cyhWZWN0b3IKICAgICAgICAgICAgICAgICBsaW5lQm90dG9tID0gY3VycmVudFJlY3RC b3R0b207CiAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgIGxhc3RMaW5lQm90 dG9tID0gbGluZUJvdHRvbTsKLSAgICAgICAgICAgICAgICBpZiAoY3VycmVudFJlY3RUb3AgPD0g bGFzdExpbmVCb3R0b20gJiYgaSAmJiByZWN0c1tpXS5jb2x1bW5OdW1iZXIoKSA9PSByZWN0c1tp IC0gMV0uY29sdW1uTnVtYmVyKCkpIHsKKyAgICAgICAgICAgICAgICBpZiAoY3VycmVudFJlY3RU b3AgPD0gbGFzdExpbmVCb3R0b20gJiYgaSAmJiByZWN0c1tpXS5wYWdlTnVtYmVyKCkgPT0gcmVj dHNbaSAtIDFdLnBhZ2VOdW1iZXIoKSkgewogICAgICAgICAgICAgICAgICAgICBsYXN0TGluZVRv cCA9IGxpbmVUb3A7CiAgICAgICAgICAgICAgICAgICAgIGxpbmVCb3R0b20gPSBsYXN0TGluZVRv cDsKICAgICAgICAgICAgICAgICB9IGVsc2UgewpAQCAtMTkxNCwxMyArMTkxNCwxMyBAQCB2b2lk IFJhbmdlOjpjb2xsZWN0U2VsZWN0aW9uUmVjdHMoVmVjdG9yCiAgICAgICAgICAgICAgICAgLy8g Rm9yIGlCb29rcywgdGhlIGludGVyaW9yIGxpbmVzIG1heSBjcm9zcyBtdWx0aXBsZSBob3Jpem9u dGFsIHBhZ2VzLgogICAgICAgICAgICAgICAgIGludGVyaW9yVW5pb25SZWN0LnVuaXRlKGN1cnJl bnRSZWN0LnJlY3QoKSk7CiAgICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgIHVu aW9uZWRSZWN0cy5hcHBlbmQoU2VsZWN0aW9uUmVjdChpbnRlcmlvclVuaW9uUmVjdCwgY3VycmVu dFJlY3QuaXNIb3Jpem9udGFsKCksIGN1cnJlbnRSZWN0LmNvbHVtbk51bWJlcigpKSk7CisgICAg ICAgICAgICAgICAgdW5pb25lZFJlY3RzLmFwcGVuZChTZWxlY3Rpb25SZWN0KGludGVyaW9yVW5p b25SZWN0LCBjdXJyZW50UmVjdC5pc0hvcml6b250YWwoKSwgY3VycmVudFJlY3QucGFnZU51bWJl cigpKSk7CiAgICAgICAgICAgICAgICAgaW50ZXJpb3JVbmlvblJlY3QgPSBjdXJyZW50UmVjdC5y ZWN0KCk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAvLyBQ cm9jZXNzaW5nIGxhc3QgbGluZS4KICAgICAgICAgICAgIGlmICghaW50ZXJpb3JVbmlvblJlY3Qu aXNFbXB0eSgpKSB7Ci0gICAgICAgICAgICAgICAgdW5pb25lZFJlY3RzLmFwcGVuZChTZWxlY3Rp b25SZWN0KGludGVyaW9yVW5pb25SZWN0LCBjdXJyZW50UmVjdC5pc0hvcml6b250YWwoKSwgY3Vy cmVudFJlY3QuY29sdW1uTnVtYmVyKCkpKTsKKyAgICAgICAgICAgICAgICB1bmlvbmVkUmVjdHMu YXBwZW5kKFNlbGVjdGlvblJlY3QoaW50ZXJpb3JVbmlvblJlY3QsIGN1cnJlbnRSZWN0LmlzSG9y aXpvbnRhbCgpLCBjdXJyZW50UmVjdC5wYWdlTnVtYmVyKCkpKTsKICAgICAgICAgICAgICAgICBp bnRlcmlvclVuaW9uUmVjdCA9IEludFJlY3QoKTsKICAgICAgICAgICAgIH0KIApJbmRleDogU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1NlbGVjdGlvblJlY3QuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvU2VsZWN0aW9uUmVjdC5oCShyZXZpc2lvbiAxNjc0 MDMpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvU2VsZWN0aW9uUmVjdC5oCSh3b3Jr aW5nIGNvcHkpCkBAIC02Miw3ICs2Miw3IEBAIHB1YmxpYzoKICAgICBib29sIGlzSG9yaXpvbnRh bCgpIGNvbnN0IHsgcmV0dXJuIG1faXNIb3Jpem9udGFsOyB9CiAgICAgYm9vbCBpc0luRml4ZWRQ b3NpdGlvbigpIGNvbnN0IHsgcmV0dXJuIG1faXNJbkZpeGVkUG9zaXRpb247IH0KICAgICBib29s IGlzUnVieVRleHQoKSBjb25zdCB7IHJldHVybiBtX2lzUnVieVRleHQ7IH0KLSAgICBpbnQgY29s dW1uTnVtYmVyKCkgY29uc3QgeyByZXR1cm4gbV9jb2x1bW5OdW1iZXI7IH0KKyAgICBpbnQgcGFn ZU51bWJlcigpIGNvbnN0IHsgcmV0dXJuIG1fcGFnZU51bWJlcjsgfQogCiAgICAgdm9pZCBzZXRS ZWN0KGNvbnN0IEludFJlY3QmIHJlY3QpIHsgbV9yZWN0ID0gcmVjdDsgfQogCkBAIC0xMjUsNyAr MTI1LDcgQEAgcHJpdmF0ZToKICAgICBib29sIG1faXNIb3Jpem9udGFsOwogICAgIGJvb2wgbV9p c0luRml4ZWRQb3NpdGlvbjsKICAgICBib29sIG1faXNSdWJ5VGV4dDsKLSAgICBpbnQgbV9jb2x1 bW5OdW1iZXI7CisgICAgaW50IG1fcGFnZU51bWJlcjsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdl YkNvcmUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbWFnZS5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckltYWdlLmNwcAkocmV2 aXNpb24gMTY3NDAzKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckltYWdlLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMTEyLDcgKzExMiw3IEBAIHZvaWQgUmVuZGVySW1hZ2U6OmNv bGxlY3RTZWxlY3Rpb25SZWN0cygKIAogICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgY29uc2lkZXIg ZWl0aGVyIG1ha2luZyBTZWxlY3Rpb25SZWN0IGEgc3RydWN0IG9yIGJldHRlciBvcmdhbml6ZSBp dHMgb3B0aW9uYWwgZmllbGRzIGludG8KICAgICAvLyBhbiBhdXhpbGlhcnkgc3RydWN0IHRvIHNp bXBsaWZ5IGl0cyBpbml0aWFsaXphdGlvbi4KLSAgICByZWN0cy5hcHBlbmQoU2VsZWN0aW9uUmVj dChhYnNvbHV0ZUJvdW5kcywgY29udGFpbmluZ0Jsb2NrLT5zdHlsZSgpLmRpcmVjdGlvbigpLCBs aW5lRXh0ZW50Qm91bmRzLngoKSwgbGluZUV4dGVudEJvdW5kcy5tYXhYKCksIGxpbmVFeHRlbnRC b3VuZHMubWF4WSgpLCAwLCBmYWxzZSAvKiBsaW5lIGJyZWFrICovLCBpc0ZpcnN0T25MaW5lLCBp c0xhc3RPbkxpbmUsIGZhbHNlIC8qIGNvbnRhaW5zIHN0YXJ0ICovLCBmYWxzZSAvKiBjb250YWlu cyBlbmQgKi8sIGNvbnRhaW5pbmdCbG9jay0+c3R5bGUoKS5pc0hvcml6b250YWxXcml0aW5nTW9k ZSgpLCBpc0ZpeGVkLCBmYWxzZSAvKiBydWJ5IHRleHQgKi8sIGNvbHVtbk51bWJlckZvck9mZnNl dChhYnNvbHV0ZUJvdW5kcy54KCkpKSk7CisgICAgcmVjdHMuYXBwZW5kKFNlbGVjdGlvblJlY3Qo YWJzb2x1dGVCb3VuZHMsIGNvbnRhaW5pbmdCbG9jay0+c3R5bGUoKS5kaXJlY3Rpb24oKSwgbGlu ZUV4dGVudEJvdW5kcy54KCksIGxpbmVFeHRlbnRCb3VuZHMubWF4WCgpLCBsaW5lRXh0ZW50Qm91 bmRzLm1heFkoKSwgMCwgZmFsc2UgLyogbGluZSBicmVhayAqLywgaXNGaXJzdE9uTGluZSwgaXNM YXN0T25MaW5lLCBmYWxzZSAvKiBjb250YWlucyBzdGFydCAqLywgZmFsc2UgLyogY29udGFpbnMg ZW5kICovLCBjb250YWluaW5nQmxvY2stPnN0eWxlKCkuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUo KSwgaXNGaXhlZCwgZmFsc2UgLyogcnVieSB0ZXh0ICovLCB2aWV3KCkucGFnZU51bWJlckZvckJs b2NrUHJvZ3Jlc3Npb25PZmZzZXQoYWJzb2x1dGVCb3VuZHMueCgpKSkpOwogfQogI2VuZGlmCiAK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCShyZXZpc2lv biAxNjc0MDMpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAko d29ya2luZyBjb3B5KQpAQCAtMTA4NiwyNiArMTA4Niw2IEBAIHZvaWQgUmVuZGVyT2JqZWN0Ojpw YWludE91dGxpbmUoUGFpbnRJbmYKICAgICAgICAgZ3JhcGhpY3NDb250ZXh0LT5lbmRUcmFuc3Bh cmVuY3lMYXllcigpOwogfQogCi0vLyBGSVhNRTogTWFrZSB0aGlzIHJldHVybiBhbiB1bnNpZ25l ZCBpbnRlZ2VyPwotaW50IFJlbmRlck9iamVjdDo6Y29sdW1uTnVtYmVyRm9yT2Zmc2V0KGludCBv ZmZzZXQpCi17Ci0gICAgaW50IGNvbHVtbk51bWJlciA9IDA7Ci0gICAgUmVuZGVyQmxvY2sqIGNv bnRhaW5pbmdCbG9jayA9IHRoaXMtPmNvbnRhaW5pbmdCbG9jaygpOwotICAgIFJlbmRlclZpZXcm IHZpZXcgPSBjb250YWluaW5nQmxvY2stPnZpZXcoKTsKLSAgICBjb25zdCBQYWdpbmF0aW9uJiBw YWdpbmF0aW9uID0gdmlldy5mcmFtZVZpZXcoKS5mcmFtZSgpLnBhZ2UoKS0+cGFnaW5hdGlvbigp OwotICAgIGlmIChwYWdpbmF0aW9uLm1vZGUgPT0gUGFnaW5hdGlvbjo6VW5wYWdpbmF0ZWQpCi0g ICAgICAgIHJldHVybiBjb2x1bW5OdW1iZXI7Ci0KLSAgICBDb2x1bW5JbmZvKiBjb2x1bW5JbmZv ID0gdmlldy5jb2x1bW5JbmZvKCk7Ci0gICAgaWYgKGNvbHVtbkluZm8gJiYgIWNvbHVtbkluZm8t PnByb2dyZXNzaW9uSXNJbmxpbmUoKSkgewotICAgICAgICBpZiAoIWNvbHVtbkluZm8tPnByb2dy ZXNzaW9uSXNSZXZlcnNlZCgpKQotICAgICAgICAgICAgY29sdW1uTnVtYmVyID0gKHBhZ2luYXRp b24ucGFnZUxlbmd0aCArIHBhZ2luYXRpb24uZ2FwIC0gb2Zmc2V0KSAvIChwYWdpbmF0aW9uLnBh Z2VMZW5ndGggKyBwYWdpbmF0aW9uLmdhcCk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIGNv bHVtbk51bWJlciA9IG9mZnNldCAvIChwYWdpbmF0aW9uLnBhZ2VMZW5ndGggKyBwYWdpbmF0aW9u LmdhcCk7Ci0gICAgfQotICAgIHJldHVybiBjb2x1bW5OdW1iZXI7Ci19Ci0KICNpZiBQTEFURk9S TShJT1MpCiAvLyBUaGlzIGZ1bmN0aW9uIGlzIHNpbWlsYXIgaW4gc3Bpcml0IHRvIFJlbmRlclRl eHQ6OmFic29sdXRlUmVjdHNGb3JSYW5nZSwgYnV0IHJldHVybnMgcmVjdGFuZ2xlcwogLy8gd2hp Y2ggYXJlIGFubm90YXRlZCB3aXRoIGFkZGl0aW9uYWwgc3RhdGUgd2hpY2ggaGVscHMgaU9TIGRy YXcgc2VsZWN0aW9ucyBpbiBpdHMgdW5pcXVlIHdheS4KQEAgLTExMzMsNyArMTExMyw3IEBAIHZv aWQgUmVuZGVyT2JqZWN0Ojpjb2xsZWN0U2VsZWN0aW9uUmVjdHMKIAogICAgIHVuc2lnbmVkIG51 bWJlck9mUXVhZHMgPSBxdWFkcy5zaXplKCk7CiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8 IG51bWJlck9mUXVhZHM7ICsraSkKLSAgICAgICAgcmVjdHMuYXBwZW5kKFNlbGVjdGlvblJlY3Qo cXVhZHNbaV0uZW5jbG9zaW5nQm91bmRpbmdCb3goKSwgaXNIb3Jpem9udGFsV3JpdGluZ01vZGUo KSwgY29sdW1uTnVtYmVyRm9yT2Zmc2V0KHF1YWRzW2ldLmVuY2xvc2luZ0JvdW5kaW5nQm94KCku eCgpKSkpOworICAgICAgICByZWN0cy5hcHBlbmQoU2VsZWN0aW9uUmVjdChxdWFkc1tpXS5lbmNs b3NpbmdCb3VuZGluZ0JveCgpLCBpc0hvcml6b250YWxXcml0aW5nTW9kZSgpLCB2aWV3KCkucGFn ZU51bWJlckZvckJsb2NrUHJvZ3Jlc3Npb25PZmZzZXQocXVhZHNbaV0uZW5jbG9zaW5nQm91bmRp bmdCb3goKS54KCkpKSk7CiB9CiAjZW5kaWYKIApJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlck9iamVjdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJPYmplY3QuaAkocmV2aXNpb24gMTY3NDAzKQorKysgU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlck9iamVjdC5oCSh3b3JraW5nIGNvcHkpCkBAIC04NzksOCArODc5LDYgQEAg cHVibGljOgogCiAgICAgdm9pZCBkcmF3TGluZUZvckJveFNpZGUoR3JhcGhpY3NDb250ZXh0Kiwg ZmxvYXQgeDEsIGZsb2F0IHkxLCBmbG9hdCB4MiwgZmxvYXQgeTIsIEJveFNpZGUsIENvbG9yLCBF Qm9yZGVyU3R5bGUsIGZsb2F0IGFkamJ3MSwgZmxvYXQgYWRqYncyLCBib29sIGFudGlhbGlhcyA9 IGZhbHNlKTsKIHByb3RlY3RlZDoKLSAgICBpbnQgY29sdW1uTnVtYmVyRm9yT2Zmc2V0KGludCBv ZmZzZXQpOwotCiAgICAgdm9pZCBwYWludEZvY3VzUmluZyhQYWludEluZm8mLCBjb25zdCBMYXlv dXRQb2ludCYsIFJlbmRlclN0eWxlKik7CiAgICAgdm9pZCBwYWludE91dGxpbmUoUGFpbnRJbmZv JiwgY29uc3QgTGF5b3V0UmVjdCYpOwogICAgIHZvaWQgYWRkUERGVVJMUmVjdChHcmFwaGljc0Nv bnRleHQqLCBjb25zdCBMYXlvdXRSZWN0Jik7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVGV4dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclRleHQuY3BwCShyZXZpc2lvbiAxNjc0MDMpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVGV4dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM5MSw3ICszOTEsNyBAQCB2 b2lkIFJlbmRlclRleHQ6OmNvbGxlY3RTZWxlY3Rpb25SZWN0cyhWCiAgICAgICAgICAgICB9CiAg ICAgICAgIH0KIAotICAgICAgICByZWN0cy5hcHBlbmQoU2VsZWN0aW9uUmVjdChhYnNSZWN0LCBi b3gtPmRpcmVjdGlvbigpLCBleHRlbnRzUmVjdC54KCksIGV4dGVudHNSZWN0Lm1heFgoKSwgZXh0 ZW50c1JlY3QubWF4WSgpLCAwLCBib3gtPmlzTGluZUJyZWFrKCksIGlzRmlyc3RPbkxpbmUsIGlz TGFzdE9uTGluZSwgY29udGFpbnNTdGFydCwgY29udGFpbnNFbmQsIGJveElzSG9yaXpvbnRhbCwg aXNGaXhlZCwgY29udGFpbmluZ0Jsb2NrLT5pc1J1YnlUZXh0KCksIGNvbHVtbk51bWJlckZvck9m ZnNldChhYnNSZWN0LngoKSkpKTsKKyAgICAgICAgcmVjdHMuYXBwZW5kKFNlbGVjdGlvblJlY3Qo YWJzUmVjdCwgYm94LT5kaXJlY3Rpb24oKSwgZXh0ZW50c1JlY3QueCgpLCBleHRlbnRzUmVjdC5t YXhYKCksIGV4dGVudHNSZWN0Lm1heFkoKSwgMCwgYm94LT5pc0xpbmVCcmVhaygpLCBpc0ZpcnN0 T25MaW5lLCBpc0xhc3RPbkxpbmUsIGNvbnRhaW5zU3RhcnQsIGNvbnRhaW5zRW5kLCBib3hJc0hv cml6b250YWwsIGlzRml4ZWQsIGNvbnRhaW5pbmdCbG9jay0+aXNSdWJ5VGV4dCgpLCB2aWV3KCku cGFnZU51bWJlckZvckJsb2NrUHJvZ3Jlc3Npb25PZmZzZXQoYWJzUmVjdC54KCkpKSk7CiAgICAg fQogfQogI2VuZGlmCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3Bw CShyZXZpc2lvbiAxNjc0MDMpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmll dy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM1LDYgKzM1LDcgQEAKICNpbmNsdWRlICJIVE1MSUZy YW1lRWxlbWVudC5oIgogI2luY2x1ZGUgIkhpdFRlc3RSZXN1bHQuaCIKICNpbmNsdWRlICJJbWFn ZVF1YWxpdHlDb250cm9sbGVyLmgiCisjaW5jbHVkZSAiUmVuZGVyTXVsdGlDb2x1bW5TZXQuaCIK ICNpbmNsdWRlICJQYWdlLmgiCiAjaW5jbHVkZSAiUmVuZGVyR2VvbWV0cnlNYXAuaCIKICNpbmNs dWRlICJSZW5kZXJJdGVyYXRvci5oIgpAQCAtMTIyNCw0ICsxMjI1LDM2IEBAIFJlbmRlclZpZXc6 OlJlcGFpbnRSZWdpb25BY2N1bXVsYXRvcjo6flIKICAgICBtX3Jvb3RWaWV3LT5mbHVzaEFjY3Vt dWxhdGVkUmVwYWludFJlZ2lvbigpOwogfQogCit1bnNpZ25lZCBSZW5kZXJWaWV3OjpwYWdlTnVt YmVyRm9yQmxvY2tQcm9ncmVzc2lvbk9mZnNldChpbnQgb2Zmc2V0KSBjb25zdAoreworICAgIGlu dCBjb2x1bW5OdW1iZXIgPSAwOworICAgIGNvbnN0IFBhZ2luYXRpb24mIHBhZ2luYXRpb24gPSBm cmFtZVZpZXcoKS5mcmFtZSgpLnBhZ2UoKS0+cGFnaW5hdGlvbigpOworICAgIGlmIChwYWdpbmF0 aW9uLm1vZGUgPT0gUGFnaW5hdGlvbjo6VW5wYWdpbmF0ZWQpCisgICAgICAgIHJldHVybiBjb2x1 bW5OdW1iZXI7CisgICAgCisgICAgYm9vbCBwcm9ncmVzc2lvbklzSW5saW5lID0gZmFsc2U7Cisg ICAgYm9vbCBwcm9ncmVzc2lvbklzUmV2ZXJzZWQgPSBmYWxzZTsKKyAgICAKKyAgICBpZiAoaGFz Q29sdW1ucygpKSB7CisgICAgICAgIENvbHVtbkluZm8qIGNvbEluZm8gPSBjb2x1bW5JbmZvKCk7 CisgICAgICAgIGlmICghY29sSW5mbykKKyAgICAgICAgICAgIHJldHVybiBjb2x1bW5OdW1iZXI7 CisgICAgICAgIHByb2dyZXNzaW9uSXNJbmxpbmUgPSBjb2xJbmZvLT5wcm9ncmVzc2lvbklzSW5s aW5lKCk7CisgICAgICAgIHByb2dyZXNzaW9uSXNSZXZlcnNlZCA9IGNvbEluZm8tPnByb2dyZXNz aW9uSXNSZXZlcnNlZCgpOworICAgIH0gZWxzZSBpZiAobXVsdGlDb2x1bW5GbG93VGhyZWFkKCkp IHsKKyAgICAgICAgcHJvZ3Jlc3Npb25Jc0lubGluZSA9IG11bHRpQ29sdW1uRmxvd1RocmVhZCgp LT5wcm9ncmVzc2lvbklzSW5saW5lKCk7CisgICAgICAgIHByb2dyZXNzaW9uSXNSZXZlcnNlZCA9 IG11bHRpQ29sdW1uRmxvd1RocmVhZCgpLT5wcm9ncmVzc2lvbklzUmV2ZXJzZWQoKTsKKyAgICB9 IGVsc2UKKyAgICAgICAgcmV0dXJuIGNvbHVtbk51bWJlcjsKKyAgICAKKyAgICBpZiAoIXByb2dy ZXNzaW9uSXNJbmxpbmUpIHsKKyAgICAgICAgaWYgKCFwcm9ncmVzc2lvbklzUmV2ZXJzZWQpCisg ICAgICAgICAgICBjb2x1bW5OdW1iZXIgPSAocGFnaW5hdGlvbi5wYWdlTGVuZ3RoICsgcGFnaW5h dGlvbi5nYXAgLSBvZmZzZXQpIC8gKHBhZ2luYXRpb24ucGFnZUxlbmd0aCArIHBhZ2luYXRpb24u Z2FwKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgY29sdW1uTnVtYmVyID0gb2Zmc2V0IC8g KHBhZ2luYXRpb24ucGFnZUxlbmd0aCArIHBhZ2luYXRpb24uZ2FwKTsKKyAgICB9CisKKyAgICBy ZXR1cm4gY29sdW1uTnVtYmVyOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmgJKHJldmlzaW9uIDE2NzQwMykKKysrIFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmgJKHdvcmtpbmcgY29weSkKQEAgLTE1 NCw2ICsxNTQsMTIgQEAgcHVibGljOgogICAgIH0KICAgICBMYXlvdXRVbml0IHBhZ2VPclZpZXdM b2dpY2FsSGVpZ2h0KCkgY29uc3Q7CiAKKyAgICAvLyBUaGlzIG1ldGhvZCBpcyB1c2VkIHRvIGFz c2lnbiBhIHBhZ2UgbnVtYmVyIG9ubHkgd2hlbiBwYWdpbmF0aW9uIG1vZGVzIGhhdmUKKyAgICAv LyBhIGJsb2NrIHByb2dyZXNzaW9uLiBUaGlzIGhhcHBlbnMgd2l0aCB2ZXJ0aWNhbC1ybCBib29r cyBmb3IgZXhhbXBsZSwgYnV0IGl0CisgICAgLy8gZG9lc24ndCBoYXBwZW4gZm9yIG5vcm1hbCBo b3Jpem9udGFsLXRiIGJvb2tzLiBUaGlzIGlzIGEgdmVyeSBzcGVjaWFsaXplZAorICAgIC8vIGZ1 bmN0aW9uIGFuZCBzaG91bGQgbm90IGJlIG1pc3Rha2VuIGZvciBhIGdlbmVyYWwgcGFnZSBudW1i ZXIgQVBJLgorICAgIHVuc2lnbmVkIHBhZ2VOdW1iZXJGb3JCbG9ja1Byb2dyZXNzaW9uT2Zmc2V0 KGludCBvZmZzZXQpIGNvbnN0OworCiAgICAgLy8gRklYTUU6IFRoZXNlIGZ1bmN0aW9ucyBhcmUg ZGVwcmVjYXRlZC4gTm8gY29kZSBzaG91bGQgYmUgYWRkZWQgdGhhdCB1c2VzIHRoZXNlLgogICAg IGludCBiZXN0VHJ1bmNhdGVkQXQoKSBjb25zdCB7IHJldHVybiBtX2xlZ2FjeVByaW50aW5nLm1f YmVzdFRydW5jYXRlZEF0OyB9CiAgICAgdm9pZCBzZXRCZXN0VHJ1bmNhdGVkQXQoaW50IHksIFJl bmRlckJveE1vZGVsT2JqZWN0KiBmb3JSZW5kZXJlciwgYm9vbCBmb3JjZWRCcmVhayA9IGZhbHNl KTsKQEAgLTIzOCw3ICsyNDQsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgdmlydHVhbCBjb25zdCBSZW5k ZXJPYmplY3QqIHB1c2hNYXBwaW5nVG9Db250YWluZXIoY29uc3QgUmVuZGVyTGF5ZXJNb2RlbE9i amVjdCogYW5jZXN0b3JUb1N0b3BBdCwgUmVuZGVyR2VvbWV0cnlNYXAmKSBjb25zdCBvdmVycmlk ZTsKICAgICB2aXJ0dWFsIHZvaWQgbWFwQWJzb2x1dGVUb0xvY2FsUG9pbnQoTWFwQ29vcmRpbmF0 ZXNGbGFncywgVHJhbnNmb3JtU3RhdGUmKSBjb25zdCBvdmVycmlkZTsKICAgICB2aXJ0dWFsIGJv b2wgcmVxdWlyZXNDb2x1bW5zKGludCBkZXNpcmVkQ29sdW1uQ291bnQpIGNvbnN0IG92ZXJyaWRl OwotICAgIAorCiBwcml2YXRlOgogICAgIHZvaWQgaW5pdGlhbGl6ZUxheW91dFN0YXRlKExheW91 dFN0YXRlJik7CiAK