138912 2014-11-19 21:11:23 -0800 Caret renderer is always a RenderBlock. 2014-11-20 00:36:11 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling commit-queue oldest_to_newest 1050046 0 kling 2014-11-19 21:11:23 -0800 Patch forthcoming. 1050047 1 241925 kling 2014-11-19 21:11:49 -0800 Created attachment 241925 Patch 1050050 2 241925 cdumez 2014-11-19 21:30:34 -0800 Comment on attachment 241925 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=241925&action=review > Source/WebCore/editing/FrameSelection.cpp:1361 > + if (RenderBlock* caretPainter = rendererForCaretPainting(node)) auto* ? > Source/WebCore/editing/FrameSelection.cpp:1481 > + if (RenderBlock* renderer = rendererForCaretPainting(node)) auto* ? > Source/WebCore/editing/htmlediting.cpp:1276 > bool paintedByBlock = renderer->isRenderBlockFlow() && caretRendersInsideNode(node); is<RenderBlockFlow>(*renderer) ? 1050056 3 241927 kling 2014-11-19 22:52:02 -0800 Created attachment 241927 Patch Tweak Chris's tweaks. 1050057 4 241927 cdumez 2014-11-19 22:57:26 -0800 Comment on attachment 241927 Patch r=me 1050073 5 241927 commit-queue 2014-11-20 00:36:07 -0800 Comment on attachment 241927 Patch Clearing flags on attachment: 241927 Committed r176387: <http://trac.webkit.org/changeset/176387> 1050074 6 commit-queue 2014-11-20 00:36:11 -0800 All reviewed patches have been landed. Closing bug. 241925 2014-11-19 21:11:49 -0800 2014-11-19 22:52:02 -0800 Patch bug-138912.diff text/plain 9078 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmN2Y4YTQ0Li44NDU0MTEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzIg QEAKIDIwMTQtMTEtMTkgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCisgICAg ICAgIENhcmV0IHJlbmRlcmVyIGlzIGFsd2F5cyBhIFJlbmRlckJsb2NrLgorICAgICAgICA8aHR0 cHM6Ly93ZWJraXQub3JnL2IvMTM4OTEyPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFRpZ2h0ZW4gdHlwaW5nIGluIHRoZSBjb2RlIHRoYXQgZmluZHMg YW5kIGRlYWxzIHdpdGggdGhlIHJlbmRlcmVyCisgICAgICAgIHVzZWQgdG8gcGFpbnQgdGhlIGNh cmV0IChpdCdzIGFsd2F5cyBhIFJlbmRlckJsb2NrLikKKworICAgICAgICAqIGVkaXRpbmcvRnJh bWVTZWxlY3Rpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2FyZXRCYXNlOjp1cGRhdGVDYXJl dFJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVTZWxlY3Rpb246OmNhcmV0UmVuZGVyZXJX aXRob3V0VXBkYXRpbmdMYXlvdXQpOgorICAgICAgICAoV2ViQ29yZTo6RHJhZ0NhcmV0Q29udHJv bGxlcjo6Y2FyZXRSZW5kZXJlcik6CisgICAgICAgIChXZWJDb3JlOjpyZXBhaW50Q2FyZXRGb3JM b2NhbFJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6Q2FyZXRCYXNlOjpwYWludENhcmV0KToKKyAg ICAgICAgKiBlZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmg6CisgICAgICAgICogZWRpdGluZy9WaXNp YmxlUG9zaXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6VmlzaWJsZVBvc2l0aW9uOjphYnNv bHV0ZUNhcmV0Qm91bmRzKToKKyAgICAgICAgKiBlZGl0aW5nL2h0bWxlZGl0aW5nLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OnJlbmRlcmVyRm9yQ2FyZXRQYWludGluZyk6CisgICAgICAgIChXZWJD b3JlOjpsb2NhbENhcmV0UmVjdEluUmVuZGVyZXJGb3JDYXJldFBhaW50aW5nKToKKyAgICAgICAg KFdlYkNvcmU6OmFic29sdXRlQm91bmRzRm9yTG9jYWxDYXJldFJlY3QpOgorICAgICAgICAqIGVk aXRpbmcvaHRtbGVkaXRpbmcuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OnBhaW50Q2FyZXQpOgorCisyMDE0LTEx LTE5ICBBbmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KKwogICAgICAgICBSZW1vdmUg ImRvY3VtZW50IGhhcyBubyBzaWJsaW5nIHJ1bGVzIiBvcHRpbWl6YXRpb24uCiAgICAgICAgIDxo dHRwczovL3dlYmtpdC5vcmcvYi8xMzg5MDI+CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9GcmFt ZVNlbGVjdGlvbi5jcHAKaW5kZXggNDZiMmRlNC4uZDM3NmE5MSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv ZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5jcHAKQEAgLTEzMjcsMTcgKzEzMjcsMTcgQEAgYm9vbCBD YXJldEJhc2U6OnVwZGF0ZUNhcmV0UmVjdChEb2N1bWVudCogZG9jdW1lbnQsIGNvbnN0IFZpc2li bGVQb3NpdGlvbiYgY2FyZXQKIHsKICAgICBkb2N1bWVudC0+dXBkYXRlTGF5b3V0SWdub3JlUGVu ZGluZ1N0eWxlc2hlZXRzKCk7CiAgICAgbV9jYXJldFJlY3ROZWVkc1VwZGF0ZSA9IGZhbHNlOwot ICAgIFJlbmRlck9iamVjdCogcmVuZGVyZXI7CisgICAgUmVuZGVyQmxvY2sqIHJlbmRlcmVyOwog ICAgIG1fY2FyZXRMb2NhbFJlY3QgPSBsb2NhbENhcmV0UmVjdEluUmVuZGVyZXJGb3JDYXJldFBh aW50aW5nKGNhcmV0UG9zaXRpb24sIHJlbmRlcmVyKTsKICAgICByZXR1cm4gIW1fY2FyZXRMb2Nh bFJlY3QuaXNFbXB0eSgpOwogfQogCi1SZW5kZXJPYmplY3QqIEZyYW1lU2VsZWN0aW9uOjpjYXJl dFJlbmRlcmVyV2l0aG91dFVwZGF0aW5nTGF5b3V0KCkgY29uc3QKK1JlbmRlckJsb2NrKiBGcmFt ZVNlbGVjdGlvbjo6Y2FyZXRSZW5kZXJlcldpdGhvdXRVcGRhdGluZ0xheW91dCgpIGNvbnN0CiB7 CiAgICAgcmV0dXJuIHJlbmRlcmVyRm9yQ2FyZXRQYWludGluZyhtX3NlbGVjdGlvbi5zdGFydCgp LmRlcHJlY2F0ZWROb2RlKCkpOwogfQogCi1SZW5kZXJPYmplY3QqIERyYWdDYXJldENvbnRyb2xs ZXI6OmNhcmV0UmVuZGVyZXIoKSBjb25zdAorUmVuZGVyQmxvY2sqIERyYWdDYXJldENvbnRyb2xs ZXI6OmNhcmV0UmVuZGVyZXIoKSBjb25zdAogewogICAgIHJldHVybiByZW5kZXJlckZvckNhcmV0 UGFpbnRpbmcobV9wb3NpdGlvbi5kZWVwRXF1aXZhbGVudCgpLmRlcHJlY2F0ZWROb2RlKCkpOwog fQpAQCAtMTM1OCwxMSArMTM1OCw4IEBAIEludFJlY3QgRnJhbWVTZWxlY3Rpb246OmFic29sdXRl Q2FyZXRCb3VuZHMoKQogCiBzdGF0aWMgdm9pZCByZXBhaW50Q2FyZXRGb3JMb2NhbFJlY3QoTm9k ZSogbm9kZSwgY29uc3QgTGF5b3V0UmVjdCYgcmVjdCkKIHsKLSAgICBSZW5kZXJPYmplY3QqIGNh cmV0UGFpbnRlciA9IHJlbmRlcmVyRm9yQ2FyZXRQYWludGluZyhub2RlKTsKLSAgICBpZiAoIWNh cmV0UGFpbnRlcikKLSAgICAgICAgcmV0dXJuOwotCi0gICAgY2FyZXRQYWludGVyLT5yZXBhaW50 UmVjdGFuZ2xlKHJlY3QpOworICAgIGlmIChSZW5kZXJCbG9jayogY2FyZXRQYWludGVyID0gcmVu ZGVyZXJGb3JDYXJldFBhaW50aW5nKG5vZGUpKQorICAgICAgICBjYXJldFBhaW50ZXItPnJlcGFp bnRSZWN0YW5nbGUocmVjdCk7CiB9CiAKIGJvb2wgRnJhbWVTZWxlY3Rpb246OnJlY29tcHV0ZUNh cmV0UmVjdCgpCkBAIC0xNDgxLDkgKzE0NzgsOCBAQCB2b2lkIENhcmV0QmFzZTo6cGFpbnRDYXJl dChOb2RlKiBub2RlLCBHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IExheW91dFBvaQog ICAgICAgICByZXR1cm47CiAKICAgICBMYXlvdXRSZWN0IGRyYXdpbmdSZWN0ID0gbG9jYWxDYXJl dFJlY3RXaXRob3V0VXBkYXRlKCk7Ci0gICAgUmVuZGVyT2JqZWN0KiByZW5kZXJlciA9IHJlbmRl cmVyRm9yQ2FyZXRQYWludGluZyhub2RlKTsKLSAgICBpZiAoaXM8UmVuZGVyQm94PihyZW5kZXJl cikpCi0gICAgICAgIGRvd25jYXN0PFJlbmRlckJveD4oKnJlbmRlcmVyKS5mbGlwRm9yV3JpdGlu Z01vZGUoZHJhd2luZ1JlY3QpOworICAgIGlmIChSZW5kZXJCbG9jayogcmVuZGVyZXIgPSByZW5k ZXJlckZvckNhcmV0UGFpbnRpbmcobm9kZSkpCisgICAgICAgIHJlbmRlcmVyLT5mbGlwRm9yV3Jp dGluZ01vZGUoZHJhd2luZ1JlY3QpOwogICAgIGRyYXdpbmdSZWN0Lm1vdmVCeShyb3VuZGVkSW50 UG9pbnQocGFpbnRPZmZzZXQpKTsKICAgICBMYXlvdXRSZWN0IGNhcmV0ID0gaW50ZXJzZWN0aW9u KGRyYXdpbmdSZWN0LCBjbGlwUmVjdCk7CiAgICAgaWYgKGNhcmV0LmlzRW1wdHkoKSkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uaCBiL1NvdXJjZS9X ZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uaAppbmRleCBmOTg4YzZjLi42YTg3NzYwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmgKKysrIGIv U291cmNlL1dlYkNvcmUvZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5oCkBAIC00Niw2ICs0Niw3IEBA IGNsYXNzIEZyYW1lOwogY2xhc3MgR3JhcGhpY3NDb250ZXh0OwogY2xhc3MgSFRNTEZvcm1FbGVt ZW50OwogY2xhc3MgTXV0YWJsZVN0eWxlUHJvcGVydGllczsKK2NsYXNzIFJlbmRlckJsb2NrOwog Y2xhc3MgUmVuZGVyT2JqZWN0OwogY2xhc3MgUmVuZGVyVmlldzsKIGNsYXNzIFNldHRpbmdzOwpA QCAtOTIsNyArOTMsNyBAQCBjbGFzcyBEcmFnQ2FyZXRDb250cm9sbGVyIDogcHJpdmF0ZSBDYXJl dEJhc2UgewogcHVibGljOgogICAgIERyYWdDYXJldENvbnRyb2xsZXIoKTsKIAotICAgIFJlbmRl ck9iamVjdCogY2FyZXRSZW5kZXJlcigpIGNvbnN0OworICAgIFJlbmRlckJsb2NrKiBjYXJldFJl bmRlcmVyKCkgY29uc3Q7CiAgICAgdm9pZCBwYWludERyYWdDYXJldChGcmFtZSosIEdyYXBoaWNz Q29udGV4dCosIGNvbnN0IExheW91dFBvaW50JiwgY29uc3QgTGF5b3V0UmVjdCYgY2xpcFJlY3Qp IGNvbnN0OwogCiAgICAgYm9vbCBpc0NvbnRlbnRFZGl0YWJsZSgpIGNvbnN0IHsgcmV0dXJuIG1f cG9zaXRpb24ucm9vdEVkaXRhYmxlRWxlbWVudCgpOyB9CkBAIC0xNjksNyArMTcwLDcgQEAgcHVi bGljOgogICAgIHZvaWQgc2V0RXh0ZW50KGNvbnN0IFBvc2l0aW9uJiwgRUFmZmluaXR5LCBFVXNl clRyaWdnZXJlZCA9IE5vdFVzZXJUcmlnZ2VyZWQpOwogCiAgICAgLy8gUmV0dXJuIHRoZSByZW5k ZXJlciB0aGF0IGlzIHJlc3BvbnNpYmxlIGZvciBwYWludGluZyB0aGUgY2FyZXQgKGluIHRoZSBz ZWxlY3Rpb24gc3RhcnQgbm9kZSkKLSAgICBSZW5kZXJPYmplY3QqIGNhcmV0UmVuZGVyZXJXaXRo b3V0VXBkYXRpbmdMYXlvdXQoKSBjb25zdDsKKyAgICBSZW5kZXJCbG9jayogY2FyZXRSZW5kZXJl cldpdGhvdXRVcGRhdGluZ0xheW91dCgpIGNvbnN0OwogCiAgICAgLy8gQm91bmRzIG9mIChwb3Nz aWJseSB0cmFuc2Zvcm1lZCkgY2FyZXQgaW4gYWJzb2x1dGUgY29vcmRzCiAgICAgV0VCQ09SRV9F WFBPUlQgSW50UmVjdCBhYnNvbHV0ZUNhcmV0Qm91bmRzKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9lZGl0aW5nL1Zpc2libGVQb3NpdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL1Zpc2libGVQb3NpdGlvbi5jcHAKaW5kZXggZmQ4Y2M0ZC4uNTVmNGZlZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9WaXNpYmxlUG9zaXRpb24uY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2VkaXRpbmcvVmlzaWJsZVBvc2l0aW9uLmNwcApAQCAtNjE4LDcgKzYxOCw3IEBA IExheW91dFJlY3QgVmlzaWJsZVBvc2l0aW9uOjpsb2NhbENhcmV0UmVjdChSZW5kZXJPYmplY3Qq JiByZW5kZXJlcikgY29uc3QKIAogSW50UmVjdCBWaXNpYmxlUG9zaXRpb246OmFic29sdXRlQ2Fy ZXRCb3VuZHMoKSBjb25zdAogewotICAgIFJlbmRlck9iamVjdCogcmVuZGVyZXIgPSBudWxscHRy OworICAgIFJlbmRlckJsb2NrKiByZW5kZXJlciA9IG51bGxwdHI7CiAgICAgTGF5b3V0UmVjdCBs b2NhbFJlY3QgPSBsb2NhbENhcmV0UmVjdEluUmVuZGVyZXJGb3JDYXJldFBhaW50aW5nKCp0aGlz LCByZW5kZXJlcik7CiAgICAgcmV0dXJuIGFic29sdXRlQm91bmRzRm9yTG9jYWxDYXJldFJlY3Qo cmVuZGVyZXIsIGxvY2FsUmVjdCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL2h0bWxlZGl0aW5nLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvaHRtbGVkaXRpbmcu Y3BwCmluZGV4IDA5NzM1YTQuLjVkZTA2NTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Vk aXRpbmcvaHRtbGVkaXRpbmcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvaHRtbGVk aXRpbmcuY3BwCkBAIC0xMjYzLDcgKzEyNjMsNyBAQCBzdGF0aWMgaW5saW5lIGJvb2wgY2FyZXRS ZW5kZXJzSW5zaWRlTm9kZShOb2RlKiBub2RlKQogICAgIHJldHVybiBub2RlICYmICFpc1JlbmRl cmVkVGFibGUobm9kZSkgJiYgIWVkaXRpbmdJZ25vcmVzQ29udGVudChub2RlKTsKIH0KIAotUmVu ZGVyT2JqZWN0KiByZW5kZXJlckZvckNhcmV0UGFpbnRpbmcoTm9kZSogbm9kZSkKK1JlbmRlckJs b2NrKiByZW5kZXJlckZvckNhcmV0UGFpbnRpbmcoTm9kZSogbm9kZSkKIHsKICAgICBpZiAoIW5v ZGUpCiAgICAgICAgIHJldHVybiBudWxscHRyOwpAQCAtMTI3NCwxMCArMTI3NCwxMCBAQCBSZW5k ZXJPYmplY3QqIHJlbmRlcmVyRm9yQ2FyZXRQYWludGluZyhOb2RlKiBub2RlKQogCiAgICAgLy8g SWYgY2FyZXROb2RlIGlzIGEgYmxvY2sgYW5kIGNhcmV0IGlzIGluc2lkZSBpdCwgdGhlbiBjYXJl dCBzaG91bGQgYmUgcGFpbnRlZCBieSB0aGF0IGJsb2NrLgogICAgIGJvb2wgcGFpbnRlZEJ5Qmxv Y2sgPSByZW5kZXJlci0+aXNSZW5kZXJCbG9ja0Zsb3coKSAmJiBjYXJldFJlbmRlcnNJbnNpZGVO b2RlKG5vZGUpOwotICAgIHJldHVybiBwYWludGVkQnlCbG9jayA/IHJlbmRlcmVyIDogcmVuZGVy ZXItPmNvbnRhaW5pbmdCbG9jaygpOworICAgIHJldHVybiBwYWludGVkQnlCbG9jayA/IGRvd25j YXN0PFJlbmRlckJsb2NrPihyZW5kZXJlcikgOiByZW5kZXJlci0+Y29udGFpbmluZ0Jsb2NrKCk7 CiB9CiAKLUxheW91dFJlY3QgbG9jYWxDYXJldFJlY3RJblJlbmRlcmVyRm9yQ2FyZXRQYWludGlu Zyhjb25zdCBWaXNpYmxlUG9zaXRpb24mIGNhcmV0UG9zaXRpb24sIFJlbmRlck9iamVjdComIGNh cmV0UGFpbnRlcikKK0xheW91dFJlY3QgbG9jYWxDYXJldFJlY3RJblJlbmRlcmVyRm9yQ2FyZXRQ YWludGluZyhjb25zdCBWaXNpYmxlUG9zaXRpb24mIGNhcmV0UG9zaXRpb24sIFJlbmRlckJsb2Nr KiYgY2FyZXRQYWludGVyKQogewogICAgIGlmIChjYXJldFBvc2l0aW9uLmlzTnVsbCgpKQogICAg ICAgICByZXR1cm4gTGF5b3V0UmVjdCgpOwpAQCAtMTMwNCwxNCArMTMwNCwxMyBAQCBMYXlvdXRS ZWN0IGxvY2FsQ2FyZXRSZWN0SW5SZW5kZXJlckZvckNhcmV0UGFpbnRpbmcoY29uc3QgVmlzaWJs ZVBvc2l0aW9uJiBjYXJldAogICAgIHJldHVybiBsb2NhbFJlY3Q7CiB9CiAKLUludFJlY3QgYWJz b2x1dGVCb3VuZHNGb3JMb2NhbENhcmV0UmVjdChSZW5kZXJPYmplY3QqIHJlbmRlcmVyRm9yQ2Fy ZXRQYWludGluZywgY29uc3QgTGF5b3V0UmVjdCYgcmVjdCkKK0ludFJlY3QgYWJzb2x1dGVCb3Vu ZHNGb3JMb2NhbENhcmV0UmVjdChSZW5kZXJCbG9jayogcmVuZGVyZXJGb3JDYXJldFBhaW50aW5n LCBjb25zdCBMYXlvdXRSZWN0JiByZWN0KQogewogICAgIGlmICghcmVuZGVyZXJGb3JDYXJldFBh aW50aW5nIHx8IHJlY3QuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm4gSW50UmVjdCgpOwogCiAg ICAgTGF5b3V0UmVjdCBsb2NhbFJlY3QocmVjdCk7Ci0gICAgaWYgKGlzPFJlbmRlckJveD4oKnJl bmRlcmVyRm9yQ2FyZXRQYWludGluZykpCi0gICAgICAgIGRvd25jYXN0PFJlbmRlckJveD4oKnJl bmRlcmVyRm9yQ2FyZXRQYWludGluZykuZmxpcEZvcldyaXRpbmdNb2RlKGxvY2FsUmVjdCk7Cisg ICAgcmVuZGVyZXJGb3JDYXJldFBhaW50aW5nLT5mbGlwRm9yV3JpdGluZ01vZGUobG9jYWxSZWN0 KTsKICAgICByZXR1cm4gcmVuZGVyZXJGb3JDYXJldFBhaW50aW5nLT5sb2NhbFRvQWJzb2x1dGVR dWFkKEZsb2F0UmVjdChsb2NhbFJlY3QpKS5lbmNsb3NpbmdCb3VuZGluZ0JveCgpOwogfQogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2h0bWxlZGl0aW5nLmggYi9Tb3VyY2Uv V2ViQ29yZS9lZGl0aW5nL2h0bWxlZGl0aW5nLmgKaW5kZXggZDI0OWNmOS4uODVmZTMyYiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9odG1sZWRpdGluZy5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2VkaXRpbmcvaHRtbGVkaXRpbmcuaApAQCAtNDEsNiArNDEsNyBAQCBjbGFzcyBI VE1MVGV4dEZvcm1Db250cm9sRWxlbWVudDsKIGNsYXNzIE5vZGU7CiBjbGFzcyBQb3NpdGlvbjsK IGNsYXNzIFJhbmdlOworY2xhc3MgUmVuZGVyQmxvY2s7CiBjbGFzcyBWaXNpYmxlUG9zaXRpb247 CiBjbGFzcyBWaXNpYmxlU2VsZWN0aW9uOwogCkBAIC0yNTksOSArMjYwLDkgQEAgY29uc3QgU3Ry aW5nJiBub25CcmVha2luZ1NwYWNlU3RyaW5nKCk7CiAKIC8vIE1pc2NlbGxhYW5lb3VzIGZ1bmN0 aW9ucyB0aGF0IGZvciBjYXJldCByZW5kZXJpbmcKIAotUmVuZGVyT2JqZWN0KiByZW5kZXJlckZv ckNhcmV0UGFpbnRpbmcoTm9kZSopOwotTGF5b3V0UmVjdCBsb2NhbENhcmV0UmVjdEluUmVuZGVy ZXJGb3JDYXJldFBhaW50aW5nKGNvbnN0IFZpc2libGVQb3NpdGlvbiYsIFJlbmRlck9iamVjdCom KTsKLUludFJlY3QgYWJzb2x1dGVCb3VuZHNGb3JMb2NhbENhcmV0UmVjdChSZW5kZXJPYmplY3Qq IHJlbmRlcmVyRm9yQ2FyZXRQYWludGluZywgY29uc3QgTGF5b3V0UmVjdCYpOworUmVuZGVyQmxv Y2sqIHJlbmRlcmVyRm9yQ2FyZXRQYWludGluZyhOb2RlKik7CitMYXlvdXRSZWN0IGxvY2FsQ2Fy ZXRSZWN0SW5SZW5kZXJlckZvckNhcmV0UGFpbnRpbmcoY29uc3QgVmlzaWJsZVBvc2l0aW9uJiwg UmVuZGVyQmxvY2sqJik7CitJbnRSZWN0IGFic29sdXRlQm91bmRzRm9yTG9jYWxDYXJldFJlY3Qo UmVuZGVyQmxvY2sqIHJlbmRlcmVyRm9yQ2FyZXRQYWludGluZywgY29uc3QgTGF5b3V0UmVjdCYp OwogCiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9j ay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCmluZGV4IDY5 YjFlZjEuLjllMGRlNzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCbG9jay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNw cApAQCAtMTUyNCw3ICsxNTI0LDcgQEAgdm9pZCBSZW5kZXJCbG9jazo6cGFpbnRDYXJldChQYWlu dEluZm8mIHBhaW50SW5mbywgY29uc3QgTGF5b3V0UG9pbnQmIHBhaW50T2Zmc2UKIHsKICAgICAv LyBQYWludCB0aGUgY2FyZXQgaWYgdGhlIEZyYW1lU2VsZWN0aW9uIHNheXMgc28gb3IgaWYgY2Fy ZXQgYnJvd3NpbmcgaXMgZW5hYmxlZAogICAgIGJvb2wgY2FyZXRCcm93c2luZyA9IGZyYW1lKCku c2V0dGluZ3MoKS5jYXJldEJyb3dzaW5nRW5hYmxlZCgpOwotICAgIFJlbmRlck9iamVjdCogY2Fy ZXRQYWludGVyOworICAgIFJlbmRlckJsb2NrKiBjYXJldFBhaW50ZXI7CiAgICAgYm9vbCBpc0Nv bnRlbnRFZGl0YWJsZTsKICAgICBpZiAodHlwZSA9PSBDdXJzb3JDYXJldCkgewogICAgICAgICBj YXJldFBhaW50ZXIgPSBmcmFtZSgpLnNlbGVjdGlvbigpLmNhcmV0UmVuZGVyZXJXaXRob3V0VXBk YXRpbmdMYXlvdXQoKTsK 241927 2014-11-19 22:52:02 -0800 2014-11-20 00:36:07 -0800 Patch bug-138912-2.diff text/plain 9180 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmN2Y4YTQ0Li44NDU0MTEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzIg QEAKIDIwMTQtMTEtMTkgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCisgICAg ICAgIENhcmV0IHJlbmRlcmVyIGlzIGFsd2F5cyBhIFJlbmRlckJsb2NrLgorICAgICAgICA8aHR0 cHM6Ly93ZWJraXQub3JnL2IvMTM4OTEyPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFRpZ2h0ZW4gdHlwaW5nIGluIHRoZSBjb2RlIHRoYXQgZmluZHMg YW5kIGRlYWxzIHdpdGggdGhlIHJlbmRlcmVyCisgICAgICAgIHVzZWQgdG8gcGFpbnQgdGhlIGNh cmV0IChpdCdzIGFsd2F5cyBhIFJlbmRlckJsb2NrLikKKworICAgICAgICAqIGVkaXRpbmcvRnJh bWVTZWxlY3Rpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2FyZXRCYXNlOjp1cGRhdGVDYXJl dFJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVTZWxlY3Rpb246OmNhcmV0UmVuZGVyZXJX aXRob3V0VXBkYXRpbmdMYXlvdXQpOgorICAgICAgICAoV2ViQ29yZTo6RHJhZ0NhcmV0Q29udHJv bGxlcjo6Y2FyZXRSZW5kZXJlcik6CisgICAgICAgIChXZWJDb3JlOjpyZXBhaW50Q2FyZXRGb3JM b2NhbFJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6Q2FyZXRCYXNlOjpwYWludENhcmV0KToKKyAg ICAgICAgKiBlZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmg6CisgICAgICAgICogZWRpdGluZy9WaXNp YmxlUG9zaXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6VmlzaWJsZVBvc2l0aW9uOjphYnNv bHV0ZUNhcmV0Qm91bmRzKToKKyAgICAgICAgKiBlZGl0aW5nL2h0bWxlZGl0aW5nLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OnJlbmRlcmVyRm9yQ2FyZXRQYWludGluZyk6CisgICAgICAgIChXZWJD b3JlOjpsb2NhbENhcmV0UmVjdEluUmVuZGVyZXJGb3JDYXJldFBhaW50aW5nKToKKyAgICAgICAg KFdlYkNvcmU6OmFic29sdXRlQm91bmRzRm9yTG9jYWxDYXJldFJlY3QpOgorICAgICAgICAqIGVk aXRpbmcvaHRtbGVkaXRpbmcuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OnBhaW50Q2FyZXQpOgorCisyMDE0LTEx LTE5ICBBbmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KKwogICAgICAgICBSZW1vdmUg ImRvY3VtZW50IGhhcyBubyBzaWJsaW5nIHJ1bGVzIiBvcHRpbWl6YXRpb24uCiAgICAgICAgIDxo dHRwczovL3dlYmtpdC5vcmcvYi8xMzg5MDI+CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9GcmFt ZVNlbGVjdGlvbi5jcHAKaW5kZXggNDZiMmRlNC4uOGY2MGQwMiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv ZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5jcHAKQEAgLTEzMjcsMTcgKzEzMjcsMTcgQEAgYm9vbCBD YXJldEJhc2U6OnVwZGF0ZUNhcmV0UmVjdChEb2N1bWVudCogZG9jdW1lbnQsIGNvbnN0IFZpc2li bGVQb3NpdGlvbiYgY2FyZXQKIHsKICAgICBkb2N1bWVudC0+dXBkYXRlTGF5b3V0SWdub3JlUGVu ZGluZ1N0eWxlc2hlZXRzKCk7CiAgICAgbV9jYXJldFJlY3ROZWVkc1VwZGF0ZSA9IGZhbHNlOwot ICAgIFJlbmRlck9iamVjdCogcmVuZGVyZXI7CisgICAgUmVuZGVyQmxvY2sqIHJlbmRlcmVyOwog ICAgIG1fY2FyZXRMb2NhbFJlY3QgPSBsb2NhbENhcmV0UmVjdEluUmVuZGVyZXJGb3JDYXJldFBh aW50aW5nKGNhcmV0UG9zaXRpb24sIHJlbmRlcmVyKTsKICAgICByZXR1cm4gIW1fY2FyZXRMb2Nh bFJlY3QuaXNFbXB0eSgpOwogfQogCi1SZW5kZXJPYmplY3QqIEZyYW1lU2VsZWN0aW9uOjpjYXJl dFJlbmRlcmVyV2l0aG91dFVwZGF0aW5nTGF5b3V0KCkgY29uc3QKK1JlbmRlckJsb2NrKiBGcmFt ZVNlbGVjdGlvbjo6Y2FyZXRSZW5kZXJlcldpdGhvdXRVcGRhdGluZ0xheW91dCgpIGNvbnN0CiB7 CiAgICAgcmV0dXJuIHJlbmRlcmVyRm9yQ2FyZXRQYWludGluZyhtX3NlbGVjdGlvbi5zdGFydCgp LmRlcHJlY2F0ZWROb2RlKCkpOwogfQogCi1SZW5kZXJPYmplY3QqIERyYWdDYXJldENvbnRyb2xs ZXI6OmNhcmV0UmVuZGVyZXIoKSBjb25zdAorUmVuZGVyQmxvY2sqIERyYWdDYXJldENvbnRyb2xs ZXI6OmNhcmV0UmVuZGVyZXIoKSBjb25zdAogewogICAgIHJldHVybiByZW5kZXJlckZvckNhcmV0 UGFpbnRpbmcobV9wb3NpdGlvbi5kZWVwRXF1aXZhbGVudCgpLmRlcHJlY2F0ZWROb2RlKCkpOwog fQpAQCAtMTM1OCwxMSArMTM1OCw4IEBAIEludFJlY3QgRnJhbWVTZWxlY3Rpb246OmFic29sdXRl Q2FyZXRCb3VuZHMoKQogCiBzdGF0aWMgdm9pZCByZXBhaW50Q2FyZXRGb3JMb2NhbFJlY3QoTm9k ZSogbm9kZSwgY29uc3QgTGF5b3V0UmVjdCYgcmVjdCkKIHsKLSAgICBSZW5kZXJPYmplY3QqIGNh cmV0UGFpbnRlciA9IHJlbmRlcmVyRm9yQ2FyZXRQYWludGluZyhub2RlKTsKLSAgICBpZiAoIWNh cmV0UGFpbnRlcikKLSAgICAgICAgcmV0dXJuOwotCi0gICAgY2FyZXRQYWludGVyLT5yZXBhaW50 UmVjdGFuZ2xlKHJlY3QpOworICAgIGlmIChhdXRvKiBjYXJldFBhaW50ZXIgPSByZW5kZXJlckZv ckNhcmV0UGFpbnRpbmcobm9kZSkpCisgICAgICAgIGNhcmV0UGFpbnRlci0+cmVwYWludFJlY3Rh bmdsZShyZWN0KTsKIH0KIAogYm9vbCBGcmFtZVNlbGVjdGlvbjo6cmVjb21wdXRlQ2FyZXRSZWN0 KCkKQEAgLTE0ODEsOSArMTQ3OCw4IEBAIHZvaWQgQ2FyZXRCYXNlOjpwYWludENhcmV0KE5vZGUq IG5vZGUsIEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgTGF5b3V0UG9pCiAgICAgICAg IHJldHVybjsKIAogICAgIExheW91dFJlY3QgZHJhd2luZ1JlY3QgPSBsb2NhbENhcmV0UmVjdFdp dGhvdXRVcGRhdGUoKTsKLSAgICBSZW5kZXJPYmplY3QqIHJlbmRlcmVyID0gcmVuZGVyZXJGb3JD YXJldFBhaW50aW5nKG5vZGUpOwotICAgIGlmIChpczxSZW5kZXJCb3g+KHJlbmRlcmVyKSkKLSAg ICAgICAgZG93bmNhc3Q8UmVuZGVyQm94PigqcmVuZGVyZXIpLmZsaXBGb3JXcml0aW5nTW9kZShk cmF3aW5nUmVjdCk7CisgICAgaWYgKGF1dG8qIHJlbmRlcmVyID0gcmVuZGVyZXJGb3JDYXJldFBh aW50aW5nKG5vZGUpKQorICAgICAgICByZW5kZXJlci0+ZmxpcEZvcldyaXRpbmdNb2RlKGRyYXdp bmdSZWN0KTsKICAgICBkcmF3aW5nUmVjdC5tb3ZlQnkocm91bmRlZEludFBvaW50KHBhaW50T2Zm c2V0KSk7CiAgICAgTGF5b3V0UmVjdCBjYXJldCA9IGludGVyc2VjdGlvbihkcmF3aW5nUmVjdCwg Y2xpcFJlY3QpOwogICAgIGlmIChjYXJldC5pc0VtcHR5KCkpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9lZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5n L0ZyYW1lU2VsZWN0aW9uLmgKaW5kZXggZjk4OGM2Yy4uNmE4Nzc2MCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uaApAQCAtNDYsNiArNDYsNyBAQCBjbGFzcyBGcmFtZTsK IGNsYXNzIEdyYXBoaWNzQ29udGV4dDsKIGNsYXNzIEhUTUxGb3JtRWxlbWVudDsKIGNsYXNzIE11 dGFibGVTdHlsZVByb3BlcnRpZXM7CitjbGFzcyBSZW5kZXJCbG9jazsKIGNsYXNzIFJlbmRlck9i amVjdDsKIGNsYXNzIFJlbmRlclZpZXc7CiBjbGFzcyBTZXR0aW5nczsKQEAgLTkyLDcgKzkzLDcg QEAgY2xhc3MgRHJhZ0NhcmV0Q29udHJvbGxlciA6IHByaXZhdGUgQ2FyZXRCYXNlIHsKIHB1Ymxp YzoKICAgICBEcmFnQ2FyZXRDb250cm9sbGVyKCk7CiAKLSAgICBSZW5kZXJPYmplY3QqIGNhcmV0 UmVuZGVyZXIoKSBjb25zdDsKKyAgICBSZW5kZXJCbG9jayogY2FyZXRSZW5kZXJlcigpIGNvbnN0 OwogICAgIHZvaWQgcGFpbnREcmFnQ2FyZXQoRnJhbWUqLCBHcmFwaGljc0NvbnRleHQqLCBjb25z dCBMYXlvdXRQb2ludCYsIGNvbnN0IExheW91dFJlY3QmIGNsaXBSZWN0KSBjb25zdDsKIAogICAg IGJvb2wgaXNDb250ZW50RWRpdGFibGUoKSBjb25zdCB7IHJldHVybiBtX3Bvc2l0aW9uLnJvb3RF ZGl0YWJsZUVsZW1lbnQoKTsgfQpAQCAtMTY5LDcgKzE3MCw3IEBAIHB1YmxpYzoKICAgICB2b2lk IHNldEV4dGVudChjb25zdCBQb3NpdGlvbiYsIEVBZmZpbml0eSwgRVVzZXJUcmlnZ2VyZWQgPSBO b3RVc2VyVHJpZ2dlcmVkKTsKIAogICAgIC8vIFJldHVybiB0aGUgcmVuZGVyZXIgdGhhdCBpcyBy ZXNwb25zaWJsZSBmb3IgcGFpbnRpbmcgdGhlIGNhcmV0IChpbiB0aGUgc2VsZWN0aW9uIHN0YXJ0 IG5vZGUpCi0gICAgUmVuZGVyT2JqZWN0KiBjYXJldFJlbmRlcmVyV2l0aG91dFVwZGF0aW5nTGF5 b3V0KCkgY29uc3Q7CisgICAgUmVuZGVyQmxvY2sqIGNhcmV0UmVuZGVyZXJXaXRob3V0VXBkYXRp bmdMYXlvdXQoKSBjb25zdDsKIAogICAgIC8vIEJvdW5kcyBvZiAocG9zc2libHkgdHJhbnNmb3Jt ZWQpIGNhcmV0IGluIGFic29sdXRlIGNvb3JkcwogICAgIFdFQkNPUkVfRVhQT1JUIEludFJlY3Qg YWJzb2x1dGVDYXJldEJvdW5kcygpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGlu Zy9WaXNpYmxlUG9zaXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9WaXNpYmxlUG9z aXRpb24uY3BwCmluZGV4IGZkOGNjNGQuLjU1ZjRmZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2VkaXRpbmcvVmlzaWJsZVBvc2l0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL1Zpc2libGVQb3NpdGlvbi5jcHAKQEAgLTYxOCw3ICs2MTgsNyBAQCBMYXlvdXRSZWN0IFZp c2libGVQb3NpdGlvbjo6bG9jYWxDYXJldFJlY3QoUmVuZGVyT2JqZWN0KiYgcmVuZGVyZXIpIGNv bnN0CiAKIEludFJlY3QgVmlzaWJsZVBvc2l0aW9uOjphYnNvbHV0ZUNhcmV0Qm91bmRzKCkgY29u c3QKIHsKLSAgICBSZW5kZXJPYmplY3QqIHJlbmRlcmVyID0gbnVsbHB0cjsKKyAgICBSZW5kZXJC bG9jayogcmVuZGVyZXIgPSBudWxscHRyOwogICAgIExheW91dFJlY3QgbG9jYWxSZWN0ID0gbG9j YWxDYXJldFJlY3RJblJlbmRlcmVyRm9yQ2FyZXRQYWludGluZygqdGhpcywgcmVuZGVyZXIpOwog ICAgIHJldHVybiBhYnNvbHV0ZUJvdW5kc0ZvckxvY2FsQ2FyZXRSZWN0KHJlbmRlcmVyLCBsb2Nh bFJlY3QpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9odG1sZWRpdGlu Zy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2h0bWxlZGl0aW5nLmNwcAppbmRleCAwOTcz NWE0Li5jN2VkZWQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2h0bWxlZGl0 aW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2h0bWxlZGl0aW5nLmNwcApAQCAt MTI2Myw3ICsxMjYzLDcgQEAgc3RhdGljIGlubGluZSBib29sIGNhcmV0UmVuZGVyc0luc2lkZU5v ZGUoTm9kZSogbm9kZSkKICAgICByZXR1cm4gbm9kZSAmJiAhaXNSZW5kZXJlZFRhYmxlKG5vZGUp ICYmICFlZGl0aW5nSWdub3Jlc0NvbnRlbnQobm9kZSk7CiB9CiAKLVJlbmRlck9iamVjdCogcmVu ZGVyZXJGb3JDYXJldFBhaW50aW5nKE5vZGUqIG5vZGUpCitSZW5kZXJCbG9jayogcmVuZGVyZXJG b3JDYXJldFBhaW50aW5nKE5vZGUqIG5vZGUpCiB7CiAgICAgaWYgKCFub2RlKQogICAgICAgICBy ZXR1cm4gbnVsbHB0cjsKQEAgLTEyNzMsMTEgKzEyNzMsMTEgQEAgUmVuZGVyT2JqZWN0KiByZW5k ZXJlckZvckNhcmV0UGFpbnRpbmcoTm9kZSogbm9kZSkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7 CiAKICAgICAvLyBJZiBjYXJldE5vZGUgaXMgYSBibG9jayBhbmQgY2FyZXQgaXMgaW5zaWRlIGl0 LCB0aGVuIGNhcmV0IHNob3VsZCBiZSBwYWludGVkIGJ5IHRoYXQgYmxvY2suCi0gICAgYm9vbCBw YWludGVkQnlCbG9jayA9IHJlbmRlcmVyLT5pc1JlbmRlckJsb2NrRmxvdygpICYmIGNhcmV0UmVu ZGVyc0luc2lkZU5vZGUobm9kZSk7Ci0gICAgcmV0dXJuIHBhaW50ZWRCeUJsb2NrID8gcmVuZGVy ZXIgOiByZW5kZXJlci0+Y29udGFpbmluZ0Jsb2NrKCk7CisgICAgYm9vbCBwYWludGVkQnlCbG9j ayA9IGlzPFJlbmRlckJsb2NrRmxvdz4oKnJlbmRlcmVyKSAmJiBjYXJldFJlbmRlcnNJbnNpZGVO b2RlKG5vZGUpOworICAgIHJldHVybiBwYWludGVkQnlCbG9jayA/IGRvd25jYXN0PFJlbmRlckJs b2NrPihyZW5kZXJlcikgOiByZW5kZXJlci0+Y29udGFpbmluZ0Jsb2NrKCk7CiB9CiAKLUxheW91 dFJlY3QgbG9jYWxDYXJldFJlY3RJblJlbmRlcmVyRm9yQ2FyZXRQYWludGluZyhjb25zdCBWaXNp YmxlUG9zaXRpb24mIGNhcmV0UG9zaXRpb24sIFJlbmRlck9iamVjdComIGNhcmV0UGFpbnRlcikK K0xheW91dFJlY3QgbG9jYWxDYXJldFJlY3RJblJlbmRlcmVyRm9yQ2FyZXRQYWludGluZyhjb25z dCBWaXNpYmxlUG9zaXRpb24mIGNhcmV0UG9zaXRpb24sIFJlbmRlckJsb2NrKiYgY2FyZXRQYWlu dGVyKQogewogICAgIGlmIChjYXJldFBvc2l0aW9uLmlzTnVsbCgpKQogICAgICAgICByZXR1cm4g TGF5b3V0UmVjdCgpOwpAQCAtMTMwNCwxNCArMTMwNCwxMyBAQCBMYXlvdXRSZWN0IGxvY2FsQ2Fy ZXRSZWN0SW5SZW5kZXJlckZvckNhcmV0UGFpbnRpbmcoY29uc3QgVmlzaWJsZVBvc2l0aW9uJiBj YXJldAogICAgIHJldHVybiBsb2NhbFJlY3Q7CiB9CiAKLUludFJlY3QgYWJzb2x1dGVCb3VuZHNG b3JMb2NhbENhcmV0UmVjdChSZW5kZXJPYmplY3QqIHJlbmRlcmVyRm9yQ2FyZXRQYWludGluZywg Y29uc3QgTGF5b3V0UmVjdCYgcmVjdCkKK0ludFJlY3QgYWJzb2x1dGVCb3VuZHNGb3JMb2NhbENh cmV0UmVjdChSZW5kZXJCbG9jayogcmVuZGVyZXJGb3JDYXJldFBhaW50aW5nLCBjb25zdCBMYXlv dXRSZWN0JiByZWN0KQogewogICAgIGlmICghcmVuZGVyZXJGb3JDYXJldFBhaW50aW5nIHx8IHJl Y3QuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm4gSW50UmVjdCgpOwogCiAgICAgTGF5b3V0UmVj dCBsb2NhbFJlY3QocmVjdCk7Ci0gICAgaWYgKGlzPFJlbmRlckJveD4oKnJlbmRlcmVyRm9yQ2Fy ZXRQYWludGluZykpCi0gICAgICAgIGRvd25jYXN0PFJlbmRlckJveD4oKnJlbmRlcmVyRm9yQ2Fy ZXRQYWludGluZykuZmxpcEZvcldyaXRpbmdNb2RlKGxvY2FsUmVjdCk7CisgICAgcmVuZGVyZXJG b3JDYXJldFBhaW50aW5nLT5mbGlwRm9yV3JpdGluZ01vZGUobG9jYWxSZWN0KTsKICAgICByZXR1 cm4gcmVuZGVyZXJGb3JDYXJldFBhaW50aW5nLT5sb2NhbFRvQWJzb2x1dGVRdWFkKEZsb2F0UmVj dChsb2NhbFJlY3QpKS5lbmNsb3NpbmdCb3VuZGluZ0JveCgpOwogfQogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9lZGl0aW5nL2h0bWxlZGl0aW5nLmggYi9Tb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL2h0bWxlZGl0aW5nLmgKaW5kZXggZDI0OWNmOS4uODVmZTMyYiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvZWRpdGluZy9odG1sZWRpdGluZy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Vk aXRpbmcvaHRtbGVkaXRpbmcuaApAQCAtNDEsNiArNDEsNyBAQCBjbGFzcyBIVE1MVGV4dEZvcm1D b250cm9sRWxlbWVudDsKIGNsYXNzIE5vZGU7CiBjbGFzcyBQb3NpdGlvbjsKIGNsYXNzIFJhbmdl OworY2xhc3MgUmVuZGVyQmxvY2s7CiBjbGFzcyBWaXNpYmxlUG9zaXRpb247CiBjbGFzcyBWaXNp YmxlU2VsZWN0aW9uOwogCkBAIC0yNTksOSArMjYwLDkgQEAgY29uc3QgU3RyaW5nJiBub25CcmVh a2luZ1NwYWNlU3RyaW5nKCk7CiAKIC8vIE1pc2NlbGxhYW5lb3VzIGZ1bmN0aW9ucyB0aGF0IGZv ciBjYXJldCByZW5kZXJpbmcKIAotUmVuZGVyT2JqZWN0KiByZW5kZXJlckZvckNhcmV0UGFpbnRp bmcoTm9kZSopOwotTGF5b3V0UmVjdCBsb2NhbENhcmV0UmVjdEluUmVuZGVyZXJGb3JDYXJldFBh aW50aW5nKGNvbnN0IFZpc2libGVQb3NpdGlvbiYsIFJlbmRlck9iamVjdComKTsKLUludFJlY3Qg YWJzb2x1dGVCb3VuZHNGb3JMb2NhbENhcmV0UmVjdChSZW5kZXJPYmplY3QqIHJlbmRlcmVyRm9y Q2FyZXRQYWludGluZywgY29uc3QgTGF5b3V0UmVjdCYpOworUmVuZGVyQmxvY2sqIHJlbmRlcmVy Rm9yQ2FyZXRQYWludGluZyhOb2RlKik7CitMYXlvdXRSZWN0IGxvY2FsQ2FyZXRSZWN0SW5SZW5k ZXJlckZvckNhcmV0UGFpbnRpbmcoY29uc3QgVmlzaWJsZVBvc2l0aW9uJiwgUmVuZGVyQmxvY2sq Jik7CitJbnRSZWN0IGFic29sdXRlQm91bmRzRm9yTG9jYWxDYXJldFJlY3QoUmVuZGVyQmxvY2sq IHJlbmRlcmVyRm9yQ2FyZXRQYWludGluZywgY29uc3QgTGF5b3V0UmVjdCYpOwogCiB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCmluZGV4IDY5YjFlZjEuLjllMGRl NzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcApAQCAtMTUyNCw3 ICsxNTI0LDcgQEAgdm9pZCBSZW5kZXJCbG9jazo6cGFpbnRDYXJldChQYWludEluZm8mIHBhaW50 SW5mbywgY29uc3QgTGF5b3V0UG9pbnQmIHBhaW50T2Zmc2UKIHsKICAgICAvLyBQYWludCB0aGUg Y2FyZXQgaWYgdGhlIEZyYW1lU2VsZWN0aW9uIHNheXMgc28gb3IgaWYgY2FyZXQgYnJvd3Npbmcg aXMgZW5hYmxlZAogICAgIGJvb2wgY2FyZXRCcm93c2luZyA9IGZyYW1lKCkuc2V0dGluZ3MoKS5j YXJldEJyb3dzaW5nRW5hYmxlZCgpOwotICAgIFJlbmRlck9iamVjdCogY2FyZXRQYWludGVyOwor ICAgIFJlbmRlckJsb2NrKiBjYXJldFBhaW50ZXI7CiAgICAgYm9vbCBpc0NvbnRlbnRFZGl0YWJs ZTsKICAgICBpZiAodHlwZSA9PSBDdXJzb3JDYXJldCkgewogICAgICAgICBjYXJldFBhaW50ZXIg PSBmcmFtZSgpLnNlbGVjdGlvbigpLmNhcmV0UmVuZGVyZXJXaXRob3V0VXBkYXRpbmdMYXlvdXQo KTsK