139445 2014-12-09 06:28:25 -0800 Refactor of rebuildFloatingObjectSetFromIntrudingFloats function after r176957. 2014-12-09 09:44:08 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jfernandez jfernandez commit-queue darin esprehn+autocc glenn hyatt jfernandez kondapallykalyan oldest_to_newest 1053769 0 jfernandez 2014-12-09 06:28:25 -0800 Refactor of rebuildFloatingObjectSetFromIntrudingFloats function after r176957. 1053772 1 242917 jfernandez 2014-12-09 06:46:01 -0800 Created attachment 242917 Patch 1053773 2 jfernandez 2014-12-09 06:49:50 -0800 This bug has been created to complete the changes suggested in the review of the patch for bug #139150. 1053781 3 242917 darin 2014-12-09 07:33:39 -0800 Comment on attachment 242917 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=242917&action=review > Source/WebCore/rendering/RenderBlockFlow.cpp:191 > + if (!siblingBlock.avoidsFloats()) { > + previousBlock = &siblingBlock; > + break; > + } This could just be: if (!siblingBlock.avoidFloats()) return &siblingBlock; Then we could get rid of the previousBlock local variable entirely. 1053789 4 242922 jfernandez 2014-12-09 08:12:25 -0800 Created attachment 242922 updated-patch Applied suggested changes. 1053825 5 242922 commit-queue 2014-12-09 09:44:04 -0800 Comment on attachment 242922 updated-patch Clearing flags on attachment: 242922 Committed r177021: <http://trac.webkit.org/changeset/177021> 1053826 6 commit-queue 2014-12-09 09:44:08 -0800 All reviewed patches have been landed. Closing bug. 242917 2014-12-09 06:46:01 -0800 2014-12-09 08:12:19 -0800 Patch bug-139445-20141209154635.patch text/plain 8508 jfernandez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3MDE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjA0YmM5ODM1NTk4NzRh MWQ2ZjQ2MDI2MmY4N2VkNmQxNWQ2ZmVjYi4uOTE5MTJiMzkwZjMxYzFhZjhkNmIxMmU1NDhkYTFk Y2MzZDZiN2ZjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE0LTEyLTA5ICBKYXZp ZXIgRmVybmFuZGV6ICA8amZlcm5hbmRlekBpZ2FsaWEuY29tPgorCisgICAgICAgIFJlZmFjdG9y IG9mIHJlYnVpbGRGbG9hdGluZ09iamVjdFNldEZyb21JbnRydWRpbmdGbG9hdHMgZnVuY3Rpb24g YWZ0ZXIgcjE3Njk1Ny4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEzOTQ0NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFRoZSBmdW5jdGlvbiByZWJ1aWxkRmxvYXRpbmdPYmplY3RTZXRGcm9tSW50cnVkaW5n RmxvYXRzIHdvdWxkIGJlIGNsZWFyZXIgaWYKKyAgICAgICAgd2UgdXNlIGEgaGVscGVyIGZ1bmN0 aW9uIHRvIGxvY2F0ZSB0aGUgcHJldmlvdXMgc2libGluZyB3aXRoIG92ZXJoYW5naW5nIGZsb2F0 cy4KKworICAgICAgICBUaGVzZSBjaGFuZ2VzIGhhcyBiZWVuIHN1Z2dlc3RlZCBhcyBwYXJ0IG9m IHRoZSBwYXRjaCByZXZpZXcgZm9yIGJ1ZyAjMTM5MTUwLCB3aGljaAorICAgICAgICBsYW5kZWQg aW4gcjE3Njk1Ny4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGJlaGF2aW9yIGNoYW5nZS4K KworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9jay5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJCbG9jazo6YXZvaWRzRmxvYXRzKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy QmxvY2tGbG93LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrRmxvdzo6cHJldmlv dXNTaWJsaW5nV2l0aE92ZXJoYW5naW5nRmxvYXRzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckJsb2NrRmxvdzo6cmVidWlsZEZsb2F0aW5nT2JqZWN0U2V0RnJvbUludHJ1ZGluZ0Zsb2F0cyk6 CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5oOgorICAgICAgICAqIHJlbmRl cmluZy9SZW5kZXJCb3guaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6aXNHcmlkSXRl bSk6CisKIDIwMTQtMTItMDkgIEFsYmVydG8gR2FyY2lhICA8YmVydG9AaWdhbGlhLmNvbT4KIAog ICAgICAgICBbTWVkaWFdW0dUS11bRUZMXSBSZWR1Y2Ugc3R5bGUgdXBkYXRlcyAocGFpbnRpbmcp IGluIGNvbnRyb2xzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy QmxvY2suY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAppbmRl eCAwMjYyNTk5ZWY0MzE2Y2ZiYjU3MTY1NWUwMGM4YmNlODkxZmI0ZmJkLi43YjRhODQxYWFkOWY4 ZDljMDRjZWY2ZjQ5MGUwZWVkOWZhODlkOTQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCbG9jay5jcHAKQEAgLTIzODQsOCArMjM4NCw3IEBAIExheW91dFVuaXQgUmVuZGVyQmxv Y2s6OmFkanVzdExvZ2ljYWxSaWdodE9mZnNldEZvckxpbmUoTGF5b3V0VW5pdCBvZmZzZXRGcm9t RmxvCiBib29sIFJlbmRlckJsb2NrOjphdm9pZHNGbG9hdHMoKSBjb25zdAogewogICAgIC8vIEZs b2F0cyBjYW4ndCBpbnRydWRlIGludG8gb3VyIGJveCBpZiB3ZSBoYXZlIGEgbm9uLWF1dG8gY29s dW1uIGNvdW50IG9yIHdpZHRoLgotICAgIHJldHVybiBSZW5kZXJCb3g6OmF2b2lkc0Zsb2F0cygp Ci0gICAgICAgIHx8IHN0eWxlKCkuaGFzRmxvd0Zyb20oKTsKKyAgICByZXR1cm4gUmVuZGVyQm94 Ojphdm9pZHNGbG9hdHMoKSB8fCBzdHlsZSgpLmhhc0Zsb3dGcm9tKCk7CiB9CiAKIGJvb2wgUmVu ZGVyQmxvY2s6OmlzUG9pbnRJbk92ZXJmbG93Q29udHJvbChIaXRUZXN0UmVzdWx0JiByZXN1bHQs IGNvbnN0IExheW91dFBvaW50JiBsb2NhdGlvbkluQ29udGFpbmVyLCBjb25zdCBMYXlvdXRQb2lu dCYgYWNjdW11bGF0ZWRPZmZzZXQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQmxvY2tGbG93LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC bG9ja0Zsb3cuY3BwCmluZGV4IGFjOTFkZTY5ZTgwMTAzMzNiMzE4MzFhNjBhMGQxZjljNzZhYTkz N2UuLjhmMjEyZjBkODEyNDEzODAwY2I1YWZkNDUwZGVhNDE3MWU0YjA0N2MgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCkBAIC0xNzUsNiArMTc1LDI3 IEBAIHZvaWQgUmVuZGVyQmxvY2tGbG93Ojp3aWxsQmVEZXN0cm95ZWQoKQogICAgIFJlbmRlckJv eDo6d2lsbEJlRGVzdHJveWVkKCk7CiB9CiAKK1JlbmRlckJsb2NrRmxvdyogUmVuZGVyQmxvY2tG bG93OjpwcmV2aW91c1NpYmxpbmdXaXRoT3ZlcmhhbmdpbmdGbG9hdHMoYm9vbCYgcGFyZW50SGFz RmxvYXRzKSBjb25zdAoreworICAgIC8vIEF0dGVtcHQgdG8gbG9jYXRlIGEgcHJldmlvdXMgc2li bGluZyB3aXRoIG92ZXJoYW5naW5nIGZsb2F0cy4gV2Ugc2tpcCBhbnkgZWxlbWVudHMgdGhhdCBh cmUKKyAgICAvLyBvdXQgb2YgZmxvdyAobGlrZSBmbG9hdGluZy9wb3NpdGlvbmVkIGVsZW1lbnRz KSwgYW5kIHdlIGFsc28gc2tpcCBvdmVyIGFueSBvYmplY3RzIHRoYXQgbWF5IGhhdmUgc2hpZnRl ZAorICAgIC8vIHRvIGF2b2lkIGZsb2F0cy4KKyAgICBwYXJlbnRIYXNGbG9hdHMgPSBmYWxzZTsK KyAgICBSZW5kZXJCbG9ja0Zsb3cqIHByZXZpb3VzQmxvY2sgPSBudWxscHRyOworICAgIGZvciAo UmVuZGVyT2JqZWN0KiBzaWJsaW5nID0gcHJldmlvdXNTaWJsaW5nKCk7IHNpYmxpbmc7IHNpYmxp bmcgPSBzaWJsaW5nLT5wcmV2aW91c1NpYmxpbmcoKSkgeworICAgICAgICBpZiAoaXM8UmVuZGVy QmxvY2tGbG93Pigqc2libGluZykpIHsKKyAgICAgICAgICAgIGF1dG8mIHNpYmxpbmdCbG9jayA9 IGRvd25jYXN0PFJlbmRlckJsb2NrRmxvdz4oKnNpYmxpbmcpOworICAgICAgICAgICAgaWYgKCFz aWJsaW5nQmxvY2suYXZvaWRzRmxvYXRzKCkpIHsKKyAgICAgICAgICAgICAgICBwcmV2aW91c0Js b2NrID0gJnNpYmxpbmdCbG9jazsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAg IH0KKyAgICAgICAgfQorICAgICAgICBpZiAoc2libGluZy0+aXNGbG9hdGluZygpKQorICAgICAg ICAgICAgcGFyZW50SGFzRmxvYXRzID0gdHJ1ZTsKKyAgICB9CisgICAgcmV0dXJuIHByZXZpb3Vz QmxvY2s7Cit9CisKIHZvaWQgUmVuZGVyQmxvY2tGbG93OjpyZWJ1aWxkRmxvYXRpbmdPYmplY3RT ZXRGcm9tSW50cnVkaW5nRmxvYXRzKCkKIHsKICAgICBpZiAobV9mbG9hdGluZ09iamVjdHMpCkBA IC0yMTUsMzYgKzIzNiwyNiBAQCB2b2lkIFJlbmRlckJsb2NrRmxvdzo6cmVidWlsZEZsb2F0aW5n T2JqZWN0U2V0RnJvbUludHJ1ZGluZ0Zsb2F0cygpCiAgICAgaWYgKCFpczxSZW5kZXJCbG9ja0Zs b3c+KHBhcmVudCgpKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgLy8gQXR0ZW1wdCB0byBsb2Nh dGUgYSBwcmV2aW91cyBzaWJsaW5nIHdpdGggb3ZlcmhhbmdpbmcgZmxvYXRzLiBXZSBza2lwIGFu eSBlbGVtZW50cyB0aGF0IGFyZQotICAgIC8vIG91dCBvZiBmbG93IChsaWtlIGZsb2F0aW5nL3Bv c2l0aW9uZWQgZWxlbWVudHMpLCBhbmQgd2UgYWxzbyBza2lwIG92ZXIgYW55IG9iamVjdHMgdGhh dCBtYXkgaGF2ZSBzaGlmdGVkCi0gICAgLy8gdG8gYXZvaWQgZmxvYXRzLgotICAgIFJlbmRlckJs b2NrRmxvdyYgcGFyZW50QmxvY2sgPSBkb3duY2FzdDxSZW5kZXJCbG9ja0Zsb3c+KCpwYXJlbnQo KSk7Ci0gICAgYm9vbCBwYXJlbnRIYXNGbG9hdHMgPSBmYWxzZTsKLSAgICBSZW5kZXJPYmplY3Qq IHByZXYgPSBwcmV2aW91c1NpYmxpbmcoKTsKLSAgICB3aGlsZSAocHJldiAmJiAoIWlzPFJlbmRl ckJveD4oKnByZXYpIHx8ICFpczxSZW5kZXJCbG9ja0Zsb3c+KCpwcmV2KSB8fCBkb3duY2FzdDxS ZW5kZXJCbG9ja0Zsb3c+KCpwcmV2KS5hdm9pZHNGbG9hdHMoKSB8fCBkb3duY2FzdDxSZW5kZXJC bG9jaz4ocHJldiktPmNyZWF0ZXNOZXdGb3JtYXR0aW5nQ29udGV4dCgpKSkgewotICAgICAgICBp ZiAocHJldi0+aXNGbG9hdGluZygpKQotICAgICAgICAgICAgcGFyZW50SGFzRmxvYXRzID0gdHJ1 ZTsKLSAgICAgICAgcHJldiA9IHByZXYtPnByZXZpb3VzU2libGluZygpOwotICAgIH0KLQogICAg IC8vIEZpcnN0IGFkZCBpbiBmbG9hdHMgZnJvbSB0aGUgcGFyZW50LiBTZWxmLWNvbGxhcHNpbmcg YmxvY2tzIGxldCB0aGVpciBwYXJlbnQgdHJhY2sgYW55IGZsb2F0cyB0aGF0IGludHJ1ZGUgaW50 bwogICAgIC8vIHRoZW0gKGFzIG9wcG9zZWQgdG8gZmxvYXRzIHRoZXkgY29udGFpbiB0aGVtc2Vs dmVzKSBzbyBjaGVjayBmb3IgdGhvc2UgaGVyZSB0b28uCisgICAgUmVuZGVyQmxvY2tGbG93JiBw YXJlbnRCbG9jayA9IGRvd25jYXN0PFJlbmRlckJsb2NrRmxvdz4oKnBhcmVudCgpKTsKKyAgICBi b29sIHBhcmVudEhhc0Zsb2F0cyA9IGZhbHNlOworICAgIFJlbmRlckJsb2NrRmxvdyogcHJldmlv dXNCbG9jayA9IHByZXZpb3VzU2libGluZ1dpdGhPdmVyaGFuZ2luZ0Zsb2F0cyhwYXJlbnRIYXNG bG9hdHMpOwogICAgIExheW91dFVuaXQgbG9naWNhbFRvcE9mZnNldCA9IGxvZ2ljYWxUb3AoKTsK LSAgICBpZiAocGFyZW50SGFzRmxvYXRzIHx8IChwYXJlbnRCbG9jay5sb3dlc3RGbG9hdExvZ2lj YWxCb3R0b20oKSA+IGxvZ2ljYWxUb3BPZmZzZXQgJiYgcHJldiAmJiBkb3duY2FzdDxSZW5kZXJC bG9ja0Zsb3c+KCpwcmV2KS5pc1NlbGZDb2xsYXBzaW5nQmxvY2soKSkpCisgICAgaWYgKHBhcmVu dEhhc0Zsb2F0cyB8fCAocGFyZW50QmxvY2subG93ZXN0RmxvYXRMb2dpY2FsQm90dG9tKCkgPiBs b2dpY2FsVG9wT2Zmc2V0ICYmIHByZXZpb3VzQmxvY2sgJiYgcHJldmlvdXNCbG9jay0+aXNTZWxm Q29sbGFwc2luZ0Jsb2NrKCkpKQogICAgICAgICBhZGRJbnRydWRpbmdGbG9hdHMoJnBhcmVudEJs b2NrLCBwYXJlbnRCbG9jay5sb2dpY2FsTGVmdE9mZnNldEZvckNvbnRlbnQoKSwgbG9naWNhbFRv cE9mZnNldCk7CiAgICAgCiAgICAgTGF5b3V0VW5pdCBsb2dpY2FsTGVmdE9mZnNldCA9IDA7Ci0g ICAgaWYgKHByZXYpCi0gICAgICAgIGxvZ2ljYWxUb3BPZmZzZXQgLT0gZG93bmNhc3Q8UmVuZGVy Qm94PigqcHJldikubG9naWNhbFRvcCgpOworICAgIGlmIChwcmV2aW91c0Jsb2NrKQorICAgICAg ICBsb2dpY2FsVG9wT2Zmc2V0IC09IHByZXZpb3VzQmxvY2stPmxvZ2ljYWxUb3AoKTsKICAgICBl bHNlIHsKLSAgICAgICAgcHJldiA9ICZwYXJlbnRCbG9jazsKKyAgICAgICAgcHJldmlvdXNCbG9j ayA9ICZwYXJlbnRCbG9jazsKICAgICAgICAgbG9naWNhbExlZnRPZmZzZXQgKz0gcGFyZW50Qmxv Y2subG9naWNhbExlZnRPZmZzZXRGb3JDb250ZW50KCk7CiAgICAgfQogCiAgICAgLy8gQWRkIG92 ZXJoYW5naW5nIGZsb2F0cyBmcm9tIHRoZSBwcmV2aW91cyBSZW5kZXJCbG9jaywgYnV0IG9ubHkg aWYgaXQgaGFzIGEgZmxvYXQgdGhhdCBpbnRydWRlcyBpbnRvIG91ciBzcGFjZS4gICAgCi0gICAg UmVuZGVyQmxvY2tGbG93JiBibG9jayA9IGRvd25jYXN0PFJlbmRlckJsb2NrRmxvdz4oKnByZXYp OwotICAgIGlmIChibG9jay5tX2Zsb2F0aW5nT2JqZWN0cyAmJiBibG9jay5sb3dlc3RGbG9hdExv Z2ljYWxCb3R0b20oKSA+IGxvZ2ljYWxUb3BPZmZzZXQpCi0gICAgICAgIGFkZEludHJ1ZGluZ0Zs b2F0cygmYmxvY2ssIGxvZ2ljYWxMZWZ0T2Zmc2V0LCBsb2dpY2FsVG9wT2Zmc2V0KTsKKyAgICBp ZiAocHJldmlvdXNCbG9jay0+bV9mbG9hdGluZ09iamVjdHMgJiYgcHJldmlvdXNCbG9jay0+bG93 ZXN0RmxvYXRMb2dpY2FsQm90dG9tKCkgPiBsb2dpY2FsVG9wT2Zmc2V0KQorICAgICAgICBhZGRJ bnRydWRpbmdGbG9hdHMocHJldmlvdXNCbG9jaywgbG9naWNhbExlZnRPZmZzZXQsIGxvZ2ljYWxU b3BPZmZzZXQpOwogCiAgICAgaWYgKGNoaWxkcmVuSW5saW5lKCkpIHsKICAgICAgICAgTGF5b3V0 VW5pdCBjaGFuZ2VMb2dpY2FsVG9wID0gTGF5b3V0VW5pdDo6bWF4KCk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmggYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmgKaW5kZXggMGY2MDZkYjA3NmEwNTdjNGRlODQ0 MTdlOTdlMjRmNDIyZWU5MTU0OC4uMTc1OTE1ZWNlMjIwODA4N2JhMGMzN2U1YTlmNTlkNjRlOWE2 ZDNjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxv dy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuaApAQCAt NDYyLDYgKzQ2Miw4IEBAIHByaXZhdGU6CiAgICAgYm9vbCByZWNvbXB1dGVMb2dpY2FsV2lkdGhB bmRDb2x1bW5XaWR0aCgpOwogICAgIExheW91dFVuaXQgY29sdW1uR2FwKCkgY29uc3Q7CiAgICAg CisgICAgUmVuZGVyQmxvY2tGbG93KiBwcmV2aW91c1NpYmxpbmdXaXRoT3ZlcmhhbmdpbmdGbG9h dHMoYm9vbCYgcGFyZW50SGFzRmxvYXRzKSBjb25zdDsKKwogICAgIC8vIENhbGxlZCB0byBsYXkg b3V0IHRoZSBsZWdlbmQgZm9yIGEgZmllbGRzZXQgb3IgdGhlIHJ1YnkgdGV4dCBvZiBhIHJ1Ynkg cnVuLiBBbHNvIHVzZWQgYnkgbXVsdGktY29sdW1uIGxheW91dCB0byBoYW5kbGUKICAgICAvLyB0 aGUgZmxvdyB0aHJlYWQgY2hpbGQuCiAgICAgdmlydHVhbCBSZW5kZXJPYmplY3QqIGxheW91dFNw ZWNpYWxFeGNsdWRlZENoaWxkKGJvb2wgLypyZWxheW91dENoaWxkcmVuKi8pOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJveC5oCmluZGV4IDExNTYwNTZkNjJjOTg5YWQ4NTdlN2M1ZTA3NGZh NWNlMDk4ZmVlZjcuLjdmMzQ3YzViYTUyOTFlMDExZDEwZGQ3YWJiMzRlMWExZTc2N2QzZTggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKQEAgLTUzMCwxMCArNTMwLDYgQEAgcHVi bGljOgogICAgIGJvb2wgaXNEZXByZWNhdGVkRmxleEl0ZW0oKSBjb25zdCB7IHJldHVybiAhaXNJ bmxpbmUoKSAmJiAhaXNGbG9hdGluZ09yT3V0T2ZGbG93UG9zaXRpb25lZCgpICYmIHBhcmVudCgp ICYmIHBhcmVudCgpLT5pc0RlcHJlY2F0ZWRGbGV4aWJsZUJveCgpOyB9CiAgICAgYm9vbCBpc0Zs ZXhJdGVtSW5jbHVkaW5nRGVwcmVjYXRlZCgpIGNvbnN0IHsgcmV0dXJuICFpc0lubGluZSgpICYm ICFpc0Zsb2F0aW5nT3JPdXRPZkZsb3dQb3NpdGlvbmVkKCkgJiYgcGFyZW50KCkgJiYgcGFyZW50 KCktPmlzRmxleGlibGVCb3hJbmNsdWRpbmdEZXByZWNhdGVkKCk7IH0KICAgICAKLSNpZiBFTkFC TEUoQ1NTX0dSSURfTEFZT1VUKQotICAgIGJvb2wgaXNHcmlkSXRlbSgpIGNvbnN0IHsgcmV0dXJu IHBhcmVudCgpICYmIHBhcmVudCgpLT5pc1JlbmRlckdyaWQoKTsgfQotI2VuZGlmCi0KICAgICB2 aXJ0dWFsIExheW91dFVuaXQgbGluZUhlaWdodChib29sIGZpcnN0TGluZSwgTGluZURpcmVjdGlv bk1vZGUsIExpbmVQb3NpdGlvbk1vZGUgPSBQb3NpdGlvbk9uQ29udGFpbmluZ0xpbmUpIGNvbnN0 IG92ZXJyaWRlOwogICAgIHZpcnR1YWwgaW50IGJhc2VsaW5lUG9zaXRpb24oRm9udEJhc2VsaW5l LCBib29sIGZpcnN0TGluZSwgTGluZURpcmVjdGlvbk1vZGUsIExpbmVQb3NpdGlvbk1vZGUgPSBQ b3NpdGlvbk9uQ29udGFpbmluZ0xpbmUpIGNvbnN0IG92ZXJyaWRlOwogCkBAIC02NTksNiArNjU1 LDEwIEBAIHByaXZhdGU6CiAgICAgdm9pZCB1cGRhdGVTaGFwZU91dHNpZGVJbmZvQWZ0ZXJTdHls ZUNoYW5nZShjb25zdCBSZW5kZXJTdHlsZSYsIGNvbnN0IFJlbmRlclN0eWxlKiBvbGRTdHlsZSk7 CiAjZW5kaWYKIAorI2lmIEVOQUJMRShDU1NfR1JJRF9MQVlPVVQpCisgICAgYm9vbCBpc0dyaWRJ dGVtKCkgY29uc3QgeyByZXR1cm4gcGFyZW50KCkgJiYgcGFyZW50KCktPmlzUmVuZGVyR3JpZCgp OyB9CisjZW5kaWYKKwogICAgIGJvb2wgc2Nyb2xsTGF5ZXIoU2Nyb2xsRGlyZWN0aW9uLCBTY3Jv bGxHcmFudWxhcml0eSwgZmxvYXQgbXVsdGlwbGllciwgRWxlbWVudCoqIHN0b3BFbGVtZW50KTsK IAogICAgIGJvb2wgZml4ZWRFbGVtZW50TGF5c091dFJlbGF0aXZlVG9GcmFtZShjb25zdCBGcmFt ZVZpZXcmKSBjb25zdDsK 242922 2014-12-09 08:12:25 -0800 2014-12-09 09:44:04 -0800 updated-patch bug-139445-20141209171259.patch text/plain 8405 jfernandez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3MDE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjA0YmM5ODM1NTk4NzRh MWQ2ZjQ2MDI2MmY4N2VkNmQxNWQ2ZmVjYi4uOTE5MTJiMzkwZjMxYzFhZjhkNmIxMmU1NDhkYTFk Y2MzZDZiN2ZjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE0LTEyLTA5ICBKYXZp ZXIgRmVybmFuZGV6ICA8amZlcm5hbmRlekBpZ2FsaWEuY29tPgorCisgICAgICAgIFJlZmFjdG9y IG9mIHJlYnVpbGRGbG9hdGluZ09iamVjdFNldEZyb21JbnRydWRpbmdGbG9hdHMgZnVuY3Rpb24g YWZ0ZXIgcjE3Njk1Ny4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEzOTQ0NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFRoZSBmdW5jdGlvbiByZWJ1aWxkRmxvYXRpbmdPYmplY3RTZXRGcm9tSW50cnVkaW5n RmxvYXRzIHdvdWxkIGJlIGNsZWFyZXIgaWYKKyAgICAgICAgd2UgdXNlIGEgaGVscGVyIGZ1bmN0 aW9uIHRvIGxvY2F0ZSB0aGUgcHJldmlvdXMgc2libGluZyB3aXRoIG92ZXJoYW5naW5nIGZsb2F0 cy4KKworICAgICAgICBUaGVzZSBjaGFuZ2VzIGhhcyBiZWVuIHN1Z2dlc3RlZCBhcyBwYXJ0IG9m IHRoZSBwYXRjaCByZXZpZXcgZm9yIGJ1ZyAjMTM5MTUwLCB3aGljaAorICAgICAgICBsYW5kZWQg aW4gcjE3Njk1Ny4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGJlaGF2aW9yIGNoYW5nZS4K KworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9jay5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJCbG9jazo6YXZvaWRzRmxvYXRzKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy QmxvY2tGbG93LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrRmxvdzo6cHJldmlv dXNTaWJsaW5nV2l0aE92ZXJoYW5naW5nRmxvYXRzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckJsb2NrRmxvdzo6cmVidWlsZEZsb2F0aW5nT2JqZWN0U2V0RnJvbUludHJ1ZGluZ0Zsb2F0cyk6 CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5oOgorICAgICAgICAqIHJlbmRl cmluZy9SZW5kZXJCb3guaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6aXNHcmlkSXRl bSk6CisKIDIwMTQtMTItMDkgIEFsYmVydG8gR2FyY2lhICA8YmVydG9AaWdhbGlhLmNvbT4KIAog ICAgICAgICBbTWVkaWFdW0dUS11bRUZMXSBSZWR1Y2Ugc3R5bGUgdXBkYXRlcyAocGFpbnRpbmcp IGluIGNvbnRyb2xzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy QmxvY2suY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAppbmRl eCAwMjYyNTk5ZWY0MzE2Y2ZiYjU3MTY1NWUwMGM4YmNlODkxZmI0ZmJkLi43YjRhODQxYWFkOWY4 ZDljMDRjZWY2ZjQ5MGUwZWVkOWZhODlkOTQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCbG9jay5jcHAKQEAgLTIzODQsOCArMjM4NCw3IEBAIExheW91dFVuaXQgUmVuZGVyQmxv Y2s6OmFkanVzdExvZ2ljYWxSaWdodE9mZnNldEZvckxpbmUoTGF5b3V0VW5pdCBvZmZzZXRGcm9t RmxvCiBib29sIFJlbmRlckJsb2NrOjphdm9pZHNGbG9hdHMoKSBjb25zdAogewogICAgIC8vIEZs b2F0cyBjYW4ndCBpbnRydWRlIGludG8gb3VyIGJveCBpZiB3ZSBoYXZlIGEgbm9uLWF1dG8gY29s dW1uIGNvdW50IG9yIHdpZHRoLgotICAgIHJldHVybiBSZW5kZXJCb3g6OmF2b2lkc0Zsb2F0cygp Ci0gICAgICAgIHx8IHN0eWxlKCkuaGFzRmxvd0Zyb20oKTsKKyAgICByZXR1cm4gUmVuZGVyQm94 Ojphdm9pZHNGbG9hdHMoKSB8fCBzdHlsZSgpLmhhc0Zsb3dGcm9tKCk7CiB9CiAKIGJvb2wgUmVu ZGVyQmxvY2s6OmlzUG9pbnRJbk92ZXJmbG93Q29udHJvbChIaXRUZXN0UmVzdWx0JiByZXN1bHQs IGNvbnN0IExheW91dFBvaW50JiBsb2NhdGlvbkluQ29udGFpbmVyLCBjb25zdCBMYXlvdXRQb2lu dCYgYWNjdW11bGF0ZWRPZmZzZXQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQmxvY2tGbG93LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC bG9ja0Zsb3cuY3BwCmluZGV4IGFjOTFkZTY5ZTgwMTAzMzNiMzE4MzFhNjBhMGQxZjljNzZhYTkz N2UuLjNlMTlkNDZiNmNjMWIxOTc1ZDdjZjg1Y2Q1MGNhODhkYzgwMzNlNDEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCkBAIC0xNzUsNiArMTc1LDI0 IEBAIHZvaWQgUmVuZGVyQmxvY2tGbG93Ojp3aWxsQmVEZXN0cm95ZWQoKQogICAgIFJlbmRlckJv eDo6d2lsbEJlRGVzdHJveWVkKCk7CiB9CiAKK1JlbmRlckJsb2NrRmxvdyogUmVuZGVyQmxvY2tG bG93OjpwcmV2aW91c1NpYmxpbmdXaXRoT3ZlcmhhbmdpbmdGbG9hdHMoYm9vbCYgcGFyZW50SGFz RmxvYXRzKSBjb25zdAoreworICAgIC8vIEF0dGVtcHQgdG8gbG9jYXRlIGEgcHJldmlvdXMgc2li bGluZyB3aXRoIG92ZXJoYW5naW5nIGZsb2F0cy4gV2Ugc2tpcCBhbnkgZWxlbWVudHMgdGhhdCBh cmUKKyAgICAvLyBvdXQgb2YgZmxvdyAobGlrZSBmbG9hdGluZy9wb3NpdGlvbmVkIGVsZW1lbnRz KSwgYW5kIHdlIGFsc28gc2tpcCBvdmVyIGFueSBvYmplY3RzIHRoYXQgbWF5IGhhdmUgc2hpZnRl ZAorICAgIC8vIHRvIGF2b2lkIGZsb2F0cy4KKyAgICBwYXJlbnRIYXNGbG9hdHMgPSBmYWxzZTsK KyAgICBmb3IgKFJlbmRlck9iamVjdCogc2libGluZyA9IHByZXZpb3VzU2libGluZygpOyBzaWJs aW5nOyBzaWJsaW5nID0gc2libGluZy0+cHJldmlvdXNTaWJsaW5nKCkpIHsKKyAgICAgICAgaWYg KGlzPFJlbmRlckJsb2NrRmxvdz4oKnNpYmxpbmcpKSB7CisgICAgICAgICAgICBhdXRvJiBzaWJs aW5nQmxvY2sgPSBkb3duY2FzdDxSZW5kZXJCbG9ja0Zsb3c+KCpzaWJsaW5nKTsKKyAgICAgICAg ICAgIGlmICghc2libGluZ0Jsb2NrLmF2b2lkc0Zsb2F0cygpKQorICAgICAgICAgICAgICAgIHJl dHVybiAmc2libGluZ0Jsb2NrOworICAgICAgICB9CisgICAgICAgIGlmIChzaWJsaW5nLT5pc0Zs b2F0aW5nKCkpCisgICAgICAgICAgICBwYXJlbnRIYXNGbG9hdHMgPSB0cnVlOworICAgIH0KKyAg ICByZXR1cm4gbnVsbHB0cjsKK30KKwogdm9pZCBSZW5kZXJCbG9ja0Zsb3c6OnJlYnVpbGRGbG9h dGluZ09iamVjdFNldEZyb21JbnRydWRpbmdGbG9hdHMoKQogewogICAgIGlmIChtX2Zsb2F0aW5n T2JqZWN0cykKQEAgLTIxNSwzNiArMjMzLDI2IEBAIHZvaWQgUmVuZGVyQmxvY2tGbG93OjpyZWJ1 aWxkRmxvYXRpbmdPYmplY3RTZXRGcm9tSW50cnVkaW5nRmxvYXRzKCkKICAgICBpZiAoIWlzPFJl bmRlckJsb2NrRmxvdz4ocGFyZW50KCkpKQogICAgICAgICByZXR1cm47CiAKLSAgICAvLyBBdHRl bXB0IHRvIGxvY2F0ZSBhIHByZXZpb3VzIHNpYmxpbmcgd2l0aCBvdmVyaGFuZ2luZyBmbG9hdHMu IFdlIHNraXAgYW55IGVsZW1lbnRzIHRoYXQgYXJlCi0gICAgLy8gb3V0IG9mIGZsb3cgKGxpa2Ug ZmxvYXRpbmcvcG9zaXRpb25lZCBlbGVtZW50cyksIGFuZCB3ZSBhbHNvIHNraXAgb3ZlciBhbnkg b2JqZWN0cyB0aGF0IG1heSBoYXZlIHNoaWZ0ZWQKLSAgICAvLyB0byBhdm9pZCBmbG9hdHMuCi0g ICAgUmVuZGVyQmxvY2tGbG93JiBwYXJlbnRCbG9jayA9IGRvd25jYXN0PFJlbmRlckJsb2NrRmxv dz4oKnBhcmVudCgpKTsKLSAgICBib29sIHBhcmVudEhhc0Zsb2F0cyA9IGZhbHNlOwotICAgIFJl bmRlck9iamVjdCogcHJldiA9IHByZXZpb3VzU2libGluZygpOwotICAgIHdoaWxlIChwcmV2ICYm ICghaXM8UmVuZGVyQm94PigqcHJldikgfHwgIWlzPFJlbmRlckJsb2NrRmxvdz4oKnByZXYpIHx8 IGRvd25jYXN0PFJlbmRlckJsb2NrRmxvdz4oKnByZXYpLmF2b2lkc0Zsb2F0cygpIHx8IGRvd25j YXN0PFJlbmRlckJsb2NrPihwcmV2KS0+Y3JlYXRlc05ld0Zvcm1hdHRpbmdDb250ZXh0KCkpKSB7 Ci0gICAgICAgIGlmIChwcmV2LT5pc0Zsb2F0aW5nKCkpCi0gICAgICAgICAgICBwYXJlbnRIYXNG bG9hdHMgPSB0cnVlOwotICAgICAgICBwcmV2ID0gcHJldi0+cHJldmlvdXNTaWJsaW5nKCk7Ci0g ICAgfQotCiAgICAgLy8gRmlyc3QgYWRkIGluIGZsb2F0cyBmcm9tIHRoZSBwYXJlbnQuIFNlbGYt Y29sbGFwc2luZyBibG9ja3MgbGV0IHRoZWlyIHBhcmVudCB0cmFjayBhbnkgZmxvYXRzIHRoYXQg aW50cnVkZSBpbnRvCiAgICAgLy8gdGhlbSAoYXMgb3Bwb3NlZCB0byBmbG9hdHMgdGhleSBjb250 YWluIHRoZW1zZWx2ZXMpIHNvIGNoZWNrIGZvciB0aG9zZSBoZXJlIHRvby4KKyAgICBSZW5kZXJC bG9ja0Zsb3cmIHBhcmVudEJsb2NrID0gZG93bmNhc3Q8UmVuZGVyQmxvY2tGbG93PigqcGFyZW50 KCkpOworICAgIGJvb2wgcGFyZW50SGFzRmxvYXRzID0gZmFsc2U7CisgICAgUmVuZGVyQmxvY2tG bG93KiBwcmV2aW91c0Jsb2NrID0gcHJldmlvdXNTaWJsaW5nV2l0aE92ZXJoYW5naW5nRmxvYXRz KHBhcmVudEhhc0Zsb2F0cyk7CiAgICAgTGF5b3V0VW5pdCBsb2dpY2FsVG9wT2Zmc2V0ID0gbG9n aWNhbFRvcCgpOwotICAgIGlmIChwYXJlbnRIYXNGbG9hdHMgfHwgKHBhcmVudEJsb2NrLmxvd2Vz dEZsb2F0TG9naWNhbEJvdHRvbSgpID4gbG9naWNhbFRvcE9mZnNldCAmJiBwcmV2ICYmIGRvd25j YXN0PFJlbmRlckJsb2NrRmxvdz4oKnByZXYpLmlzU2VsZkNvbGxhcHNpbmdCbG9jaygpKSkKKyAg ICBpZiAocGFyZW50SGFzRmxvYXRzIHx8IChwYXJlbnRCbG9jay5sb3dlc3RGbG9hdExvZ2ljYWxC b3R0b20oKSA+IGxvZ2ljYWxUb3BPZmZzZXQgJiYgcHJldmlvdXNCbG9jayAmJiBwcmV2aW91c0Js b2NrLT5pc1NlbGZDb2xsYXBzaW5nQmxvY2soKSkpCiAgICAgICAgIGFkZEludHJ1ZGluZ0Zsb2F0 cygmcGFyZW50QmxvY2ssIHBhcmVudEJsb2NrLmxvZ2ljYWxMZWZ0T2Zmc2V0Rm9yQ29udGVudCgp LCBsb2dpY2FsVG9wT2Zmc2V0KTsKICAgICAKICAgICBMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0T2Zm c2V0ID0gMDsKLSAgICBpZiAocHJldikKLSAgICAgICAgbG9naWNhbFRvcE9mZnNldCAtPSBkb3du Y2FzdDxSZW5kZXJCb3g+KCpwcmV2KS5sb2dpY2FsVG9wKCk7CisgICAgaWYgKHByZXZpb3VzQmxv Y2spCisgICAgICAgIGxvZ2ljYWxUb3BPZmZzZXQgLT0gcHJldmlvdXNCbG9jay0+bG9naWNhbFRv cCgpOwogICAgIGVsc2UgewotICAgICAgICBwcmV2ID0gJnBhcmVudEJsb2NrOworICAgICAgICBw cmV2aW91c0Jsb2NrID0gJnBhcmVudEJsb2NrOwogICAgICAgICBsb2dpY2FsTGVmdE9mZnNldCAr PSBwYXJlbnRCbG9jay5sb2dpY2FsTGVmdE9mZnNldEZvckNvbnRlbnQoKTsKICAgICB9CiAKICAg ICAvLyBBZGQgb3ZlcmhhbmdpbmcgZmxvYXRzIGZyb20gdGhlIHByZXZpb3VzIFJlbmRlckJsb2Nr LCBidXQgb25seSBpZiBpdCBoYXMgYSBmbG9hdCB0aGF0IGludHJ1ZGVzIGludG8gb3VyIHNwYWNl LiAgICAKLSAgICBSZW5kZXJCbG9ja0Zsb3cmIGJsb2NrID0gZG93bmNhc3Q8UmVuZGVyQmxvY2tG bG93PigqcHJldik7Ci0gICAgaWYgKGJsb2NrLm1fZmxvYXRpbmdPYmplY3RzICYmIGJsb2NrLmxv d2VzdEZsb2F0TG9naWNhbEJvdHRvbSgpID4gbG9naWNhbFRvcE9mZnNldCkKLSAgICAgICAgYWRk SW50cnVkaW5nRmxvYXRzKCZibG9jaywgbG9naWNhbExlZnRPZmZzZXQsIGxvZ2ljYWxUb3BPZmZz ZXQpOworICAgIGlmIChwcmV2aW91c0Jsb2NrLT5tX2Zsb2F0aW5nT2JqZWN0cyAmJiBwcmV2aW91 c0Jsb2NrLT5sb3dlc3RGbG9hdExvZ2ljYWxCb3R0b20oKSA+IGxvZ2ljYWxUb3BPZmZzZXQpCisg ICAgICAgIGFkZEludHJ1ZGluZ0Zsb2F0cyhwcmV2aW91c0Jsb2NrLCBsb2dpY2FsTGVmdE9mZnNl dCwgbG9naWNhbFRvcE9mZnNldCk7CiAKICAgICBpZiAoY2hpbGRyZW5JbmxpbmUoKSkgewogICAg ICAgICBMYXlvdXRVbml0IGNoYW5nZUxvZ2ljYWxUb3AgPSBMYXlvdXRVbml0OjptYXgoKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuaCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuaAppbmRleCAwZjYwNmRiMDc2 YTA1N2M0ZGU4NDQxN2U5N2UyNGY0MjJlZTkxNTQ4Li4xNzU5MTVlY2UyMjA4MDg3YmEwYzM3ZTVh OWY1OWQ2NGU5YTZkM2M2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQmxvY2tGbG93LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2Nr Rmxvdy5oCkBAIC00NjIsNiArNDYyLDggQEAgcHJpdmF0ZToKICAgICBib29sIHJlY29tcHV0ZUxv Z2ljYWxXaWR0aEFuZENvbHVtbldpZHRoKCk7CiAgICAgTGF5b3V0VW5pdCBjb2x1bW5HYXAoKSBj b25zdDsKICAgICAKKyAgICBSZW5kZXJCbG9ja0Zsb3cqIHByZXZpb3VzU2libGluZ1dpdGhPdmVy aGFuZ2luZ0Zsb2F0cyhib29sJiBwYXJlbnRIYXNGbG9hdHMpIGNvbnN0OworCiAgICAgLy8gQ2Fs bGVkIHRvIGxheSBvdXQgdGhlIGxlZ2VuZCBmb3IgYSBmaWVsZHNldCBvciB0aGUgcnVieSB0ZXh0 IG9mIGEgcnVieSBydW4uIEFsc28gdXNlZCBieSBtdWx0aS1jb2x1bW4gbGF5b3V0IHRvIGhhbmRs ZQogICAgIC8vIHRoZSBmbG93IHRocmVhZCBjaGlsZC4KICAgICB2aXJ0dWFsIFJlbmRlck9iamVj dCogbGF5b3V0U3BlY2lhbEV4Y2x1ZGVkQ2hpbGQoYm9vbCAvKnJlbGF5b3V0Q2hpbGRyZW4qLyk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmggYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKaW5kZXggMTE1NjA1NmQ2MmM5ODlhZDg1 N2U3YzVlMDc0ZmE1Y2UwOThmZWVmNy4uN2YzNDdjNWJhNTI5MWUwMTFkMTBkZDdhYmIzNGUxYTFl NzY3ZDNlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaApAQCAtNTMwLDEwICs1 MzAsNiBAQCBwdWJsaWM6CiAgICAgYm9vbCBpc0RlcHJlY2F0ZWRGbGV4SXRlbSgpIGNvbnN0IHsg cmV0dXJuICFpc0lubGluZSgpICYmICFpc0Zsb2F0aW5nT3JPdXRPZkZsb3dQb3NpdGlvbmVkKCkg JiYgcGFyZW50KCkgJiYgcGFyZW50KCktPmlzRGVwcmVjYXRlZEZsZXhpYmxlQm94KCk7IH0KICAg ICBib29sIGlzRmxleEl0ZW1JbmNsdWRpbmdEZXByZWNhdGVkKCkgY29uc3QgeyByZXR1cm4gIWlz SW5saW5lKCkgJiYgIWlzRmxvYXRpbmdPck91dE9mRmxvd1Bvc2l0aW9uZWQoKSAmJiBwYXJlbnQo KSAmJiBwYXJlbnQoKS0+aXNGbGV4aWJsZUJveEluY2x1ZGluZ0RlcHJlY2F0ZWQoKTsgfQogICAg IAotI2lmIEVOQUJMRShDU1NfR1JJRF9MQVlPVVQpCi0gICAgYm9vbCBpc0dyaWRJdGVtKCkgY29u c3QgeyByZXR1cm4gcGFyZW50KCkgJiYgcGFyZW50KCktPmlzUmVuZGVyR3JpZCgpOyB9Ci0jZW5k aWYKLQogICAgIHZpcnR1YWwgTGF5b3V0VW5pdCBsaW5lSGVpZ2h0KGJvb2wgZmlyc3RMaW5lLCBM aW5lRGlyZWN0aW9uTW9kZSwgTGluZVBvc2l0aW9uTW9kZSA9IFBvc2l0aW9uT25Db250YWluaW5n TGluZSkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCBpbnQgYmFzZWxpbmVQb3NpdGlvbihG b250QmFzZWxpbmUsIGJvb2wgZmlyc3RMaW5lLCBMaW5lRGlyZWN0aW9uTW9kZSwgTGluZVBvc2l0 aW9uTW9kZSA9IFBvc2l0aW9uT25Db250YWluaW5nTGluZSkgY29uc3Qgb3ZlcnJpZGU7CiAKQEAg LTY1OSw2ICs2NTUsMTAgQEAgcHJpdmF0ZToKICAgICB2b2lkIHVwZGF0ZVNoYXBlT3V0c2lkZUlu Zm9BZnRlclN0eWxlQ2hhbmdlKGNvbnN0IFJlbmRlclN0eWxlJiwgY29uc3QgUmVuZGVyU3R5bGUq IG9sZFN0eWxlKTsKICNlbmRpZgogCisjaWYgRU5BQkxFKENTU19HUklEX0xBWU9VVCkKKyAgICBi b29sIGlzR3JpZEl0ZW0oKSBjb25zdCB7IHJldHVybiBwYXJlbnQoKSAmJiBwYXJlbnQoKS0+aXNS ZW5kZXJHcmlkKCk7IH0KKyNlbmRpZgorCiAgICAgYm9vbCBzY3JvbGxMYXllcihTY3JvbGxEaXJl Y3Rpb24sIFNjcm9sbEdyYW51bGFyaXR5LCBmbG9hdCBtdWx0aXBsaWVyLCBFbGVtZW50Kiogc3Rv cEVsZW1lbnQpOwogCiAgICAgYm9vbCBmaXhlZEVsZW1lbnRMYXlzT3V0UmVsYXRpdmVUb0ZyYW1l KGNvbnN0IEZyYW1lVmlldyYpIGNvbnN0Owo=