88204 2012-06-03 18:49:23 -0700 Remove SelectorQueryCacheEntry from SelectorQuery.h 2012-06-04 08:44:39 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 87625 1 haraken haraken darin koivisto webkit.review.bot oldest_to_newest 640259 0 haraken 2012-06-03 18:49:23 -0700 As anttik@ pointed out in https://bugs.webkit.org/show_bug.cgi?id=87942#c15 , we can remove SelectorQueryCacheEntry by having SelectorQuery hold CSSSelectorList. 640260 1 145501 haraken 2012-06-03 18:52:11 -0700 Created attachment 145501 Patch 640306 2 145501 morrita 2012-06-03 22:02:29 -0700 Comment on attachment 145501 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=145501&action=review > Source/WebCore/dom/SelectorQuery.cpp:187 > + SelectorQuery* selectorQueryPtr = selectorQuery.get(); Don't use abbreviations like Ptr. FooPointer or rawFoo would be nicer. 640309 3 145515 haraken 2012-06-03 22:06:02 -0700 Created attachment 145515 patch for landing 640310 4 haraken 2012-06-03 22:06:50 -0700 (In reply to comment #2) > (From update of attachment 145501 [details]) > Don't use abbreviations like Ptr. FooPointer or rawFoo would be nicer. Fixed. anttik: If the patch looks OK, please cq+ it. 640403 5 145515 koivisto 2012-06-04 01:36:41 -0700 Comment on attachment 145515 patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=145515&action=review > Source/WebCore/dom/SelectorQuery.cpp:147 > +SelectorQuery::SelectorQuery(const CSSSelectorList& selectorList) : m_selectorList(selectorList) > { In WebKit style an initializer goes to a line of its own (indented) > Source/WebCore/dom/SelectorQuery.h:79 > + // m_selectorList keeps the lifetime of CSSSelector objects in m_selectors. > + // Since m_selectors just holds pointers to CSSSelector objects, > + // m_selectorList must not be destructed before m_selectors is destructed. This comment no longer adds value and can be removed 640404 6 145538 haraken 2012-06-04 01:39:01 -0700 Created attachment 145538 patch for landing 640406 7 haraken 2012-06-04 01:39:43 -0700 (In reply to comment #5) > > Source/WebCore/dom/SelectorQuery.cpp:147 > > +SelectorQuery::SelectorQuery(const CSSSelectorList& selectorList) : m_selectorList(selectorList) > > { > > In WebKit style an initializer goes to a line of its own (indented) Fixed. > > Source/WebCore/dom/SelectorQuery.h:79 > > + // m_selectorList keeps the lifetime of CSSSelector objects in m_selectors. > > + // Since m_selectors just holds pointers to CSSSelector objects, > > + // m_selectorList must not be destructed before m_selectors is destructed. > > This comment no longer adds value and can be removed Removed. Thanks. 640416 8 145538 webkit.review.bot 2012-06-04 01:53:41 -0700 Comment on attachment 145538 patch for landing Rejecting attachment 145538 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: #1 succeeded at 1 with fuzz 3. patching file Source/WebCore/dom/SelectorQuery.cpp Hunk #1 succeeded at 143 with fuzz 1. Hunk #2 succeeded at 169 (offset 6 lines). patching file Source/WebCore/dom/SelectorQuery.h Hunk #1 FAILED at 67. Hunk #2 succeeded at 102 (offset 1 line). 1 out of 2 hunks FAILED -- saving rejects to file Source/WebCore/dom/SelectorQuery.h.rej Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force']" exit_code: 1 cwd: /mnt/git/webkit-commit-queue/ Full output: http://queues.webkit.org/results/12894238 640493 9 145562 haraken 2012-06-04 05:16:32 -0700 Created attachment 145562 patch for landing 640497 10 145562 webkit.review.bot 2012-06-04 05:20:51 -0700 Comment on attachment 145562 patch for landing Rejecting attachment 145562 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 1 MORITA Hajime found in /mnt/git/webkit-commit-queue/Source/WebCore/ChangeLog does not appear to be a valid reviewer according to committers.py. ERROR: /mnt/git/webkit-commit-queue/Source/WebCore/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive). Full output: http://queues.webkit.org/results/12894294 640499 11 145564 haraken 2012-06-04 05:22:43 -0700 Created attachment 145564 patch for landing 640501 12 145564 webkit.review.bot 2012-06-04 05:26:18 -0700 Comment on attachment 145564 patch for landing Rejecting attachment 145564 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 1 Morita Hajime found in /mnt/git/webkit-commit-queue/Source/WebCore/ChangeLog does not appear to be a valid reviewer according to committers.py. ERROR: /mnt/git/webkit-commit-queue/Source/WebCore/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive). Full output: http://queues.webkit.org/results/12900193 640503 13 145565 haraken 2012-06-04 05:27:38 -0700 Created attachment 145565 patch for landing 640608 14 145565 webkit.review.bot 2012-06-04 08:30:55 -0700 Comment on attachment 145565 patch for landing Clearing flags on attachment: 145565 Committed r119399: <http://trac.webkit.org/changeset/119399> 145501 2012-06-03 18:52:11 -0700 2012-06-04 08:44:39 -0700 Patch bug-88204-20120604105210.patch text/plain 5573 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5MzY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTZkYmFhZGZkYmY1YzA2 MzZmYzM4YzU5ZjkwNGVmZWRkYzYxN2QyNy4uZTY2YTgzMTI0ZDRiZmMyMzMyYWZmNzlhZWEwZTQ2 OTEwOTE3OGIwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTA2LTAzICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZW1vdmUgU2VsZWN0 b3JRdWVyeUNhY2hlRW50cnkgZnJvbSBTZWxlY3RvclF1ZXJ5LmgKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg4MjA0CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQXMgYW50dGlrQCBwb2ludGVkIG91dCBpbiBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODc5NDIjYzE1LAorICAgICAg ICB3ZSBjYW4gcmVtb3ZlIFNlbGVjdG9yUXVlcnlDYWNoZUVudHJ5IGJ5IGhhdmluZyBTZWxlY3Rv clF1ZXJ5IGhvbGQgQ1NTU2VsZWN0b3JMaXN0LgorCisgICAgICAgIFRlc3RzOiBmYXN0L2RvbS9T ZWxlY3RvckFQSS8qIE5vIGNoYW5nZSBpbiB0ZXN0IHJlc3VsdHMuCisKKyAgICAgICAgKiBkb20v U2VsZWN0b3JRdWVyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTZWxlY3RvclF1ZXJ5OjpTZWxl Y3RvclF1ZXJ5KToKKyAgICAgICAgKFdlYkNvcmU6OlNlbGVjdG9yUXVlcnlDYWNoZTo6YWRkKToK KyAgICAgICAgKiBkb20vU2VsZWN0b3JRdWVyeS5oOgorICAgICAgICAoU2VsZWN0b3JRdWVyeSk6 CisgICAgICAgIChTZWxlY3RvclF1ZXJ5Q2FjaGUpOgorCiAyMDEyLTA2LTAzICBIYXlhdG8gSXRv ICA8aGF5YXRvQGNocm9taXVtLm9yZz4KIAogICAgICAgICBTdXBwb3J0cyB0cmF2ZXJzaW5nIG5v ZGVzIGluIGFuIG9ycGhhbmVkIHNoYWRvdyBzdWJ0cmVlIGluIENvbXBvc2VkU2hhZG93VHJlZVBh cmVudFdhbGtlci4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TZWxlY3RvclF1ZXJ5 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9TZWxlY3RvclF1ZXJ5LmNwcAppbmRleCBmYWQ2MmE1 ZjYzNjU1Mjc3NjhkMTgwYTI2YzViZmViNjMwZWY0MTRiLi5lZjI4MzZhNmQxZTQyODNlYzcxZTM4 ZGI5OWQzMWVlMmMyZjYxNDM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vU2VsZWN0 b3JRdWVyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL1NlbGVjdG9yUXVlcnkuY3BwCkBA IC0xNDMsOSArMTQzLDkgQEAgdm9pZCBTZWxlY3RvckRhdGFMaXN0OjpleGVjdXRlKGNvbnN0IFNl bGVjdG9yQ2hlY2tlciYgc2VsZWN0b3JDaGVja2VyLCBOb2RlKiByb28KICAgICB9CiB9CiAKLXZv aWQgU2VsZWN0b3JRdWVyeTo6aW5pdGlhbGl6ZShjb25zdCBDU1NTZWxlY3Rvckxpc3QmIHNlbGVj dG9yTGlzdCkKK1NlbGVjdG9yUXVlcnk6OlNlbGVjdG9yUXVlcnkoY29uc3QgQ1NTU2VsZWN0b3JM aXN0JiBzZWxlY3Rvckxpc3QpIDogbV9zZWxlY3Rvckxpc3Qoc2VsZWN0b3JMaXN0KQogewotICAg IG1fc2VsZWN0b3JzLmluaXRpYWxpemUoc2VsZWN0b3JMaXN0KTsKKyAgICBtX3NlbGVjdG9ycy5p bml0aWFsaXplKG1fc2VsZWN0b3JMaXN0KTsKIH0KIAogUGFzc1JlZlB0cjxOb2RlTGlzdD4gU2Vs ZWN0b3JRdWVyeTo6cXVlcnlBbGwoTm9kZSogcm9vdE5vZGUpIGNvbnN0CkBAIC0xNjIsMzcgKzE2 MiwzMSBAQCBQYXNzUmVmUHRyPEVsZW1lbnQ+IFNlbGVjdG9yUXVlcnk6OnF1ZXJ5Rmlyc3QoTm9k ZSogcm9vdE5vZGUpIGNvbnN0CiAgICAgcmV0dXJuIG1fc2VsZWN0b3JzLnF1ZXJ5Rmlyc3Qoc2Vs ZWN0b3JDaGVja2VyLCByb290Tm9kZSk7CiB9CiAKLVNlbGVjdG9yUXVlcnlDYWNoZUVudHJ5OjpT ZWxlY3RvclF1ZXJ5Q2FjaGVFbnRyeShDU1NTZWxlY3Rvckxpc3QmIHF1ZXJ5U2VsZWN0b3JMaXN0 KQotICAgIDogbV9xdWVyeVNlbGVjdG9yTGlzdChxdWVyeVNlbGVjdG9yTGlzdCkKLXsKLSAgICBt X3NlbGVjdG9yUXVlcnkuaW5pdGlhbGl6ZShtX3F1ZXJ5U2VsZWN0b3JMaXN0KTsKLX0KLQogU2Vs ZWN0b3JRdWVyeSogU2VsZWN0b3JRdWVyeUNhY2hlOjphZGQoY29uc3QgQXRvbWljU3RyaW5nJiBz ZWxlY3RvcnMsIERvY3VtZW50KiBkb2N1bWVudCwgRXhjZXB0aW9uQ29kZSYgZWMpCiB7Ci0gICAg SGFzaE1hcDxBdG9taWNTdHJpbmcsIE93blB0cjxTZWxlY3RvclF1ZXJ5Q2FjaGVFbnRyeT4gPjo6 aXRlcmF0b3IgaXQgPSBtX2VudHJpZXMuZmluZChzZWxlY3RvcnMpOworICAgIEhhc2hNYXA8QXRv bWljU3RyaW5nLCBPd25QdHI8U2VsZWN0b3JRdWVyeT4gPjo6aXRlcmF0b3IgaXQgPSBtX2VudHJp ZXMuZmluZChzZWxlY3RvcnMpOwogICAgIGlmIChpdCAhPSBtX2VudHJpZXMuZW5kKCkpCi0gICAg ICAgIHJldHVybiBpdC0+c2Vjb25kLT5zZWxlY3RvclF1ZXJ5KCk7CisgICAgICAgIHJldHVybiBp dC0+c2Vjb25kLmdldCgpOwogCiAgICAgQ1NTUGFyc2VyIHBhcnNlcihkb2N1bWVudCk7Ci0gICAg Q1NTU2VsZWN0b3JMaXN0IHF1ZXJ5U2VsZWN0b3JMaXN0OwotICAgIHBhcnNlci5wYXJzZVNlbGVj dG9yKHNlbGVjdG9ycywgcXVlcnlTZWxlY3Rvckxpc3QpOworICAgIENTU1NlbGVjdG9yTGlzdCBz ZWxlY3Rvckxpc3Q7CisgICAgcGFyc2VyLnBhcnNlU2VsZWN0b3Ioc2VsZWN0b3JzLCBzZWxlY3Rv ckxpc3QpOwogCi0gICAgaWYgKCFxdWVyeVNlbGVjdG9yTGlzdC5maXJzdCgpIHx8IHF1ZXJ5U2Vs ZWN0b3JMaXN0Lmhhc1Vua25vd25Qc2V1ZG9FbGVtZW50cygpKSB7CisgICAgaWYgKCFzZWxlY3Rv ckxpc3QuZmlyc3QoKSB8fCBzZWxlY3Rvckxpc3QuaGFzVW5rbm93blBzZXVkb0VsZW1lbnRzKCkp IHsKICAgICAgICAgZWMgPSBTWU5UQVhfRVJSOwogICAgICAgICByZXR1cm4gMDsKICAgICB9CiAK ICAgICAvLyB0aHJvdyBhIE5BTUVTUEFDRV9FUlIgaWYgdGhlIHNlbGVjdG9yIGluY2x1ZGVzIGFu eSBuYW1lc3BhY2UgcHJlZml4ZXMuCi0gICAgaWYgKHF1ZXJ5U2VsZWN0b3JMaXN0LnNlbGVjdG9y c05lZWROYW1lc3BhY2VSZXNvbHV0aW9uKCkpIHsKKyAgICBpZiAoc2VsZWN0b3JMaXN0LnNlbGVj dG9yc05lZWROYW1lc3BhY2VSZXNvbHV0aW9uKCkpIHsKICAgICAgICAgZWMgPSBOQU1FU1BBQ0Vf RVJSOwogICAgICAgICByZXR1cm4gMDsKICAgICB9CiAgICAgCi0gICAgT3duUHRyPFNlbGVjdG9y UXVlcnlDYWNoZUVudHJ5PiBlbnRyeSA9IGFkb3B0UHRyKG5ldyBTZWxlY3RvclF1ZXJ5Q2FjaGVF bnRyeShxdWVyeVNlbGVjdG9yTGlzdCkpOwotICAgIFNlbGVjdG9yUXVlcnkqIHNlbGVjdG9yUXVl cnkgPSBlbnRyeS0+c2VsZWN0b3JRdWVyeSgpOwotICAgIG1fZW50cmllcy5hZGQoc2VsZWN0b3Jz LCBlbnRyeS5yZWxlYXNlKCkpOwotICAgIHJldHVybiBzZWxlY3RvclF1ZXJ5OworICAgIE93blB0 cjxTZWxlY3RvclF1ZXJ5PiBzZWxlY3RvclF1ZXJ5ID0gYWRvcHRQdHIobmV3IFNlbGVjdG9yUXVl cnkoc2VsZWN0b3JMaXN0KSk7CisgICAgU2VsZWN0b3JRdWVyeSogc2VsZWN0b3JRdWVyeVB0ciA9 IHNlbGVjdG9yUXVlcnkuZ2V0KCk7CisgICAgbV9lbnRyaWVzLmFkZChzZWxlY3RvcnMsIHNlbGVj dG9yUXVlcnkucmVsZWFzZSgpKTsKKyAgICByZXR1cm4gc2VsZWN0b3JRdWVyeVB0cjsKIH0KIAog dm9pZCBTZWxlY3RvclF1ZXJ5Q2FjaGU6OmludmFsaWRhdGUoKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvZG9tL1NlbGVjdG9yUXVlcnkuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9TZWxlY3Rv clF1ZXJ5LmgKaW5kZXggYmUxYTgxOTQyMDFlNmMzMTFkNmRmNWVlNjc4ZGEzNzUyOWY3ZWRlNi4u YWQzOGQ2OTQ3ODFhZjM1MWM2N2RlYWU1YjBjOTkwN2Y1ZTQ2NjgzZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvZG9tL1NlbGVjdG9yUXVlcnkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20v U2VsZWN0b3JRdWVyeS5oCkBAIC02NywyOCArNjcsMTcgQEAgcHJpdmF0ZToKIAogY2xhc3MgU2Vs ZWN0b3JRdWVyeSB7CiAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoU2VsZWN0b3JRdWVyeSk7Cisg ICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiBwdWJsaWM6Ci0gICAgU2VsZWN0b3JRdWVyeSgp IHsgfTsKLSAgICB2b2lkIGluaXRpYWxpemUoY29uc3QgQ1NTU2VsZWN0b3JMaXN0Jik7CisgICAg U2VsZWN0b3JRdWVyeShjb25zdCBDU1NTZWxlY3Rvckxpc3QmKTsKICAgICBQYXNzUmVmUHRyPE5v ZGVMaXN0PiBxdWVyeUFsbChOb2RlKiByb290Tm9kZSkgY29uc3Q7CiAgICAgUGFzc1JlZlB0cjxF bGVtZW50PiBxdWVyeUZpcnN0KE5vZGUqIHJvb3ROb2RlKSBjb25zdDsKIHByaXZhdGU6CiAgICAg U2VsZWN0b3JEYXRhTGlzdCBtX3NlbGVjdG9yczsKLX07Ci0KLWNsYXNzIFNlbGVjdG9yUXVlcnlD YWNoZUVudHJ5IHsKLSAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShTZWxlY3RvclF1ZXJ5Q2FjaGVF bnRyeSk7Ci0gICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7Ci1wdWJsaWM6Ci0gICAgZXhwbGlj aXQgU2VsZWN0b3JRdWVyeUNhY2hlRW50cnkoQ1NTU2VsZWN0b3JMaXN0Jik7Ci0gICAgU2VsZWN0 b3JRdWVyeSogc2VsZWN0b3JRdWVyeSgpIHsgcmV0dXJuICZtX3NlbGVjdG9yUXVlcnk7IH07Ci0K LXByaXZhdGU6Ci0gICAgLy8gbV9xdWVyeVNlbGVjdG9yTGlzdCBrZWVwcyB0aGUgbGlmZXRpbWUg b2YgQ1NTU2VsZWN0b3JzIGluIG1fc2VsZWN0b3JRdWVyeS4KLSAgICAvLyBTaW5jZSBtX3NlbGVj dG9yUXVlcnkganVzdCBob2xkcyBwb2ludGVycyB0byBDU1NTZWxlY3RvciBvYmplY3RzLAotICAg IC8vIG1fcXVlcnlTZWxlY3Rvckxpc3QgbXVzdCBub3QgYmUgZGVzdHJ1Y3RlZCBiZWZvcmUgbV9z ZWxlY3RvclF1ZXJ5IGlzIGRlc3RydWN0ZWQuCi0gICAgQ1NTU2VsZWN0b3JMaXN0IG1fcXVlcnlT ZWxlY3Rvckxpc3Q7Ci0gICAgU2VsZWN0b3JRdWVyeSBtX3NlbGVjdG9yUXVlcnk7CisgICAgLy8g bV9zZWxlY3Rvckxpc3Qga2VlcHMgdGhlIGxpZmV0aW1lIG9mIENTU1NlbGVjdG9yIG9iamVjdHMg aW4gbV9zZWxlY3RvcnMuCisgICAgLy8gU2luY2UgbV9zZWxlY3RvcnMganVzdCBob2xkcyBwb2lu dGVycyB0byBDU1NTZWxlY3RvciBvYmplY3RzLAorICAgIC8vIG1fc2VsZWN0b3JMaXN0IG11c3Qg bm90IGJlIGRlc3RydWN0ZWQgYmVmb3JlIG1fc2VsZWN0b3JzIGlzIGRlc3RydWN0ZWQuCisgICAg Q1NTU2VsZWN0b3JMaXN0IG1fc2VsZWN0b3JMaXN0OwogfTsKIAogY2xhc3MgU2VsZWN0b3JRdWVy eUNhY2hlIHsKQEAgLTEwMSw3ICs5MCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGludmFsaWRhdGUo KTsKIAogcHJpdmF0ZToKLSAgICBIYXNoTWFwPEF0b21pY1N0cmluZywgT3duUHRyPFNlbGVjdG9y UXVlcnlDYWNoZUVudHJ5PiA+IG1fZW50cmllczsKKyAgICBIYXNoTWFwPEF0b21pY1N0cmluZywg T3duUHRyPFNlbGVjdG9yUXVlcnk+ID4gbV9lbnRyaWVzOwogfTsKIAogfQo= 145515 2012-06-03 22:06:02 -0700 2012-06-04 01:36:41 -0700 patch for landing bug-88204-20120604140601.patch text/plain 5572 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5MzY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTZkYmFhZGZkYmY1YzA2 MzZmYzM4YzU5ZjkwNGVmZWRkYzYxN2QyNy4uMDYyMjFjMzI2ZTJhMzg0MjA0Njc4NWNiYjkwNTRl NTYwNWZmMTlkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTA2LTAzICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZW1vdmUgU2VsZWN0 b3JRdWVyeUNhY2hlRW50cnkgZnJvbSBTZWxlY3RvclF1ZXJ5LmgKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg4MjA0CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTU9SSVRBIEhhamltZS4KKworICAgICAgICBBcyBhbnR0aWtAIHBvaW50ZWQgb3V0IGluIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04Nzk0MiNjMTUsCisgICAgICAg IHdlIGNhbiByZW1vdmUgU2VsZWN0b3JRdWVyeUNhY2hlRW50cnkgYnkgaGF2aW5nIFNlbGVjdG9y UXVlcnkgaG9sZCBDU1NTZWxlY3Rvckxpc3QuCisKKyAgICAgICAgVGVzdHM6IGZhc3QvZG9tL1Nl bGVjdG9yQVBJLyogTm8gY2hhbmdlIGluIHRlc3QgcmVzdWx0cy4KKworICAgICAgICAqIGRvbS9T ZWxlY3RvclF1ZXJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNlbGVjdG9yUXVlcnk6OlNlbGVj dG9yUXVlcnkpOgorICAgICAgICAoV2ViQ29yZTo6U2VsZWN0b3JRdWVyeUNhY2hlOjphZGQpOgor ICAgICAgICAqIGRvbS9TZWxlY3RvclF1ZXJ5Lmg6CisgICAgICAgIChTZWxlY3RvclF1ZXJ5KToK KyAgICAgICAgKFNlbGVjdG9yUXVlcnlDYWNoZSk6CisKIDIwMTItMDYtMDMgIEhheWF0byBJdG8g IDxoYXlhdG9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFN1cHBvcnRzIHRyYXZlcnNpbmcgbm9k ZXMgaW4gYW4gb3JwaGFuZWQgc2hhZG93IHN1YnRyZWUgaW4gQ29tcG9zZWRTaGFkb3dUcmVlUGFy ZW50V2Fsa2VyLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL1NlbGVjdG9yUXVlcnku Y3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL1NlbGVjdG9yUXVlcnkuY3BwCmluZGV4IGZhZDYyYTVm NjM2NTUyNzc2OGQxODBhMjZjNWJmZWI2MzBlZjQxNGIuLjI0NDczMWFmMzgzMGM2ZWRmMjg2NTUx ZDJlYjc0NzcwNmIxYTk4MmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TZWxlY3Rv clF1ZXJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vU2VsZWN0b3JRdWVyeS5jcHAKQEAg LTE0Myw5ICsxNDMsOSBAQCB2b2lkIFNlbGVjdG9yRGF0YUxpc3Q6OmV4ZWN1dGUoY29uc3QgU2Vs ZWN0b3JDaGVja2VyJiBzZWxlY3RvckNoZWNrZXIsIE5vZGUqIHJvbwogICAgIH0KIH0KIAotdm9p ZCBTZWxlY3RvclF1ZXJ5Ojppbml0aWFsaXplKGNvbnN0IENTU1NlbGVjdG9yTGlzdCYgc2VsZWN0 b3JMaXN0KQorU2VsZWN0b3JRdWVyeTo6U2VsZWN0b3JRdWVyeShjb25zdCBDU1NTZWxlY3Rvckxp c3QmIHNlbGVjdG9yTGlzdCkgOiBtX3NlbGVjdG9yTGlzdChzZWxlY3Rvckxpc3QpCiB7Ci0gICAg bV9zZWxlY3RvcnMuaW5pdGlhbGl6ZShzZWxlY3Rvckxpc3QpOworICAgIG1fc2VsZWN0b3JzLmlu aXRpYWxpemUobV9zZWxlY3Rvckxpc3QpOwogfQogCiBQYXNzUmVmUHRyPE5vZGVMaXN0PiBTZWxl Y3RvclF1ZXJ5OjpxdWVyeUFsbChOb2RlKiByb290Tm9kZSkgY29uc3QKQEAgLTE2MiwzNyArMTYy LDMxIEBAIFBhc3NSZWZQdHI8RWxlbWVudD4gU2VsZWN0b3JRdWVyeTo6cXVlcnlGaXJzdChOb2Rl KiByb290Tm9kZSkgY29uc3QKICAgICByZXR1cm4gbV9zZWxlY3RvcnMucXVlcnlGaXJzdChzZWxl Y3RvckNoZWNrZXIsIHJvb3ROb2RlKTsKIH0KIAotU2VsZWN0b3JRdWVyeUNhY2hlRW50cnk6OlNl bGVjdG9yUXVlcnlDYWNoZUVudHJ5KENTU1NlbGVjdG9yTGlzdCYgcXVlcnlTZWxlY3Rvckxpc3Qp Ci0gICAgOiBtX3F1ZXJ5U2VsZWN0b3JMaXN0KHF1ZXJ5U2VsZWN0b3JMaXN0KQotewotICAgIG1f c2VsZWN0b3JRdWVyeS5pbml0aWFsaXplKG1fcXVlcnlTZWxlY3Rvckxpc3QpOwotfQotCiBTZWxl Y3RvclF1ZXJ5KiBTZWxlY3RvclF1ZXJ5Q2FjaGU6OmFkZChjb25zdCBBdG9taWNTdHJpbmcmIHNl bGVjdG9ycywgRG9jdW1lbnQqIGRvY3VtZW50LCBFeGNlcHRpb25Db2RlJiBlYykKIHsKLSAgICBI YXNoTWFwPEF0b21pY1N0cmluZywgT3duUHRyPFNlbGVjdG9yUXVlcnlDYWNoZUVudHJ5PiA+Ojpp dGVyYXRvciBpdCA9IG1fZW50cmllcy5maW5kKHNlbGVjdG9ycyk7CisgICAgSGFzaE1hcDxBdG9t aWNTdHJpbmcsIE93blB0cjxTZWxlY3RvclF1ZXJ5PiA+OjppdGVyYXRvciBpdCA9IG1fZW50cmll cy5maW5kKHNlbGVjdG9ycyk7CiAgICAgaWYgKGl0ICE9IG1fZW50cmllcy5lbmQoKSkKLSAgICAg ICAgcmV0dXJuIGl0LT5zZWNvbmQtPnNlbGVjdG9yUXVlcnkoKTsKKyAgICAgICAgcmV0dXJuIGl0 LT5zZWNvbmQuZ2V0KCk7CiAKICAgICBDU1NQYXJzZXIgcGFyc2VyKGRvY3VtZW50KTsKLSAgICBD U1NTZWxlY3Rvckxpc3QgcXVlcnlTZWxlY3Rvckxpc3Q7Ci0gICAgcGFyc2VyLnBhcnNlU2VsZWN0 b3Ioc2VsZWN0b3JzLCBxdWVyeVNlbGVjdG9yTGlzdCk7CisgICAgQ1NTU2VsZWN0b3JMaXN0IHNl bGVjdG9yTGlzdDsKKyAgICBwYXJzZXIucGFyc2VTZWxlY3RvcihzZWxlY3RvcnMsIHNlbGVjdG9y TGlzdCk7CiAKLSAgICBpZiAoIXF1ZXJ5U2VsZWN0b3JMaXN0LmZpcnN0KCkgfHwgcXVlcnlTZWxl Y3Rvckxpc3QuaGFzVW5rbm93blBzZXVkb0VsZW1lbnRzKCkpIHsKKyAgICBpZiAoIXNlbGVjdG9y TGlzdC5maXJzdCgpIHx8IHNlbGVjdG9yTGlzdC5oYXNVbmtub3duUHNldWRvRWxlbWVudHMoKSkg ewogICAgICAgICBlYyA9IFNZTlRBWF9FUlI7CiAgICAgICAgIHJldHVybiAwOwogICAgIH0KIAog ICAgIC8vIHRocm93IGEgTkFNRVNQQUNFX0VSUiBpZiB0aGUgc2VsZWN0b3IgaW5jbHVkZXMgYW55 IG5hbWVzcGFjZSBwcmVmaXhlcy4KLSAgICBpZiAocXVlcnlTZWxlY3Rvckxpc3Quc2VsZWN0b3Jz TmVlZE5hbWVzcGFjZVJlc29sdXRpb24oKSkgeworICAgIGlmIChzZWxlY3Rvckxpc3Quc2VsZWN0 b3JzTmVlZE5hbWVzcGFjZVJlc29sdXRpb24oKSkgewogICAgICAgICBlYyA9IE5BTUVTUEFDRV9F UlI7CiAgICAgICAgIHJldHVybiAwOwogICAgIH0KICAgICAKLSAgICBPd25QdHI8U2VsZWN0b3JR dWVyeUNhY2hlRW50cnk+IGVudHJ5ID0gYWRvcHRQdHIobmV3IFNlbGVjdG9yUXVlcnlDYWNoZUVu dHJ5KHF1ZXJ5U2VsZWN0b3JMaXN0KSk7Ci0gICAgU2VsZWN0b3JRdWVyeSogc2VsZWN0b3JRdWVy eSA9IGVudHJ5LT5zZWxlY3RvclF1ZXJ5KCk7Ci0gICAgbV9lbnRyaWVzLmFkZChzZWxlY3RvcnMs IGVudHJ5LnJlbGVhc2UoKSk7Ci0gICAgcmV0dXJuIHNlbGVjdG9yUXVlcnk7CisgICAgT3duUHRy PFNlbGVjdG9yUXVlcnk+IHNlbGVjdG9yUXVlcnkgPSBhZG9wdFB0cihuZXcgU2VsZWN0b3JRdWVy eShzZWxlY3Rvckxpc3QpKTsKKyAgICBTZWxlY3RvclF1ZXJ5KiByYXdTZWxlY3RvclF1ZXJ5ID0g c2VsZWN0b3JRdWVyeS5nZXQoKTsKKyAgICBtX2VudHJpZXMuYWRkKHNlbGVjdG9ycywgc2VsZWN0 b3JRdWVyeS5yZWxlYXNlKCkpOworICAgIHJldHVybiByYXdTZWxlY3RvclF1ZXJ5OwogfQogCiB2 b2lkIFNlbGVjdG9yUXVlcnlDYWNoZTo6aW52YWxpZGF0ZSgpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9kb20vU2VsZWN0b3JRdWVyeS5oIGIvU291cmNlL1dlYkNvcmUvZG9tL1NlbGVjdG9y UXVlcnkuaAppbmRleCBiZTFhODE5NDIwMWU2YzMxMWQ2ZGY1ZWU2NzhkYTM3NTI5ZjdlZGU2Li5h ZDM4ZDY5NDc4MWFmMzUxYzY3ZGVhZTViMGM5OTA3ZjVlNDY2ODNkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9kb20vU2VsZWN0b3JRdWVyeS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9T ZWxlY3RvclF1ZXJ5LmgKQEAgLTY3LDI4ICs2NywxNyBAQCBwcml2YXRlOgogCiBjbGFzcyBTZWxl Y3RvclF1ZXJ5IHsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShTZWxlY3RvclF1ZXJ5KTsKKyAg ICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoKLSAgICBTZWxlY3RvclF1ZXJ5KCkg eyB9OwotICAgIHZvaWQgaW5pdGlhbGl6ZShjb25zdCBDU1NTZWxlY3Rvckxpc3QmKTsKKyAgICBT ZWxlY3RvclF1ZXJ5KGNvbnN0IENTU1NlbGVjdG9yTGlzdCYpOwogICAgIFBhc3NSZWZQdHI8Tm9k ZUxpc3Q+IHF1ZXJ5QWxsKE5vZGUqIHJvb3ROb2RlKSBjb25zdDsKICAgICBQYXNzUmVmUHRyPEVs ZW1lbnQ+IHF1ZXJ5Rmlyc3QoTm9kZSogcm9vdE5vZGUpIGNvbnN0OwogcHJpdmF0ZToKICAgICBT ZWxlY3RvckRhdGFMaXN0IG1fc2VsZWN0b3JzOwotfTsKLQotY2xhc3MgU2VsZWN0b3JRdWVyeUNh Y2hlRW50cnkgewotICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKFNlbGVjdG9yUXVlcnlDYWNoZUVu dHJ5KTsKLSAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKLXB1YmxpYzoKLSAgICBleHBsaWNp dCBTZWxlY3RvclF1ZXJ5Q2FjaGVFbnRyeShDU1NTZWxlY3Rvckxpc3QmKTsKLSAgICBTZWxlY3Rv clF1ZXJ5KiBzZWxlY3RvclF1ZXJ5KCkgeyByZXR1cm4gJm1fc2VsZWN0b3JRdWVyeTsgfTsKLQot cHJpdmF0ZToKLSAgICAvLyBtX3F1ZXJ5U2VsZWN0b3JMaXN0IGtlZXBzIHRoZSBsaWZldGltZSBv ZiBDU1NTZWxlY3RvcnMgaW4gbV9zZWxlY3RvclF1ZXJ5LgotICAgIC8vIFNpbmNlIG1fc2VsZWN0 b3JRdWVyeSBqdXN0IGhvbGRzIHBvaW50ZXJzIHRvIENTU1NlbGVjdG9yIG9iamVjdHMsCi0gICAg Ly8gbV9xdWVyeVNlbGVjdG9yTGlzdCBtdXN0IG5vdCBiZSBkZXN0cnVjdGVkIGJlZm9yZSBtX3Nl bGVjdG9yUXVlcnkgaXMgZGVzdHJ1Y3RlZC4KLSAgICBDU1NTZWxlY3Rvckxpc3QgbV9xdWVyeVNl bGVjdG9yTGlzdDsKLSAgICBTZWxlY3RvclF1ZXJ5IG1fc2VsZWN0b3JRdWVyeTsKKyAgICAvLyBt X3NlbGVjdG9yTGlzdCBrZWVwcyB0aGUgbGlmZXRpbWUgb2YgQ1NTU2VsZWN0b3Igb2JqZWN0cyBp biBtX3NlbGVjdG9ycy4KKyAgICAvLyBTaW5jZSBtX3NlbGVjdG9ycyBqdXN0IGhvbGRzIHBvaW50 ZXJzIHRvIENTU1NlbGVjdG9yIG9iamVjdHMsCisgICAgLy8gbV9zZWxlY3Rvckxpc3QgbXVzdCBu b3QgYmUgZGVzdHJ1Y3RlZCBiZWZvcmUgbV9zZWxlY3RvcnMgaXMgZGVzdHJ1Y3RlZC4KKyAgICBD U1NTZWxlY3Rvckxpc3QgbV9zZWxlY3Rvckxpc3Q7CiB9OwogCiBjbGFzcyBTZWxlY3RvclF1ZXJ5 Q2FjaGUgewpAQCAtMTAxLDcgKzkwLDcgQEAgcHVibGljOgogICAgIHZvaWQgaW52YWxpZGF0ZSgp OwogCiBwcml2YXRlOgotICAgIEhhc2hNYXA8QXRvbWljU3RyaW5nLCBPd25QdHI8U2VsZWN0b3JR dWVyeUNhY2hlRW50cnk+ID4gbV9lbnRyaWVzOworICAgIEhhc2hNYXA8QXRvbWljU3RyaW5nLCBP d25QdHI8U2VsZWN0b3JRdWVyeT4gPiBtX2VudHJpZXM7CiB9OwogCiB9Cg== 145538 2012-06-04 01:39:01 -0700 2012-06-04 01:53:41 -0700 patch for landing bug-88204-20120604173859.patch text/plain 5347 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5MzY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTZkYmFhZGZkYmY1YzA2 MzZmYzM4YzU5ZjkwNGVmZWRkYzYxN2QyNy4uMDYyMjFjMzI2ZTJhMzg0MjA0Njc4NWNiYjkwNTRl NTYwNWZmMTlkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTA2LTAzICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZW1vdmUgU2VsZWN0 b3JRdWVyeUNhY2hlRW50cnkgZnJvbSBTZWxlY3RvclF1ZXJ5LmgKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg4MjA0CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTU9SSVRBIEhhamltZS4KKworICAgICAgICBBcyBhbnR0aWtAIHBvaW50ZWQgb3V0IGluIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04Nzk0MiNjMTUsCisgICAgICAg IHdlIGNhbiByZW1vdmUgU2VsZWN0b3JRdWVyeUNhY2hlRW50cnkgYnkgaGF2aW5nIFNlbGVjdG9y UXVlcnkgaG9sZCBDU1NTZWxlY3Rvckxpc3QuCisKKyAgICAgICAgVGVzdHM6IGZhc3QvZG9tL1Nl bGVjdG9yQVBJLyogTm8gY2hhbmdlIGluIHRlc3QgcmVzdWx0cy4KKworICAgICAgICAqIGRvbS9T ZWxlY3RvclF1ZXJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNlbGVjdG9yUXVlcnk6OlNlbGVj dG9yUXVlcnkpOgorICAgICAgICAoV2ViQ29yZTo6U2VsZWN0b3JRdWVyeUNhY2hlOjphZGQpOgor ICAgICAgICAqIGRvbS9TZWxlY3RvclF1ZXJ5Lmg6CisgICAgICAgIChTZWxlY3RvclF1ZXJ5KToK KyAgICAgICAgKFNlbGVjdG9yUXVlcnlDYWNoZSk6CisKIDIwMTItMDYtMDMgIEhheWF0byBJdG8g IDxoYXlhdG9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFN1cHBvcnRzIHRyYXZlcnNpbmcgbm9k ZXMgaW4gYW4gb3JwaGFuZWQgc2hhZG93IHN1YnRyZWUgaW4gQ29tcG9zZWRTaGFkb3dUcmVlUGFy ZW50V2Fsa2VyLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL1NlbGVjdG9yUXVlcnku Y3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL1NlbGVjdG9yUXVlcnkuY3BwCmluZGV4IGZhZDYyYTVm NjM2NTUyNzc2OGQxODBhMjZjNWJmZWI2MzBlZjQxNGIuLjkwMzI4MzgxMTE5MmU0MGMzMDgwNDE5 NTRhNzJmMTEwZmVmYWU0MjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TZWxlY3Rv clF1ZXJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vU2VsZWN0b3JRdWVyeS5jcHAKQEAg LTE0Myw5ICsxNDMsMTAgQEAgdm9pZCBTZWxlY3RvckRhdGFMaXN0OjpleGVjdXRlKGNvbnN0IFNl bGVjdG9yQ2hlY2tlciYgc2VsZWN0b3JDaGVja2VyLCBOb2RlKiByb28KICAgICB9CiB9CiAKLXZv aWQgU2VsZWN0b3JRdWVyeTo6aW5pdGlhbGl6ZShjb25zdCBDU1NTZWxlY3Rvckxpc3QmIHNlbGVj dG9yTGlzdCkKK1NlbGVjdG9yUXVlcnk6OlNlbGVjdG9yUXVlcnkoY29uc3QgQ1NTU2VsZWN0b3JM aXN0JiBzZWxlY3Rvckxpc3QpCisgICAgOiBtX3NlbGVjdG9yTGlzdChzZWxlY3Rvckxpc3QpCiB7 Ci0gICAgbV9zZWxlY3RvcnMuaW5pdGlhbGl6ZShzZWxlY3Rvckxpc3QpOworICAgIG1fc2VsZWN0 b3JzLmluaXRpYWxpemUobV9zZWxlY3Rvckxpc3QpOwogfQogCiBQYXNzUmVmUHRyPE5vZGVMaXN0 PiBTZWxlY3RvclF1ZXJ5OjpxdWVyeUFsbChOb2RlKiByb290Tm9kZSkgY29uc3QKQEAgLTE2Miwz NyArMTYzLDMxIEBAIFBhc3NSZWZQdHI8RWxlbWVudD4gU2VsZWN0b3JRdWVyeTo6cXVlcnlGaXJz dChOb2RlKiByb290Tm9kZSkgY29uc3QKICAgICByZXR1cm4gbV9zZWxlY3RvcnMucXVlcnlGaXJz dChzZWxlY3RvckNoZWNrZXIsIHJvb3ROb2RlKTsKIH0KIAotU2VsZWN0b3JRdWVyeUNhY2hlRW50 cnk6OlNlbGVjdG9yUXVlcnlDYWNoZUVudHJ5KENTU1NlbGVjdG9yTGlzdCYgcXVlcnlTZWxlY3Rv ckxpc3QpCi0gICAgOiBtX3F1ZXJ5U2VsZWN0b3JMaXN0KHF1ZXJ5U2VsZWN0b3JMaXN0KQotewot ICAgIG1fc2VsZWN0b3JRdWVyeS5pbml0aWFsaXplKG1fcXVlcnlTZWxlY3Rvckxpc3QpOwotfQot CiBTZWxlY3RvclF1ZXJ5KiBTZWxlY3RvclF1ZXJ5Q2FjaGU6OmFkZChjb25zdCBBdG9taWNTdHJp bmcmIHNlbGVjdG9ycywgRG9jdW1lbnQqIGRvY3VtZW50LCBFeGNlcHRpb25Db2RlJiBlYykKIHsK LSAgICBIYXNoTWFwPEF0b21pY1N0cmluZywgT3duUHRyPFNlbGVjdG9yUXVlcnlDYWNoZUVudHJ5 PiA+OjppdGVyYXRvciBpdCA9IG1fZW50cmllcy5maW5kKHNlbGVjdG9ycyk7CisgICAgSGFzaE1h cDxBdG9taWNTdHJpbmcsIE93blB0cjxTZWxlY3RvclF1ZXJ5PiA+OjppdGVyYXRvciBpdCA9IG1f ZW50cmllcy5maW5kKHNlbGVjdG9ycyk7CiAgICAgaWYgKGl0ICE9IG1fZW50cmllcy5lbmQoKSkK LSAgICAgICAgcmV0dXJuIGl0LT5zZWNvbmQtPnNlbGVjdG9yUXVlcnkoKTsKKyAgICAgICAgcmV0 dXJuIGl0LT5zZWNvbmQuZ2V0KCk7CiAKICAgICBDU1NQYXJzZXIgcGFyc2VyKGRvY3VtZW50KTsK LSAgICBDU1NTZWxlY3Rvckxpc3QgcXVlcnlTZWxlY3Rvckxpc3Q7Ci0gICAgcGFyc2VyLnBhcnNl U2VsZWN0b3Ioc2VsZWN0b3JzLCBxdWVyeVNlbGVjdG9yTGlzdCk7CisgICAgQ1NTU2VsZWN0b3JM aXN0IHNlbGVjdG9yTGlzdDsKKyAgICBwYXJzZXIucGFyc2VTZWxlY3RvcihzZWxlY3RvcnMsIHNl bGVjdG9yTGlzdCk7CiAKLSAgICBpZiAoIXF1ZXJ5U2VsZWN0b3JMaXN0LmZpcnN0KCkgfHwgcXVl cnlTZWxlY3Rvckxpc3QuaGFzVW5rbm93blBzZXVkb0VsZW1lbnRzKCkpIHsKKyAgICBpZiAoIXNl bGVjdG9yTGlzdC5maXJzdCgpIHx8IHNlbGVjdG9yTGlzdC5oYXNVbmtub3duUHNldWRvRWxlbWVu dHMoKSkgewogICAgICAgICBlYyA9IFNZTlRBWF9FUlI7CiAgICAgICAgIHJldHVybiAwOwogICAg IH0KIAogICAgIC8vIHRocm93IGEgTkFNRVNQQUNFX0VSUiBpZiB0aGUgc2VsZWN0b3IgaW5jbHVk ZXMgYW55IG5hbWVzcGFjZSBwcmVmaXhlcy4KLSAgICBpZiAocXVlcnlTZWxlY3Rvckxpc3Quc2Vs ZWN0b3JzTmVlZE5hbWVzcGFjZVJlc29sdXRpb24oKSkgeworICAgIGlmIChzZWxlY3Rvckxpc3Qu c2VsZWN0b3JzTmVlZE5hbWVzcGFjZVJlc29sdXRpb24oKSkgewogICAgICAgICBlYyA9IE5BTUVT UEFDRV9FUlI7CiAgICAgICAgIHJldHVybiAwOwogICAgIH0KICAgICAKLSAgICBPd25QdHI8U2Vs ZWN0b3JRdWVyeUNhY2hlRW50cnk+IGVudHJ5ID0gYWRvcHRQdHIobmV3IFNlbGVjdG9yUXVlcnlD YWNoZUVudHJ5KHF1ZXJ5U2VsZWN0b3JMaXN0KSk7Ci0gICAgU2VsZWN0b3JRdWVyeSogc2VsZWN0 b3JRdWVyeSA9IGVudHJ5LT5zZWxlY3RvclF1ZXJ5KCk7Ci0gICAgbV9lbnRyaWVzLmFkZChzZWxl Y3RvcnMsIGVudHJ5LnJlbGVhc2UoKSk7Ci0gICAgcmV0dXJuIHNlbGVjdG9yUXVlcnk7CisgICAg T3duUHRyPFNlbGVjdG9yUXVlcnk+IHNlbGVjdG9yUXVlcnkgPSBhZG9wdFB0cihuZXcgU2VsZWN0 b3JRdWVyeShzZWxlY3Rvckxpc3QpKTsKKyAgICBTZWxlY3RvclF1ZXJ5KiByYXdTZWxlY3RvclF1 ZXJ5ID0gc2VsZWN0b3JRdWVyeS5nZXQoKTsKKyAgICBtX2VudHJpZXMuYWRkKHNlbGVjdG9ycywg c2VsZWN0b3JRdWVyeS5yZWxlYXNlKCkpOworICAgIHJldHVybiByYXdTZWxlY3RvclF1ZXJ5Owog fQogCiB2b2lkIFNlbGVjdG9yUXVlcnlDYWNoZTo6aW52YWxpZGF0ZSgpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9kb20vU2VsZWN0b3JRdWVyeS5oIGIvU291cmNlL1dlYkNvcmUvZG9tL1Nl bGVjdG9yUXVlcnkuaAppbmRleCBiZTFhODE5NDIwMWU2YzMxMWQ2ZGY1ZWU2NzhkYTM3NTI5Zjdl ZGU2Li4wZWRlZjRiYmJkNmM5YmRmNWM2YjBjYWI0ZWIxYjMyNmE3OWIwZjk1IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9kb20vU2VsZWN0b3JRdWVyeS5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2RvbS9TZWxlY3RvclF1ZXJ5LmgKQEAgLTY3LDI4ICs2NywxNCBAQCBwcml2YXRlOgogCiBjbGFz cyBTZWxlY3RvclF1ZXJ5IHsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShTZWxlY3RvclF1ZXJ5 KTsKKyAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoKLSAgICBTZWxlY3RvclF1 ZXJ5KCkgeyB9OwotICAgIHZvaWQgaW5pdGlhbGl6ZShjb25zdCBDU1NTZWxlY3Rvckxpc3QmKTsK KyAgICBTZWxlY3RvclF1ZXJ5KGNvbnN0IENTU1NlbGVjdG9yTGlzdCYpOwogICAgIFBhc3NSZWZQ dHI8Tm9kZUxpc3Q+IHF1ZXJ5QWxsKE5vZGUqIHJvb3ROb2RlKSBjb25zdDsKICAgICBQYXNzUmVm UHRyPEVsZW1lbnQ+IHF1ZXJ5Rmlyc3QoTm9kZSogcm9vdE5vZGUpIGNvbnN0OwogcHJpdmF0ZToK ICAgICBTZWxlY3RvckRhdGFMaXN0IG1fc2VsZWN0b3JzOwotfTsKLQotY2xhc3MgU2VsZWN0b3JR dWVyeUNhY2hlRW50cnkgewotICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKFNlbGVjdG9yUXVlcnlD YWNoZUVudHJ5KTsKLSAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKLXB1YmxpYzoKLSAgICBl eHBsaWNpdCBTZWxlY3RvclF1ZXJ5Q2FjaGVFbnRyeShDU1NTZWxlY3Rvckxpc3QmKTsKLSAgICBT ZWxlY3RvclF1ZXJ5KiBzZWxlY3RvclF1ZXJ5KCkgeyByZXR1cm4gJm1fc2VsZWN0b3JRdWVyeTsg fTsKLQotcHJpdmF0ZToKLSAgICAvLyBtX3F1ZXJ5U2VsZWN0b3JMaXN0IGtlZXBzIHRoZSBsaWZl dGltZSBvZiBDU1NTZWxlY3RvcnMgaW4gbV9zZWxlY3RvclF1ZXJ5LgotICAgIC8vIFNpbmNlIG1f c2VsZWN0b3JRdWVyeSBqdXN0IGhvbGRzIHBvaW50ZXJzIHRvIENTU1NlbGVjdG9yIG9iamVjdHMs Ci0gICAgLy8gbV9xdWVyeVNlbGVjdG9yTGlzdCBtdXN0IG5vdCBiZSBkZXN0cnVjdGVkIGJlZm9y ZSBtX3NlbGVjdG9yUXVlcnkgaXMgZGVzdHJ1Y3RlZC4KLSAgICBDU1NTZWxlY3Rvckxpc3QgbV9x dWVyeVNlbGVjdG9yTGlzdDsKLSAgICBTZWxlY3RvclF1ZXJ5IG1fc2VsZWN0b3JRdWVyeTsKKyAg ICBDU1NTZWxlY3Rvckxpc3QgbV9zZWxlY3Rvckxpc3Q7CiB9OwogCiBjbGFzcyBTZWxlY3RvclF1 ZXJ5Q2FjaGUgewpAQCAtMTAxLDcgKzg3LDcgQEAgcHVibGljOgogICAgIHZvaWQgaW52YWxpZGF0 ZSgpOwogCiBwcml2YXRlOgotICAgIEhhc2hNYXA8QXRvbWljU3RyaW5nLCBPd25QdHI8U2VsZWN0 b3JRdWVyeUNhY2hlRW50cnk+ID4gbV9lbnRyaWVzOworICAgIEhhc2hNYXA8QXRvbWljU3RyaW5n LCBPd25QdHI8U2VsZWN0b3JRdWVyeT4gPiBtX2VudHJpZXM7CiB9OwogCiB9Cg== 145562 2012-06-04 05:16:32 -0700 2012-06-04 05:20:51 -0700 patch for landing bug-88204-20120604211629.patch text/plain 5335 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5Mzg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWY0OGQwNmQ2ODY2YzZk ZGJhNmFmZmM1YjZiNzdhZDVkYzY4MjExNi4uMjlkZWU2NjQ1NDJiNWFkZGYyNjRjNGZkMDMzNDRm YmJiODkwZjhhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTA2LTAzICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZW1vdmUgU2VsZWN0 b3JRdWVyeUNhY2hlRW50cnkgZnJvbSBTZWxlY3RvclF1ZXJ5LmgKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg4MjA0CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTU9SSVRBIEhhamltZS4KKworICAgICAgICBBcyBhbnR0aWtAIHBvaW50ZWQgb3V0IGluIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04Nzk0MiNjMTUsCisgICAgICAg IHdlIGNhbiByZW1vdmUgU2VsZWN0b3JRdWVyeUNhY2hlRW50cnkgYnkgaGF2aW5nIFNlbGVjdG9y UXVlcnkgaG9sZCBDU1NTZWxlY3Rvckxpc3QuCisKKyAgICAgICAgVGVzdHM6IGZhc3QvZG9tL1Nl bGVjdG9yQVBJLyogTm8gY2hhbmdlIGluIHRlc3QgcmVzdWx0cy4KKworICAgICAgICAqIGRvbS9T ZWxlY3RvclF1ZXJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNlbGVjdG9yUXVlcnk6OlNlbGVj dG9yUXVlcnkpOgorICAgICAgICAoV2ViQ29yZTo6U2VsZWN0b3JRdWVyeUNhY2hlOjphZGQpOgor ICAgICAgICAqIGRvbS9TZWxlY3RvclF1ZXJ5Lmg6CisgICAgICAgIChTZWxlY3RvclF1ZXJ5KToK KyAgICAgICAgKFNlbGVjdG9yUXVlcnlDYWNoZSk6CisKIDIwMTItMDYtMDQgIE1pa2UgV2VzdCAg PG1rd3N0QGNocm9taXVtLm9yZz4KIAogICAgICAgICBBZGRpbmcgZXhwbGljaXQgY29uc29sZSBl cnJvciBmb3IgZHVwbGljYXRlZCBDU1AgZGlyZWN0aXZlcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2RvbS9TZWxlY3RvclF1ZXJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9TZWxlY3Rv clF1ZXJ5LmNwcAppbmRleCBlODAxMTY2YjRjZGJkZWMzY2U1ZTZkODc1NDRhYjk0ODAxYzNmMTA5 Li4wMmZmODM5MzVhY2ExNzU2ZDJiNTZkMTI5MjU1NGMzOTk1MTE1YmJmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9kb20vU2VsZWN0b3JRdWVyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv ZG9tL1NlbGVjdG9yUXVlcnkuY3BwCkBAIC0xNDMsOSArMTQzLDEwIEBAIHZvaWQgU2VsZWN0b3JE YXRhTGlzdDo6ZXhlY3V0ZShjb25zdCBTZWxlY3RvckNoZWNrZXImIHNlbGVjdG9yQ2hlY2tlciwg Tm9kZSogcm9vCiAgICAgfQogfQogCi12b2lkIFNlbGVjdG9yUXVlcnk6OmluaXRpYWxpemUoY29u c3QgQ1NTU2VsZWN0b3JMaXN0JiBzZWxlY3Rvckxpc3QpCitTZWxlY3RvclF1ZXJ5OjpTZWxlY3Rv clF1ZXJ5KGNvbnN0IENTU1NlbGVjdG9yTGlzdCYgc2VsZWN0b3JMaXN0KQorICAgIDogbV9zZWxl Y3Rvckxpc3Qoc2VsZWN0b3JMaXN0KQogewotICAgIG1fc2VsZWN0b3JzLmluaXRpYWxpemUoc2Vs ZWN0b3JMaXN0KTsKKyAgICBtX3NlbGVjdG9ycy5pbml0aWFsaXplKG1fc2VsZWN0b3JMaXN0KTsK IH0KIAogYm9vbCBTZWxlY3RvclF1ZXJ5OjptYXRjaGVzKEVsZW1lbnQqIGVsZW1lbnQpIGNvbnN0 CkBAIC0xNjgsMzcgKzE2OSwzMSBAQCBQYXNzUmVmUHRyPEVsZW1lbnQ+IFNlbGVjdG9yUXVlcnk6 OnF1ZXJ5Rmlyc3QoTm9kZSogcm9vdE5vZGUpIGNvbnN0CiAgICAgcmV0dXJuIG1fc2VsZWN0b3Jz LnF1ZXJ5Rmlyc3Qoc2VsZWN0b3JDaGVja2VyLCByb290Tm9kZSk7CiB9CiAKLVNlbGVjdG9yUXVl cnlDYWNoZUVudHJ5OjpTZWxlY3RvclF1ZXJ5Q2FjaGVFbnRyeShDU1NTZWxlY3Rvckxpc3QmIHF1 ZXJ5U2VsZWN0b3JMaXN0KQotICAgIDogbV9xdWVyeVNlbGVjdG9yTGlzdChxdWVyeVNlbGVjdG9y TGlzdCkKLXsKLSAgICBtX3NlbGVjdG9yUXVlcnkuaW5pdGlhbGl6ZShtX3F1ZXJ5U2VsZWN0b3JM aXN0KTsKLX0KLQogU2VsZWN0b3JRdWVyeSogU2VsZWN0b3JRdWVyeUNhY2hlOjphZGQoY29uc3Qg QXRvbWljU3RyaW5nJiBzZWxlY3RvcnMsIERvY3VtZW50KiBkb2N1bWVudCwgRXhjZXB0aW9uQ29k ZSYgZWMpCiB7Ci0gICAgSGFzaE1hcDxBdG9taWNTdHJpbmcsIE93blB0cjxTZWxlY3RvclF1ZXJ5 Q2FjaGVFbnRyeT4gPjo6aXRlcmF0b3IgaXQgPSBtX2VudHJpZXMuZmluZChzZWxlY3RvcnMpOwor ICAgIEhhc2hNYXA8QXRvbWljU3RyaW5nLCBPd25QdHI8U2VsZWN0b3JRdWVyeT4gPjo6aXRlcmF0 b3IgaXQgPSBtX2VudHJpZXMuZmluZChzZWxlY3RvcnMpOwogICAgIGlmIChpdCAhPSBtX2VudHJp ZXMuZW5kKCkpCi0gICAgICAgIHJldHVybiBpdC0+c2Vjb25kLT5zZWxlY3RvclF1ZXJ5KCk7Cisg ICAgICAgIHJldHVybiBpdC0+c2Vjb25kLmdldCgpOwogCiAgICAgQ1NTUGFyc2VyIHBhcnNlcihk b2N1bWVudCk7Ci0gICAgQ1NTU2VsZWN0b3JMaXN0IHF1ZXJ5U2VsZWN0b3JMaXN0OwotICAgIHBh cnNlci5wYXJzZVNlbGVjdG9yKHNlbGVjdG9ycywgcXVlcnlTZWxlY3Rvckxpc3QpOworICAgIENT U1NlbGVjdG9yTGlzdCBzZWxlY3Rvckxpc3Q7CisgICAgcGFyc2VyLnBhcnNlU2VsZWN0b3Ioc2Vs ZWN0b3JzLCBzZWxlY3Rvckxpc3QpOwogCi0gICAgaWYgKCFxdWVyeVNlbGVjdG9yTGlzdC5maXJz dCgpIHx8IHF1ZXJ5U2VsZWN0b3JMaXN0Lmhhc1Vua25vd25Qc2V1ZG9FbGVtZW50cygpKSB7Cisg ICAgaWYgKCFzZWxlY3Rvckxpc3QuZmlyc3QoKSB8fCBzZWxlY3Rvckxpc3QuaGFzVW5rbm93blBz ZXVkb0VsZW1lbnRzKCkpIHsKICAgICAgICAgZWMgPSBTWU5UQVhfRVJSOwogICAgICAgICByZXR1 cm4gMDsKICAgICB9CiAKICAgICAvLyB0aHJvdyBhIE5BTUVTUEFDRV9FUlIgaWYgdGhlIHNlbGVj dG9yIGluY2x1ZGVzIGFueSBuYW1lc3BhY2UgcHJlZml4ZXMuCi0gICAgaWYgKHF1ZXJ5U2VsZWN0 b3JMaXN0LnNlbGVjdG9yc05lZWROYW1lc3BhY2VSZXNvbHV0aW9uKCkpIHsKKyAgICBpZiAoc2Vs ZWN0b3JMaXN0LnNlbGVjdG9yc05lZWROYW1lc3BhY2VSZXNvbHV0aW9uKCkpIHsKICAgICAgICAg ZWMgPSBOQU1FU1BBQ0VfRVJSOwogICAgICAgICByZXR1cm4gMDsKICAgICB9CiAgICAgCi0gICAg T3duUHRyPFNlbGVjdG9yUXVlcnlDYWNoZUVudHJ5PiBlbnRyeSA9IGFkb3B0UHRyKG5ldyBTZWxl Y3RvclF1ZXJ5Q2FjaGVFbnRyeShxdWVyeVNlbGVjdG9yTGlzdCkpOwotICAgIFNlbGVjdG9yUXVl cnkqIHNlbGVjdG9yUXVlcnkgPSBlbnRyeS0+c2VsZWN0b3JRdWVyeSgpOwotICAgIG1fZW50cmll cy5hZGQoc2VsZWN0b3JzLCBlbnRyeS5yZWxlYXNlKCkpOwotICAgIHJldHVybiBzZWxlY3RvclF1 ZXJ5OworICAgIE93blB0cjxTZWxlY3RvclF1ZXJ5PiBzZWxlY3RvclF1ZXJ5ID0gYWRvcHRQdHIo bmV3IFNlbGVjdG9yUXVlcnkoc2VsZWN0b3JMaXN0KSk7CisgICAgU2VsZWN0b3JRdWVyeSogcmF3 U2VsZWN0b3JRdWVyeSA9IHNlbGVjdG9yUXVlcnkuZ2V0KCk7CisgICAgbV9lbnRyaWVzLmFkZChz ZWxlY3RvcnMsIHNlbGVjdG9yUXVlcnkucmVsZWFzZSgpKTsKKyAgICByZXR1cm4gcmF3U2VsZWN0 b3JRdWVyeTsKIH0KIAogdm9pZCBTZWxlY3RvclF1ZXJ5Q2FjaGU6OmludmFsaWRhdGUoKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL1NlbGVjdG9yUXVlcnkuaCBiL1NvdXJjZS9XZWJD b3JlL2RvbS9TZWxlY3RvclF1ZXJ5LmgKaW5kZXggOTM5MGYwMDYwZDE3ZmUwYTEzMDIyMGE4NTYx ODM5MWU4MTI3OGNmZC4uODk3MDlkMmUxMDllZDhmNmU3MDFjMzg3NTUwYmYxYWY4ZDgzYjMwOCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL1NlbGVjdG9yUXVlcnkuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9kb20vU2VsZWN0b3JRdWVyeS5oCkBAIC02NywyOSArNjcsMTUgQEAgcHJpdmF0 ZToKIAogY2xhc3MgU2VsZWN0b3JRdWVyeSB7CiAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoU2Vs ZWN0b3JRdWVyeSk7CisgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiBwdWJsaWM6Ci0gICAg U2VsZWN0b3JRdWVyeSgpIHsgfTsKLSAgICB2b2lkIGluaXRpYWxpemUoY29uc3QgQ1NTU2VsZWN0 b3JMaXN0Jik7CisgICAgU2VsZWN0b3JRdWVyeShjb25zdCBDU1NTZWxlY3Rvckxpc3QmKTsKICAg ICBib29sIG1hdGNoZXMoRWxlbWVudCopIGNvbnN0OwogICAgIFBhc3NSZWZQdHI8Tm9kZUxpc3Q+ IHF1ZXJ5QWxsKE5vZGUqIHJvb3ROb2RlKSBjb25zdDsKICAgICBQYXNzUmVmUHRyPEVsZW1lbnQ+ IHF1ZXJ5Rmlyc3QoTm9kZSogcm9vdE5vZGUpIGNvbnN0OwogcHJpdmF0ZToKICAgICBTZWxlY3Rv ckRhdGFMaXN0IG1fc2VsZWN0b3JzOwotfTsKLQotY2xhc3MgU2VsZWN0b3JRdWVyeUNhY2hlRW50 cnkgewotICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKFNlbGVjdG9yUXVlcnlDYWNoZUVudHJ5KTsK LSAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKLXB1YmxpYzoKLSAgICBleHBsaWNpdCBTZWxl Y3RvclF1ZXJ5Q2FjaGVFbnRyeShDU1NTZWxlY3Rvckxpc3QmKTsKLSAgICBTZWxlY3RvclF1ZXJ5 KiBzZWxlY3RvclF1ZXJ5KCkgeyByZXR1cm4gJm1fc2VsZWN0b3JRdWVyeTsgfTsKLQotcHJpdmF0 ZToKLSAgICAvLyBtX3F1ZXJ5U2VsZWN0b3JMaXN0IGtlZXBzIHRoZSBsaWZldGltZSBvZiBDU1NT ZWxlY3RvcnMgaW4gbV9zZWxlY3RvclF1ZXJ5LgotICAgIC8vIFNpbmNlIG1fc2VsZWN0b3JRdWVy eSBqdXN0IGhvbGRzIHBvaW50ZXJzIHRvIENTU1NlbGVjdG9yIG9iamVjdHMsCi0gICAgLy8gbV9x dWVyeVNlbGVjdG9yTGlzdCBtdXN0IG5vdCBiZSBkZXN0cnVjdGVkIGJlZm9yZSBtX3NlbGVjdG9y UXVlcnkgaXMgZGVzdHJ1Y3RlZC4KLSAgICBDU1NTZWxlY3Rvckxpc3QgbV9xdWVyeVNlbGVjdG9y TGlzdDsKLSAgICBTZWxlY3RvclF1ZXJ5IG1fc2VsZWN0b3JRdWVyeTsKKyAgICBDU1NTZWxlY3Rv ckxpc3QgbV9zZWxlY3Rvckxpc3Q7CiB9OwogCiBjbGFzcyBTZWxlY3RvclF1ZXJ5Q2FjaGUgewpA QCAtMTAyLDcgKzg4LDcgQEAgcHVibGljOgogICAgIHZvaWQgaW52YWxpZGF0ZSgpOwogCiBwcml2 YXRlOgotICAgIEhhc2hNYXA8QXRvbWljU3RyaW5nLCBPd25QdHI8U2VsZWN0b3JRdWVyeUNhY2hl RW50cnk+ID4gbV9lbnRyaWVzOworICAgIEhhc2hNYXA8QXRvbWljU3RyaW5nLCBPd25QdHI8U2Vs ZWN0b3JRdWVyeT4gPiBtX2VudHJpZXM7CiB9OwogCiB9Cg== 145564 2012-06-04 05:22:43 -0700 2012-06-04 05:26:18 -0700 patch for landing bug-88204-20120604212242.patch text/plain 5335 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5Mzg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWY0OGQwNmQ2ODY2YzZk ZGJhNmFmZmM1YjZiNzdhZDVkYzY4MjExNi4uN2RiNGM5ZDYwNzYwMjQzYjk1NTljNGM1MmZjYTA4 ZjYzOTkzNzUyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTA2LTAzICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZW1vdmUgU2VsZWN0 b3JRdWVyeUNhY2hlRW50cnkgZnJvbSBTZWxlY3RvclF1ZXJ5LmgKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg4MjA0CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTW9yaXRhIEhhamltZS4KKworICAgICAgICBBcyBhbnR0aWtAIHBvaW50ZWQgb3V0IGluIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04Nzk0MiNjMTUsCisgICAgICAg IHdlIGNhbiByZW1vdmUgU2VsZWN0b3JRdWVyeUNhY2hlRW50cnkgYnkgaGF2aW5nIFNlbGVjdG9y UXVlcnkgaG9sZCBDU1NTZWxlY3Rvckxpc3QuCisKKyAgICAgICAgVGVzdHM6IGZhc3QvZG9tL1Nl bGVjdG9yQVBJLyogTm8gY2hhbmdlIGluIHRlc3QgcmVzdWx0cy4KKworICAgICAgICAqIGRvbS9T ZWxlY3RvclF1ZXJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNlbGVjdG9yUXVlcnk6OlNlbGVj dG9yUXVlcnkpOgorICAgICAgICAoV2ViQ29yZTo6U2VsZWN0b3JRdWVyeUNhY2hlOjphZGQpOgor ICAgICAgICAqIGRvbS9TZWxlY3RvclF1ZXJ5Lmg6CisgICAgICAgIChTZWxlY3RvclF1ZXJ5KToK KyAgICAgICAgKFNlbGVjdG9yUXVlcnlDYWNoZSk6CisKIDIwMTItMDYtMDQgIE1pa2UgV2VzdCAg PG1rd3N0QGNocm9taXVtLm9yZz4KIAogICAgICAgICBBZGRpbmcgZXhwbGljaXQgY29uc29sZSBl cnJvciBmb3IgZHVwbGljYXRlZCBDU1AgZGlyZWN0aXZlcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2RvbS9TZWxlY3RvclF1ZXJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9TZWxlY3Rv clF1ZXJ5LmNwcAppbmRleCBlODAxMTY2YjRjZGJkZWMzY2U1ZTZkODc1NDRhYjk0ODAxYzNmMTA5 Li4wMmZmODM5MzVhY2ExNzU2ZDJiNTZkMTI5MjU1NGMzOTk1MTE1YmJmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9kb20vU2VsZWN0b3JRdWVyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv ZG9tL1NlbGVjdG9yUXVlcnkuY3BwCkBAIC0xNDMsOSArMTQzLDEwIEBAIHZvaWQgU2VsZWN0b3JE YXRhTGlzdDo6ZXhlY3V0ZShjb25zdCBTZWxlY3RvckNoZWNrZXImIHNlbGVjdG9yQ2hlY2tlciwg Tm9kZSogcm9vCiAgICAgfQogfQogCi12b2lkIFNlbGVjdG9yUXVlcnk6OmluaXRpYWxpemUoY29u c3QgQ1NTU2VsZWN0b3JMaXN0JiBzZWxlY3Rvckxpc3QpCitTZWxlY3RvclF1ZXJ5OjpTZWxlY3Rv clF1ZXJ5KGNvbnN0IENTU1NlbGVjdG9yTGlzdCYgc2VsZWN0b3JMaXN0KQorICAgIDogbV9zZWxl Y3Rvckxpc3Qoc2VsZWN0b3JMaXN0KQogewotICAgIG1fc2VsZWN0b3JzLmluaXRpYWxpemUoc2Vs ZWN0b3JMaXN0KTsKKyAgICBtX3NlbGVjdG9ycy5pbml0aWFsaXplKG1fc2VsZWN0b3JMaXN0KTsK IH0KIAogYm9vbCBTZWxlY3RvclF1ZXJ5OjptYXRjaGVzKEVsZW1lbnQqIGVsZW1lbnQpIGNvbnN0 CkBAIC0xNjgsMzcgKzE2OSwzMSBAQCBQYXNzUmVmUHRyPEVsZW1lbnQ+IFNlbGVjdG9yUXVlcnk6 OnF1ZXJ5Rmlyc3QoTm9kZSogcm9vdE5vZGUpIGNvbnN0CiAgICAgcmV0dXJuIG1fc2VsZWN0b3Jz LnF1ZXJ5Rmlyc3Qoc2VsZWN0b3JDaGVja2VyLCByb290Tm9kZSk7CiB9CiAKLVNlbGVjdG9yUXVl cnlDYWNoZUVudHJ5OjpTZWxlY3RvclF1ZXJ5Q2FjaGVFbnRyeShDU1NTZWxlY3Rvckxpc3QmIHF1 ZXJ5U2VsZWN0b3JMaXN0KQotICAgIDogbV9xdWVyeVNlbGVjdG9yTGlzdChxdWVyeVNlbGVjdG9y TGlzdCkKLXsKLSAgICBtX3NlbGVjdG9yUXVlcnkuaW5pdGlhbGl6ZShtX3F1ZXJ5U2VsZWN0b3JM aXN0KTsKLX0KLQogU2VsZWN0b3JRdWVyeSogU2VsZWN0b3JRdWVyeUNhY2hlOjphZGQoY29uc3Qg QXRvbWljU3RyaW5nJiBzZWxlY3RvcnMsIERvY3VtZW50KiBkb2N1bWVudCwgRXhjZXB0aW9uQ29k ZSYgZWMpCiB7Ci0gICAgSGFzaE1hcDxBdG9taWNTdHJpbmcsIE93blB0cjxTZWxlY3RvclF1ZXJ5 Q2FjaGVFbnRyeT4gPjo6aXRlcmF0b3IgaXQgPSBtX2VudHJpZXMuZmluZChzZWxlY3RvcnMpOwor ICAgIEhhc2hNYXA8QXRvbWljU3RyaW5nLCBPd25QdHI8U2VsZWN0b3JRdWVyeT4gPjo6aXRlcmF0 b3IgaXQgPSBtX2VudHJpZXMuZmluZChzZWxlY3RvcnMpOwogICAgIGlmIChpdCAhPSBtX2VudHJp ZXMuZW5kKCkpCi0gICAgICAgIHJldHVybiBpdC0+c2Vjb25kLT5zZWxlY3RvclF1ZXJ5KCk7Cisg ICAgICAgIHJldHVybiBpdC0+c2Vjb25kLmdldCgpOwogCiAgICAgQ1NTUGFyc2VyIHBhcnNlcihk b2N1bWVudCk7Ci0gICAgQ1NTU2VsZWN0b3JMaXN0IHF1ZXJ5U2VsZWN0b3JMaXN0OwotICAgIHBh cnNlci5wYXJzZVNlbGVjdG9yKHNlbGVjdG9ycywgcXVlcnlTZWxlY3Rvckxpc3QpOworICAgIENT U1NlbGVjdG9yTGlzdCBzZWxlY3Rvckxpc3Q7CisgICAgcGFyc2VyLnBhcnNlU2VsZWN0b3Ioc2Vs ZWN0b3JzLCBzZWxlY3Rvckxpc3QpOwogCi0gICAgaWYgKCFxdWVyeVNlbGVjdG9yTGlzdC5maXJz dCgpIHx8IHF1ZXJ5U2VsZWN0b3JMaXN0Lmhhc1Vua25vd25Qc2V1ZG9FbGVtZW50cygpKSB7Cisg ICAgaWYgKCFzZWxlY3Rvckxpc3QuZmlyc3QoKSB8fCBzZWxlY3Rvckxpc3QuaGFzVW5rbm93blBz ZXVkb0VsZW1lbnRzKCkpIHsKICAgICAgICAgZWMgPSBTWU5UQVhfRVJSOwogICAgICAgICByZXR1 cm4gMDsKICAgICB9CiAKICAgICAvLyB0aHJvdyBhIE5BTUVTUEFDRV9FUlIgaWYgdGhlIHNlbGVj dG9yIGluY2x1ZGVzIGFueSBuYW1lc3BhY2UgcHJlZml4ZXMuCi0gICAgaWYgKHF1ZXJ5U2VsZWN0 b3JMaXN0LnNlbGVjdG9yc05lZWROYW1lc3BhY2VSZXNvbHV0aW9uKCkpIHsKKyAgICBpZiAoc2Vs ZWN0b3JMaXN0LnNlbGVjdG9yc05lZWROYW1lc3BhY2VSZXNvbHV0aW9uKCkpIHsKICAgICAgICAg ZWMgPSBOQU1FU1BBQ0VfRVJSOwogICAgICAgICByZXR1cm4gMDsKICAgICB9CiAgICAgCi0gICAg T3duUHRyPFNlbGVjdG9yUXVlcnlDYWNoZUVudHJ5PiBlbnRyeSA9IGFkb3B0UHRyKG5ldyBTZWxl Y3RvclF1ZXJ5Q2FjaGVFbnRyeShxdWVyeVNlbGVjdG9yTGlzdCkpOwotICAgIFNlbGVjdG9yUXVl cnkqIHNlbGVjdG9yUXVlcnkgPSBlbnRyeS0+c2VsZWN0b3JRdWVyeSgpOwotICAgIG1fZW50cmll cy5hZGQoc2VsZWN0b3JzLCBlbnRyeS5yZWxlYXNlKCkpOwotICAgIHJldHVybiBzZWxlY3RvclF1 ZXJ5OworICAgIE93blB0cjxTZWxlY3RvclF1ZXJ5PiBzZWxlY3RvclF1ZXJ5ID0gYWRvcHRQdHIo bmV3IFNlbGVjdG9yUXVlcnkoc2VsZWN0b3JMaXN0KSk7CisgICAgU2VsZWN0b3JRdWVyeSogcmF3 U2VsZWN0b3JRdWVyeSA9IHNlbGVjdG9yUXVlcnkuZ2V0KCk7CisgICAgbV9lbnRyaWVzLmFkZChz ZWxlY3RvcnMsIHNlbGVjdG9yUXVlcnkucmVsZWFzZSgpKTsKKyAgICByZXR1cm4gcmF3U2VsZWN0 b3JRdWVyeTsKIH0KIAogdm9pZCBTZWxlY3RvclF1ZXJ5Q2FjaGU6OmludmFsaWRhdGUoKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL1NlbGVjdG9yUXVlcnkuaCBiL1NvdXJjZS9XZWJD b3JlL2RvbS9TZWxlY3RvclF1ZXJ5LmgKaW5kZXggOTM5MGYwMDYwZDE3ZmUwYTEzMDIyMGE4NTYx ODM5MWU4MTI3OGNmZC4uODk3MDlkMmUxMDllZDhmNmU3MDFjMzg3NTUwYmYxYWY4ZDgzYjMwOCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL1NlbGVjdG9yUXVlcnkuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9kb20vU2VsZWN0b3JRdWVyeS5oCkBAIC02NywyOSArNjcsMTUgQEAgcHJpdmF0 ZToKIAogY2xhc3MgU2VsZWN0b3JRdWVyeSB7CiAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoU2Vs ZWN0b3JRdWVyeSk7CisgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiBwdWJsaWM6Ci0gICAg U2VsZWN0b3JRdWVyeSgpIHsgfTsKLSAgICB2b2lkIGluaXRpYWxpemUoY29uc3QgQ1NTU2VsZWN0 b3JMaXN0Jik7CisgICAgU2VsZWN0b3JRdWVyeShjb25zdCBDU1NTZWxlY3Rvckxpc3QmKTsKICAg ICBib29sIG1hdGNoZXMoRWxlbWVudCopIGNvbnN0OwogICAgIFBhc3NSZWZQdHI8Tm9kZUxpc3Q+ IHF1ZXJ5QWxsKE5vZGUqIHJvb3ROb2RlKSBjb25zdDsKICAgICBQYXNzUmVmUHRyPEVsZW1lbnQ+ IHF1ZXJ5Rmlyc3QoTm9kZSogcm9vdE5vZGUpIGNvbnN0OwogcHJpdmF0ZToKICAgICBTZWxlY3Rv ckRhdGFMaXN0IG1fc2VsZWN0b3JzOwotfTsKLQotY2xhc3MgU2VsZWN0b3JRdWVyeUNhY2hlRW50 cnkgewotICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKFNlbGVjdG9yUXVlcnlDYWNoZUVudHJ5KTsK LSAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKLXB1YmxpYzoKLSAgICBleHBsaWNpdCBTZWxl Y3RvclF1ZXJ5Q2FjaGVFbnRyeShDU1NTZWxlY3Rvckxpc3QmKTsKLSAgICBTZWxlY3RvclF1ZXJ5 KiBzZWxlY3RvclF1ZXJ5KCkgeyByZXR1cm4gJm1fc2VsZWN0b3JRdWVyeTsgfTsKLQotcHJpdmF0 ZToKLSAgICAvLyBtX3F1ZXJ5U2VsZWN0b3JMaXN0IGtlZXBzIHRoZSBsaWZldGltZSBvZiBDU1NT ZWxlY3RvcnMgaW4gbV9zZWxlY3RvclF1ZXJ5LgotICAgIC8vIFNpbmNlIG1fc2VsZWN0b3JRdWVy eSBqdXN0IGhvbGRzIHBvaW50ZXJzIHRvIENTU1NlbGVjdG9yIG9iamVjdHMsCi0gICAgLy8gbV9x dWVyeVNlbGVjdG9yTGlzdCBtdXN0IG5vdCBiZSBkZXN0cnVjdGVkIGJlZm9yZSBtX3NlbGVjdG9y UXVlcnkgaXMgZGVzdHJ1Y3RlZC4KLSAgICBDU1NTZWxlY3Rvckxpc3QgbV9xdWVyeVNlbGVjdG9y TGlzdDsKLSAgICBTZWxlY3RvclF1ZXJ5IG1fc2VsZWN0b3JRdWVyeTsKKyAgICBDU1NTZWxlY3Rv ckxpc3QgbV9zZWxlY3Rvckxpc3Q7CiB9OwogCiBjbGFzcyBTZWxlY3RvclF1ZXJ5Q2FjaGUgewpA QCAtMTAyLDcgKzg4LDcgQEAgcHVibGljOgogICAgIHZvaWQgaW52YWxpZGF0ZSgpOwogCiBwcml2 YXRlOgotICAgIEhhc2hNYXA8QXRvbWljU3RyaW5nLCBPd25QdHI8U2VsZWN0b3JRdWVyeUNhY2hl RW50cnk+ID4gbV9lbnRyaWVzOworICAgIEhhc2hNYXA8QXRvbWljU3RyaW5nLCBPd25QdHI8U2Vs ZWN0b3JRdWVyeT4gPiBtX2VudHJpZXM7CiB9OwogCiB9Cg== 145565 2012-06-04 05:27:38 -0700 2012-06-04 08:30:54 -0700 patch for landing bug-88204-20120604212737.patch text/plain 5335 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5Mzg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWY0OGQwNmQ2ODY2YzZk ZGJhNmFmZmM1YjZiNzdhZDVkYzY4MjExNi4uZGFmNjNhYzFhNjhjZGFiZjliMWEzMzgzNDczZDNl OGE0ZDk0NDk3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTA2LTAzICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZW1vdmUgU2VsZWN0 b3JRdWVyeUNhY2hlRW50cnkgZnJvbSBTZWxlY3RvclF1ZXJ5LmgKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg4MjA0CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgSGFqaW1lIE1vcml0YS4KKworICAgICAgICBBcyBhbnR0aWtAIHBvaW50ZWQgb3V0IGluIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04Nzk0MiNjMTUsCisgICAgICAg IHdlIGNhbiByZW1vdmUgU2VsZWN0b3JRdWVyeUNhY2hlRW50cnkgYnkgaGF2aW5nIFNlbGVjdG9y UXVlcnkgaG9sZCBDU1NTZWxlY3Rvckxpc3QuCisKKyAgICAgICAgVGVzdHM6IGZhc3QvZG9tL1Nl bGVjdG9yQVBJLyogTm8gY2hhbmdlIGluIHRlc3QgcmVzdWx0cy4KKworICAgICAgICAqIGRvbS9T ZWxlY3RvclF1ZXJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNlbGVjdG9yUXVlcnk6OlNlbGVj dG9yUXVlcnkpOgorICAgICAgICAoV2ViQ29yZTo6U2VsZWN0b3JRdWVyeUNhY2hlOjphZGQpOgor ICAgICAgICAqIGRvbS9TZWxlY3RvclF1ZXJ5Lmg6CisgICAgICAgIChTZWxlY3RvclF1ZXJ5KToK KyAgICAgICAgKFNlbGVjdG9yUXVlcnlDYWNoZSk6CisKIDIwMTItMDYtMDQgIE1pa2UgV2VzdCAg PG1rd3N0QGNocm9taXVtLm9yZz4KIAogICAgICAgICBBZGRpbmcgZXhwbGljaXQgY29uc29sZSBl cnJvciBmb3IgZHVwbGljYXRlZCBDU1AgZGlyZWN0aXZlcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2RvbS9TZWxlY3RvclF1ZXJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9TZWxlY3Rv clF1ZXJ5LmNwcAppbmRleCBlODAxMTY2YjRjZGJkZWMzY2U1ZTZkODc1NDRhYjk0ODAxYzNmMTA5 Li4wMmZmODM5MzVhY2ExNzU2ZDJiNTZkMTI5MjU1NGMzOTk1MTE1YmJmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9kb20vU2VsZWN0b3JRdWVyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv ZG9tL1NlbGVjdG9yUXVlcnkuY3BwCkBAIC0xNDMsOSArMTQzLDEwIEBAIHZvaWQgU2VsZWN0b3JE YXRhTGlzdDo6ZXhlY3V0ZShjb25zdCBTZWxlY3RvckNoZWNrZXImIHNlbGVjdG9yQ2hlY2tlciwg Tm9kZSogcm9vCiAgICAgfQogfQogCi12b2lkIFNlbGVjdG9yUXVlcnk6OmluaXRpYWxpemUoY29u c3QgQ1NTU2VsZWN0b3JMaXN0JiBzZWxlY3Rvckxpc3QpCitTZWxlY3RvclF1ZXJ5OjpTZWxlY3Rv clF1ZXJ5KGNvbnN0IENTU1NlbGVjdG9yTGlzdCYgc2VsZWN0b3JMaXN0KQorICAgIDogbV9zZWxl Y3Rvckxpc3Qoc2VsZWN0b3JMaXN0KQogewotICAgIG1fc2VsZWN0b3JzLmluaXRpYWxpemUoc2Vs ZWN0b3JMaXN0KTsKKyAgICBtX3NlbGVjdG9ycy5pbml0aWFsaXplKG1fc2VsZWN0b3JMaXN0KTsK IH0KIAogYm9vbCBTZWxlY3RvclF1ZXJ5OjptYXRjaGVzKEVsZW1lbnQqIGVsZW1lbnQpIGNvbnN0 CkBAIC0xNjgsMzcgKzE2OSwzMSBAQCBQYXNzUmVmUHRyPEVsZW1lbnQ+IFNlbGVjdG9yUXVlcnk6 OnF1ZXJ5Rmlyc3QoTm9kZSogcm9vdE5vZGUpIGNvbnN0CiAgICAgcmV0dXJuIG1fc2VsZWN0b3Jz LnF1ZXJ5Rmlyc3Qoc2VsZWN0b3JDaGVja2VyLCByb290Tm9kZSk7CiB9CiAKLVNlbGVjdG9yUXVl cnlDYWNoZUVudHJ5OjpTZWxlY3RvclF1ZXJ5Q2FjaGVFbnRyeShDU1NTZWxlY3Rvckxpc3QmIHF1 ZXJ5U2VsZWN0b3JMaXN0KQotICAgIDogbV9xdWVyeVNlbGVjdG9yTGlzdChxdWVyeVNlbGVjdG9y TGlzdCkKLXsKLSAgICBtX3NlbGVjdG9yUXVlcnkuaW5pdGlhbGl6ZShtX3F1ZXJ5U2VsZWN0b3JM aXN0KTsKLX0KLQogU2VsZWN0b3JRdWVyeSogU2VsZWN0b3JRdWVyeUNhY2hlOjphZGQoY29uc3Qg QXRvbWljU3RyaW5nJiBzZWxlY3RvcnMsIERvY3VtZW50KiBkb2N1bWVudCwgRXhjZXB0aW9uQ29k ZSYgZWMpCiB7Ci0gICAgSGFzaE1hcDxBdG9taWNTdHJpbmcsIE93blB0cjxTZWxlY3RvclF1ZXJ5 Q2FjaGVFbnRyeT4gPjo6aXRlcmF0b3IgaXQgPSBtX2VudHJpZXMuZmluZChzZWxlY3RvcnMpOwor ICAgIEhhc2hNYXA8QXRvbWljU3RyaW5nLCBPd25QdHI8U2VsZWN0b3JRdWVyeT4gPjo6aXRlcmF0 b3IgaXQgPSBtX2VudHJpZXMuZmluZChzZWxlY3RvcnMpOwogICAgIGlmIChpdCAhPSBtX2VudHJp ZXMuZW5kKCkpCi0gICAgICAgIHJldHVybiBpdC0+c2Vjb25kLT5zZWxlY3RvclF1ZXJ5KCk7Cisg ICAgICAgIHJldHVybiBpdC0+c2Vjb25kLmdldCgpOwogCiAgICAgQ1NTUGFyc2VyIHBhcnNlcihk b2N1bWVudCk7Ci0gICAgQ1NTU2VsZWN0b3JMaXN0IHF1ZXJ5U2VsZWN0b3JMaXN0OwotICAgIHBh cnNlci5wYXJzZVNlbGVjdG9yKHNlbGVjdG9ycywgcXVlcnlTZWxlY3Rvckxpc3QpOworICAgIENT U1NlbGVjdG9yTGlzdCBzZWxlY3Rvckxpc3Q7CisgICAgcGFyc2VyLnBhcnNlU2VsZWN0b3Ioc2Vs ZWN0b3JzLCBzZWxlY3Rvckxpc3QpOwogCi0gICAgaWYgKCFxdWVyeVNlbGVjdG9yTGlzdC5maXJz dCgpIHx8IHF1ZXJ5U2VsZWN0b3JMaXN0Lmhhc1Vua25vd25Qc2V1ZG9FbGVtZW50cygpKSB7Cisg ICAgaWYgKCFzZWxlY3Rvckxpc3QuZmlyc3QoKSB8fCBzZWxlY3Rvckxpc3QuaGFzVW5rbm93blBz ZXVkb0VsZW1lbnRzKCkpIHsKICAgICAgICAgZWMgPSBTWU5UQVhfRVJSOwogICAgICAgICByZXR1 cm4gMDsKICAgICB9CiAKICAgICAvLyB0aHJvdyBhIE5BTUVTUEFDRV9FUlIgaWYgdGhlIHNlbGVj dG9yIGluY2x1ZGVzIGFueSBuYW1lc3BhY2UgcHJlZml4ZXMuCi0gICAgaWYgKHF1ZXJ5U2VsZWN0 b3JMaXN0LnNlbGVjdG9yc05lZWROYW1lc3BhY2VSZXNvbHV0aW9uKCkpIHsKKyAgICBpZiAoc2Vs ZWN0b3JMaXN0LnNlbGVjdG9yc05lZWROYW1lc3BhY2VSZXNvbHV0aW9uKCkpIHsKICAgICAgICAg ZWMgPSBOQU1FU1BBQ0VfRVJSOwogICAgICAgICByZXR1cm4gMDsKICAgICB9CiAgICAgCi0gICAg T3duUHRyPFNlbGVjdG9yUXVlcnlDYWNoZUVudHJ5PiBlbnRyeSA9IGFkb3B0UHRyKG5ldyBTZWxl Y3RvclF1ZXJ5Q2FjaGVFbnRyeShxdWVyeVNlbGVjdG9yTGlzdCkpOwotICAgIFNlbGVjdG9yUXVl cnkqIHNlbGVjdG9yUXVlcnkgPSBlbnRyeS0+c2VsZWN0b3JRdWVyeSgpOwotICAgIG1fZW50cmll cy5hZGQoc2VsZWN0b3JzLCBlbnRyeS5yZWxlYXNlKCkpOwotICAgIHJldHVybiBzZWxlY3RvclF1 ZXJ5OworICAgIE93blB0cjxTZWxlY3RvclF1ZXJ5PiBzZWxlY3RvclF1ZXJ5ID0gYWRvcHRQdHIo bmV3IFNlbGVjdG9yUXVlcnkoc2VsZWN0b3JMaXN0KSk7CisgICAgU2VsZWN0b3JRdWVyeSogcmF3 U2VsZWN0b3JRdWVyeSA9IHNlbGVjdG9yUXVlcnkuZ2V0KCk7CisgICAgbV9lbnRyaWVzLmFkZChz ZWxlY3RvcnMsIHNlbGVjdG9yUXVlcnkucmVsZWFzZSgpKTsKKyAgICByZXR1cm4gcmF3U2VsZWN0 b3JRdWVyeTsKIH0KIAogdm9pZCBTZWxlY3RvclF1ZXJ5Q2FjaGU6OmludmFsaWRhdGUoKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL1NlbGVjdG9yUXVlcnkuaCBiL1NvdXJjZS9XZWJD b3JlL2RvbS9TZWxlY3RvclF1ZXJ5LmgKaW5kZXggOTM5MGYwMDYwZDE3ZmUwYTEzMDIyMGE4NTYx ODM5MWU4MTI3OGNmZC4uODk3MDlkMmUxMDllZDhmNmU3MDFjMzg3NTUwYmYxYWY4ZDgzYjMwOCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL1NlbGVjdG9yUXVlcnkuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9kb20vU2VsZWN0b3JRdWVyeS5oCkBAIC02NywyOSArNjcsMTUgQEAgcHJpdmF0 ZToKIAogY2xhc3MgU2VsZWN0b3JRdWVyeSB7CiAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoU2Vs ZWN0b3JRdWVyeSk7CisgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiBwdWJsaWM6Ci0gICAg U2VsZWN0b3JRdWVyeSgpIHsgfTsKLSAgICB2b2lkIGluaXRpYWxpemUoY29uc3QgQ1NTU2VsZWN0 b3JMaXN0Jik7CisgICAgU2VsZWN0b3JRdWVyeShjb25zdCBDU1NTZWxlY3Rvckxpc3QmKTsKICAg ICBib29sIG1hdGNoZXMoRWxlbWVudCopIGNvbnN0OwogICAgIFBhc3NSZWZQdHI8Tm9kZUxpc3Q+ IHF1ZXJ5QWxsKE5vZGUqIHJvb3ROb2RlKSBjb25zdDsKICAgICBQYXNzUmVmUHRyPEVsZW1lbnQ+ IHF1ZXJ5Rmlyc3QoTm9kZSogcm9vdE5vZGUpIGNvbnN0OwogcHJpdmF0ZToKICAgICBTZWxlY3Rv ckRhdGFMaXN0IG1fc2VsZWN0b3JzOwotfTsKLQotY2xhc3MgU2VsZWN0b3JRdWVyeUNhY2hlRW50 cnkgewotICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKFNlbGVjdG9yUXVlcnlDYWNoZUVudHJ5KTsK LSAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKLXB1YmxpYzoKLSAgICBleHBsaWNpdCBTZWxl Y3RvclF1ZXJ5Q2FjaGVFbnRyeShDU1NTZWxlY3Rvckxpc3QmKTsKLSAgICBTZWxlY3RvclF1ZXJ5 KiBzZWxlY3RvclF1ZXJ5KCkgeyByZXR1cm4gJm1fc2VsZWN0b3JRdWVyeTsgfTsKLQotcHJpdmF0 ZToKLSAgICAvLyBtX3F1ZXJ5U2VsZWN0b3JMaXN0IGtlZXBzIHRoZSBsaWZldGltZSBvZiBDU1NT ZWxlY3RvcnMgaW4gbV9zZWxlY3RvclF1ZXJ5LgotICAgIC8vIFNpbmNlIG1fc2VsZWN0b3JRdWVy eSBqdXN0IGhvbGRzIHBvaW50ZXJzIHRvIENTU1NlbGVjdG9yIG9iamVjdHMsCi0gICAgLy8gbV9x dWVyeVNlbGVjdG9yTGlzdCBtdXN0IG5vdCBiZSBkZXN0cnVjdGVkIGJlZm9yZSBtX3NlbGVjdG9y UXVlcnkgaXMgZGVzdHJ1Y3RlZC4KLSAgICBDU1NTZWxlY3Rvckxpc3QgbV9xdWVyeVNlbGVjdG9y TGlzdDsKLSAgICBTZWxlY3RvclF1ZXJ5IG1fc2VsZWN0b3JRdWVyeTsKKyAgICBDU1NTZWxlY3Rv ckxpc3QgbV9zZWxlY3Rvckxpc3Q7CiB9OwogCiBjbGFzcyBTZWxlY3RvclF1ZXJ5Q2FjaGUgewpA QCAtMTAyLDcgKzg4LDcgQEAgcHVibGljOgogICAgIHZvaWQgaW52YWxpZGF0ZSgpOwogCiBwcml2 YXRlOgotICAgIEhhc2hNYXA8QXRvbWljU3RyaW5nLCBPd25QdHI8U2VsZWN0b3JRdWVyeUNhY2hl RW50cnk+ID4gbV9lbnRyaWVzOworICAgIEhhc2hNYXA8QXRvbWljU3RyaW5nLCBPd25QdHI8U2Vs ZWN0b3JRdWVyeT4gPiBtX2VudHJpZXM7CiB9OwogCiB9Cg==