127343 2014-01-21 06:17:29 -0800 [CSS Regions] layerOwner in RenderNamedFlowFragment cannot return null 2022-03-01 02:55:47 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED AdobeTracked P2 Normal --- 57312 1 mmaerean mmaerean commit-queue esprehn+autocc glenn kondapallykalyan mihnea simon.fraser WebkitBugTracker oldest_to_newest 970228 0 mmaerean 2014-01-21 06:17:29 -0800 RenderNamedFlowFragment::layerOwner cannot return null because regions create stacking contexts which create layers. 970242 1 221741 mmaerean 2014-01-21 07:23:57 -0800 Created attachment 221741 patch 970575 2 221741 sam 2014-01-21 22:05:22 -0800 Comment on attachment 221741 patch View in context: https://bugs.webkit.org/attachment.cgi?id=221741&action=review > Source/WebCore/rendering/RenderFlowThread.cpp:256 > for (auto iter = m_regionList.begin(), end = m_regionList.end(); iter != end; ++iter) > - if (RenderLayerModelObject* layerOwner = toRenderNamedFlowFragment(*iter)->layerOwner()) > - if (layerOwner->hasLayer() && layerOwner->layer()->hasCompositingDescendant()) > - return true; > + if (toRenderNamedFlowFragment(*iter)->layerOwner().layer()->hasCompositingDescendant()) > + return true; You should totally convert this loop to for-range style while you are here. > Source/WebCore/rendering/RenderLayer.cpp:6940 > + LayoutRect regionContentBox = toRenderBox(&region->layerOwner())->contentBoxRect(); This can probably be: LayoutRect regionContentBox = toRenderBox(region->layerOwner()).contentBoxRect(); 970658 3 221855 mmaerean 2014-01-22 03:46:29 -0800 Created attachment 221855 patch for landing 970667 4 221859 mmaerean 2014-01-22 04:50:23 -0800 Created attachment 221859 patch for landing 970668 5 221859 commit-queue 2014-01-22 04:55:56 -0800 Comment on attachment 221859 patch for landing Rejecting attachment 221859 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-01', 'validate-changelog', '--check-oops', '--non-interactive', 221859, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit ChangeLog entry in Source/WebCore/ChangeLog contains OOPS!. Full output: http://webkit-queues.appspot.com/results/4584376553701376 970673 6 221862 mmaerean 2014-01-22 05:22:08 -0800 Created attachment 221862 patch for landing 970707 7 221862 commit-queue 2014-01-22 09:25:52 -0800 Comment on attachment 221862 patch for landing Clearing flags on attachment: 221862 Committed r162523: <http://trac.webkit.org/changeset/162523> 221741 2014-01-21 07:23:57 -0800 2022-03-01 02:55:47 -0800 patch patch127343layerOwnerNull.diff text/plain 6544 mmaerean ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAyMTIwZjk1Li5hMGEzYzI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUg QEAKKzIwMTQtMDEtMjEgIE1paGFpIE1hZXJlYW4gIDxtbWFlcmVhbkBhZG9iZS5jb20+CisKKyAg ICAgICAgW0NTUyBSZWdpb25zXSBsYXllck93bmVyIGluIFJlbmRlck5hbWVkRmxvd0ZyYWdtZW50 IGNhbm5vdCByZXR1cm4gbnVsbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTI3MzQzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgUmVuZGVyTmFtZWRGbG93RnJhZ21lbnQ6OmxheWVyT3duZXIgY2Fubm90IHJl dHVybiBudWxsIGJlY2F1c2UgcmVnaW9ucyBjcmVhdGUgc3RhY2tpbmcKKyAgICAgICAgY29udGV4 dHMgd2hpY2ggY3JlYXRlIGxheWVycy4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGZ1bmN0 aW9uYWwgY2hhbmdlLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxvd1RocmVhZDo6aGFzQ29tcG9zaXRpbmdSZWdp b25EZXNjZW5kYW50KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OmNhbGN1bGF0ZUNsaXBSZWN0cyk6CisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJMYXllckJhY2tpbmc6OmFkanVzdEFuY2VzdG9yQ29tcG9zaXRpbmdCb3VuZHNGb3JGbG93 VGhyZWFkKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6Y29tcHV0ZVJlZ2lvbkNv bXBvc2l0aW5nUmVxdWlyZW1lbnRzKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTmFtZWRG bG93RnJhZ21lbnQuaDoKKwogMjAxNC0wMS0yMCAgUnl1YW4gQ2hvaSAgPHJ5dWFuLmNob2lAc2Ft c3VuZy5jb20+CiAKICAgICAgICAgW0NNQUtFXSBSZW1vdmUgTml4IGZyb20gQ01ha2Ugc2NyaXB0 cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQu Y3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQuY3BwCmluZGV4 IGJjNDM1NTEuLjk4MGE1OTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJGbG93VGhyZWFkLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy Rmxvd1RocmVhZC5jcHAKQEAgLTI1Miw5ICsyNTIsOCBAQCB2b2lkIFJlbmRlckZsb3dUaHJlYWQ6 OmxheW91dCgpCiBib29sIFJlbmRlckZsb3dUaHJlYWQ6Omhhc0NvbXBvc2l0aW5nUmVnaW9uRGVz Y2VuZGFudCgpIGNvbnN0CiB7CiAgICAgZm9yIChhdXRvIGl0ZXIgPSBtX3JlZ2lvbkxpc3QuYmVn aW4oKSwgZW5kID0gbV9yZWdpb25MaXN0LmVuZCgpOyBpdGVyICE9IGVuZDsgKytpdGVyKQotICAg ICAgICBpZiAoUmVuZGVyTGF5ZXJNb2RlbE9iamVjdCogbGF5ZXJPd25lciA9IHRvUmVuZGVyTmFt ZWRGbG93RnJhZ21lbnQoKml0ZXIpLT5sYXllck93bmVyKCkpCi0gICAgICAgICAgICBpZiAobGF5 ZXJPd25lci0+aGFzTGF5ZXIoKSAmJiBsYXllck93bmVyLT5sYXllcigpLT5oYXNDb21wb3NpdGlu Z0Rlc2NlbmRhbnQoKSkKLSAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgaWYg KHRvUmVuZGVyTmFtZWRGbG93RnJhZ21lbnQoKml0ZXIpLT5sYXllck93bmVyKCkubGF5ZXIoKS0+ aGFzQ29tcG9zaXRpbmdEZXNjZW5kYW50KCkpCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKIAog ICAgIHJldHVybiBmYWxzZTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIu Y3BwCmluZGV4IDgwNTk2ZWYuLmI5MzA1YTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMYXllci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyLmNwcApAQCAtNjkzNyw3ICs2OTM3LDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6Zmls dGVyTmVlZHNSZXBhaW50KCkKIAogdm9pZCBSZW5kZXJMYXllcjo6cGFpbnROYW1lZEZsb3dUaHJl YWRJbnNpZGVSZWdpb24oR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBSZW5kZXJOYW1lZEZsb3dG cmFnbWVudCogcmVnaW9uLCBMYXlvdXRSZWN0IHBhaW50RGlydHlSZWN0LCBMYXlvdXRQb2ludCBw YWludE9mZnNldCwgUGFpbnRCZWhhdmlvciBwYWludEJlaGF2aW9yLCBQYWludExheWVyRmxhZ3Mg cGFpbnRGbGFncykKIHsKLSAgICBMYXlvdXRSZWN0IHJlZ2lvbkNvbnRlbnRCb3ggPSB0b1JlbmRl ckJveChyZWdpb24tPmxheWVyT3duZXIoKSktPmNvbnRlbnRCb3hSZWN0KCk7CisgICAgTGF5b3V0 UmVjdCByZWdpb25Db250ZW50Qm94ID0gdG9SZW5kZXJCb3goJnJlZ2lvbi0+bGF5ZXJPd25lcigp KS0+Y29udGVudEJveFJlY3QoKTsKICAgICBMYXlvdXRTaXplIG1vdmVPZmZzZXQgPSByZWdpb24t PmZsb3dUaHJlYWRQb3J0aW9uTG9jYXRpb24oKSAtIChwYWludE9mZnNldCArIHJlZ2lvbkNvbnRl bnRCb3gubG9jYXRpb24oKSk7CiAgICAgSW50UG9pbnQgYWRqdXN0ZWRQYWludE9mZnNldCA9IHJv dW5kZWRJbnRQb2ludCgtbW92ZU9mZnNldCk7CiAgICAgcGFpbnREaXJ0eVJlY3QubW92ZShtb3Zl T2Zmc2V0KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll ckJhY2tpbmcuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2lu Zy5jcHAKaW5kZXggZTVlMzdjNS4uOGE1YmYwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKQEAgLTk5NywxNCArOTk3LDE0IEBAIHZvaWQg UmVuZGVyTGF5ZXJCYWNraW5nOjphZGp1c3RBbmNlc3RvckNvbXBvc2l0aW5nQm91bmRzRm9yRmxv d1RocmVhZChJbnRSZWN0JiBhCiAgICAgICAgICAgICBJbnRQb2ludCBmbG93RGVsdGE7CiAgICAg ICAgICAgICBtX293bmluZ0xheWVyLmNvbnZlcnRUb1BpeGVsU25hcHBlZExheWVyQ29vcmRzKGZs b3dUaHJlYWRMYXllciwgZmxvd0RlbHRhKTsKICAgICAgICAgICAgIHBhcmVudFJlZ2lvbi0+YWRq dXN0UmVnaW9uQm91bmRzRnJvbUZsb3dUaHJlYWRQb3J0aW9uUmVjdChmbG93RGVsdGEsIGFuY2Vz dG9yQ29tcG9zaXRpbmdCb3VuZHMpOwotICAgICAgICAgICAgUmVuZGVyQm94TW9kZWxPYmplY3Qq IGxheWVyT3duZXIgPSB0b1JlbmRlckJveE1vZGVsT2JqZWN0KHBhcmVudFJlZ2lvbi0+bGF5ZXJP d25lcigpKTsKLSAgICAgICAgICAgIGlmIChsYXllck93bmVyLT5oYXNMYXllcigpICYmIGxheWVy T3duZXItPmxheWVyKCktPmJhY2tpbmcoKSkgeworICAgICAgICAgICAgUmVuZGVyQm94TW9kZWxP YmplY3QmIGxheWVyT3duZXIgPSB0b1JlbmRlckJveE1vZGVsT2JqZWN0KHBhcmVudFJlZ2lvbi0+ bGF5ZXJPd25lcigpKTsKKyAgICAgICAgICAgIGlmIChsYXllck93bmVyLmxheWVyKCktPmJhY2tp bmcoKSkgewogICAgICAgICAgICAgICAgIC8vIE1ha2Ugc3VyZSB0aGF0IHRoZSByZWdpb24gcHJv cGFnYXRlcyBpdHMgYm9yZGVycywgcGFkZGluZ3MsIG91dGxpbmVzIG9yIGJveC1zaGFkb3dzIHRv IGxheWVycyBpbnNpZGUgaXQuCiAgICAgICAgICAgICAgICAgLy8gTm90ZSB0aGF0IHRoZSBjb21w b3NpdGVkIGJvdW5kcyBvZiB0aGUgUmVuZGVyUmVnaW9uIGFyZSBhbHJlYWR5IGNhbGN1bGF0ZWQK ICAgICAgICAgICAgICAgICAvLyBiZWNhdXNlIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6cmVidWls ZENvbXBvc2l0aW5nTGF5ZXJUcmVlIHdpbGwgb25seQogICAgICAgICAgICAgICAgIC8vIGl0ZXJh dGUgb24gdGhlIGNvbnRlbnQgb2YgdGhlIHJlZ2lvbiBhZnRlciB0aGUgcmVnaW9uIGl0c2VsZiBp cyBjb21wdXRlZC4KLSAgICAgICAgICAgICAgICBhbmNlc3RvckNvbXBvc2l0aW5nQm91bmRzLm1v dmVCeShyb3VuZGVkSW50UG9pbnQobGF5ZXJPd25lci0+bGF5ZXIoKS0+YmFja2luZygpLT5jb21w b3NpdGVkQm91bmRzKCkubG9jYXRpb24oKSkpOwotICAgICAgICAgICAgICAgIGFuY2VzdG9yQ29t cG9zaXRpbmdCb3VuZHMubW92ZSgtbGF5ZXJPd25lci0+Ym9yZGVyQW5kUGFkZGluZ1N0YXJ0KCks IC1sYXllck93bmVyLT5ib3JkZXJBbmRQYWRkaW5nQmVmb3JlKCkpOworICAgICAgICAgICAgICAg IGFuY2VzdG9yQ29tcG9zaXRpbmdCb3VuZHMubW92ZUJ5KHJvdW5kZWRJbnRQb2ludChsYXllck93 bmVyLmxheWVyKCktPmJhY2tpbmcoKS0+Y29tcG9zaXRlZEJvdW5kcygpLmxvY2F0aW9uKCkpKTsK KyAgICAgICAgICAgICAgICBhbmNlc3RvckNvbXBvc2l0aW5nQm91bmRzLm1vdmUoLWxheWVyT3du ZXIuYm9yZGVyQW5kUGFkZGluZ1N0YXJ0KCksIC1sYXllck93bmVyLmJvcmRlckFuZFBhZGRpbmdC ZWZvcmUoKSk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCmluZGV4IDhhZGQ0 NGEuLjY2ZGFkYmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM YXllckNvbXBvc2l0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM YXllckNvbXBvc2l0b3IuY3BwCkBAIC0xMjg4LDcgKzEyODgsNyBAQCB2b2lkIFJlbmRlckxheWVy Q29tcG9zaXRvcjo6Y29tcHV0ZVJlZ2lvbkNvbXBvc2l0aW5nUmVxdWlyZW1lbnRzKFJlbmRlck5h bWVkRmxvdwogICAgIH0KIAogICAgIGlmIChvdmVybGFwTWFwKQotICAgICAgICBvdmVybGFwTWFw LT5nZW9tZXRyeU1hcCgpLnBvcE1hcHBpbmdzVG9BbmNlc3RvcihyZWdpb24tPmxheWVyT3duZXIo KSk7CisgICAgICAgIG92ZXJsYXBNYXAtPmdlb21ldHJ5TWFwKCkucG9wTWFwcGluZ3NUb0FuY2Vz dG9yKCZyZWdpb24tPmxheWVyT3duZXIoKSk7CiB9CiAKIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3Np dG9yOjpzZXRDb21wb3NpdGluZ1BhcmVudChSZW5kZXJMYXllciYgY2hpbGRMYXllciwgUmVuZGVy TGF5ZXIqIHBhcmVudExheWVyKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlck5hbWVkRmxvd0ZyYWdtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTmFtZWRGbG93RnJhZ21lbnQuaAppbmRleCA4YWZkYmY3Li45OGM1NDk3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTmFtZWRGbG93RnJhZ21lbnQuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTmFtZWRGbG93RnJhZ21lbnQuaApAQCAt NjUsOSArNjUsOCBAQCBwdWJsaWM6CiAgICAgLy8gV2hlbiB0aGUgY29udGVudCBpbnNpZGUgdGhl IHJlZ2lvbiByZXF1aXJlcyB0aGUgcmVnaW9uIHRvIGhhdmUgYSBsYXllciwgdGhlIGxheWVyIHdp bGwgYmUgY3JlYXRlZCBvbiB0aGUgcmVnaW9uJ3MKICAgICAvLyBwYXJlbnQgcmVuZGVyZXIgaW5z dGVhZC4KICAgICAvLyBUaGlzIG1ldGhvZCByZXR1cm5zIHRoYXQgcmVuZGVyZXIgaG9sZGluZyB0 aGUgbGF5ZXIuCi0gICAgLy8gVGhlIHJldHVybiB2YWx1ZSBtYXkgYmUgbnVsbC4KLSAgICBSZW5k ZXJMYXllck1vZGVsT2JqZWN0KiBsYXllck93bmVyKCkgY29uc3QgeyByZXR1cm4gcGFyZW50KCkg JiYgcGFyZW50KCktPmlzUmVuZGVyTGF5ZXJNb2RlbE9iamVjdCgpID8gdG9SZW5kZXJMYXllck1v ZGVsT2JqZWN0KHBhcmVudCgpKQotICAgICAgICA6IG51bGxwdHI7IH0KKyAgICAvLyBUaGUgcmV0 dXJuIHZhbHVlIGNhbm5vdCBiZSBudWxsIGJlY2F1c2UgQ1NTIFJlZ2lvbnMgY3JlYXRlIFN0YWNr aW5nIENvbnRleHRzICh3aGljaCBtZWFucyB0aGV5IGNyZWF0ZSBsYXllcnMpLgorICAgIFJlbmRl ckxheWVyTW9kZWxPYmplY3QmIGxheWVyT3duZXIoKSBjb25zdCB7IHJldHVybiAqdG9SZW5kZXJM YXllck1vZGVsT2JqZWN0KHBhcmVudCgpKTsgfQogCiAgICAgYm9vbCBoYXNDdXN0b21SZWdpb25T dHlsZSgpIGNvbnN0IHsgcmV0dXJuIG1faGFzQ3VzdG9tUmVnaW9uU3R5bGU7IH0KICAgICB2b2lk IHNldEhhc0N1c3RvbVJlZ2lvblN0eWxlKGJvb2wgaGFzQ3VzdG9tUmVnaW9uU3R5bGUpIHsgbV9o YXNDdXN0b21SZWdpb25TdHlsZSA9IGhhc0N1c3RvbVJlZ2lvblN0eWxlOyB9Cg== 221855 2014-01-22 03:46:29 -0800 2014-01-22 04:50:23 -0800 patch for landing patch127343layerOwnerNull.diff text/plain 6619 mmaerean ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAyMTIwZjk1Li5hMGEzYzI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUg QEAKKzIwMTQtMDEtMjEgIE1paGFpIE1hZXJlYW4gIDxtbWFlcmVhbkBhZG9iZS5jb20+CisKKyAg ICAgICAgW0NTUyBSZWdpb25zXSBsYXllck93bmVyIGluIFJlbmRlck5hbWVkRmxvd0ZyYWdtZW50 IGNhbm5vdCByZXR1cm4gbnVsbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTI3MzQzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgUmVuZGVyTmFtZWRGbG93RnJhZ21lbnQ6OmxheWVyT3duZXIgY2Fubm90IHJl dHVybiBudWxsIGJlY2F1c2UgcmVnaW9ucyBjcmVhdGUgc3RhY2tpbmcKKyAgICAgICAgY29udGV4 dHMgd2hpY2ggY3JlYXRlIGxheWVycy4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGZ1bmN0 aW9uYWwgY2hhbmdlLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxvd1RocmVhZDo6aGFzQ29tcG9zaXRpbmdSZWdp b25EZXNjZW5kYW50KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OmNhbGN1bGF0ZUNsaXBSZWN0cyk6CisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJMYXllckJhY2tpbmc6OmFkanVzdEFuY2VzdG9yQ29tcG9zaXRpbmdCb3VuZHNGb3JGbG93 VGhyZWFkKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6Y29tcHV0ZVJlZ2lvbkNv bXBvc2l0aW5nUmVxdWlyZW1lbnRzKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTmFtZWRG bG93RnJhZ21lbnQuaDoKKwogMjAxNC0wMS0yMCAgUnl1YW4gQ2hvaSAgPHJ5dWFuLmNob2lAc2Ft c3VuZy5jb20+CiAKICAgICAgICAgW0NNQUtFXSBSZW1vdmUgTml4IGZyb20gQ01ha2Ugc2NyaXB0 cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQu Y3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQuY3BwCmluZGV4 IGJjNDM1NTEuLjVjZmQxOGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJGbG93VGhyZWFkLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy Rmxvd1RocmVhZC5jcHAKQEAgLTI1MSwxMCArMjUxLDkgQEAgdm9pZCBSZW5kZXJGbG93VGhyZWFk OjpsYXlvdXQoKQogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKIGJvb2wgUmVuZGVy Rmxvd1RocmVhZDo6aGFzQ29tcG9zaXRpbmdSZWdpb25EZXNjZW5kYW50KCkgY29uc3QKIHsKLSAg ICBmb3IgKGF1dG8gaXRlciA9IG1fcmVnaW9uTGlzdC5iZWdpbigpLCBlbmQgPSBtX3JlZ2lvbkxp c3QuZW5kKCk7IGl0ZXIgIT0gZW5kOyArK2l0ZXIpCi0gICAgICAgIGlmIChSZW5kZXJMYXllck1v ZGVsT2JqZWN0KiBsYXllck93bmVyID0gdG9SZW5kZXJOYW1lZEZsb3dGcmFnbWVudCgqaXRlcikt PmxheWVyT3duZXIoKSkKLSAgICAgICAgICAgIGlmIChsYXllck93bmVyLT5oYXNMYXllcigpICYm IGxheWVyT3duZXItPmxheWVyKCktPmhhc0NvbXBvc2l0aW5nRGVzY2VuZGFudCgpKQotICAgICAg ICAgICAgICAgIHJldHVybiB0cnVlOworICAgIGZvciAoYXV0byYgcmVnaW9uIDogbV9yZWdpb25M aXN0KQorICAgICAgICBpZiAodG9SZW5kZXJOYW1lZEZsb3dGcmFnbWVudChyZWdpb24pLT5sYXll ck93bmVyKCkubGF5ZXIoKS0+aGFzQ29tcG9zaXRpbmdEZXNjZW5kYW50KCkpCisgICAgICAgICAg ICByZXR1cm4gdHJ1ZTsKIAogICAgIHJldHVybiBmYWxzZTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCmluZGV4IDgwNTk2ZWYuLmI5MzA1YTcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcApAQCAtNjkzNyw3ICs2OTM3LDcgQEAgdm9p ZCBSZW5kZXJMYXllcjo6ZmlsdGVyTmVlZHNSZXBhaW50KCkKIAogdm9pZCBSZW5kZXJMYXllcjo6 cGFpbnROYW1lZEZsb3dUaHJlYWRJbnNpZGVSZWdpb24oR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0 LCBSZW5kZXJOYW1lZEZsb3dGcmFnbWVudCogcmVnaW9uLCBMYXlvdXRSZWN0IHBhaW50RGlydHlS ZWN0LCBMYXlvdXRQb2ludCBwYWludE9mZnNldCwgUGFpbnRCZWhhdmlvciBwYWludEJlaGF2aW9y LCBQYWludExheWVyRmxhZ3MgcGFpbnRGbGFncykKIHsKLSAgICBMYXlvdXRSZWN0IHJlZ2lvbkNv bnRlbnRCb3ggPSB0b1JlbmRlckJveChyZWdpb24tPmxheWVyT3duZXIoKSktPmNvbnRlbnRCb3hS ZWN0KCk7CisgICAgTGF5b3V0UmVjdCByZWdpb25Db250ZW50Qm94ID0gdG9SZW5kZXJCb3goJnJl Z2lvbi0+bGF5ZXJPd25lcigpKS0+Y29udGVudEJveFJlY3QoKTsKICAgICBMYXlvdXRTaXplIG1v dmVPZmZzZXQgPSByZWdpb24tPmZsb3dUaHJlYWRQb3J0aW9uTG9jYXRpb24oKSAtIChwYWludE9m ZnNldCArIHJlZ2lvbkNvbnRlbnRCb3gubG9jYXRpb24oKSk7CiAgICAgSW50UG9pbnQgYWRqdXN0 ZWRQYWludE9mZnNldCA9IHJvdW5kZWRJbnRQb2ludCgtbW92ZU9mZnNldCk7CiAgICAgcGFpbnRE aXJ0eVJlY3QubW92ZShtb3ZlT2Zmc2V0KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyQmFja2luZy5jcHAKaW5kZXggZTVlMzdjNS4uOGE1YmYwOSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKQEAgLTk5Nywx NCArOTk3LDE0IEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNraW5nOjphZGp1c3RBbmNlc3RvckNvbXBv c2l0aW5nQm91bmRzRm9yRmxvd1RocmVhZChJbnRSZWN0JiBhCiAgICAgICAgICAgICBJbnRQb2lu dCBmbG93RGVsdGE7CiAgICAgICAgICAgICBtX293bmluZ0xheWVyLmNvbnZlcnRUb1BpeGVsU25h cHBlZExheWVyQ29vcmRzKGZsb3dUaHJlYWRMYXllciwgZmxvd0RlbHRhKTsKICAgICAgICAgICAg IHBhcmVudFJlZ2lvbi0+YWRqdXN0UmVnaW9uQm91bmRzRnJvbUZsb3dUaHJlYWRQb3J0aW9uUmVj dChmbG93RGVsdGEsIGFuY2VzdG9yQ29tcG9zaXRpbmdCb3VuZHMpOwotICAgICAgICAgICAgUmVu ZGVyQm94TW9kZWxPYmplY3QqIGxheWVyT3duZXIgPSB0b1JlbmRlckJveE1vZGVsT2JqZWN0KHBh cmVudFJlZ2lvbi0+bGF5ZXJPd25lcigpKTsKLSAgICAgICAgICAgIGlmIChsYXllck93bmVyLT5o YXNMYXllcigpICYmIGxheWVyT3duZXItPmxheWVyKCktPmJhY2tpbmcoKSkgeworICAgICAgICAg ICAgUmVuZGVyQm94TW9kZWxPYmplY3QmIGxheWVyT3duZXIgPSB0b1JlbmRlckJveE1vZGVsT2Jq ZWN0KHBhcmVudFJlZ2lvbi0+bGF5ZXJPd25lcigpKTsKKyAgICAgICAgICAgIGlmIChsYXllck93 bmVyLmxheWVyKCktPmJhY2tpbmcoKSkgewogICAgICAgICAgICAgICAgIC8vIE1ha2Ugc3VyZSB0 aGF0IHRoZSByZWdpb24gcHJvcGFnYXRlcyBpdHMgYm9yZGVycywgcGFkZGluZ3MsIG91dGxpbmVz IG9yIGJveC1zaGFkb3dzIHRvIGxheWVycyBpbnNpZGUgaXQuCiAgICAgICAgICAgICAgICAgLy8g Tm90ZSB0aGF0IHRoZSBjb21wb3NpdGVkIGJvdW5kcyBvZiB0aGUgUmVuZGVyUmVnaW9uIGFyZSBh bHJlYWR5IGNhbGN1bGF0ZWQKICAgICAgICAgICAgICAgICAvLyBiZWNhdXNlIFJlbmRlckxheWVy Q29tcG9zaXRvcjo6cmVidWlsZENvbXBvc2l0aW5nTGF5ZXJUcmVlIHdpbGwgb25seQogICAgICAg ICAgICAgICAgIC8vIGl0ZXJhdGUgb24gdGhlIGNvbnRlbnQgb2YgdGhlIHJlZ2lvbiBhZnRlciB0 aGUgcmVnaW9uIGl0c2VsZiBpcyBjb21wdXRlZC4KLSAgICAgICAgICAgICAgICBhbmNlc3RvckNv bXBvc2l0aW5nQm91bmRzLm1vdmVCeShyb3VuZGVkSW50UG9pbnQobGF5ZXJPd25lci0+bGF5ZXIo KS0+YmFja2luZygpLT5jb21wb3NpdGVkQm91bmRzKCkubG9jYXRpb24oKSkpOwotICAgICAgICAg ICAgICAgIGFuY2VzdG9yQ29tcG9zaXRpbmdCb3VuZHMubW92ZSgtbGF5ZXJPd25lci0+Ym9yZGVy QW5kUGFkZGluZ1N0YXJ0KCksIC1sYXllck93bmVyLT5ib3JkZXJBbmRQYWRkaW5nQmVmb3JlKCkp OworICAgICAgICAgICAgICAgIGFuY2VzdG9yQ29tcG9zaXRpbmdCb3VuZHMubW92ZUJ5KHJvdW5k ZWRJbnRQb2ludChsYXllck93bmVyLmxheWVyKCktPmJhY2tpbmcoKS0+Y29tcG9zaXRlZEJvdW5k cygpLmxvY2F0aW9uKCkpKTsKKyAgICAgICAgICAgICAgICBhbmNlc3RvckNvbXBvc2l0aW5nQm91 bmRzLm1vdmUoLWxheWVyT3duZXIuYm9yZGVyQW5kUGFkZGluZ1N0YXJ0KCksIC1sYXllck93bmVy LmJvcmRlckFuZFBhZGRpbmdCZWZvcmUoKSk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAg ICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21w b3NpdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0 b3IuY3BwCmluZGV4IDhhZGQ0NGEuLjY2ZGFkYmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCkBAIC0xMjg4LDcgKzEyODgsNyBA QCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6Y29tcHV0ZVJlZ2lvbkNvbXBvc2l0aW5nUmVx dWlyZW1lbnRzKFJlbmRlck5hbWVkRmxvdwogICAgIH0KIAogICAgIGlmIChvdmVybGFwTWFwKQot ICAgICAgICBvdmVybGFwTWFwLT5nZW9tZXRyeU1hcCgpLnBvcE1hcHBpbmdzVG9BbmNlc3Rvcihy ZWdpb24tPmxheWVyT3duZXIoKSk7CisgICAgICAgIG92ZXJsYXBNYXAtPmdlb21ldHJ5TWFwKCku cG9wTWFwcGluZ3NUb0FuY2VzdG9yKCZyZWdpb24tPmxheWVyT3duZXIoKSk7CiB9CiAKIHZvaWQg UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpzZXRDb21wb3NpdGluZ1BhcmVudChSZW5kZXJMYXllciYg Y2hpbGRMYXllciwgUmVuZGVyTGF5ZXIqIHBhcmVudExheWVyKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck5hbWVkRmxvd0ZyYWdtZW50LmggYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTmFtZWRGbG93RnJhZ21lbnQuaAppbmRleCA4YWZkYmY3Li45 OGM1NDk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTmFtZWRG bG93RnJhZ21lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTmFtZWRG bG93RnJhZ21lbnQuaApAQCAtNjUsOSArNjUsOCBAQCBwdWJsaWM6CiAgICAgLy8gV2hlbiB0aGUg Y29udGVudCBpbnNpZGUgdGhlIHJlZ2lvbiByZXF1aXJlcyB0aGUgcmVnaW9uIHRvIGhhdmUgYSBs YXllciwgdGhlIGxheWVyIHdpbGwgYmUgY3JlYXRlZCBvbiB0aGUgcmVnaW9uJ3MKICAgICAvLyBw YXJlbnQgcmVuZGVyZXIgaW5zdGVhZC4KICAgICAvLyBUaGlzIG1ldGhvZCByZXR1cm5zIHRoYXQg cmVuZGVyZXIgaG9sZGluZyB0aGUgbGF5ZXIuCi0gICAgLy8gVGhlIHJldHVybiB2YWx1ZSBtYXkg YmUgbnVsbC4KLSAgICBSZW5kZXJMYXllck1vZGVsT2JqZWN0KiBsYXllck93bmVyKCkgY29uc3Qg eyByZXR1cm4gcGFyZW50KCkgJiYgcGFyZW50KCktPmlzUmVuZGVyTGF5ZXJNb2RlbE9iamVjdCgp ID8gdG9SZW5kZXJMYXllck1vZGVsT2JqZWN0KHBhcmVudCgpKQotICAgICAgICA6IG51bGxwdHI7 IH0KKyAgICAvLyBUaGUgcmV0dXJuIHZhbHVlIGNhbm5vdCBiZSBudWxsIGJlY2F1c2UgQ1NTIFJl Z2lvbnMgY3JlYXRlIFN0YWNraW5nIENvbnRleHRzICh3aGljaCBtZWFucyB0aGV5IGNyZWF0ZSBs YXllcnMpLgorICAgIFJlbmRlckxheWVyTW9kZWxPYmplY3QmIGxheWVyT3duZXIoKSBjb25zdCB7 IHJldHVybiAqdG9SZW5kZXJMYXllck1vZGVsT2JqZWN0KHBhcmVudCgpKTsgfQogCiAgICAgYm9v bCBoYXNDdXN0b21SZWdpb25TdHlsZSgpIGNvbnN0IHsgcmV0dXJuIG1faGFzQ3VzdG9tUmVnaW9u U3R5bGU7IH0KICAgICB2b2lkIHNldEhhc0N1c3RvbVJlZ2lvblN0eWxlKGJvb2wgaGFzQ3VzdG9t UmVnaW9uU3R5bGUpIHsgbV9oYXNDdXN0b21SZWdpb25TdHlsZSA9IGhhc0N1c3RvbVJlZ2lvblN0 eWxlOyB9Cg== 221859 2014-01-22 04:50:23 -0800 2014-01-22 05:22:08 -0800 patch for landing patch127343layerOwnerNull.diff text/plain 6638 mmaerean ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1MDM3OTkzLi43Nzg4NjRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUg QEAKKzIwMTQtMDEtMjEgIE1paGFpIE1hZXJlYW4gIDxtbWFlcmVhbkBhZG9iZS5jb20+CisKKyAg ICAgICAgW0NTUyBSZWdpb25zXSBsYXllck93bmVyIGluIFJlbmRlck5hbWVkRmxvd0ZyYWdtZW50 IGNhbm5vdCByZXR1cm4gbnVsbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTI3MzQzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgUmVuZGVyTmFtZWRGbG93RnJhZ21lbnQ6OmxheWVyT3duZXIgY2Fubm90IHJl dHVybiBudWxsIGJlY2F1c2UgcmVnaW9ucyBjcmVhdGUgc3RhY2tpbmcKKyAgICAgICAgY29udGV4 dHMgd2hpY2ggY3JlYXRlIGxheWVycy4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGZ1bmN0 aW9uYWwgY2hhbmdlLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxvd1RocmVhZDo6aGFzQ29tcG9zaXRpbmdSZWdp b25EZXNjZW5kYW50KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OmNhbGN1bGF0ZUNsaXBSZWN0cyk6CisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJMYXllckJhY2tpbmc6OmFkanVzdEFuY2VzdG9yQ29tcG9zaXRpbmdCb3VuZHNGb3JGbG93 VGhyZWFkKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6Y29tcHV0ZVJlZ2lvbkNv bXBvc2l0aW5nUmVxdWlyZW1lbnRzKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTmFtZWRG bG93RnJhZ21lbnQuaDoKKwogMjAxNC0wMS0yMiAgTWlobmVhIE92aWRlbmllICA8bWlobmVhQGFk b2JlLmNvbT4KIAogICAgICAgICBbQ1NTUmVnaW9uc10gSW5jb3JyZWN0IGxheW91dCBvZiBhIHJl Z2lvbiBwc2V1ZG8gY2hpbGRyZW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJGbG93VGhyZWFkLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJG bG93VGhyZWFkLmNwcAppbmRleCBiYzQzNTUxLi41Y2ZkMThlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxvd1RocmVhZC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQuY3BwCkBAIC0yNTEsMTAgKzI1MSw5IEBAIHZv aWQgUmVuZGVyRmxvd1RocmVhZDo6bGF5b3V0KCkKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9T SVRJTkcpCiBib29sIFJlbmRlckZsb3dUaHJlYWQ6Omhhc0NvbXBvc2l0aW5nUmVnaW9uRGVzY2Vu ZGFudCgpIGNvbnN0CiB7Ci0gICAgZm9yIChhdXRvIGl0ZXIgPSBtX3JlZ2lvbkxpc3QuYmVnaW4o KSwgZW5kID0gbV9yZWdpb25MaXN0LmVuZCgpOyBpdGVyICE9IGVuZDsgKytpdGVyKQotICAgICAg ICBpZiAoUmVuZGVyTGF5ZXJNb2RlbE9iamVjdCogbGF5ZXJPd25lciA9IHRvUmVuZGVyTmFtZWRG bG93RnJhZ21lbnQoKml0ZXIpLT5sYXllck93bmVyKCkpCi0gICAgICAgICAgICBpZiAobGF5ZXJP d25lci0+aGFzTGF5ZXIoKSAmJiBsYXllck93bmVyLT5sYXllcigpLT5oYXNDb21wb3NpdGluZ0Rl c2NlbmRhbnQoKSkKLSAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICBmb3IgKGF1dG8m IHJlZ2lvbiA6IG1fcmVnaW9uTGlzdCkKKyAgICAgICAgaWYgKHRvUmVuZGVyTmFtZWRGbG93RnJh Z21lbnQocmVnaW9uKS0+bGF5ZXJPd25lcigpLmxheWVyKCktPmhhc0NvbXBvc2l0aW5nRGVzY2Vu ZGFudCgpKQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAKICAgICByZXR1cm4gZmFsc2U7CiB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAppbmRleCA4MDU5NmVmLi5i YWU2ZDM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKQEAgLTY5 MzcsNyArNjkzNyw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OmZpbHRlck5lZWRzUmVwYWludCgpCiAK IHZvaWQgUmVuZGVyTGF5ZXI6OnBhaW50TmFtZWRGbG93VGhyZWFkSW5zaWRlUmVnaW9uKEdyYXBo aWNzQ29udGV4dCogY29udGV4dCwgUmVuZGVyTmFtZWRGbG93RnJhZ21lbnQqIHJlZ2lvbiwgTGF5 b3V0UmVjdCBwYWludERpcnR5UmVjdCwgTGF5b3V0UG9pbnQgcGFpbnRPZmZzZXQsIFBhaW50QmVo YXZpb3IgcGFpbnRCZWhhdmlvciwgUGFpbnRMYXllckZsYWdzIHBhaW50RmxhZ3MpCiB7Ci0gICAg TGF5b3V0UmVjdCByZWdpb25Db250ZW50Qm94ID0gdG9SZW5kZXJCb3gocmVnaW9uLT5sYXllck93 bmVyKCkpLT5jb250ZW50Qm94UmVjdCgpOworICAgIExheW91dFJlY3QgcmVnaW9uQ29udGVudEJv eCA9IHRvUmVuZGVyQm94KHJlZ2lvbi0+bGF5ZXJPd25lcigpKS5jb250ZW50Qm94UmVjdCgpOwog ICAgIExheW91dFNpemUgbW92ZU9mZnNldCA9IHJlZ2lvbi0+Zmxvd1RocmVhZFBvcnRpb25Mb2Nh dGlvbigpIC0gKHBhaW50T2Zmc2V0ICsgcmVnaW9uQ29udGVudEJveC5sb2NhdGlvbigpKTsKICAg ICBJbnRQb2ludCBhZGp1c3RlZFBhaW50T2Zmc2V0ID0gcm91bmRlZEludFBvaW50KC1tb3ZlT2Zm c2V0KTsKICAgICBwYWludERpcnR5UmVjdC5tb3ZlKG1vdmVPZmZzZXQpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAppbmRleCA0ODE5OGRmLi5h NmRmYjIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJC YWNraW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNr aW5nLmNwcApAQCAtMTAwMSwxNCArMTAwMSwxNCBAQCB2b2lkIFJlbmRlckxheWVyQmFja2luZzo6 YWRqdXN0QW5jZXN0b3JDb21wb3NpdGluZ0JvdW5kc0ZvckZsb3dUaHJlYWQoSW50UmVjdCYgYQog ICAgICAgICAgICAgSW50UG9pbnQgZmxvd0RlbHRhOwogICAgICAgICAgICAgbV9vd25pbmdMYXll ci5jb252ZXJ0VG9QaXhlbFNuYXBwZWRMYXllckNvb3JkcyhmbG93VGhyZWFkTGF5ZXIsIGZsb3dE ZWx0YSk7CiAgICAgICAgICAgICBwYXJlbnRSZWdpb24tPmFkanVzdFJlZ2lvbkJvdW5kc0Zyb21G bG93VGhyZWFkUG9ydGlvblJlY3QoZmxvd0RlbHRhLCBhbmNlc3RvckNvbXBvc2l0aW5nQm91bmRz KTsKLSAgICAgICAgICAgIFJlbmRlckJveE1vZGVsT2JqZWN0KiBsYXllck93bmVyID0gdG9SZW5k ZXJCb3hNb2RlbE9iamVjdChwYXJlbnRSZWdpb24tPmxheWVyT3duZXIoKSk7Ci0gICAgICAgICAg ICBpZiAobGF5ZXJPd25lci0+aGFzTGF5ZXIoKSAmJiBsYXllck93bmVyLT5sYXllcigpLT5iYWNr aW5nKCkpIHsKKyAgICAgICAgICAgIFJlbmRlckJveE1vZGVsT2JqZWN0JiBsYXllck93bmVyID0g dG9SZW5kZXJCb3hNb2RlbE9iamVjdChwYXJlbnRSZWdpb24tPmxheWVyT3duZXIoKSk7CisgICAg ICAgICAgICBpZiAobGF5ZXJPd25lci5sYXllcigpLT5iYWNraW5nKCkpIHsKICAgICAgICAgICAg ICAgICAvLyBNYWtlIHN1cmUgdGhhdCB0aGUgcmVnaW9uIHByb3BhZ2F0ZXMgaXRzIGJvcmRlcnMs IHBhZGRpbmdzLCBvdXRsaW5lcyBvciBib3gtc2hhZG93cyB0byBsYXllcnMgaW5zaWRlIGl0Lgog ICAgICAgICAgICAgICAgIC8vIE5vdGUgdGhhdCB0aGUgY29tcG9zaXRlZCBib3VuZHMgb2YgdGhl IFJlbmRlclJlZ2lvbiBhcmUgYWxyZWFkeSBjYWxjdWxhdGVkCiAgICAgICAgICAgICAgICAgLy8g YmVjYXVzZSBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnJlYnVpbGRDb21wb3NpdGluZ0xheWVyVHJl ZSB3aWxsIG9ubHkKICAgICAgICAgICAgICAgICAvLyBpdGVyYXRlIG9uIHRoZSBjb250ZW50IG9m IHRoZSByZWdpb24gYWZ0ZXIgdGhlIHJlZ2lvbiBpdHNlbGYgaXMgY29tcHV0ZWQuCi0gICAgICAg ICAgICAgICAgYW5jZXN0b3JDb21wb3NpdGluZ0JvdW5kcy5tb3ZlQnkocm91bmRlZEludFBvaW50 KGxheWVyT3duZXItPmxheWVyKCktPmJhY2tpbmcoKS0+Y29tcG9zaXRlZEJvdW5kcygpLmxvY2F0 aW9uKCkpKTsKLSAgICAgICAgICAgICAgICBhbmNlc3RvckNvbXBvc2l0aW5nQm91bmRzLm1vdmUo LWxheWVyT3duZXItPmJvcmRlckFuZFBhZGRpbmdTdGFydCgpLCAtbGF5ZXJPd25lci0+Ym9yZGVy QW5kUGFkZGluZ0JlZm9yZSgpKTsKKyAgICAgICAgICAgICAgICBhbmNlc3RvckNvbXBvc2l0aW5n Qm91bmRzLm1vdmVCeShyb3VuZGVkSW50UG9pbnQobGF5ZXJPd25lci5sYXllcigpLT5iYWNraW5n KCktPmNvbXBvc2l0ZWRCb3VuZHMoKS5sb2NhdGlvbigpKSk7CisgICAgICAgICAgICAgICAgYW5j ZXN0b3JDb21wb3NpdGluZ0JvdW5kcy5tb3ZlKC1sYXllck93bmVyLmJvcmRlckFuZFBhZGRpbmdT dGFydCgpLCAtbGF5ZXJPd25lci5ib3JkZXJBbmRQYWRkaW5nQmVmb3JlKCkpOwogICAgICAgICAg ICAgfQogICAgICAgICB9CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAppbmRleCAxYTEyOTQzLi5hYjhhNTFkIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcApA QCAtMTI4OCw3ICsxMjg4LDcgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmNvbXB1dGVS ZWdpb25Db21wb3NpdGluZ1JlcXVpcmVtZW50cyhSZW5kZXJOYW1lZEZsb3cKICAgICB9CiAKICAg ICBpZiAob3ZlcmxhcE1hcCkKLSAgICAgICAgb3ZlcmxhcE1hcC0+Z2VvbWV0cnlNYXAoKS5wb3BN YXBwaW5nc1RvQW5jZXN0b3IocmVnaW9uLT5sYXllck93bmVyKCkpOworICAgICAgICBvdmVybGFw TWFwLT5nZW9tZXRyeU1hcCgpLnBvcE1hcHBpbmdzVG9BbmNlc3RvcigmcmVnaW9uLT5sYXllck93 bmVyKCkpOwogfQogCiB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6c2V0Q29tcG9zaXRpbmdQ YXJlbnQoUmVuZGVyTGF5ZXImIGNoaWxkTGF5ZXIsIFJlbmRlckxheWVyKiBwYXJlbnRMYXllcikK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJOYW1lZEZsb3dGcmFn bWVudC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck5hbWVkRmxvd0ZyYWdtZW50 LmgKaW5kZXggOGFmZGJmNy4uOThjNTQ5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlck5hbWVkRmxvd0ZyYWdtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlck5hbWVkRmxvd0ZyYWdtZW50LmgKQEAgLTY1LDkgKzY1LDggQEAgcHVibGlj OgogICAgIC8vIFdoZW4gdGhlIGNvbnRlbnQgaW5zaWRlIHRoZSByZWdpb24gcmVxdWlyZXMgdGhl IHJlZ2lvbiB0byBoYXZlIGEgbGF5ZXIsIHRoZSBsYXllciB3aWxsIGJlIGNyZWF0ZWQgb24gdGhl IHJlZ2lvbidzCiAgICAgLy8gcGFyZW50IHJlbmRlcmVyIGluc3RlYWQuCiAgICAgLy8gVGhpcyBt ZXRob2QgcmV0dXJucyB0aGF0IHJlbmRlcmVyIGhvbGRpbmcgdGhlIGxheWVyLgotICAgIC8vIFRo ZSByZXR1cm4gdmFsdWUgbWF5IGJlIG51bGwuCi0gICAgUmVuZGVyTGF5ZXJNb2RlbE9iamVjdCog bGF5ZXJPd25lcigpIGNvbnN0IHsgcmV0dXJuIHBhcmVudCgpICYmIHBhcmVudCgpLT5pc1JlbmRl ckxheWVyTW9kZWxPYmplY3QoKSA/IHRvUmVuZGVyTGF5ZXJNb2RlbE9iamVjdChwYXJlbnQoKSkK LSAgICAgICAgOiBudWxscHRyOyB9CisgICAgLy8gVGhlIHJldHVybiB2YWx1ZSBjYW5ub3QgYmUg bnVsbCBiZWNhdXNlIENTUyBSZWdpb25zIGNyZWF0ZSBTdGFja2luZyBDb250ZXh0cyAod2hpY2gg bWVhbnMgdGhleSBjcmVhdGUgbGF5ZXJzKS4KKyAgICBSZW5kZXJMYXllck1vZGVsT2JqZWN0JiBs YXllck93bmVyKCkgY29uc3QgeyByZXR1cm4gKnRvUmVuZGVyTGF5ZXJNb2RlbE9iamVjdChwYXJl bnQoKSk7IH0KIAogICAgIGJvb2wgaGFzQ3VzdG9tUmVnaW9uU3R5bGUoKSBjb25zdCB7IHJldHVy biBtX2hhc0N1c3RvbVJlZ2lvblN0eWxlOyB9CiAgICAgdm9pZCBzZXRIYXNDdXN0b21SZWdpb25T dHlsZShib29sIGhhc0N1c3RvbVJlZ2lvblN0eWxlKSB7IG1faGFzQ3VzdG9tUmVnaW9uU3R5bGUg PSBoYXNDdXN0b21SZWdpb25TdHlsZTsgfQo= 221862 2014-01-22 05:22:08 -0800 2014-01-22 09:25:52 -0800 patch for landing patch127343layerOwnerNull.diff text/plain 6634 mmaerean ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1MDM3OTkzLi4wYTM1YjgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUg QEAKKzIwMTQtMDEtMjEgIE1paGFpIE1hZXJlYW4gIDxtbWFlcmVhbkBhZG9iZS5jb20+CisKKyAg ICAgICAgW0NTUyBSZWdpb25zXSBsYXllck93bmVyIGluIFJlbmRlck5hbWVkRmxvd0ZyYWdtZW50 IGNhbm5vdCByZXR1cm4gbnVsbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTI3MzQzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2FtIFdlaW5pZy4KKwor ICAgICAgICBSZW5kZXJOYW1lZEZsb3dGcmFnbWVudDo6bGF5ZXJPd25lciBjYW5ub3QgcmV0dXJu IG51bGwgYmVjYXVzZSByZWdpb25zIGNyZWF0ZSBzdGFja2luZworICAgICAgICBjb250ZXh0cyB3 aGljaCBjcmVhdGUgbGF5ZXJzLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgbm8gZnVuY3Rpb25h bCBjaGFuZ2UuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxvd1RocmVhZC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbG93VGhyZWFkOjpoYXNDb21wb3NpdGluZ1JlZ2lvbkRl c2NlbmRhbnQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJMYXllcjo6Y2FsY3VsYXRlQ2xpcFJlY3RzKToKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckxheWVyQmFja2luZzo6YWRqdXN0QW5jZXN0b3JDb21wb3NpdGluZ0JvdW5kc0ZvckZsb3dUaHJl YWQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpjb21wdXRlUmVnaW9uQ29tcG9z aXRpbmdSZXF1aXJlbWVudHMpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJOYW1lZEZsb3dG cmFnbWVudC5oOgorCiAyMDE0LTAxLTIyICBNaWhuZWEgT3ZpZGVuaWUgIDxtaWhuZWFAYWRvYmUu Y29tPgogCiAgICAgICAgIFtDU1NSZWdpb25zXSBJbmNvcnJlY3QgbGF5b3V0IG9mIGEgcmVnaW9u IHBzZXVkbyBjaGlsZHJlbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckZsb3dUaHJlYWQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsb3dU aHJlYWQuY3BwCmluZGV4IGJjNDM1NTEuLjVjZmQxOGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJGbG93VGhyZWFkLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyRmxvd1RocmVhZC5jcHAKQEAgLTI1MSwxMCArMjUxLDkgQEAgdm9pZCBS ZW5kZXJGbG93VGhyZWFkOjpsYXlvdXQoKQogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElO RykKIGJvb2wgUmVuZGVyRmxvd1RocmVhZDo6aGFzQ29tcG9zaXRpbmdSZWdpb25EZXNjZW5kYW50 KCkgY29uc3QKIHsKLSAgICBmb3IgKGF1dG8gaXRlciA9IG1fcmVnaW9uTGlzdC5iZWdpbigpLCBl bmQgPSBtX3JlZ2lvbkxpc3QuZW5kKCk7IGl0ZXIgIT0gZW5kOyArK2l0ZXIpCi0gICAgICAgIGlm IChSZW5kZXJMYXllck1vZGVsT2JqZWN0KiBsYXllck93bmVyID0gdG9SZW5kZXJOYW1lZEZsb3dG cmFnbWVudCgqaXRlciktPmxheWVyT3duZXIoKSkKLSAgICAgICAgICAgIGlmIChsYXllck93bmVy LT5oYXNMYXllcigpICYmIGxheWVyT3duZXItPmxheWVyKCktPmhhc0NvbXBvc2l0aW5nRGVzY2Vu ZGFudCgpKQotICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgIGZvciAoYXV0byYgcmVn aW9uIDogbV9yZWdpb25MaXN0KQorICAgICAgICBpZiAodG9SZW5kZXJOYW1lZEZsb3dGcmFnbWVu dChyZWdpb24pLT5sYXllck93bmVyKCkubGF5ZXIoKS0+aGFzQ29tcG9zaXRpbmdEZXNjZW5kYW50 KCkpCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKIAogICAgIHJldHVybiBmYWxzZTsKIH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCmluZGV4IDgwNTk2ZWYuLmJhZTZk MzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcApAQCAtNjkzNyw3 ICs2OTM3LDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6ZmlsdGVyTmVlZHNSZXBhaW50KCkKIAogdm9p ZCBSZW5kZXJMYXllcjo6cGFpbnROYW1lZEZsb3dUaHJlYWRJbnNpZGVSZWdpb24oR3JhcGhpY3ND b250ZXh0KiBjb250ZXh0LCBSZW5kZXJOYW1lZEZsb3dGcmFnbWVudCogcmVnaW9uLCBMYXlvdXRS ZWN0IHBhaW50RGlydHlSZWN0LCBMYXlvdXRQb2ludCBwYWludE9mZnNldCwgUGFpbnRCZWhhdmlv ciBwYWludEJlaGF2aW9yLCBQYWludExheWVyRmxhZ3MgcGFpbnRGbGFncykKIHsKLSAgICBMYXlv dXRSZWN0IHJlZ2lvbkNvbnRlbnRCb3ggPSB0b1JlbmRlckJveChyZWdpb24tPmxheWVyT3duZXIo KSktPmNvbnRlbnRCb3hSZWN0KCk7CisgICAgTGF5b3V0UmVjdCByZWdpb25Db250ZW50Qm94ID0g dG9SZW5kZXJCb3gocmVnaW9uLT5sYXllck93bmVyKCkpLmNvbnRlbnRCb3hSZWN0KCk7CiAgICAg TGF5b3V0U2l6ZSBtb3ZlT2Zmc2V0ID0gcmVnaW9uLT5mbG93VGhyZWFkUG9ydGlvbkxvY2F0aW9u KCkgLSAocGFpbnRPZmZzZXQgKyByZWdpb25Db250ZW50Qm94LmxvY2F0aW9uKCkpOwogICAgIElu dFBvaW50IGFkanVzdGVkUGFpbnRPZmZzZXQgPSByb3VuZGVkSW50UG9pbnQoLW1vdmVPZmZzZXQp OwogICAgIHBhaW50RGlydHlSZWN0Lm1vdmUobW92ZU9mZnNldCk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCmluZGV4IDQ4MTk4ZGYuLmE2ZGZi MjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tp bmcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcu Y3BwCkBAIC0xMDAxLDE0ICsxMDAxLDE0IEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNraW5nOjphZGp1 c3RBbmNlc3RvckNvbXBvc2l0aW5nQm91bmRzRm9yRmxvd1RocmVhZChJbnRSZWN0JiBhCiAgICAg ICAgICAgICBJbnRQb2ludCBmbG93RGVsdGE7CiAgICAgICAgICAgICBtX293bmluZ0xheWVyLmNv bnZlcnRUb1BpeGVsU25hcHBlZExheWVyQ29vcmRzKGZsb3dUaHJlYWRMYXllciwgZmxvd0RlbHRh KTsKICAgICAgICAgICAgIHBhcmVudFJlZ2lvbi0+YWRqdXN0UmVnaW9uQm91bmRzRnJvbUZsb3dU aHJlYWRQb3J0aW9uUmVjdChmbG93RGVsdGEsIGFuY2VzdG9yQ29tcG9zaXRpbmdCb3VuZHMpOwot ICAgICAgICAgICAgUmVuZGVyQm94TW9kZWxPYmplY3QqIGxheWVyT3duZXIgPSB0b1JlbmRlckJv eE1vZGVsT2JqZWN0KHBhcmVudFJlZ2lvbi0+bGF5ZXJPd25lcigpKTsKLSAgICAgICAgICAgIGlm IChsYXllck93bmVyLT5oYXNMYXllcigpICYmIGxheWVyT3duZXItPmxheWVyKCktPmJhY2tpbmco KSkgeworICAgICAgICAgICAgUmVuZGVyQm94TW9kZWxPYmplY3QmIGxheWVyT3duZXIgPSB0b1Jl bmRlckJveE1vZGVsT2JqZWN0KHBhcmVudFJlZ2lvbi0+bGF5ZXJPd25lcigpKTsKKyAgICAgICAg ICAgIGlmIChsYXllck93bmVyLmxheWVyKCktPmJhY2tpbmcoKSkgewogICAgICAgICAgICAgICAg IC8vIE1ha2Ugc3VyZSB0aGF0IHRoZSByZWdpb24gcHJvcGFnYXRlcyBpdHMgYm9yZGVycywgcGFk ZGluZ3MsIG91dGxpbmVzIG9yIGJveC1zaGFkb3dzIHRvIGxheWVycyBpbnNpZGUgaXQuCiAgICAg ICAgICAgICAgICAgLy8gTm90ZSB0aGF0IHRoZSBjb21wb3NpdGVkIGJvdW5kcyBvZiB0aGUgUmVu ZGVyUmVnaW9uIGFyZSBhbHJlYWR5IGNhbGN1bGF0ZWQKICAgICAgICAgICAgICAgICAvLyBiZWNh dXNlIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6cmVidWlsZENvbXBvc2l0aW5nTGF5ZXJUcmVlIHdp bGwgb25seQogICAgICAgICAgICAgICAgIC8vIGl0ZXJhdGUgb24gdGhlIGNvbnRlbnQgb2YgdGhl IHJlZ2lvbiBhZnRlciB0aGUgcmVnaW9uIGl0c2VsZiBpcyBjb21wdXRlZC4KLSAgICAgICAgICAg ICAgICBhbmNlc3RvckNvbXBvc2l0aW5nQm91bmRzLm1vdmVCeShyb3VuZGVkSW50UG9pbnQobGF5 ZXJPd25lci0+bGF5ZXIoKS0+YmFja2luZygpLT5jb21wb3NpdGVkQm91bmRzKCkubG9jYXRpb24o KSkpOwotICAgICAgICAgICAgICAgIGFuY2VzdG9yQ29tcG9zaXRpbmdCb3VuZHMubW92ZSgtbGF5 ZXJPd25lci0+Ym9yZGVyQW5kUGFkZGluZ1N0YXJ0KCksIC1sYXllck93bmVyLT5ib3JkZXJBbmRQ YWRkaW5nQmVmb3JlKCkpOworICAgICAgICAgICAgICAgIGFuY2VzdG9yQ29tcG9zaXRpbmdCb3Vu ZHMubW92ZUJ5KHJvdW5kZWRJbnRQb2ludChsYXllck93bmVyLmxheWVyKCktPmJhY2tpbmcoKS0+ Y29tcG9zaXRlZEJvdW5kcygpLmxvY2F0aW9uKCkpKTsKKyAgICAgICAgICAgICAgICBhbmNlc3Rv ckNvbXBvc2l0aW5nQm91bmRzLm1vdmUoLWxheWVyT3duZXIuYm9yZGVyQW5kUGFkZGluZ1N0YXJ0 KCksIC1sYXllck93bmVyLmJvcmRlckFuZFBhZGRpbmdCZWZvcmUoKSk7CiAgICAgICAgICAgICB9 CiAgICAgICAgIH0KICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllckNvbXBvc2l0b3IuY3BwCmluZGV4IDFhMTI5NDMuLmFiOGE1MWQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCkBAIC0x Mjg4LDcgKzEyODgsNyBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6Y29tcHV0ZVJlZ2lv bkNvbXBvc2l0aW5nUmVxdWlyZW1lbnRzKFJlbmRlck5hbWVkRmxvdwogICAgIH0KIAogICAgIGlm IChvdmVybGFwTWFwKQotICAgICAgICBvdmVybGFwTWFwLT5nZW9tZXRyeU1hcCgpLnBvcE1hcHBp bmdzVG9BbmNlc3RvcihyZWdpb24tPmxheWVyT3duZXIoKSk7CisgICAgICAgIG92ZXJsYXBNYXAt Pmdlb21ldHJ5TWFwKCkucG9wTWFwcGluZ3NUb0FuY2VzdG9yKCZyZWdpb24tPmxheWVyT3duZXIo KSk7CiB9CiAKIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpzZXRDb21wb3NpdGluZ1BhcmVu dChSZW5kZXJMYXllciYgY2hpbGRMYXllciwgUmVuZGVyTGF5ZXIqIHBhcmVudExheWVyKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck5hbWVkRmxvd0ZyYWdtZW50 LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTmFtZWRGbG93RnJhZ21lbnQuaApp bmRleCA4YWZkYmY3Li45OGM1NDk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTmFtZWRGbG93RnJhZ21lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTmFtZWRGbG93RnJhZ21lbnQuaApAQCAtNjUsOSArNjUsOCBAQCBwdWJsaWM6CiAg ICAgLy8gV2hlbiB0aGUgY29udGVudCBpbnNpZGUgdGhlIHJlZ2lvbiByZXF1aXJlcyB0aGUgcmVn aW9uIHRvIGhhdmUgYSBsYXllciwgdGhlIGxheWVyIHdpbGwgYmUgY3JlYXRlZCBvbiB0aGUgcmVn aW9uJ3MKICAgICAvLyBwYXJlbnQgcmVuZGVyZXIgaW5zdGVhZC4KICAgICAvLyBUaGlzIG1ldGhv ZCByZXR1cm5zIHRoYXQgcmVuZGVyZXIgaG9sZGluZyB0aGUgbGF5ZXIuCi0gICAgLy8gVGhlIHJl dHVybiB2YWx1ZSBtYXkgYmUgbnVsbC4KLSAgICBSZW5kZXJMYXllck1vZGVsT2JqZWN0KiBsYXll ck93bmVyKCkgY29uc3QgeyByZXR1cm4gcGFyZW50KCkgJiYgcGFyZW50KCktPmlzUmVuZGVyTGF5 ZXJNb2RlbE9iamVjdCgpID8gdG9SZW5kZXJMYXllck1vZGVsT2JqZWN0KHBhcmVudCgpKQotICAg ICAgICA6IG51bGxwdHI7IH0KKyAgICAvLyBUaGUgcmV0dXJuIHZhbHVlIGNhbm5vdCBiZSBudWxs IGJlY2F1c2UgQ1NTIFJlZ2lvbnMgY3JlYXRlIFN0YWNraW5nIENvbnRleHRzICh3aGljaCBtZWFu cyB0aGV5IGNyZWF0ZSBsYXllcnMpLgorICAgIFJlbmRlckxheWVyTW9kZWxPYmplY3QmIGxheWVy T3duZXIoKSBjb25zdCB7IHJldHVybiAqdG9SZW5kZXJMYXllck1vZGVsT2JqZWN0KHBhcmVudCgp KTsgfQogCiAgICAgYm9vbCBoYXNDdXN0b21SZWdpb25TdHlsZSgpIGNvbnN0IHsgcmV0dXJuIG1f aGFzQ3VzdG9tUmVnaW9uU3R5bGU7IH0KICAgICB2b2lkIHNldEhhc0N1c3RvbVJlZ2lvblN0eWxl KGJvb2wgaGFzQ3VzdG9tUmVnaW9uU3R5bGUpIHsgbV9oYXNDdXN0b21SZWdpb25TdHlsZSA9IGhh c0N1c3RvbVJlZ2lvblN0eWxlOyB9Cg==