75959 2012-01-10 06:42:28 -0800 Add RenderStyle::isPositioned() helper method 2012-01-12 02:23:09 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mihnea mihnea hyatt tony webkit.review.bot oldest_to_newest 533024 0 mihnea 2012-01-10 06:42:28 -0800 Instead of (style()->position() == AbsolutePosition || style()->position() == FixedPosition) use (style()->isAbsolutelyPositioned()). Instead of (style()->position() != AbsolutePosition && style()->position() != FixedPosition) use (!style()->isAbsolutelyPositioned()). 533072 1 121847 mihnea 2012-01-10 07:55:37 -0800 Created attachment 121847 Patch 533147 2 tony 2012-01-10 09:43:35 -0800 Should we name the function isPositioned() to match the function on RenderObject? 533157 3 mihnea 2012-01-10 10:03:01 -0800 (In reply to comment #2) > Should we name the function isPositioned() to match the function on RenderObject? I initially thought so, but i decided to name it after looking at the phrase "absolutely positioned element" from http://www.w3.org/TR/CSS2/visuren.html#absolute-positioning. 534165 4 121847 hyatt 2012-01-11 12:53:57 -0800 Comment on attachment 121847 Patch Agree with Tony. Would prefer isPositioned. 534217 5 122086 mihnea 2012-01-11 13:40:59 -0800 Created attachment 122086 Patch 2 534225 6 122086 tony 2012-01-11 13:45:59 -0800 Comment on attachment 122086 Patch 2 View in context: https://bugs.webkit.org/attachment.cgi?id=122086&action=review > Source/WebCore/rendering/RenderObject.cpp:629 > + if (!last->isText() && (last->style()->isPositioned())) { Nit: Remove extra ()s. > Source/WebCore/rendering/RenderObject.cpp:669 > + if (b && !alreadyDirty && markParents && (isText() || (!style()->isPositioned()))) Nit: Remove extra ()s. 534632 7 122184 mihnea 2012-01-12 00:48:40 -0800 Created attachment 122184 Patch for landing 534675 8 122184 webkit.review.bot 2012-01-12 02:23:04 -0800 Comment on attachment 122184 Patch for landing Clearing flags on attachment: 122184 Committed r104802: <http://trac.webkit.org/changeset/104802> 534676 9 webkit.review.bot 2012-01-12 02:23:09 -0800 All reviewed patches have been landed. Closing bug. 121847 2012-01-10 07:55:37 -0800 2012-01-11 13:40:59 -0800 Patch 75959.patch text/plain 7030 mihnea ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmYWE2MzMyLi5hZmE3ZmQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAg QEAKKzIwMTItMDEtMTAgIE1paG5lYSBPdmlkZW5pZSAgPG1paG5lYUBhZG9iZS5jb20+CisKKyAg ICAgICAgQWRkIFJlbmRlclN0eWxlOjppc0Fic29sdXRlbHlQb3NpdGlvbmVkKCkgaGVscGVyIG1l dGhvZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzU5 NTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBu ZXcgdGVzdHMgc2luY2UgdGhpcyBpcyByZWZhY3RvcmluZyBvZiBleGlzdGluZyBjb2RlLgorICAg ICAgICBSZXBsYWNlIChzdHlsZSgpLT5wb3NpdGlvbigpID09IEFic29sdXRlUG9zaXRpb24gfHwg c3R5bGUoKS0+cG9zaXRpb24oKSA9PSBGaXhlZFBvc2l0aW9uKSAKKyAgICAgICAgd2l0aCAoc3R5 bGUoKS0+aXNBYnNvbHV0ZWx5UG9zaXRpb25lZCgpKS4KKyAgICAgICAgUmVwbGFjZSAoc3R5bGUo KS0+cG9zaXRpb24oKSAhPSBBYnNvbHV0ZVBvc2l0aW9uICYmIHN0eWxlKCktPnBvc2l0aW9uKCkg IT0gRml4ZWRQb3NpdGlvbikgCisgICAgICAgIHdpdGggKCFzdHlsZSgpLT5pc0Fic29sdXRlbHlQ b3NpdGlvbmVkKCkpLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OnVwZGF0ZUJveE1vZGVsSW5mb0Zyb21TdHlsZSk6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6Om9mZnNldEZyb21Db250YWluZXIpOgorICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJCb3hNb2RlbE9iamVjdDo6bWFwQWJzb2x1dGVUb0xvY2FsUG9pbnQpOgorICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy SW5saW5lOjpjb21wdXRlUmVjdEZvclJlcGFpbnQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5k ZXJPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyT2JqZWN0OjptYXJrQ29udGFp bmluZ0Jsb2Nrc0ZvckxheW91dCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6OnNl dFByZWZlcnJlZExvZ2ljYWxXaWR0aHNEaXJ0eSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJP YmplY3Q6OmludmFsaWRhdGVDb250YWluZXJQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKToKKyAgICAg ICAgKiByZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclN0eWxlQml0ZmllbGRzOjppc0Fic29sdXRlbHlQb3NpdGlvbmVkKToKKwogMjAxMi0wMS0w NiAgU3RlcGhlbiBXaGl0ZSAgPHNlbm9yYmxhbmNvQGNocm9taXVtLm9yZz4KIAogICAgICAgICBb U2tpYV0gU3dpdGNoIEZFQ29sb3JNYXRyaXggdG8gdXNlIGEgc2tpYS1iYXNlZCBpbXBsZW1lbnRh dGlvbiB3aGVuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IDQwYWRm MzguLjRlNWFlZWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC b3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC00 MDksNyArNDA5LDcgQEAgdm9pZCBSZW5kZXJCb3g6OnVwZGF0ZUJveE1vZGVsSW5mb0Zyb21TdHls ZSgpCiAgICAgaWYgKGlzUm9vdE9iamVjdCB8fCBpc1ZpZXdPYmplY3QpCiAgICAgICAgIHNldEhh c0JveERlY29yYXRpb25zKHRydWUpOwogCi0gICAgc2V0UG9zaXRpb25lZChzdHlsZSgpLT5wb3Np dGlvbigpID09IEFic29sdXRlUG9zaXRpb24gfHwgc3R5bGUoKS0+cG9zaXRpb24oKSA9PSBGaXhl ZFBvc2l0aW9uKTsKKyAgICBzZXRQb3NpdGlvbmVkKHN0eWxlKCktPmlzQWJzb2x1dGVseVBvc2l0 aW9uZWQoKSk7CiAgICAgc2V0RmxvYXRpbmcoc3R5bGUoKS0+aXNGbG9hdGluZygpICYmICghaXNQ b3NpdGlvbmVkKCkgfHwgc3R5bGUoKS0+ZmxvYXRpbmcoKSA9PSBQb3NpdGlvbmVkRmxvYXQpKTsK IAogICAgIC8vIFdlIGFsc28gaGFuZGxlIDxib2R5PiBhbmQgPGh0bWw+LCB3aG9zZSBvdmVyZmxv dyBhcHBsaWVzIHRvIHRoZSB2aWV3cG9ydC4KQEAgLTE0MDgsNyArMTQwOCw3IEBAIExheW91dFNp emUgUmVuZGVyQm94OjpvZmZzZXRGcm9tQ29udGFpbmVyKFJlbmRlck9iamVjdCogbywgY29uc3Qg TGF5b3V0UG9pbnQmIHBvCiAgICAgICAgIG9mZnNldCArPSByZWxhdGl2ZVBvc2l0aW9uT2Zmc2V0 KCk7CiAKICAgICBpZiAoIWlzSW5saW5lKCkgfHwgaXNSZXBsYWNlZCgpKSB7Ci0gICAgICAgIGlm IChzdHlsZSgpLT5wb3NpdGlvbigpICE9IEFic29sdXRlUG9zaXRpb24gJiYgc3R5bGUoKS0+cG9z aXRpb24oKSAhPSBGaXhlZFBvc2l0aW9uICYmIG8tPmhhc0NvbHVtbnMoKSkgeworICAgICAgICBp ZiAoIXN0eWxlKCktPmlzQWJzb2x1dGVseVBvc2l0aW9uZWQoKSAmJiBvLT5oYXNDb2x1bW5zKCkp IHsKICAgICAgICAgICAgIFJlbmRlckJsb2NrKiBibG9jayA9IHRvUmVuZGVyQmxvY2sobyk7CiAg ICAgICAgICAgICBMYXlvdXRSZWN0IGNvbHVtblJlY3QoZnJhbWVSZWN0KCkpOwogICAgICAgICAg ICAgYmxvY2stPmFkanVzdFN0YXJ0RWRnZUZvcldyaXRpbmdNb2RlSW5jbHVkaW5nQ29sdW1ucyhj b2x1bW5SZWN0KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC b3hNb2RlbE9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9k ZWxPYmplY3QuY3BwCmluZGV4IDNhYjRlMjEuLjZmMDcxMWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcApAQCAtMjc1OSw3ICsyNzU5 LDcgQEAgdm9pZCBSZW5kZXJCb3hNb2RlbE9iamVjdDo6bWFwQWJzb2x1dGVUb0xvY2FsUG9pbnQo Ym9vbCBmaXhlZCwgYm9vbCB1c2VUcmFuc2Zvcm0KIAogICAgIExheW91dFNpemUgY29udGFpbmVy T2Zmc2V0ID0gb2Zmc2V0RnJvbUNvbnRhaW5lcihvLCBMYXlvdXRQb2ludCgpKTsKIAotICAgIGlm IChzdHlsZSgpLT5wb3NpdGlvbigpICE9IEFic29sdXRlUG9zaXRpb24gJiYgc3R5bGUoKS0+cG9z aXRpb24oKSAhPSBGaXhlZFBvc2l0aW9uICYmIG8tPmhhc0NvbHVtbnMoKSkgeworICAgIGlmICgh c3R5bGUoKS0+aXNBYnNvbHV0ZWx5UG9zaXRpb25lZCgpICYmIG8tPmhhc0NvbHVtbnMoKSkgewog ICAgICAgICBSZW5kZXJCbG9jayogYmxvY2sgPSBzdGF0aWNfY2FzdDxSZW5kZXJCbG9jayo+KG8p OwogICAgICAgICBMYXlvdXRQb2ludCBwb2ludChyb3VuZGVkTGF5b3V0UG9pbnQodHJhbnNmb3Jt U3RhdGUubWFwcGVkUG9pbnQoKSkpOwogICAgICAgICBwb2ludCAtPSBjb250YWluZXJPZmZzZXQ7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwCmluZGV4IDAxODI0NTku Ljc0ZTBiYjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbmxp bmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwCkBA IC0xMDUzLDcgKzEwNTMsNyBAQCB2b2lkIFJlbmRlcklubGluZTo6Y29tcHV0ZVJlY3RGb3JSZXBh aW50KFJlbmRlckJveE1vZGVsT2JqZWN0KiByZXBhaW50Q29udGFpbmVyLAogCiAgICAgTGF5b3V0 UG9pbnQgdG9wTGVmdCA9IHJlY3QubG9jYXRpb24oKTsKIAotICAgIGlmIChvLT5pc0Jsb2NrRmxv dygpICYmIHN0eWxlKCktPnBvc2l0aW9uKCkgIT0gQWJzb2x1dGVQb3NpdGlvbiAmJiBzdHlsZSgp LT5wb3NpdGlvbigpICE9IEZpeGVkUG9zaXRpb24pIHsKKyAgICBpZiAoby0+aXNCbG9ja0Zsb3co KSAmJiAhc3R5bGUoKS0+aXNBYnNvbHV0ZWx5UG9zaXRpb25lZCgpKSB7CiAgICAgICAgIFJlbmRl ckJsb2NrKiBjYiA9IHRvUmVuZGVyQmxvY2sobyk7CiAgICAgICAgIGlmIChjYi0+aGFzQ29sdW1u cygpKSB7CiAgICAgICAgICAgICBMYXlvdXRSZWN0IHJlcGFpbnRSZWN0KHRvcExlZnQsIHJlY3Qu c2l6ZSgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmpl Y3QuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKaW5kZXgg MWYxZWIyNi4uNmQ3M2IyYSAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlck9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVj dC5jcHAKQEAgLTYyNSw3ICs2MjUsNyBAQCB2b2lkIFJlbmRlck9iamVjdDo6bWFya0NvbnRhaW5p bmdCbG9ja3NGb3JMYXlvdXQoYm9vbCBzY2hlZHVsZVJlbGF5b3V0LCBSZW5kZXJPYgogICAgICAg ICBSZW5kZXJPYmplY3QqIGNvbnRhaW5lciA9IG9iamVjdC0+Y29udGFpbmVyKCk7CiAgICAgICAg IGlmICghY29udGFpbmVyICYmICFvYmplY3QtPmlzUmVuZGVyVmlldygpKQogICAgICAgICAgICAg cmV0dXJuOwotICAgICAgICBpZiAoIWxhc3QtPmlzVGV4dCgpICYmIChsYXN0LT5zdHlsZSgpLT5w b3NpdGlvbigpID09IEZpeGVkUG9zaXRpb24gfHwgbGFzdC0+c3R5bGUoKS0+cG9zaXRpb24oKSA9 PSBBYnNvbHV0ZVBvc2l0aW9uKSkgeworICAgICAgICBpZiAoIWxhc3QtPmlzVGV4dCgpICYmIChs YXN0LT5zdHlsZSgpLT5pc0Fic29sdXRlbHlQb3NpdGlvbmVkKCkpKSB7CiAgICAgICAgICAgICBi b29sIHdpbGxTa2lwUmVsYXRpdmVseVBvc2l0aW9uZWRJbmxpbmVzID0gIW9iamVjdC0+aXNSZW5k ZXJCbG9jaygpOwogICAgICAgICAgICAgd2hpbGUgKG9iamVjdCAmJiAhb2JqZWN0LT5pc1JlbmRl ckJsb2NrKCkpIC8vIFNraXAgcmVsYXRpdmVseSBwb3NpdGlvbmVkIGlubGluZXMgYW5kIGdldCB0 byB0aGUgZW5jbG9zaW5nIFJlbmRlckJsb2NrLgogICAgICAgICAgICAgICAgIG9iamVjdCA9IG9i amVjdC0+Y29udGFpbmVyKCk7CkBAIC02NjUsNyArNjY1LDcgQEAgdm9pZCBSZW5kZXJPYmplY3Q6 OnNldFByZWZlcnJlZExvZ2ljYWxXaWR0aHNEaXJ0eShib29sIGIsIGJvb2wgbWFya1BhcmVudHMp CiB7CiAgICAgYm9vbCBhbHJlYWR5RGlydHkgPSBwcmVmZXJyZWRMb2dpY2FsV2lkdGhzRGlydHko KTsKICAgICBtX2JpdGZpZWxkcy5zZXRQcmVmZXJyZWRMb2dpY2FsV2lkdGhzRGlydHkoYik7Ci0g ICAgaWYgKGIgJiYgIWFscmVhZHlEaXJ0eSAmJiBtYXJrUGFyZW50cyAmJiAoaXNUZXh0KCkgfHwg KHN0eWxlKCktPnBvc2l0aW9uKCkgIT0gRml4ZWRQb3NpdGlvbiAmJiBzdHlsZSgpLT5wb3NpdGlv bigpICE9IEFic29sdXRlUG9zaXRpb24pKSkKKyAgICBpZiAoYiAmJiAhYWxyZWFkeURpcnR5ICYm IG1hcmtQYXJlbnRzICYmIChpc1RleHQoKSB8fCAoIXN0eWxlKCktPmlzQWJzb2x1dGVseVBvc2l0 aW9uZWQoKSkpKQogICAgICAgICBpbnZhbGlkYXRlQ29udGFpbmVyUHJlZmVycmVkTG9naWNhbFdp ZHRocygpOwogfQogCkBAIC02ODIsNyArNjgyLDcgQEAgdm9pZCBSZW5kZXJPYmplY3Q6OmludmFs aWRhdGVDb250YWluZXJQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKCkKICAgICAgICAgICAgIGJyZWFr OwogCiAgICAgICAgIG8tPm1fYml0ZmllbGRzLnNldFByZWZlcnJlZExvZ2ljYWxXaWR0aHNEaXJ0 eSh0cnVlKTsKLSAgICAgICAgaWYgKG8tPnN0eWxlKCktPnBvc2l0aW9uKCkgPT0gRml4ZWRQb3Np dGlvbiB8fCBvLT5zdHlsZSgpLT5wb3NpdGlvbigpID09IEFic29sdXRlUG9zaXRpb24pCisgICAg ICAgIGlmIChvLT5zdHlsZSgpLT5pc0Fic29sdXRlbHlQb3NpdGlvbmVkKCkpCiAgICAgICAgICAg ICAvLyBBIHBvc2l0aW9uZWQgb2JqZWN0IGhhcyBubyBlZmZlY3Qgb24gdGhlIG1pbi9tYXggd2lk dGggb2YgaXRzIGNvbnRhaW5pbmcgYmxvY2sgZXZlci4KICAgICAgICAgICAgIC8vIFdlIGNhbiBv cHRpbWl6ZSB0aGlzIGNhc2UgYW5kIG5vdCBnbyB1cCBhbnkgZnVydGhlci4KICAgICAgICAgICAg IGJyZWFrOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRl clN0eWxlLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaApp bmRleCBjMDM3YWNlLi5kMjFiODI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvc3R5bGUvUmVuZGVyU3R5bGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5 bGUvUmVuZGVyU3R5bGUuaApAQCAtNTA4LDYgKzUwOCw3IEBAIHB1YmxpYzoKICAgICBib29sIGhh c1N0YXRpY0Jsb2NrUG9zaXRpb24oYm9vbCBob3Jpem9udGFsKSBjb25zdCB7IHJldHVybiBob3Jp em9udGFsID8gaGFzQXV0b1RvcEFuZEJvdHRvbSgpIDogaGFzQXV0b0xlZnRBbmRSaWdodCgpOyB9 CiAKICAgICBFUG9zaXRpb24gcG9zaXRpb24oKSBjb25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxF UG9zaXRpb24+KG5vbmluaGVyaXRlZF9mbGFncy5fcG9zaXRpb24pOyB9CisgICAgYm9vbCBpc0Fi c29sdXRlbHlQb3NpdGlvbmVkKCkgY29uc3QgeyByZXR1cm4gcG9zaXRpb24oKSA9PSBBYnNvbHV0 ZVBvc2l0aW9uIHx8IHBvc2l0aW9uKCkgPT0gRml4ZWRQb3NpdGlvbjsgfQogICAgIEVGbG9hdCBm bG9hdGluZygpIGNvbnN0IHsgcmV0dXJuIHN0YXRpY19jYXN0PEVGbG9hdD4obm9uaW5oZXJpdGVk X2ZsYWdzLl9mbG9hdGluZyk7IH0KIAogICAgIExlbmd0aCB3aWR0aCgpIGNvbnN0IHsgcmV0dXJu IG1fYm94LT53aWR0aCgpOyB9Cg== 122086 2012-01-11 13:40:59 -0800 2012-01-12 00:48:25 -0800 Patch 2 75959-2.patch text/plain 6901 mihnea ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiYmZiMzI4Li5lYWJhZDZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAg QEAKKzIwMTItMDEtMTEgIE1paG5lYSBPdmlkZW5pZSAgPG1paG5lYUBhZG9iZS5jb20+CisKKyAg ICAgICAgQWRkIFJlbmRlclN0eWxlOjppc1Bvc2l0aW9uZWQoKSBoZWxwZXIgbWV0aG9kCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NTk1OQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBz aW5jZSB0aGlzIGlzIHJlZmFjdG9yaW5nIG9mIGV4aXN0aW5nIGNvZGUuCisgICAgICAgIFJlcGxh Y2UgKHN0eWxlKCktPnBvc2l0aW9uKCkgPT0gQWJzb2x1dGVQb3NpdGlvbiB8fCBzdHlsZSgpLT5w b3NpdGlvbigpID09IEZpeGVkUG9zaXRpb24pIAorICAgICAgICB3aXRoIChzdHlsZSgpLT5pc1Bv c2l0aW9uZWQoKSkuCisgICAgICAgIFJlcGxhY2UgKHN0eWxlKCktPnBvc2l0aW9uKCkgIT0gQWJz b2x1dGVQb3NpdGlvbiAmJiBzdHlsZSgpLT5wb3NpdGlvbigpICE9IEZpeGVkUG9zaXRpb24pIAor ICAgICAgICB3aXRoICghc3R5bGUoKS0+aXNQb3NpdGlvbmVkKCkpLgorCisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OnVwZGF0 ZUJveE1vZGVsSW5mb0Zyb21TdHlsZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6Om9m ZnNldEZyb21Db250YWluZXIpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9i amVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3hNb2RlbE9iamVjdDo6bWFwQWJz b2x1dGVUb0xvY2FsUG9pbnQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVySW5saW5lOjpjb21wdXRlUmVjdEZvclJlcGFpbnQp OgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyT2JqZWN0OjptYXJrQ29udGFpbmluZ0Jsb2Nrc0ZvckxheW91dCk6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6OnNldFByZWZlcnJlZExvZ2ljYWxXaWR0aHNEaXJ0eSk6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6OmludmFsaWRhdGVDb250YWluZXJQcmVm ZXJyZWRMb2dpY2FsV2lkdGhzKToKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5 bGUuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclN0eWxlQml0ZmllbGRzOjppc1Bvc2l0aW9u ZWQpOgorCiAyMDEyLTAxLTExICBHcmVnIEJpbGxvY2sgIDxnYmlsbG9ja0Bnb29nbGUuY29tPgog CiAgICAgICAgIFtDb3Zlcml0eV0gQWRkcmVzcyBzb21lIHVuaW5pdCBjb25zdHJ1Y3RvciBpc3N1 ZXMgaW4gV2ViQ29yZS9kb20KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5k ZXggNTA2MTA1Ni4uYmVmZDVhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5j cHAKQEAgLTQwOSw3ICs0MDksNyBAQCB2b2lkIFJlbmRlckJveDo6dXBkYXRlQm94TW9kZWxJbmZv RnJvbVN0eWxlKCkKICAgICBpZiAoaXNSb290T2JqZWN0IHx8IGlzVmlld09iamVjdCkKICAgICAg ICAgc2V0SGFzQm94RGVjb3JhdGlvbnModHJ1ZSk7CiAKLSAgICBzZXRQb3NpdGlvbmVkKHN0eWxl KCktPnBvc2l0aW9uKCkgPT0gQWJzb2x1dGVQb3NpdGlvbiB8fCBzdHlsZSgpLT5wb3NpdGlvbigp ID09IEZpeGVkUG9zaXRpb24pOworICAgIHNldFBvc2l0aW9uZWQoc3R5bGUoKS0+aXNQb3NpdGlv bmVkKCkpOwogICAgIHNldEZsb2F0aW5nKHN0eWxlKCktPmlzRmxvYXRpbmcoKSAmJiAoIWlzUG9z aXRpb25lZCgpIHx8IHN0eWxlKCktPmZsb2F0aW5nKCkgPT0gUG9zaXRpb25lZEZsb2F0KSk7CiAK ICAgICAvLyBXZSBhbHNvIGhhbmRsZSA8Ym9keT4gYW5kIDxodG1sPiwgd2hvc2Ugb3ZlcmZsb3cg YXBwbGllcyB0byB0aGUgdmlld3BvcnQuCkBAIC0xMzk3LDcgKzEzOTcsNyBAQCBMYXlvdXRTaXpl IFJlbmRlckJveDo6b2Zmc2V0RnJvbUNvbnRhaW5lcihSZW5kZXJPYmplY3QqIG8sIGNvbnN0IExh eW91dFBvaW50JiBwbwogICAgICAgICBvZmZzZXQgKz0gcmVsYXRpdmVQb3NpdGlvbk9mZnNldCgp OwogCiAgICAgaWYgKCFpc0lubGluZSgpIHx8IGlzUmVwbGFjZWQoKSkgewotICAgICAgICBpZiAo c3R5bGUoKS0+cG9zaXRpb24oKSAhPSBBYnNvbHV0ZVBvc2l0aW9uICYmIHN0eWxlKCktPnBvc2l0 aW9uKCkgIT0gRml4ZWRQb3NpdGlvbiAmJiBvLT5oYXNDb2x1bW5zKCkpIHsKKyAgICAgICAgaWYg KCFzdHlsZSgpLT5pc1Bvc2l0aW9uZWQoKSAmJiBvLT5oYXNDb2x1bW5zKCkpIHsKICAgICAgICAg ICAgIFJlbmRlckJsb2NrKiBibG9jayA9IHRvUmVuZGVyQmxvY2sobyk7CiAgICAgICAgICAgICBM YXlvdXRSZWN0IGNvbHVtblJlY3QoZnJhbWVSZWN0KCkpOwogICAgICAgICAgICAgYmxvY2stPmFk anVzdFN0YXJ0RWRnZUZvcldyaXRpbmdNb2RlSW5jbHVkaW5nQ29sdW1ucyhjb2x1bW5SZWN0KTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVj dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3Bw CmluZGV4IDNhYjRlMjEuLmRkODEzYjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcApAQCAtMjc1OSw3ICsyNzU5LDcgQEAgdm9pZCBS ZW5kZXJCb3hNb2RlbE9iamVjdDo6bWFwQWJzb2x1dGVUb0xvY2FsUG9pbnQoYm9vbCBmaXhlZCwg Ym9vbCB1c2VUcmFuc2Zvcm0KIAogICAgIExheW91dFNpemUgY29udGFpbmVyT2Zmc2V0ID0gb2Zm c2V0RnJvbUNvbnRhaW5lcihvLCBMYXlvdXRQb2ludCgpKTsKIAotICAgIGlmIChzdHlsZSgpLT5w b3NpdGlvbigpICE9IEFic29sdXRlUG9zaXRpb24gJiYgc3R5bGUoKS0+cG9zaXRpb24oKSAhPSBG aXhlZFBvc2l0aW9uICYmIG8tPmhhc0NvbHVtbnMoKSkgeworICAgIGlmICghc3R5bGUoKS0+aXNQ b3NpdGlvbmVkKCkgJiYgby0+aGFzQ29sdW1ucygpKSB7CiAgICAgICAgIFJlbmRlckJsb2NrKiBi bG9jayA9IHN0YXRpY19jYXN0PFJlbmRlckJsb2NrKj4obyk7CiAgICAgICAgIExheW91dFBvaW50 IHBvaW50KHJvdW5kZWRMYXlvdXRQb2ludCh0cmFuc2Zvcm1TdGF0ZS5tYXBwZWRQb2ludCgpKSk7 CiAgICAgICAgIHBvaW50IC09IGNvbnRhaW5lck9mZnNldDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlcklubGluZS5jcHAKaW5kZXggMDE4MjQ1OS4uMWZjODE3YiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHAKQEAgLTEwNTMsNyArMTA1Myw3IEBAIHZv aWQgUmVuZGVySW5saW5lOjpjb21wdXRlUmVjdEZvclJlcGFpbnQoUmVuZGVyQm94TW9kZWxPYmpl Y3QqIHJlcGFpbnRDb250YWluZXIsCiAKICAgICBMYXlvdXRQb2ludCB0b3BMZWZ0ID0gcmVjdC5s b2NhdGlvbigpOwogCi0gICAgaWYgKG8tPmlzQmxvY2tGbG93KCkgJiYgc3R5bGUoKS0+cG9zaXRp b24oKSAhPSBBYnNvbHV0ZVBvc2l0aW9uICYmIHN0eWxlKCktPnBvc2l0aW9uKCkgIT0gRml4ZWRQ b3NpdGlvbikgeworICAgIGlmIChvLT5pc0Jsb2NrRmxvdygpICYmICFzdHlsZSgpLT5pc1Bvc2l0 aW9uZWQoKSkgewogICAgICAgICBSZW5kZXJCbG9jayogY2IgPSB0b1JlbmRlckJsb2NrKG8pOwog ICAgICAgICBpZiAoY2ItPmhhc0NvbHVtbnMoKSkgewogICAgICAgICAgICAgTGF5b3V0UmVjdCBy ZXBhaW50UmVjdCh0b3BMZWZ0LCByZWN0LnNpemUoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJPYmplY3QuY3BwCmluZGV4IDVlMjE3YzguLjVlYTY4NzMgMTAwNzU1Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCkBAIC02MjYsNyArNjI2LDcgQEAgdm9pZCBS ZW5kZXJPYmplY3Q6Om1hcmtDb250YWluaW5nQmxvY2tzRm9yTGF5b3V0KGJvb2wgc2NoZWR1bGVS ZWxheW91dCwgUmVuZGVyT2IKICAgICAgICAgUmVuZGVyT2JqZWN0KiBjb250YWluZXIgPSBvYmpl Y3QtPmNvbnRhaW5lcigpOwogICAgICAgICBpZiAoIWNvbnRhaW5lciAmJiAhb2JqZWN0LT5pc1Jl bmRlclZpZXcoKSkKICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgaWYgKCFsYXN0LT5pc1Rl eHQoKSAmJiAobGFzdC0+c3R5bGUoKS0+cG9zaXRpb24oKSA9PSBGaXhlZFBvc2l0aW9uIHx8IGxh c3QtPnN0eWxlKCktPnBvc2l0aW9uKCkgPT0gQWJzb2x1dGVQb3NpdGlvbikpIHsKKyAgICAgICAg aWYgKCFsYXN0LT5pc1RleHQoKSAmJiAobGFzdC0+c3R5bGUoKS0+aXNQb3NpdGlvbmVkKCkpKSB7 CiAgICAgICAgICAgICBib29sIHdpbGxTa2lwUmVsYXRpdmVseVBvc2l0aW9uZWRJbmxpbmVzID0g IW9iamVjdC0+aXNSZW5kZXJCbG9jaygpOwogICAgICAgICAgICAgd2hpbGUgKG9iamVjdCAmJiAh b2JqZWN0LT5pc1JlbmRlckJsb2NrKCkpIC8vIFNraXAgcmVsYXRpdmVseSBwb3NpdGlvbmVkIGlu bGluZXMgYW5kIGdldCB0byB0aGUgZW5jbG9zaW5nIFJlbmRlckJsb2NrLgogICAgICAgICAgICAg ICAgIG9iamVjdCA9IG9iamVjdC0+Y29udGFpbmVyKCk7CkBAIC02NjYsNyArNjY2LDcgQEAgdm9p ZCBSZW5kZXJPYmplY3Q6OnNldFByZWZlcnJlZExvZ2ljYWxXaWR0aHNEaXJ0eShib29sIGIsIGJv b2wgbWFya1BhcmVudHMpCiB7CiAgICAgYm9vbCBhbHJlYWR5RGlydHkgPSBwcmVmZXJyZWRMb2dp Y2FsV2lkdGhzRGlydHkoKTsKICAgICBtX2JpdGZpZWxkcy5zZXRQcmVmZXJyZWRMb2dpY2FsV2lk dGhzRGlydHkoYik7Ci0gICAgaWYgKGIgJiYgIWFscmVhZHlEaXJ0eSAmJiBtYXJrUGFyZW50cyAm JiAoaXNUZXh0KCkgfHwgKHN0eWxlKCktPnBvc2l0aW9uKCkgIT0gRml4ZWRQb3NpdGlvbiAmJiBz dHlsZSgpLT5wb3NpdGlvbigpICE9IEFic29sdXRlUG9zaXRpb24pKSkKKyAgICBpZiAoYiAmJiAh YWxyZWFkeURpcnR5ICYmIG1hcmtQYXJlbnRzICYmIChpc1RleHQoKSB8fCAoIXN0eWxlKCktPmlz UG9zaXRpb25lZCgpKSkpCiAgICAgICAgIGludmFsaWRhdGVDb250YWluZXJQcmVmZXJyZWRMb2dp Y2FsV2lkdGhzKCk7CiB9CiAKQEAgLTY4Myw3ICs2ODMsNyBAQCB2b2lkIFJlbmRlck9iamVjdDo6 aW52YWxpZGF0ZUNvbnRhaW5lclByZWZlcnJlZExvZ2ljYWxXaWR0aHMoKQogICAgICAgICAgICAg YnJlYWs7CiAKICAgICAgICAgby0+bV9iaXRmaWVsZHMuc2V0UHJlZmVycmVkTG9naWNhbFdpZHRo c0RpcnR5KHRydWUpOwotICAgICAgICBpZiAoby0+c3R5bGUoKS0+cG9zaXRpb24oKSA9PSBGaXhl ZFBvc2l0aW9uIHx8IG8tPnN0eWxlKCktPnBvc2l0aW9uKCkgPT0gQWJzb2x1dGVQb3NpdGlvbikK KyAgICAgICAgaWYgKG8tPnN0eWxlKCktPmlzUG9zaXRpb25lZCgpKQogICAgICAgICAgICAgLy8g QSBwb3NpdGlvbmVkIG9iamVjdCBoYXMgbm8gZWZmZWN0IG9uIHRoZSBtaW4vbWF4IHdpZHRoIG9m IGl0cyBjb250YWluaW5nIGJsb2NrIGV2ZXIuCiAgICAgICAgICAgICAvLyBXZSBjYW4gb3B0aW1p emUgdGhpcyBjYXNlIGFuZCBub3QgZ28gdXAgYW55IGZ1cnRoZXIuCiAgICAgICAgICAgICBicmVh azsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHls ZS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKaW5kZXgg ZWRkZDBmOC4uODhmOTUwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0 eWxlL1JlbmRlclN0eWxlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1Jl bmRlclN0eWxlLmgKQEAgLTUwOCw2ICs1MDgsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBoYXNTdGF0 aWNCbG9ja1Bvc2l0aW9uKGJvb2wgaG9yaXpvbnRhbCkgY29uc3QgeyByZXR1cm4gaG9yaXpvbnRh bCA/IGhhc0F1dG9Ub3BBbmRCb3R0b20oKSA6IGhhc0F1dG9MZWZ0QW5kUmlnaHQoKTsgfQogCiAg ICAgRVBvc2l0aW9uIHBvc2l0aW9uKCkgY29uc3QgeyByZXR1cm4gc3RhdGljX2Nhc3Q8RVBvc2l0 aW9uPihub25pbmhlcml0ZWRfZmxhZ3MuX3Bvc2l0aW9uKTsgfQorICAgIGJvb2wgaXNQb3NpdGlv bmVkKCkgY29uc3QgeyByZXR1cm4gcG9zaXRpb24oKSA9PSBBYnNvbHV0ZVBvc2l0aW9uIHx8IHBv c2l0aW9uKCkgPT0gRml4ZWRQb3NpdGlvbjsgfQogICAgIEVGbG9hdCBmbG9hdGluZygpIGNvbnN0 IHsgcmV0dXJuIHN0YXRpY19jYXN0PEVGbG9hdD4obm9uaW5oZXJpdGVkX2ZsYWdzLl9mbG9hdGlu Zyk7IH0KIAogICAgIExlbmd0aCB3aWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1fYm94LT53aWR0aCgp OyB9Cg== 122184 2012-01-12 00:48:40 -0800 2012-01-12 02:23:04 -0800 Patch for landing bug-75959-20120112104838.patch text/plain 7297 mihnea U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0Nzk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzcxOWE5ZDNkMjFiOGU0 NTRmNjJlZTZiNTBlY2RjOWY2NjAwZDhlZC4uNDZiNDhmYTEyN2I5NDM3YWUwNmI4YzgxZTdiODY2 MGIzY2IwYWViYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEyLTAxLTEyICBNaWhu ZWEgT3ZpZGVuaWUgIDxtaWhuZWFAYWRvYmUuY29tPgorCisgICAgICAgIEFkZCBSZW5kZXJTdHls ZTo6aXNQb3NpdGlvbmVkKCkgaGVscGVyIG1ldGhvZAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzU5NTkKKworICAgICAgICBSZXZpZXdlZCBieSBUb255 IENoYW5nLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBzaW5jZSB0aGlzIGlzIHJlZmFjdG9yaW5n IG9mIGV4aXN0aW5nIGNvZGUuCisgICAgICAgIFJlcGxhY2UgKHN0eWxlKCktPnBvc2l0aW9uKCkg PT0gQWJzb2x1dGVQb3NpdGlvbiB8fCBzdHlsZSgpLT5wb3NpdGlvbigpID09IEZpeGVkUG9zaXRp b24pIAorICAgICAgICB3aXRoIChzdHlsZSgpLT5pc1Bvc2l0aW9uZWQoKSkuCisgICAgICAgIFJl cGxhY2UgKHN0eWxlKCktPnBvc2l0aW9uKCkgIT0gQWJzb2x1dGVQb3NpdGlvbiAmJiBzdHlsZSgp LT5wb3NpdGlvbigpICE9IEZpeGVkUG9zaXRpb24pIAorICAgICAgICB3aXRoICghc3R5bGUoKS0+ aXNQb3NpdGlvbmVkKCkpLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OnVwZGF0ZUJveE1vZGVsSW5mb0Zyb21TdHlsZSk6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6Om9mZnNldEZyb21Db250YWluZXIpOgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJCb3hNb2RlbE9iamVjdDo6bWFwQWJzb2x1dGVUb0xvY2FsUG9pbnQpOgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVySW5saW5lOjpjb21wdXRlUmVjdEZvclJlcGFpbnQpOgorICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyT2JqZWN0OjptYXJrQ29u dGFpbmluZ0Jsb2Nrc0ZvckxheW91dCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6 OnNldFByZWZlcnJlZExvZ2ljYWxXaWR0aHNEaXJ0eSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJPYmplY3Q6OmludmFsaWRhdGVDb250YWluZXJQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKToKKyAg ICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaDoKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlclN0eWxlQml0ZmllbGRzOjppc1Bvc2l0aW9uZWQpOgorCiAyMDEyLTAxLTExICBTaGlu eWEgS2F3YW5ha2EgIDxzaGlueWFrQGdvb2dsZS5jb20+CiAKICAgICAgICAgUXVlcnlTZWxlY3Rv ciBzaG91bGQgbm90IGhhdmUgc2lkZSBlZmZlY3QuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCb3guY3BwCmluZGV4IDUwNjEwNTYzNmJkZDljNDI2YTc1NDBkZWUyYWI1NDMyZjc2ZDc5NDMu LmJlZmQ1YTIzNThlN2FmNDk2NzZmMDI3ZDcyMmVmMTM0ODFlY2E3NzkgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC00MDksNyArNDA5LDcgQEAgdm9pZCBSZW5kZXJC b3g6OnVwZGF0ZUJveE1vZGVsSW5mb0Zyb21TdHlsZSgpCiAgICAgaWYgKGlzUm9vdE9iamVjdCB8 fCBpc1ZpZXdPYmplY3QpCiAgICAgICAgIHNldEhhc0JveERlY29yYXRpb25zKHRydWUpOwogCi0g ICAgc2V0UG9zaXRpb25lZChzdHlsZSgpLT5wb3NpdGlvbigpID09IEFic29sdXRlUG9zaXRpb24g fHwgc3R5bGUoKS0+cG9zaXRpb24oKSA9PSBGaXhlZFBvc2l0aW9uKTsKKyAgICBzZXRQb3NpdGlv bmVkKHN0eWxlKCktPmlzUG9zaXRpb25lZCgpKTsKICAgICBzZXRGbG9hdGluZyhzdHlsZSgpLT5p c0Zsb2F0aW5nKCkgJiYgKCFpc1Bvc2l0aW9uZWQoKSB8fCBzdHlsZSgpLT5mbG9hdGluZygpID09 IFBvc2l0aW9uZWRGbG9hdCkpOwogCiAgICAgLy8gV2UgYWxzbyBoYW5kbGUgPGJvZHk+IGFuZCA8 aHRtbD4sIHdob3NlIG92ZXJmbG93IGFwcGxpZXMgdG8gdGhlIHZpZXdwb3J0LgpAQCAtMTM5Nyw3 ICsxMzk3LDcgQEAgTGF5b3V0U2l6ZSBSZW5kZXJCb3g6Om9mZnNldEZyb21Db250YWluZXIoUmVu ZGVyT2JqZWN0KiBvLCBjb25zdCBMYXlvdXRQb2ludCYgcG8KICAgICAgICAgb2Zmc2V0ICs9IHJl bGF0aXZlUG9zaXRpb25PZmZzZXQoKTsKIAogICAgIGlmICghaXNJbmxpbmUoKSB8fCBpc1JlcGxh Y2VkKCkpIHsKLSAgICAgICAgaWYgKHN0eWxlKCktPnBvc2l0aW9uKCkgIT0gQWJzb2x1dGVQb3Np dGlvbiAmJiBzdHlsZSgpLT5wb3NpdGlvbigpICE9IEZpeGVkUG9zaXRpb24gJiYgby0+aGFzQ29s dW1ucygpKSB7CisgICAgICAgIGlmICghc3R5bGUoKS0+aXNQb3NpdGlvbmVkKCkgJiYgby0+aGFz Q29sdW1ucygpKSB7CiAgICAgICAgICAgICBSZW5kZXJCbG9jayogYmxvY2sgPSB0b1JlbmRlckJs b2NrKG8pOwogICAgICAgICAgICAgTGF5b3V0UmVjdCBjb2x1bW5SZWN0KGZyYW1lUmVjdCgpKTsK ICAgICAgICAgICAgIGJsb2NrLT5hZGp1c3RTdGFydEVkZ2VGb3JXcml0aW5nTW9kZUluY2x1ZGlu Z0NvbHVtbnMoY29sdW1uUmVjdCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJveE1vZGVsT2JqZWN0LmNwcAppbmRleCAzYWI0ZTIxMzg5YjVmZTljOGI4MDhkOTJiMjgz MWQ2ZjUzYTVmMWJiLi5kZDgxM2I3ZWJlZTI3MWZhNjRiNDBlMjdmZWVkMjlkYjE3ZWMwZGQwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3Qu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5j cHAKQEAgLTI3NTksNyArMjc1OSw3IEBAIHZvaWQgUmVuZGVyQm94TW9kZWxPYmplY3Q6Om1hcEFi c29sdXRlVG9Mb2NhbFBvaW50KGJvb2wgZml4ZWQsIGJvb2wgdXNlVHJhbnNmb3JtCiAKICAgICBM YXlvdXRTaXplIGNvbnRhaW5lck9mZnNldCA9IG9mZnNldEZyb21Db250YWluZXIobywgTGF5b3V0 UG9pbnQoKSk7CiAKLSAgICBpZiAoc3R5bGUoKS0+cG9zaXRpb24oKSAhPSBBYnNvbHV0ZVBvc2l0 aW9uICYmIHN0eWxlKCktPnBvc2l0aW9uKCkgIT0gRml4ZWRQb3NpdGlvbiAmJiBvLT5oYXNDb2x1 bW5zKCkpIHsKKyAgICBpZiAoIXN0eWxlKCktPmlzUG9zaXRpb25lZCgpICYmIG8tPmhhc0NvbHVt bnMoKSkgewogICAgICAgICBSZW5kZXJCbG9jayogYmxvY2sgPSBzdGF0aWNfY2FzdDxSZW5kZXJC bG9jayo+KG8pOwogICAgICAgICBMYXlvdXRQb2ludCBwb2ludChyb3VuZGVkTGF5b3V0UG9pbnQo dHJhbnNmb3JtU3RhdGUubWFwcGVkUG9pbnQoKSkpOwogICAgICAgICBwb2ludCAtPSBjb250YWlu ZXJPZmZzZXQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5s aW5lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwCmluZGV4 IDAxODI0NTlhMWNmOWIyOTRhODliZjI2MjE1MGU1NGIzMTFjMDdmZjEuLjFmYzgxN2IyODk3MjA2 MjRlZjk1ZjU1MWZkODEyZDBkMTM4NmIyMmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJJbmxpbmUuY3BwCkBAIC0xMDUzLDcgKzEwNTMsNyBAQCB2b2lkIFJlbmRlcklubGluZTo6 Y29tcHV0ZVJlY3RGb3JSZXBhaW50KFJlbmRlckJveE1vZGVsT2JqZWN0KiByZXBhaW50Q29udGFp bmVyLAogCiAgICAgTGF5b3V0UG9pbnQgdG9wTGVmdCA9IHJlY3QubG9jYXRpb24oKTsKIAotICAg IGlmIChvLT5pc0Jsb2NrRmxvdygpICYmIHN0eWxlKCktPnBvc2l0aW9uKCkgIT0gQWJzb2x1dGVQ b3NpdGlvbiAmJiBzdHlsZSgpLT5wb3NpdGlvbigpICE9IEZpeGVkUG9zaXRpb24pIHsKKyAgICBp ZiAoby0+aXNCbG9ja0Zsb3coKSAmJiAhc3R5bGUoKS0+aXNQb3NpdGlvbmVkKCkpIHsKICAgICAg ICAgUmVuZGVyQmxvY2sqIGNiID0gdG9SZW5kZXJCbG9jayhvKTsKICAgICAgICAgaWYgKGNiLT5o YXNDb2x1bW5zKCkpIHsKICAgICAgICAgICAgIExheW91dFJlY3QgcmVwYWludFJlY3QodG9wTGVm dCwgcmVjdC5zaXplKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlck9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNw cAppbmRleCA1ZTIxN2M4MmM2ZjMxNTVmMTZhMzYxNmRiNDZmMzAzOGFkOGI0ZTE0Li4wY2Y1MDMy YTg4NDg0YzI1NmM5M2FlMzYyYjhiMDYyNzMyOWZhZWFmIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyT2JqZWN0LmNwcApAQCAtNjI2LDcgKzYyNiw3IEBAIHZvaWQgUmVuZGVyT2Jq ZWN0OjptYXJrQ29udGFpbmluZ0Jsb2Nrc0ZvckxheW91dChib29sIHNjaGVkdWxlUmVsYXlvdXQs IFJlbmRlck9iCiAgICAgICAgIFJlbmRlck9iamVjdCogY29udGFpbmVyID0gb2JqZWN0LT5jb250 YWluZXIoKTsKICAgICAgICAgaWYgKCFjb250YWluZXIgJiYgIW9iamVjdC0+aXNSZW5kZXJWaWV3 KCkpCiAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIGlmICghbGFzdC0+aXNUZXh0KCkgJiYg KGxhc3QtPnN0eWxlKCktPnBvc2l0aW9uKCkgPT0gRml4ZWRQb3NpdGlvbiB8fCBsYXN0LT5zdHls ZSgpLT5wb3NpdGlvbigpID09IEFic29sdXRlUG9zaXRpb24pKSB7CisgICAgICAgIGlmICghbGFz dC0+aXNUZXh0KCkgJiYgbGFzdC0+c3R5bGUoKS0+aXNQb3NpdGlvbmVkKCkpIHsKICAgICAgICAg ICAgIGJvb2wgd2lsbFNraXBSZWxhdGl2ZWx5UG9zaXRpb25lZElubGluZXMgPSAhb2JqZWN0LT5p c1JlbmRlckJsb2NrKCk7CiAgICAgICAgICAgICB3aGlsZSAob2JqZWN0ICYmICFvYmplY3QtPmlz UmVuZGVyQmxvY2soKSkgLy8gU2tpcCByZWxhdGl2ZWx5IHBvc2l0aW9uZWQgaW5saW5lcyBhbmQg Z2V0IHRvIHRoZSBlbmNsb3NpbmcgUmVuZGVyQmxvY2suCiAgICAgICAgICAgICAgICAgb2JqZWN0 ID0gb2JqZWN0LT5jb250YWluZXIoKTsKQEAgLTY2Niw3ICs2NjYsNyBAQCB2b2lkIFJlbmRlck9i amVjdDo6c2V0UHJlZmVycmVkTG9naWNhbFdpZHRoc0RpcnR5KGJvb2wgYiwgYm9vbCBtYXJrUGFy ZW50cykKIHsKICAgICBib29sIGFscmVhZHlEaXJ0eSA9IHByZWZlcnJlZExvZ2ljYWxXaWR0aHNE aXJ0eSgpOwogICAgIG1fYml0ZmllbGRzLnNldFByZWZlcnJlZExvZ2ljYWxXaWR0aHNEaXJ0eShi KTsKLSAgICBpZiAoYiAmJiAhYWxyZWFkeURpcnR5ICYmIG1hcmtQYXJlbnRzICYmIChpc1RleHQo KSB8fCAoc3R5bGUoKS0+cG9zaXRpb24oKSAhPSBGaXhlZFBvc2l0aW9uICYmIHN0eWxlKCktPnBv c2l0aW9uKCkgIT0gQWJzb2x1dGVQb3NpdGlvbikpKQorICAgIGlmIChiICYmICFhbHJlYWR5RGly dHkgJiYgbWFya1BhcmVudHMgJiYgKGlzVGV4dCgpIHx8ICFzdHlsZSgpLT5pc1Bvc2l0aW9uZWQo KSkpCiAgICAgICAgIGludmFsaWRhdGVDb250YWluZXJQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKCk7 CiB9CiAKQEAgLTY4Myw3ICs2ODMsNyBAQCB2b2lkIFJlbmRlck9iamVjdDo6aW52YWxpZGF0ZUNv bnRhaW5lclByZWZlcnJlZExvZ2ljYWxXaWR0aHMoKQogICAgICAgICAgICAgYnJlYWs7CiAKICAg ICAgICAgby0+bV9iaXRmaWVsZHMuc2V0UHJlZmVycmVkTG9naWNhbFdpZHRoc0RpcnR5KHRydWUp OwotICAgICAgICBpZiAoby0+c3R5bGUoKS0+cG9zaXRpb24oKSA9PSBGaXhlZFBvc2l0aW9uIHx8 IG8tPnN0eWxlKCktPnBvc2l0aW9uKCkgPT0gQWJzb2x1dGVQb3NpdGlvbikKKyAgICAgICAgaWYg KG8tPnN0eWxlKCktPmlzUG9zaXRpb25lZCgpKQogICAgICAgICAgICAgLy8gQSBwb3NpdGlvbmVk IG9iamVjdCBoYXMgbm8gZWZmZWN0IG9uIHRoZSBtaW4vbWF4IHdpZHRoIG9mIGl0cyBjb250YWlu aW5nIGJsb2NrIGV2ZXIuCiAgICAgICAgICAgICAvLyBXZSBjYW4gb3B0aW1pemUgdGhpcyBjYXNl IGFuZCBub3QgZ28gdXAgYW55IGZ1cnRoZXIuCiAgICAgICAgICAgICBicmVhazsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKaW5kZXggZWRkZDBmODhjODFh OTBiZmZhZjlkZWMwYjRjNGJkNWVhNGMwMWEwNS4uODhmOTUwYjY1OTA3MDkxMmYzMzkwNWRlMjFi N2ZjMmIzYmY4NDcyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxl L1JlbmRlclN0eWxlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRl clN0eWxlLmgKQEAgLTUwOCw2ICs1MDgsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBoYXNTdGF0aWNC bG9ja1Bvc2l0aW9uKGJvb2wgaG9yaXpvbnRhbCkgY29uc3QgeyByZXR1cm4gaG9yaXpvbnRhbCA/ IGhhc0F1dG9Ub3BBbmRCb3R0b20oKSA6IGhhc0F1dG9MZWZ0QW5kUmlnaHQoKTsgfQogCiAgICAg RVBvc2l0aW9uIHBvc2l0aW9uKCkgY29uc3QgeyByZXR1cm4gc3RhdGljX2Nhc3Q8RVBvc2l0aW9u Pihub25pbmhlcml0ZWRfZmxhZ3MuX3Bvc2l0aW9uKTsgfQorICAgIGJvb2wgaXNQb3NpdGlvbmVk KCkgY29uc3QgeyByZXR1cm4gcG9zaXRpb24oKSA9PSBBYnNvbHV0ZVBvc2l0aW9uIHx8IHBvc2l0 aW9uKCkgPT0gRml4ZWRQb3NpdGlvbjsgfQogICAgIEVGbG9hdCBmbG9hdGluZygpIGNvbnN0IHsg cmV0dXJuIHN0YXRpY19jYXN0PEVGbG9hdD4obm9uaW5oZXJpdGVkX2ZsYWdzLl9mbG9hdGluZyk7 IH0KIAogICAgIExlbmd0aCB3aWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1fYm94LT53aWR0aCgpOyB9 Cg==