124958 2013-11-27 20:42:34 -0800 Remove BreakingContext's friendship from RenderBlockFlow 2013-12-03 23:53:39 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 121261 1 zoltan zoltan commit-queue esprehn+autocc glenn kondapallykalyan oldest_to_newest 954649 0 zoltan 2013-11-27 20:42:34 -0800 BreakingContext uses only 2 functions from RenderBlockFlow: insertFloatingObject/positionNewFloatOnLine. I added helper functions for LineBreaker, what is already a friend of RenderBlockFlow, so BreakingContext doesn't need to be anymore. 954650 1 217978 zoltan 2013-11-27 20:45:32 -0800 Created attachment 217978 Patch 956096 2 217978 hyatt 2013-12-03 14:21:16 -0800 Comment on attachment 217978 Patch r=me 956117 3 217978 commit-queue 2013-12-03 14:33:42 -0800 Comment on attachment 217978 Patch Rejecting attachment 217978 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-03', 'apply-attachment', '--no-update', '--non-interactive', 217978, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: at 1 with fuzz 3. patching file Source/WebCore/rendering/RenderBlockFlow.h patching file Source/WebCore/rendering/line/BreakingContextInlineHeaders.h Hunk #1 FAILED at 456. 1 out of 1 hunk FAILED -- saving rejects to file Source/WebCore/rendering/line/BreakingContextInlineHeaders.h.rej patching file Source/WebCore/rendering/line/LineBreaker.h Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'David Hyatt']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Full output: http://webkit-queues.appspot.com/results/42958036 956286 4 218384 zoltan 2013-12-03 23:04:17 -0800 Created attachment 218384 patch for landing 956293 5 218384 commit-queue 2013-12-03 23:53:37 -0800 Comment on attachment 218384 patch for landing Clearing flags on attachment: 218384 Committed r160073: <http://trac.webkit.org/changeset/160073> 956294 6 commit-queue 2013-12-03 23:53:39 -0800 All reviewed patches have been landed. Closing bug. 217978 2013-11-27 20:45:32 -0800 2013-12-03 23:04:17 -0800 Patch removefriendship.patch text/plain 3922 zoltan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2ODM3MjY2Li42NGJiZGUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTMtMTEtMjcgIFpvbHRhbiBIb3J2YXRoICA8em9sdGFuQHdlYmtpdC5vcmc+CisKKyAg ICAgICAgUmVtb3ZlIEJyZWFraW5nQ29udGV4dCdzIGZyaWVuZHNoaXAgZnJvbSBSZW5kZXJCbG9j a0Zsb3cKKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzEyNDk1OD4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBCcmVha2luZ0NvbnRleHQgdXNl cyBvbmx5IDIgZnVuY3Rpb25zIGZyb20gUmVuZGVyQmxvY2tGbG93OiBpbnNlcnRGbG9hdGluZ09i amVjdC9wb3NpdGlvbk5ld0Zsb2F0T25MaW5lLiBJIGFkZGVkIGhlbHBlcgorICAgICAgICBmdW5j dGlvbnMgdG8gTGluZUJyZWFrZXIsIHdoYXQgaXMgYWxyZWFkeSBhIGZyaWVuZCBvZiBSZW5kZXJC bG9ja0Zsb3csIHNvIEJyZWFraW5nQ29udGV4dCBkb2Vzbid0IG5lZWQgdG8gYmUgYW55bW9yZS4K KyAKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBubyBiZWhhdmlvciBjaGFuZ2UuCisKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93Lmg6CisgICAgICAgICogcmVuZGVyaW5nL2xpbmUv QnJlYWtpbmdDb250ZXh0SW5saW5lSGVhZGVycy5oOgorICAgICAgICAoV2ViQ29yZTo6QnJlYWtp bmdDb250ZXh0OjpoYW5kbGVGbG9hdCk6CisgICAgICAgICogcmVuZGVyaW5nL2xpbmUvTGluZUJy ZWFrZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkxpbmVCcmVha2VyOjppbnNlcnRGbG9hdGluZ09i amVjdCk6CisgICAgICAgIChXZWJDb3JlOjpMaW5lQnJlYWtlcjo6cG9zaXRpb25OZXdGbG9hdE9u TGluZSk6CisKIDIwMTMtMTEtMjcgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5j b20+CiAKICAgICAgICAgQWxsb3cgdGhlIFF1aWNrVGltZSBwbHVnLWluIHRvIGJlIHJlcGxhY2Vk IGJ5IHNjcmlwdCBpbiBhbiBpc29sYXRlZCB3b3JkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyQmxvY2tGbG93LmgKaW5kZXggZWQ2Mzk4NC4uNWQyODEwMSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuaApAQCAtNTMxLDcgKzUzMSw2IEBAIHByb3Rl Y3RlZDoKICAgICBSZW5kZXJMaW5lQm94TGlzdCBtX2xpbmVCb3hlczsKICAgICBzdGQ6OnVuaXF1 ZV9wdHI8U2ltcGxlTGluZUxheW91dDo6TGF5b3V0PiBtX3NpbXBsZUxpbmVMYXlvdXQ7CiAKLSAg ICBmcmllbmQgY2xhc3MgQnJlYWtpbmdDb250ZXh0OwogICAgIGZyaWVuZCBjbGFzcyBMaW5lQnJl YWtlcjsKICAgICBmcmllbmQgY2xhc3MgTGluZVdpZHRoOyAvLyBOZWVkcyB0byBrbm93IEZsb2F0 aW5nT2JqZWN0CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL2xpbmUv QnJlYWtpbmdDb250ZXh0SW5saW5lSGVhZGVycy5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L2xpbmUvQnJlYWtpbmdDb250ZXh0SW5saW5lSGVhZGVycy5oCmluZGV4IDdiOTk1NzUuLmFlZmM3 NWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9saW5lL0JyZWFraW5nQ29u dGV4dElubGluZUhlYWRlcnMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbGluZS9C cmVha2luZ0NvbnRleHRJbmxpbmVIZWFkZXJzLmgKQEAgLTQ1NiwxMyArNDU2LDEzIEBAIGlubGlu ZSB2b2lkIEJyZWFraW5nQ29udGV4dDo6aGFuZGxlT3V0T2ZGbG93UG9zaXRpb25lZChWZWN0b3I8 UmVuZGVyQm94Kj4mIHBvc2l0CiBpbmxpbmUgdm9pZCBCcmVha2luZ0NvbnRleHQ6OmhhbmRsZUZs b2F0KCkKIHsKICAgICBSZW5kZXJCb3gmIGZsb2F0Qm94ID0gdG9SZW5kZXJCb3goKm1fY3VycmVu dC5tX29iaik7Ci0gICAgRmxvYXRpbmdPYmplY3QqIGZsb2F0aW5nT2JqZWN0ID0gbV9ibG9jay5p bnNlcnRGbG9hdGluZ09iamVjdChmbG9hdEJveCk7CisgICAgRmxvYXRpbmdPYmplY3QqIGZsb2F0 aW5nT2JqZWN0ID0gbV9saW5lQnJlYWtlci5pbnNlcnRGbG9hdGluZ09iamVjdChmbG9hdEJveCk7 CiAgICAgLy8gY2hlY2sgaWYgaXQgZml0cyBpbiB0aGUgY3VycmVudCBsaW5lLgogICAgIC8vIElm IGl0IGRvZXMsIHBvc2l0aW9uIGl0IG5vdywgb3RoZXJ3aXNlLCBwb3NpdGlvbgogICAgIC8vIGl0 IGFmdGVyIG1vdmluZyB0byBuZXh0IGxpbmUgKGluIG5ld0xpbmUoKSBmdW5jKQogICAgIC8vIEZJ WE1FOiBCdWcgMTEwMzcyOiBQcm9wZXJseSBwb3NpdGlvbiBtdWx0aXBsZSBzdGFja2VkIGZsb2F0 cyB3aXRoIG5vbi1yZWN0YW5ndWxhciBzaGFwZSBvdXRzaWRlLgogICAgIGlmIChtX2Zsb2F0c0Zp dE9uTGluZSAmJiBtX3dpZHRoLmZpdHNPbkxpbmVFeGNsdWRpbmdUcmFpbGluZ1doaXRlc3BhY2Uo bV9ibG9jay5sb2dpY2FsV2lkdGhGb3JGbG9hdChmbG9hdGluZ09iamVjdCkpKSB7Ci0gICAgICAg IG1fYmxvY2sucG9zaXRpb25OZXdGbG9hdE9uTGluZShmbG9hdGluZ09iamVjdCwgbV9sYXN0Rmxv YXRGcm9tUHJldmlvdXNMaW5lLCBtX2xpbmVJbmZvLCBtX3dpZHRoKTsKKyAgICAgICAgbV9saW5l QnJlYWtlci5wb3NpdGlvbk5ld0Zsb2F0T25MaW5lKGZsb2F0aW5nT2JqZWN0LCBtX2xhc3RGbG9h dEZyb21QcmV2aW91c0xpbmUsIG1fbGluZUluZm8sIG1fd2lkdGgpOwogICAgICAgICBpZiAobV9s aW5lQnJlYWsubV9vYmogPT0gbV9jdXJyZW50Lm1fb2JqKSB7CiAgICAgICAgICAgICBBU1NFUlQo IW1fbGluZUJyZWFrLm1fcG9zKTsKICAgICAgICAgICAgIG1fbGluZUJyZWFrLmluY3JlbWVudCgp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL2xpbmUvTGluZUJyZWFrZXIu aCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9saW5lL0xpbmVCcmVha2VyLmgKaW5kZXggNzVl Y2ZiZS4uZjA3ZGM4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL2xpbmUv TGluZUJyZWFrZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbGluZS9MaW5lQnJl YWtlci5oCkBAIC02Nyw2ICs2NywxMiBAQCBwcml2YXRlOgogICAgIHZvaWQgc2tpcFRyYWlsaW5n V2hpdGVzcGFjZShJbmxpbmVJdGVyYXRvciYsIGNvbnN0IExpbmVJbmZvJik7CiAgICAgdm9pZCBz a2lwTGVhZGluZ1doaXRlc3BhY2UoSW5saW5lQmlkaVJlc29sdmVyJiwgTGluZUluZm8mLCBGbG9h dGluZ09iamVjdCogbGFzdEZsb2F0RnJvbVByZXZpb3VzTGluZSwgTGluZVdpZHRoJik7CiAKKyAg ICBGbG9hdGluZ09iamVjdCogaW5zZXJ0RmxvYXRpbmdPYmplY3QoUmVuZGVyQm94JiBmbG9hdEJv eCkgeyByZXR1cm4gbV9ibG9jay5pbnNlcnRGbG9hdGluZ09iamVjdChmbG9hdEJveCk7IH0KKyAg ICBib29sIHBvc2l0aW9uTmV3RmxvYXRPbkxpbmUoRmxvYXRpbmdPYmplY3QqIG5ld0Zsb2F0LCBG bG9hdGluZ09iamVjdCogbGFzdEZsb2F0RnJvbVByZXZpb3VzTGluZSwgTGluZUluZm8mIGxpbmVJ bmZvLCBMaW5lV2lkdGgmIHdpZHRoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIG1fYmxvY2sucG9z aXRpb25OZXdGbG9hdE9uTGluZShuZXdGbG9hdCwgbGFzdEZsb2F0RnJvbVByZXZpb3VzTGluZSwg bGluZUluZm8sIHdpZHRoKTsKKyAgICB9CisKICAgICBSZW5kZXJCbG9ja0Zsb3cmIG1fYmxvY2s7 CiAgICAgYm9vbCBtX2h5cGhlbmF0ZWQ7CiAgICAgRUNsZWFyIG1fY2xlYXI7Cg== 218384 2013-12-03 23:04:17 -0800 2013-12-03 23:53:37 -0800 patch for landing unfriendly.patch text/plain 3910 zoltan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhOWRlNmZiLi4wOGVjZDk4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTMtMTItMDMgIFpvbHRhbiBIb3J2YXRoICA8em9sdGFuQHdlYmtpdC5vcmc+CisKKyAg ICAgICAgUmVtb3ZlIEJyZWFraW5nQ29udGV4dCdzIGZyaWVuZHNoaXAgZnJvbSBSZW5kZXJCbG9j a0Zsb3cKKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzEyNDk1OD4KKworICAgICAgICBS ZXZpZXdlZCBieSBEYXZpZCBIeWF0dC4KKworICAgICAgICBCcmVha2luZ0NvbnRleHQgdXNlcyBv bmx5IDIgZnVuY3Rpb25zIGZyb20gUmVuZGVyQmxvY2tGbG93OiBpbnNlcnRGbG9hdGluZ09iamVj dC9wb3NpdGlvbk5ld0Zsb2F0T25MaW5lLiBJIGFkZGVkIGhlbHBlcgorICAgICAgICBmdW5jdGlv bnMgdG8gTGluZUJyZWFrZXIsIHdoYXQgaXMgYWxyZWFkeSBhIGZyaWVuZCBvZiBSZW5kZXJCbG9j a0Zsb3csIHNvIEJyZWFraW5nQ29udGV4dCBkb2Vzbid0IG5lZWQgdG8gYmUgYW55bW9yZS4KKyAK KyAgICAgICAgTm8gbmV3IHRlc3RzLCBubyBiZWhhdmlvciBjaGFuZ2UuCisKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93Lmg6CisgICAgICAgICogcmVuZGVyaW5nL2xpbmUvQnJl YWtpbmdDb250ZXh0SW5saW5lSGVhZGVycy5oOgorICAgICAgICAoV2ViQ29yZTo6QnJlYWtpbmdD b250ZXh0OjpoYW5kbGVGbG9hdCk6CisgICAgICAgICogcmVuZGVyaW5nL2xpbmUvTGluZUJyZWFr ZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkxpbmVCcmVha2VyOjppbnNlcnRGbG9hdGluZ09iamVj dCk6CisgICAgICAgIChXZWJDb3JlOjpMaW5lQnJlYWtlcjo6cG9zaXRpb25OZXdGbG9hdE9uTGlu ZSk6CisKIDIwMTMtMTItMDMgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCiAg ICAgICAgIEFkZCBhIENTU1Byb3BlcnR5Ojppc0RpcmVjdGlvbkF3YXJlUHJvcGVydHkoKSBoZWxw ZXIuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93 LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmgKaW5kZXggZWQ2 Mzk4NC4uNWQyODEwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJsb2NrRmxvdy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zs b3cuaApAQCAtNTMxLDcgKzUzMSw2IEBAIHByb3RlY3RlZDoKICAgICBSZW5kZXJMaW5lQm94TGlz dCBtX2xpbmVCb3hlczsKICAgICBzdGQ6OnVuaXF1ZV9wdHI8U2ltcGxlTGluZUxheW91dDo6TGF5 b3V0PiBtX3NpbXBsZUxpbmVMYXlvdXQ7CiAKLSAgICBmcmllbmQgY2xhc3MgQnJlYWtpbmdDb250 ZXh0OwogICAgIGZyaWVuZCBjbGFzcyBMaW5lQnJlYWtlcjsKICAgICBmcmllbmQgY2xhc3MgTGlu ZVdpZHRoOyAvLyBOZWVkcyB0byBrbm93IEZsb2F0aW5nT2JqZWN0CiB9OwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL2xpbmUvQnJlYWtpbmdDb250ZXh0SW5saW5lSGVhZGVy cy5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL2xpbmUvQnJlYWtpbmdDb250ZXh0SW5saW5l SGVhZGVycy5oCmluZGV4IGY2NWQ3YmMuLjgzZTE3NTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9saW5lL0JyZWFraW5nQ29udGV4dElubGluZUhlYWRlcnMuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbGluZS9CcmVha2luZ0NvbnRleHRJbmxpbmVIZWFkZXJz LmgKQEAgLTQ1NiwxMyArNDU2LDEzIEBAIGlubGluZSB2b2lkIEJyZWFraW5nQ29udGV4dDo6aGFu ZGxlT3V0T2ZGbG93UG9zaXRpb25lZChWZWN0b3I8UmVuZGVyQm94Kj4mIHBvc2l0CiBpbmxpbmUg dm9pZCBCcmVha2luZ0NvbnRleHQ6OmhhbmRsZUZsb2F0KCkKIHsKICAgICBSZW5kZXJCb3gmIGZs b2F0Qm94ID0gdG9SZW5kZXJCb3goKm1fY3VycmVudC5yZW5kZXJlcigpKTsKLSAgICBGbG9hdGlu Z09iamVjdCogZmxvYXRpbmdPYmplY3QgPSBtX2Jsb2NrLmluc2VydEZsb2F0aW5nT2JqZWN0KGZs b2F0Qm94KTsKKyAgICBGbG9hdGluZ09iamVjdCogZmxvYXRpbmdPYmplY3QgPSBtX2xpbmVCcmVh a2VyLmluc2VydEZsb2F0aW5nT2JqZWN0KGZsb2F0Qm94KTsKICAgICAvLyBjaGVjayBpZiBpdCBm aXRzIGluIHRoZSBjdXJyZW50IGxpbmUuCiAgICAgLy8gSWYgaXQgZG9lcywgcG9zaXRpb24gaXQg bm93LCBvdGhlcndpc2UsIHBvc2l0aW9uCiAgICAgLy8gaXQgYWZ0ZXIgbW92aW5nIHRvIG5leHQg bGluZSAoaW4gbmV3TGluZSgpIGZ1bmMpCiAgICAgLy8gRklYTUU6IEJ1ZyAxMTAzNzI6IFByb3Bl cmx5IHBvc2l0aW9uIG11bHRpcGxlIHN0YWNrZWQgZmxvYXRzIHdpdGggbm9uLXJlY3Rhbmd1bGFy IHNoYXBlIG91dHNpZGUuCiAgICAgaWYgKG1fZmxvYXRzRml0T25MaW5lICYmIG1fd2lkdGguZml0 c09uTGluZUV4Y2x1ZGluZ1RyYWlsaW5nV2hpdGVzcGFjZShtX2Jsb2NrLmxvZ2ljYWxXaWR0aEZv ckZsb2F0KGZsb2F0aW5nT2JqZWN0KSkpIHsKLSAgICAgICAgbV9ibG9jay5wb3NpdGlvbk5ld0Zs b2F0T25MaW5lKGZsb2F0aW5nT2JqZWN0LCBtX2xhc3RGbG9hdEZyb21QcmV2aW91c0xpbmUsIG1f bGluZUluZm8sIG1fd2lkdGgpOworICAgICAgICBtX2xpbmVCcmVha2VyLnBvc2l0aW9uTmV3Rmxv YXRPbkxpbmUoZmxvYXRpbmdPYmplY3QsIG1fbGFzdEZsb2F0RnJvbVByZXZpb3VzTGluZSwgbV9s aW5lSW5mbywgbV93aWR0aCk7CiAgICAgICAgIGlmIChtX2xpbmVCcmVhay5yZW5kZXJlcigpID09 IG1fY3VycmVudC5yZW5kZXJlcigpKSB7CiAgICAgICAgICAgICBBU1NFUlQoIW1fbGluZUJyZWFr Lm1fcG9zKTsKICAgICAgICAgICAgIG1fbGluZUJyZWFrLmluY3JlbWVudCgpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL2xpbmUvTGluZUJyZWFrZXIuaCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9saW5lL0xpbmVCcmVha2VyLmgKaW5kZXggNzVlY2ZiZS4uZjA3ZGM4 ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL2xpbmUvTGluZUJyZWFrZXIu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbGluZS9MaW5lQnJlYWtlci5oCkBAIC02 Nyw2ICs2NywxMiBAQCBwcml2YXRlOgogICAgIHZvaWQgc2tpcFRyYWlsaW5nV2hpdGVzcGFjZShJ bmxpbmVJdGVyYXRvciYsIGNvbnN0IExpbmVJbmZvJik7CiAgICAgdm9pZCBza2lwTGVhZGluZ1do aXRlc3BhY2UoSW5saW5lQmlkaVJlc29sdmVyJiwgTGluZUluZm8mLCBGbG9hdGluZ09iamVjdCog bGFzdEZsb2F0RnJvbVByZXZpb3VzTGluZSwgTGluZVdpZHRoJik7CiAKKyAgICBGbG9hdGluZ09i amVjdCogaW5zZXJ0RmxvYXRpbmdPYmplY3QoUmVuZGVyQm94JiBmbG9hdEJveCkgeyByZXR1cm4g bV9ibG9jay5pbnNlcnRGbG9hdGluZ09iamVjdChmbG9hdEJveCk7IH0KKyAgICBib29sIHBvc2l0 aW9uTmV3RmxvYXRPbkxpbmUoRmxvYXRpbmdPYmplY3QqIG5ld0Zsb2F0LCBGbG9hdGluZ09iamVj dCogbGFzdEZsb2F0RnJvbVByZXZpb3VzTGluZSwgTGluZUluZm8mIGxpbmVJbmZvLCBMaW5lV2lk dGgmIHdpZHRoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIG1fYmxvY2sucG9zaXRpb25OZXdGbG9h dE9uTGluZShuZXdGbG9hdCwgbGFzdEZsb2F0RnJvbVByZXZpb3VzTGluZSwgbGluZUluZm8sIHdp ZHRoKTsKKyAgICB9CisKICAgICBSZW5kZXJCbG9ja0Zsb3cmIG1fYmxvY2s7CiAgICAgYm9vbCBt X2h5cGhlbmF0ZWQ7CiAgICAgRUNsZWFyIG1fY2xlYXI7Cg==