59025 2011-04-20 14:16:45 -0700 Split bidiFirst into two functions 2011-04-20 16:48:48 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 58944 1 eric eric abarth commit-queue hyatt leviw mitz rniwa oldest_to_newest 389513 0 eric 2011-04-20 14:16:45 -0700 Split bidiFirst into two functions 389514 1 90409 eric 2011-04-20 14:18:25 -0700 Created attachment 90409 Patch 389524 2 eric 2011-04-20 14:25:41 -0700 I think this is going to fail a layout test. I think I flipped an or somewhere. Investigating. 389531 3 90416 eric 2011-04-20 14:32:44 -0700 Created attachment 90416 Patch for landing 389638 4 90416 commit-queue 2011-04-20 16:48:44 -0700 Comment on attachment 90416 Patch for landing Clearing flags on attachment: 90416 Committed r84436: <http://trac.webkit.org/changeset/84436> 389640 5 commit-queue 2011-04-20 16:48:48 -0700 All reviewed patches have been landed. Closing bug. 90409 2011-04-20 14:18:25 -0700 2011-04-20 14:32:16 -0700 Patch bug-59025-20110420141824.patch text/plain 6622 eric U3VidmVyc2lvbiBSZXZpc2lvbjogODQzMDYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBmYzE5MGIzZGU3MjVmYmFl ZmVhNDBmYTMyNmUwY2ZmMjdlNzNkNTYxLi5lY2ViMjM0ZGMzMTQ5MjIyZWY5YjFmYmI4MDFkOWFi MDlmZDg0NTQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTEtMDQtMjAgIEVyaWMg U2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFNwbGl0IGJpZGlGaXJzdCBpbnRvIHR3byBmdW5jdGlvbnMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU5MDI1CisKKyAg ICAgICAgSSBkb24ndCBoYXZlIGEgZnVsbCB1bmRlcnN0YW5kaW5nIG9mIHRoZSBza2lwSW5saW5l cyBjYXNlIHlldAorICAgICAgICAoaGVuY2UgaXQncyBub3QgYXMgcHJldHR5IGFzIHRoZSBub24t c2tpcHBpbmcgY2FzZSksIGJ1dAorICAgICAgICB0aGlzIGlzIGNsZWFybHkgYSB3aW4sIGFzIGJv dGggZnVuY3Rpb25zIGFyZSBtdWNoIHNpbXBsZXIKKyAgICAgICAgdGhhbiB0aGVpciBjb21iaW5l ZCB2ZXJzaW9uLgorCisgICAgICAgIEJvdGggb2YgdGhlc2UgZnVuY3Rpb25zIHN0aWxsIGhhdmUg YmFkIG5hbWVzLiAgSG93ZXZlciB0aGUKKyAgICAgICAgYmlkaU5leHQvYmlkaUZpcnN0IG5hbWVz IGRhdGUgYWxsIHRoZSB3YXkgYmFjayB0byByZXZpc2lvbiAxCisgICAgICAgIG9mIHRoZSBXZWJL aXQgcmVwb3NpdG9yeS4gOikgIFNvIEkgZG9uJ3QgZmVlbCB0b28gYmFkIGtlZXBpbmcKKyAgICAg ICAgdGhlbSBmb3IgdGhlIG1vbWVudC4KKworICAgICAgICAqIHJlbmRlcmluZy9JbmxpbmVJdGVy YXRvci5oOgorICAgICAgICAoV2ViQ29yZTo6YmlkaU5leHQpOgorICAgICAgICAoV2ViQ29yZTo6 YmlkaUZpcnN0U2tpcHBpbmdJbmxpbmVzKToKKyAgICAgICAgKFdlYkNvcmU6OmJpZGlGaXJzdE5v dFNraXBwaW5nSW5saW5lcyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpzaW1wbGlmaWVkTm9ybWFsRmxvd0xheW91 dCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6bGF5b3V0SW5saW5lQ2hpbGRyZW4pOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmRldGVybWluZVN0YXJ0UG9zaXRpb24pOgorCiAyMDEx LTA0LTE5ICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgQmV0aCBEYWtpbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9J bmxpbmVJdGVyYXRvci5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUl0ZXJhdG9y LmgKaW5kZXggMWY2YjIxY2IwNjJlMDA5YzZmNDZhMmQ1MjgzMjI1ZDZmNDRlYWIxOC4uYzE5ZmIy Y2M3NTlmNmY1Y2IwMGIxZDUxMjVhMmQ3MGI5OTgzNzcwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL0lubGluZUl0ZXJhdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL0lubGluZUl0ZXJhdG9yLmgKQEAgLTEzNyw2ICsxMzcsNyBAQCBzdGF0aWMgaW5saW5l IHZvaWQgbm90aWZ5UmVzb2x2ZXJXaWxsRXhpdE9iamVjdChJbmxpbmVCaWRpUmVzb2x2ZXIqIHJl c29sdmVyLCBSZQogc3RhdGljIGlubGluZSBSZW5kZXJPYmplY3QqIGJpZGlOZXh0KFJlbmRlck9i amVjdCogcm9vdCwgUmVuZGVyT2JqZWN0KiBjdXJyZW50LCBJbmxpbmVCaWRpUmVzb2x2ZXIqIHJl c29sdmVyID0gMCwgYm9vbCBza2lwSW5saW5lcyA9IHRydWUsIGJvb2wqIGVuZE9mSW5saW5lUHRy ID0gMCkKIHsKICAgICBSZW5kZXJPYmplY3QqIG5leHQgPSAwOworICAgIC8vIG9sZEVuZE9mSW5s aW5lIGRlbm90ZXMgaWYgd2hlbiB3ZSBsYXN0IHN0b3BwZWQgaXRlcmF0aW5nIGlmIHdlIHdlcmUg YXQgdGhlIGVuZCBvZiBhbiBpbmxpbmUuCiAgICAgYm9vbCBvbGRFbmRPZklubGluZSA9IGVuZE9m SW5saW5lUHRyID8gKmVuZE9mSW5saW5lUHRyIDogZmFsc2U7CiAgICAgYm9vbCBlbmRPZklubGlu ZSA9IGZhbHNlOwogCkBAIC0xNDcsNyArMTQ4LDkgQEAgc3RhdGljIGlubGluZSBSZW5kZXJPYmpl Y3QqIGJpZGlOZXh0KFJlbmRlck9iamVjdCogcm9vdCwgUmVuZGVyT2JqZWN0KiBjdXJyZW50LAog ICAgICAgICAgICAgbm90aWZ5UmVzb2x2ZXJFbnRlcmVkT2JqZWN0KHJlc29sdmVyLCBuZXh0KTsK ICAgICAgICAgfQogCisgICAgICAgIC8vIFdlIGhpdCB0aGlzIHdoZW4gZWl0aGVyIGN1cnJlbnQg aGFzIG5vIGNoaWxkcmVuLCBvciB3aGVuIGN1cnJlbnQgaXMgbm90IGEgcmVuZGVyZXIgd2UgY2Fy ZSBhYm91dC4KICAgICAgICAgaWYgKCFuZXh0KSB7CisgICAgICAgICAgICAvLyBJZiBpdCBpcyBh IHJlbmRlcmVyIHdlIGNhcmUgYWJvdXQsIGFuZCB3ZSdyZSBkb2luZyBvdXIgaW5saW5lLXdhbGss IHJldHVybiBpdC4KICAgICAgICAgICAgIGlmICghc2tpcElubGluZXMgJiYgIW9sZEVuZE9mSW5s aW5lICYmIGN1cnJlbnQtPmlzUmVuZGVySW5saW5lKCkpIHsKICAgICAgICAgICAgICAgICBuZXh0 ID0gY3VycmVudDsKICAgICAgICAgICAgICAgICBlbmRPZklubGluZSA9IHRydWU7CkBAIC0xODgs MzIgKzE5MSwzOSBAQCBzdGF0aWMgaW5saW5lIFJlbmRlck9iamVjdCogYmlkaU5leHQoUmVuZGVy T2JqZWN0KiByb290LCBSZW5kZXJPYmplY3QqIGN1cnJlbnQsCiAgICAgcmV0dXJuIG5leHQ7CiB9 CiAKLXN0YXRpYyBpbmxpbmUgUmVuZGVyT2JqZWN0KiBiaWRpRmlyc3QoUmVuZGVyT2JqZWN0KiBy b290LCBJbmxpbmVCaWRpUmVzb2x2ZXIqIHJlc29sdmVyLCBib29sIHNraXBJbmxpbmVzID0gdHJ1 ZSkKK3N0YXRpYyBpbmxpbmUgUmVuZGVyT2JqZWN0KiBiaWRpRmlyc3RTa2lwcGluZ0lubGluZXMo UmVuZGVyT2JqZWN0KiByb290LCBJbmxpbmVCaWRpUmVzb2x2ZXIqIHJlc29sdmVyKQogewotICAg IGlmICghcm9vdC0+Zmlyc3RDaGlsZCgpKQorICAgIEFTU0VSVChyZXNvbHZlcik7CisgICAgUmVu ZGVyT2JqZWN0KiBvID0gcm9vdC0+Zmlyc3RDaGlsZCgpOworICAgIGlmICghbykKICAgICAgICAg cmV0dXJuIDA7CiAKLSAgICBSZW5kZXJPYmplY3QqIG8gPSByb290LT5maXJzdENoaWxkKCk7CiAg ICAgaWYgKG8tPmlzUmVuZGVySW5saW5lKCkpIHsKICAgICAgICAgbm90aWZ5UmVzb2x2ZXJFbnRl cmVkT2JqZWN0KHJlc29sdmVyLCBvKTsKLSAgICAgICAgaWYgKHNraXBJbmxpbmVzICYmIG8tPmZp cnN0Q2hpbGQoKSkKLSAgICAgICAgICAgIG8gPSBiaWRpTmV4dChyb290LCBvLCByZXNvbHZlciwg c2tpcElubGluZXMpOwotICAgICAgICBlbHNlIHsKLSAgICAgICAgICAgIC8vIE5ldmVyIHNraXAg ZW1wdHkgaW5saW5lcy4KLSAgICAgICAgICAgIGlmIChyZXNvbHZlcikKLSAgICAgICAgICAgICAg ICByZXNvbHZlci0+Y29tbWl0RXhwbGljaXRFbWJlZGRpbmcoKTsKLSAgICAgICAgICAgIHJldHVy biBvOyAKLSAgICAgICAgfQorICAgICAgICBpZiAoby0+Zmlyc3RDaGlsZCgpKQorICAgICAgICAg ICAgbyA9IGJpZGlOZXh0KHJvb3QsIG8sIHJlc29sdmVyLCB0cnVlKTsKICAgICB9CiAKKyAgICAv LyBGSVhNRTogSXQgaXMgdW5jbGVhciB3aHkgdGhpcyBjYXNlIGlzIHJlcXVpcmVkLgogICAgIGlm IChvICYmICFvLT5pc1RleHQoKSAmJiAhby0+aXNSZXBsYWNlZCgpICYmICFvLT5pc0Zsb2F0aW5n KCkgJiYgIW8tPmlzUG9zaXRpb25lZCgpKQotICAgICAgICBvID0gYmlkaU5leHQocm9vdCwgbywg cmVzb2x2ZXIsIHNraXBJbmxpbmVzKTsKKyAgICAgICAgbyA9IGJpZGlOZXh0KHJvb3QsIG8sIHJl c29sdmVyLCB0cnVlKTsKIAotICAgIGlmIChyZXNvbHZlcikKLSAgICAgICAgcmVzb2x2ZXItPmNv bW1pdEV4cGxpY2l0RW1iZWRkaW5nKCk7CisgICAgcmVzb2x2ZXItPmNvbW1pdEV4cGxpY2l0RW1i ZWRkaW5nKCk7CiAgICAgcmV0dXJuIG87CiB9CiAKKy8vIEZJWE1FOiBUaGlzIG1ldGhvZCBuZWVk cyB0byBiZSByZW5hbWVkIHdoZW4gYmlkaU5leHQgZmluZHMgYSBnb29kIG5hbWUuCitzdGF0aWMg aW5saW5lIFJlbmRlck9iamVjdCogYmlkaUZpcnN0Tm90U2tpcHBpbmdJbmxpbmVzKFJlbmRlck9i amVjdCogcm9vdCkKK3sKKyAgICBSZW5kZXJPYmplY3QqIG8gPSByb290LT5maXJzdENoaWxkKCk7 CisgICAgLy8gSWYgZWl0aGVyIHRoZXJlIGFyZSBubyBjaGlsZHJlbiB0byB3YWxrLCBvciB0aGUg Zmlyc3Qgb25lIGlzIGNvcnJlY3QKKyAgICAvLyB0aGVuIGp1c3QgcmV0dXJuIGl0LgorICAgIGlm ICghbyB8fCBvLT5pc1JlbmRlcklubGluZSgpIHx8IG8tPmlzVGV4dCgpIHx8IG8tPmlzUmVwbGFj ZWQoKSB8fCBvLT5pc0Zsb2F0aW5nKCkgfHwgby0+aXNQb3NpdGlvbmVkKCkpCisgICAgICAgIHJl dHVybiBvOworCisgICAgcmV0dXJuIGJpZGlOZXh0KHJvb3QsIG8sIDAsIGZhbHNlKTsKK30KKwog aW5saW5lIHZvaWQgSW5saW5lSXRlcmF0b3I6OmluY3JlbWVudChJbmxpbmVCaWRpUmVzb2x2ZXIq IHJlc29sdmVyKQogewogICAgIGlmICghbV9vYmopCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJsb2NrLmNwcAppbmRleCA2YWUyYWU1MzQ3MGU2NDJlYjE4ZmY4ODg2NDU3NmE5NzQyM2Ey ZjViLi4wMmM5NjFkMTdhNGEzZmRkN2VmYmMwZDQ5N2M4YjQzYTE0ZTM4NmJmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKQEAgLTIwODEsNyArMjA4MSw3IEBAIHZv aWQgUmVuZGVyQmxvY2s6OnNpbXBsaWZpZWROb3JtYWxGbG93TGF5b3V0KCkKICAgICBpZiAoY2hp bGRyZW5JbmxpbmUoKSkgewogICAgICAgICBMaXN0SGFzaFNldDxSb290SW5saW5lQm94Kj4gbGlu ZUJveGVzOwogICAgICAgICBib29sIGVuZE9mSW5saW5lID0gZmFsc2U7Ci0gICAgICAgIFJlbmRl ck9iamVjdCogbyA9IGJpZGlGaXJzdCh0aGlzLCAwLCBmYWxzZSk7CisgICAgICAgIFJlbmRlck9i amVjdCogbyA9IGJpZGlGaXJzdE5vdFNraXBwaW5nSW5saW5lcyh0aGlzKTsKICAgICAgICAgd2hp bGUgKG8pIHsKICAgICAgICAgICAgIGlmICghby0+aXNQb3NpdGlvbmVkKCkgJiYgKG8tPmlzUmVw bGFjZWQoKSB8fCBvLT5pc0Zsb2F0aW5nKCkpKSB7CiAgICAgICAgICAgICAgICAgby0+bGF5b3V0 SWZOZWVkZWQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC bG9ja0xpbmVMYXlvdXQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2Nr TGluZUxheW91dC5jcHAKaW5kZXggZjMwNWM4NjljMjUyMTMwNGMzYzU3ZjQxOGI1ZDNmYzViZjBi MTAwMi4uZjI5ZGY5MmViZmIyNjZhNTM1YmUwYmI5MmQ0MDljMjFlYzM4MjRlMCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAKQEAg LTc1Myw3ICs3NTMsNyBAQCB2b2lkIFJlbmRlckJsb2NrOjpsYXlvdXRJbmxpbmVDaGlsZHJlbihi b29sIHJlbGF5b3V0Q2hpbGRyZW4sIGludCYgcmVwYWludExvZ2ljYQogICAgIGlmIChmaXJzdENo aWxkKCkpIHsKICAgICAgICAgLy8gbGF5b3V0IHJlcGxhY2VkIGVsZW1lbnRzCiAgICAgICAgIGJv b2wgZW5kT2ZJbmxpbmUgPSBmYWxzZTsKLSAgICAgICAgUmVuZGVyT2JqZWN0KiBvID0gYmlkaUZp cnN0KHRoaXMsIDAsIGZhbHNlKTsKKyAgICAgICAgUmVuZGVyT2JqZWN0KiBvID0gYmlkaUZpcnN0 Tm90U2tpcHBpbmdJbmxpbmVzKHRoaXMpOwogICAgICAgICBWZWN0b3I8RmxvYXRXaXRoUmVjdD4g ZmxvYXRzOwogICAgICAgICBib29sIGhhc0lubGluZUNoaWxkID0gZmFsc2U7CiAgICAgICAgIHdo aWxlIChvKSB7CkBAIC0xMjc0LDcgKzEyNzQsNyBAQCBSb290SW5saW5lQm94KiBSZW5kZXJCbG9j azo6ZGV0ZXJtaW5lU3RhcnRQb3NpdGlvbihib29sJiBmaXJzdExpbmUsIGJvb2wmIGZ1bGxMYQog ICAgICAgICByZXNvbHZlci5zZXRFb3JEaXIoZGlyZWN0aW9uKTsKICAgICAgICAgcmVzb2x2ZXIu c2V0Q29udGV4dChCaWRpQ29udGV4dDo6Y3JlYXRlKGx0ciA/IDAgOiAxLCBkaXJlY3Rpb24sIHN0 eWxlKCktPnVuaWNvZGVCaWRpKCkgPT0gT3ZlcnJpZGUsIEZyb21TdHlsZU9yRE9NKSk7CiAKLSAg ICAgICAgc3RhcnRPYmogPSBiaWRpRmlyc3QodGhpcywgJnJlc29sdmVyKTsKKyAgICAgICAgc3Rh cnRPYmogPSBiaWRpRmlyc3RTa2lwcGluZ0lubGluZXModGhpcywgJnJlc29sdmVyKTsKICAgICB9 CiAKICAgICByZXNvbHZlci5zZXRQb3NpdGlvbihJbmxpbmVJdGVyYXRvcih0aGlzLCBzdGFydE9i aiwgcG9zKSk7Cg== 90416 2011-04-20 14:32:44 -0700 2011-04-20 16:48:44 -0700 Patch for landing bug-59025-20110420143243.patch text/plain 6645 eric U3VidmVyc2lvbiBSZXZpc2lvbjogODQzMDYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBmYzE5MGIzZGU3MjVmYmFl ZmVhNDBmYTMyNmUwY2ZmMjdlNzNkNTYxLi4yOGM5MmY5Yzk4ZTE5MzY3YzA2MDc3Mjk0YjZhMmFk OTlhZTkyNGExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTEtMDQtMjAgIEVyaWMg U2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IFJ5b3N1a2Ug Tml3YS4KKworICAgICAgICBTcGxpdCBiaWRpRmlyc3QgaW50byB0d28gZnVuY3Rpb25zCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01OTAyNQorCisgICAg ICAgIEkgZG9uJ3QgaGF2ZSBhIGZ1bGwgdW5kZXJzdGFuZGluZyBvZiB0aGUgc2tpcElubGluZXMg Y2FzZSB5ZXQKKyAgICAgICAgKGhlbmNlIGl0J3Mgbm90IGFzIHByZXR0eSBhcyB0aGUgbm9uLXNr aXBwaW5nIGNhc2UpLCBidXQKKyAgICAgICAgdGhpcyBpcyBjbGVhcmx5IGEgd2luLCBhcyBib3Ro IGZ1bmN0aW9ucyBhcmUgbXVjaCBzaW1wbGVyCisgICAgICAgIHRoYW4gdGhlaXIgY29tYmluZWQg dmVyc2lvbi4KKworICAgICAgICBCb3RoIG9mIHRoZXNlIGZ1bmN0aW9ucyBzdGlsbCBoYXZlIGJh ZCBuYW1lcy4gIEhvd2V2ZXIgdGhlCisgICAgICAgIGJpZGlOZXh0L2JpZGlGaXJzdCBuYW1lcyBk YXRlIGFsbCB0aGUgd2F5IGJhY2sgdG8gcmV2aXNpb24gMQorICAgICAgICBvZiB0aGUgV2ViS2l0 IHJlcG9zaXRvcnkuIDopICBTbyBJIGRvbid0IGZlZWwgdG9vIGJhZCBrZWVwaW5nCisgICAgICAg IHRoZW0gZm9yIHRoZSBtb21lbnQuCisKKyAgICAgICAgKiByZW5kZXJpbmcvSW5saW5lSXRlcmF0 b3IuaDoKKyAgICAgICAgKFdlYkNvcmU6OmJpZGlOZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OmJp ZGlGaXJzdFNraXBwaW5nSW5saW5lcyk6CisgICAgICAgIChXZWJDb3JlOjpiaWRpRmlyc3ROb3RT a2lwcGluZ0lubGluZXMpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9jay5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6c2ltcGxpZmllZE5vcm1hbEZsb3dMYXlvdXQp OgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmxheW91dElubGluZUNoaWxkcmVuKToKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckJsb2NrOjpkZXRlcm1pbmVTdGFydFBvc2l0aW9uKToKKwogMjAxMS0w NC0xOSAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IEJldGggRGFraW4uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5s aW5lSXRlcmF0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVJdGVyYXRvci5o CmluZGV4IDFmNmIyMWNiMDYyZTAwOWM2ZjQ2YTJkNTI4MzIyNWQ2ZjQ0ZWFiMTguLjMzYTk4MWQ5 M2U2ZWViMTRhYjU4OTU1ZmY1YjBjZGFkYmU2OGI0YTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9JbmxpbmVJdGVyYXRvci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9JbmxpbmVJdGVyYXRvci5oCkBAIC0xMzcsNiArMTM3LDcgQEAgc3RhdGljIGlubGluZSB2 b2lkIG5vdGlmeVJlc29sdmVyV2lsbEV4aXRPYmplY3QoSW5saW5lQmlkaVJlc29sdmVyKiByZXNv bHZlciwgUmUKIHN0YXRpYyBpbmxpbmUgUmVuZGVyT2JqZWN0KiBiaWRpTmV4dChSZW5kZXJPYmpl Y3QqIHJvb3QsIFJlbmRlck9iamVjdCogY3VycmVudCwgSW5saW5lQmlkaVJlc29sdmVyKiByZXNv bHZlciA9IDAsIGJvb2wgc2tpcElubGluZXMgPSB0cnVlLCBib29sKiBlbmRPZklubGluZVB0ciA9 IDApCiB7CiAgICAgUmVuZGVyT2JqZWN0KiBuZXh0ID0gMDsKKyAgICAvLyBvbGRFbmRPZklubGlu ZSBkZW5vdGVzIGlmIHdoZW4gd2UgbGFzdCBzdG9wcGVkIGl0ZXJhdGluZyBpZiB3ZSB3ZXJlIGF0 IHRoZSBlbmQgb2YgYW4gaW5saW5lLgogICAgIGJvb2wgb2xkRW5kT2ZJbmxpbmUgPSBlbmRPZklu bGluZVB0ciA/ICplbmRPZklubGluZVB0ciA6IGZhbHNlOwogICAgIGJvb2wgZW5kT2ZJbmxpbmUg PSBmYWxzZTsKIApAQCAtMTQ3LDcgKzE0OCw5IEBAIHN0YXRpYyBpbmxpbmUgUmVuZGVyT2JqZWN0 KiBiaWRpTmV4dChSZW5kZXJPYmplY3QqIHJvb3QsIFJlbmRlck9iamVjdCogY3VycmVudCwKICAg ICAgICAgICAgIG5vdGlmeVJlc29sdmVyRW50ZXJlZE9iamVjdChyZXNvbHZlciwgbmV4dCk7CiAg ICAgICAgIH0KIAorICAgICAgICAvLyBXZSBoaXQgdGhpcyB3aGVuIGVpdGhlciBjdXJyZW50IGhh cyBubyBjaGlsZHJlbiwgb3Igd2hlbiBjdXJyZW50IGlzIG5vdCBhIHJlbmRlcmVyIHdlIGNhcmUg YWJvdXQuCiAgICAgICAgIGlmICghbmV4dCkgeworICAgICAgICAgICAgLy8gSWYgaXQgaXMgYSBy ZW5kZXJlciB3ZSBjYXJlIGFib3V0LCBhbmQgd2UncmUgZG9pbmcgb3VyIGlubGluZS13YWxrLCBy ZXR1cm4gaXQuCiAgICAgICAgICAgICBpZiAoIXNraXBJbmxpbmVzICYmICFvbGRFbmRPZklubGlu ZSAmJiBjdXJyZW50LT5pc1JlbmRlcklubGluZSgpKSB7CiAgICAgICAgICAgICAgICAgbmV4dCA9 IGN1cnJlbnQ7CiAgICAgICAgICAgICAgICAgZW5kT2ZJbmxpbmUgPSB0cnVlOwpAQCAtMTg4LDE2 ICsxOTEsMTcgQEAgc3RhdGljIGlubGluZSBSZW5kZXJPYmplY3QqIGJpZGlOZXh0KFJlbmRlck9i amVjdCogcm9vdCwgUmVuZGVyT2JqZWN0KiBjdXJyZW50LAogICAgIHJldHVybiBuZXh0OwogfQog Ci1zdGF0aWMgaW5saW5lIFJlbmRlck9iamVjdCogYmlkaUZpcnN0KFJlbmRlck9iamVjdCogcm9v dCwgSW5saW5lQmlkaVJlc29sdmVyKiByZXNvbHZlciwgYm9vbCBza2lwSW5saW5lcyA9IHRydWUp CitzdGF0aWMgaW5saW5lIFJlbmRlck9iamVjdCogYmlkaUZpcnN0U2tpcHBpbmdJbmxpbmVzKFJl bmRlck9iamVjdCogcm9vdCwgSW5saW5lQmlkaVJlc29sdmVyKiByZXNvbHZlcikKIHsKLSAgICBp ZiAoIXJvb3QtPmZpcnN0Q2hpbGQoKSkKKyAgICBBU1NFUlQocmVzb2x2ZXIpOworICAgIFJlbmRl ck9iamVjdCogbyA9IHJvb3QtPmZpcnN0Q2hpbGQoKTsKKyAgICBpZiAoIW8pCiAgICAgICAgIHJl dHVybiAwOwogCi0gICAgUmVuZGVyT2JqZWN0KiBvID0gcm9vdC0+Zmlyc3RDaGlsZCgpOwogICAg IGlmIChvLT5pc1JlbmRlcklubGluZSgpKSB7CiAgICAgICAgIG5vdGlmeVJlc29sdmVyRW50ZXJl ZE9iamVjdChyZXNvbHZlciwgbyk7Ci0gICAgICAgIGlmIChza2lwSW5saW5lcyAmJiBvLT5maXJz dENoaWxkKCkpCi0gICAgICAgICAgICBvID0gYmlkaU5leHQocm9vdCwgbywgcmVzb2x2ZXIsIHNr aXBJbmxpbmVzKTsKKyAgICAgICAgaWYgKG8tPmZpcnN0Q2hpbGQoKSkKKyAgICAgICAgICAgIG8g PSBiaWRpTmV4dChyb290LCBvLCByZXNvbHZlciwgdHJ1ZSk7CiAgICAgICAgIGVsc2UgewogICAg ICAgICAgICAgLy8gTmV2ZXIgc2tpcCBlbXB0eSBpbmxpbmVzLgogICAgICAgICAgICAgaWYgKHJl c29sdmVyKQpAQCAtMjA2LDE0ICsyMTAsMjYgQEAgc3RhdGljIGlubGluZSBSZW5kZXJPYmplY3Qq IGJpZGlGaXJzdChSZW5kZXJPYmplY3QqIHJvb3QsIElubGluZUJpZGlSZXNvbHZlciogcmUKICAg ICAgICAgfQogICAgIH0KIAorICAgIC8vIEZJWE1FOiBVbmlmeSB0aGlzIHdpdGggdGhlIGJpZGlO ZXh0IGNhbGwgYWJvdmUuCiAgICAgaWYgKG8gJiYgIW8tPmlzVGV4dCgpICYmICFvLT5pc1JlcGxh Y2VkKCkgJiYgIW8tPmlzRmxvYXRpbmcoKSAmJiAhby0+aXNQb3NpdGlvbmVkKCkpCi0gICAgICAg IG8gPSBiaWRpTmV4dChyb290LCBvLCByZXNvbHZlciwgc2tpcElubGluZXMpOworICAgICAgICBv ID0gYmlkaU5leHQocm9vdCwgbywgcmVzb2x2ZXIsIHRydWUpOwogCi0gICAgaWYgKHJlc29sdmVy KQotICAgICAgICByZXNvbHZlci0+Y29tbWl0RXhwbGljaXRFbWJlZGRpbmcoKTsKKyAgICByZXNv bHZlci0+Y29tbWl0RXhwbGljaXRFbWJlZGRpbmcoKTsKICAgICByZXR1cm4gbzsKIH0KIAorLy8g RklYTUU6IFRoaXMgbWV0aG9kIG5lZWRzIHRvIGJlIHJlbmFtZWQgd2hlbiBiaWRpTmV4dCBmaW5k cyBhIGdvb2QgbmFtZS4KK3N0YXRpYyBpbmxpbmUgUmVuZGVyT2JqZWN0KiBiaWRpRmlyc3ROb3RT a2lwcGluZ0lubGluZXMoUmVuZGVyT2JqZWN0KiByb290KQoreworICAgIFJlbmRlck9iamVjdCog byA9IHJvb3QtPmZpcnN0Q2hpbGQoKTsKKyAgICAvLyBJZiBlaXRoZXIgdGhlcmUgYXJlIG5vIGNo aWxkcmVuIHRvIHdhbGssIG9yIHRoZSBmaXJzdCBvbmUgaXMgY29ycmVjdAorICAgIC8vIHRoZW4g anVzdCByZXR1cm4gaXQuCisgICAgaWYgKCFvIHx8IG8tPmlzUmVuZGVySW5saW5lKCkgfHwgby0+ aXNUZXh0KCkgfHwgby0+aXNSZXBsYWNlZCgpIHx8IG8tPmlzRmxvYXRpbmcoKSB8fCBvLT5pc1Bv c2l0aW9uZWQoKSkKKyAgICAgICAgcmV0dXJuIG87CisKKyAgICByZXR1cm4gYmlkaU5leHQocm9v dCwgbywgMCwgZmFsc2UpOworfQorCiBpbmxpbmUgdm9pZCBJbmxpbmVJdGVyYXRvcjo6aW5jcmVt ZW50KElubGluZUJpZGlSZXNvbHZlciogcmVzb2x2ZXIpCiB7CiAgICAgaWYgKCFtX29iaikKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCmluZGV4IDZhZTJhZTUzNDcwZTY0 MmViMThmZjg4ODY0NTc2YTk3NDIzYTJmNWIuLjAyYzk2MWQxN2E0YTNmZGQ3ZWZiYzBkNDk3Yzhi NDNhMTRlMzg2YmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC bG9jay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcApA QCAtMjA4MSw3ICsyMDgxLDcgQEAgdm9pZCBSZW5kZXJCbG9jazo6c2ltcGxpZmllZE5vcm1hbEZs b3dMYXlvdXQoKQogICAgIGlmIChjaGlsZHJlbklubGluZSgpKSB7CiAgICAgICAgIExpc3RIYXNo U2V0PFJvb3RJbmxpbmVCb3gqPiBsaW5lQm94ZXM7CiAgICAgICAgIGJvb2wgZW5kT2ZJbmxpbmUg PSBmYWxzZTsKLSAgICAgICAgUmVuZGVyT2JqZWN0KiBvID0gYmlkaUZpcnN0KHRoaXMsIDAsIGZh bHNlKTsKKyAgICAgICAgUmVuZGVyT2JqZWN0KiBvID0gYmlkaUZpcnN0Tm90U2tpcHBpbmdJbmxp bmVzKHRoaXMpOwogICAgICAgICB3aGlsZSAobykgewogICAgICAgICAgICAgaWYgKCFvLT5pc1Bv c2l0aW9uZWQoKSAmJiAoby0+aXNSZXBsYWNlZCgpIHx8IG8tPmlzRmxvYXRpbmcoKSkpIHsKICAg ICAgICAgICAgICAgICBvLT5sYXlvdXRJZk5lZWRlZCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcAppbmRleCBmMzA1Yzg2OWMyNTIx MzA0YzNjNTdmNDE4YjVkM2ZjNWJmMGIxMDAyLi5mMjlkZjkyZWJmYjI2NmE1MzViZTBiYjkyZDQw OWMyMWVjMzgyNGUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy QmxvY2tMaW5lTGF5b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy QmxvY2tMaW5lTGF5b3V0LmNwcApAQCAtNzUzLDcgKzc1Myw3IEBAIHZvaWQgUmVuZGVyQmxvY2s6 OmxheW91dElubGluZUNoaWxkcmVuKGJvb2wgcmVsYXlvdXRDaGlsZHJlbiwgaW50JiByZXBhaW50 TG9naWNhCiAgICAgaWYgKGZpcnN0Q2hpbGQoKSkgewogICAgICAgICAvLyBsYXlvdXQgcmVwbGFj ZWQgZWxlbWVudHMKICAgICAgICAgYm9vbCBlbmRPZklubGluZSA9IGZhbHNlOwotICAgICAgICBS ZW5kZXJPYmplY3QqIG8gPSBiaWRpRmlyc3QodGhpcywgMCwgZmFsc2UpOworICAgICAgICBSZW5k ZXJPYmplY3QqIG8gPSBiaWRpRmlyc3ROb3RTa2lwcGluZ0lubGluZXModGhpcyk7CiAgICAgICAg IFZlY3RvcjxGbG9hdFdpdGhSZWN0PiBmbG9hdHM7CiAgICAgICAgIGJvb2wgaGFzSW5saW5lQ2hp bGQgPSBmYWxzZTsKICAgICAgICAgd2hpbGUgKG8pIHsKQEAgLTEyNzQsNyArMTI3NCw3IEBAIFJv b3RJbmxpbmVCb3gqIFJlbmRlckJsb2NrOjpkZXRlcm1pbmVTdGFydFBvc2l0aW9uKGJvb2wmIGZp cnN0TGluZSwgYm9vbCYgZnVsbExhCiAgICAgICAgIHJlc29sdmVyLnNldEVvckRpcihkaXJlY3Rp b24pOwogICAgICAgICByZXNvbHZlci5zZXRDb250ZXh0KEJpZGlDb250ZXh0OjpjcmVhdGUobHRy ID8gMCA6IDEsIGRpcmVjdGlvbiwgc3R5bGUoKS0+dW5pY29kZUJpZGkoKSA9PSBPdmVycmlkZSwg RnJvbVN0eWxlT3JET00pKTsKIAotICAgICAgICBzdGFydE9iaiA9IGJpZGlGaXJzdCh0aGlzLCAm cmVzb2x2ZXIpOworICAgICAgICBzdGFydE9iaiA9IGJpZGlGaXJzdFNraXBwaW5nSW5saW5lcyh0 aGlzLCAmcmVzb2x2ZXIpOwogICAgIH0KIAogICAgIHJlc29sdmVyLnNldFBvc2l0aW9uKElubGlu ZUl0ZXJhdG9yKHRoaXMsIHN0YXJ0T2JqLCBwb3MpKTsK