40513 2010-06-11 18:49:53 -0700 Rename tok, asHTMLTokenizer to parser, asHTMLDocumentParser 2010-06-13 21:44:46 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 40491 1 eric eric abarth commit-queue oldest_to_newest 237211 0 eric 2010-06-11 18:49:53 -0700 Rename tok, asHTMLTokenizer to parser, asHTMLDocumentParser 237214 1 58538 eric 2010-06-11 18:52:08 -0700 Created attachment 58538 Patch 237314 2 58538 commit-queue 2010-06-12 10:39:32 -0700 Comment on attachment 58538 Patch Rejecting patch 58538 from commit-queue. Failed to run "[u'/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', u'--reviewer', u'Darin Adler', u'--force']" exit_code: 1 Last 500 characters of output: o this was: -------------------------- |Index: WebCore/html/HTMLDocumentParser.h |index 9ccebe5dc17668f3082dee5bb7ebfd9f391d216c..0951c2a358d0d81416792931e1601a2941b2af1c 100644 |--- WebCore/html/HTMLDocumentParser.h |+++ WebCore/html/HTMLDocumentParser.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored patching file WebCore/loader/DocumentLoader.cpp Hunk #1 FAILED at 393. 1 out of 1 hunk FAILED -- saving rejects to file WebCore/loader/DocumentLoader.cpp.rej Full output: http://webkit-commit-queue.appspot.com/results/3183377 237515 3 58538 commit-queue 2010-06-13 00:26:50 -0700 Comment on attachment 58538 Patch Rejecting patch 58538 from commit-queue. Failed to run "[u'/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', u'--reviewer', u'Darin Adler', u'--force']" exit_code: 1 Last 500 characters of output: unk #1 succeeded at 1 with fuzz 3. patching file WebCore/dom/Document.cpp Hunk #1 FAILED at 1958. Hunk #2 FAILED at 1966. 2 out of 2 hunks FAILED -- saving rejects to file WebCore/dom/Document.cpp.rej patching file WebCore/dom/DocumentParser.h patching file WebCore/html/HTMLDocumentParser.cpp patching file WebCore/html/HTMLDocumentParser.h patching file WebCore/loader/DocumentLoader.cpp Hunk #1 FAILED at 393. 1 out of 1 hunk FAILED -- saving rejects to file WebCore/loader/DocumentLoader.cpp.rej Full output: http://webkit-commit-queue.appspot.com/results/3273026 237634 4 58538 eric 2010-06-13 17:25:27 -0700 Comment on attachment 58538 Patch One more try now that I've updated bug 40512. 237635 5 58606 eric 2010-06-13 17:26:55 -0700 Created attachment 58606 Patch for landing 237636 6 58607 eric 2010-06-13 17:31:29 -0700 Created attachment 58607 Patch for landing 237703 7 58607 abarth 2010-06-13 21:44:39 -0700 Comment on attachment 58607 Patch for landing Clearing flags on attachment: 58607 Committed r61105: <http://trac.webkit.org/changeset/61105> 237704 8 abarth 2010-06-13 21:44:46 -0700 All reviewed patches have been landed. Closing bug. 58538 2010-06-11 18:52:08 -0700 2010-06-13 17:26:40 -0700 Patch bug-40513-20100611185207.patch text/plain 5271 eric ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZmJkMzM1ZmM5MGM2YmZkNDk1NGZlZDVhZGUwMDM2NzVjNjhmM2EyOS4uYzc1ZGVlZTlkYmVkMGY5 ODcyZWRhNzBhZTdkNDlkM2EzNzdiMWMwNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTIsNiArMiwzMCBAQAogCiAgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgogCisgICAgICAgIFJlbmFtZSB0b2ssIGFzSFRNTFRva2Vu aXplciB0byBwYXJzZXIsIGFzSFRNTERvY3VtZW50UGFyc2VyCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MDUxMworCisgICAgICAgIExhc3Qgc2V0IG9m IFRva2VuaXplciByZWxhdGVkIHJlbmFtZXMsIGFsc28gZG9uZSB2aWEgZG8td2ViY29yZS1yZW5h bWU6CisgICAgICAgIGFzSFRNTFRva2VuaXplciA9PiBhc0hUTUxEb2N1bWVudFBhcnNlcgorICAg ICAgICB0b2sgPT4gcGFyc2VyCisKKyAgICAgICAgTm8gZnVuY3Rpb25hbCBjaGFuZ2VzLCB0aHVz IG5vIHRlc3RzLgorCisgICAgICAgICogZG9tL0RvY3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkRvY3VtZW50Ojp3cml0ZSk6CisgICAgICAgICogZG9tL0RvY3VtZW50UGFyc2VyLmg6Cisg ICAgICAgIChXZWJDb3JlOjpEb2N1bWVudFBhcnNlcjo6YXNIVE1MRG9jdW1lbnRQYXJzZXIpOgor ICAgICAgICAqIGh0bWwvSFRNTERvY3VtZW50UGFyc2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OnBhcnNlSFRNTERvY3VtZW50RnJhZ21lbnQpOgorICAgICAgICAqIGh0bWwvSFRNTERvY3VtZW50 UGFyc2VyLmg6CisgICAgICAgIChXZWJDb3JlOjpIVE1MRG9jdW1lbnRQYXJzZXI6OmFzSFRNTERv Y3VtZW50UGFyc2VyKToKKyAgICAgICAgKiBsb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6RG9jdW1lbnRMb2FkZXI6OmlzTG9hZGluZ0luQVBJU2Vuc2UpOgorCisy MDEwLTA2LTExICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwogICAgICAgICBGaXggdGhlIHJlc3Qgb2YgdGhlIHJl ZmVyZW5jZXMgdG8gdGhlIG9sZCBUb2tlbml6ZXIgY2xhc3MgKG5vdyBEb2N1bWVudFBhcnNlcikK ICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQwNTEyCiAK ZGlmZiAtLWdpdCBhL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCBiL1dlYkNvcmUvZG9tL0RvY3Vt ZW50LmNwcAppbmRleCBkNGRiMDViNmMwZThkZDAyZWI0MDVkZGZlNzQ3ZjcyOTQ4OTMzYzE3Li43 MTkzNDQwMTAxNzVjODgxYmU1MGQzYmFmNzQwNTFkYWQ5YzJmODU4IDEwMDY0NAotLS0gYS9XZWJD b3JlL2RvbS9Eb2N1bWVudC5jcHAKKysrIGIvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCkBAIC0x OTU4LDcgKzE5NTgsNyBAQCB2b2lkIERvY3VtZW50Ojp3cml0ZShjb25zdCBTZWdtZW50ZWRTdHJp bmcmIHRleHQsIERvY3VtZW50KiBvd25lckRvY3VtZW50KQogCiAgICAgQVNTRVJUKG1fcGFyc2Vy KTsKICAgICBib29sIHdhc0ZvcmNlZFN5bmNocm9ub3VzID0gZmFsc2U7Ci0gICAgSFRNTERvY3Vt ZW50UGFyc2VyKiBwYXJzZXIgPSBtX3BhcnNlci0+YXNIVE1MVG9rZW5pemVyKCk7CisgICAgSFRN TERvY3VtZW50UGFyc2VyKiBwYXJzZXIgPSBtX3BhcnNlci0+YXNIVE1MRG9jdW1lbnRQYXJzZXIo KTsKICAgICBpZiAocGFyc2VyKSB7CiAgICAgICAgIHdhc0ZvcmNlZFN5bmNocm9ub3VzID0gcGFy c2VyLT5mb3JjZVN5bmNocm9ub3VzKCk7CiAgICAgICAgIHBhcnNlci0+c2V0Rm9yY2VTeW5jaHJv bm91cyh0cnVlKTsKQEAgLTE5NjYsNyArMTk2Niw3IEBAIHZvaWQgRG9jdW1lbnQ6OndyaXRlKGNv bnN0IFNlZ21lbnRlZFN0cmluZyYgdGV4dCwgRG9jdW1lbnQqIG93bmVyRG9jdW1lbnQpCiAKICAg ICBtX3BhcnNlci0+d3JpdGUodGV4dCwgZmFsc2UpOwogCi0gICAgaWYgKG1fcGFyc2VyICYmIHBh cnNlciAmJiBtX3BhcnNlci0+YXNIVE1MVG9rZW5pemVyKCkgPT0gcGFyc2VyKQorICAgIGlmICht X3BhcnNlciAmJiBwYXJzZXIgJiYgbV9wYXJzZXItPmFzSFRNTERvY3VtZW50UGFyc2VyKCkgPT0g cGFyc2VyKQogICAgICAgICBwYXJzZXItPnNldEZvcmNlU3luY2hyb25vdXMod2FzRm9yY2VkU3lu Y2hyb25vdXMpOwogCiAjaWZkZWYgSU5TVFJVTUVOVF9MQVlPVVRfU0NIRURVTElORwpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9kb20vRG9jdW1lbnRQYXJzZXIuaCBiL1dlYkNvcmUvZG9tL0RvY3VtZW50 UGFyc2VyLmgKaW5kZXggNGUxOGM2NzkzNjAzMWI1Yjc5ZWE1MTM2ODRkZGY4NDNkNmU1NWJlZS4u MjM0YWU3YzU0MjdkYzRkMGFjODJlNzhiYjRiOTQ5MTEzZTE3ZDUyNCAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9kb20vRG9jdW1lbnRQYXJzZXIuaAorKysgYi9XZWJDb3JlL2RvbS9Eb2N1bWVudFBhcnNl ci5oCkBAIC01OSw3ICs1OSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgdmlydHVh bCB2b2lkIGV4ZWN1dGVTY3JpcHRzV2FpdGluZ0ZvclN0eWxlc2hlZXRzKCkge30KIAogICAgICAg ICB2aXJ0dWFsIEhUTUxQYXJzZXIqIGh0bWxQYXJzZXIoKSBjb25zdCB7IHJldHVybiAwOyB9Ci0g ICAgICAgIHZpcnR1YWwgSFRNTERvY3VtZW50UGFyc2VyKiBhc0hUTUxUb2tlbml6ZXIoKSB7IHJl dHVybiAwOyB9CisgICAgICAgIHZpcnR1YWwgSFRNTERvY3VtZW50UGFyc2VyKiBhc0hUTUxEb2N1 bWVudFBhcnNlcigpIHsgcmV0dXJuIDA7IH0KIAogICAgICAgICBYU1NBdWRpdG9yKiB4c3NBdWRp dG9yKCkgY29uc3QgeyByZXR1cm4gbV9YU1NBdWRpdG9yOyB9CiAgICAgICAgIHZvaWQgc2V0WFNT QXVkaXRvcihYU1NBdWRpdG9yKiBhdWRpdG9yKSB7IG1fWFNTQXVkaXRvciA9IGF1ZGl0b3I7IH0K ZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9IVE1MRG9jdW1lbnRQYXJzZXIuY3BwIGIvV2ViQ29y ZS9odG1sL0hUTUxEb2N1bWVudFBhcnNlci5jcHAKaW5kZXggN2I2ZDUxOGZlZTFjNzljYmRmYzI3 Mjk5Yzc0YzQwNGEzY2FiMjkwZi4uNjVhZjhhMDhmYTE4OWE5N2IyNmNjNjQ0YmVjZWVkNzUzZmY3 MGMyOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9odG1sL0hUTUxEb2N1bWVudFBhcnNlci5jcHAKKysr IGIvV2ViQ29yZS9odG1sL0hUTUxEb2N1bWVudFBhcnNlci5jcHAKQEAgLTIwOTcsMTEgKzIwOTcs MTEgQEAgdm9pZCBIVE1MRG9jdW1lbnRQYXJzZXI6OnNldFNyYyhjb25zdCBTZWdtZW50ZWRTdHJp bmcmIHNvdXJjZSkKIAogdm9pZCBwYXJzZUhUTUxEb2N1bWVudEZyYWdtZW50KGNvbnN0IFN0cmlu ZyYgc291cmNlLCBEb2N1bWVudEZyYWdtZW50KiBmcmFnbWVudCwgRnJhZ21lbnRTY3JpcHRpbmdQ ZXJtaXNzaW9uIHNjcmlwdGluZ1Blcm1pc3Npb24pCiB7Ci0gICAgSFRNTERvY3VtZW50UGFyc2Vy IHRvayhmcmFnbWVudCwgc2NyaXB0aW5nUGVybWlzc2lvbik7Ci0gICAgdG9rLnNldEZvcmNlU3lu Y2hyb25vdXModHJ1ZSk7Ci0gICAgdG9rLndyaXRlKHNvdXJjZSwgdHJ1ZSk7Ci0gICAgdG9rLmZp bmlzaCgpOwotICAgIEFTU0VSVCghdG9rLnByb2Nlc3NpbmdEYXRhKCkpOyAgICAgIC8vIG1ha2Ug c3VyZSB3ZSdyZSBkb25lIChzZWUgMzk2MzE1MSkKKyAgICBIVE1MRG9jdW1lbnRQYXJzZXIgcGFy c2VyKGZyYWdtZW50LCBzY3JpcHRpbmdQZXJtaXNzaW9uKTsKKyAgICBwYXJzZXIuc2V0Rm9yY2VT eW5jaHJvbm91cyh0cnVlKTsKKyAgICBwYXJzZXIud3JpdGUoc291cmNlLCB0cnVlKTsKKyAgICBw YXJzZXIuZmluaXNoKCk7CisgICAgQVNTRVJUKCFwYXJzZXIucHJvY2Vzc2luZ0RhdGEoKSk7ICAg ICAgLy8gbWFrZSBzdXJlIHdlJ3JlIGRvbmUgKHNlZSAzOTYzMTUxKQogfQogCiBVQ2hhciBkZWNv ZGVOYW1lZEVudGl0eShjb25zdCBjaGFyKiBuYW1lKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1s L0hUTUxEb2N1bWVudFBhcnNlci5oIGIvV2ViQ29yZS9odG1sL0hUTUxEb2N1bWVudFBhcnNlci5o CmluZGV4IDljY2ViZTVkYzE3NjY4ZjMwODJkZWU1YmI3ZWJmZDlmMzkxZDIxNmMuLjA5NTFjMmEz NThkMGQ4MTQxNjc5MjkzMWUxNjAxYTI5NDFiMmFmMWMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRt bC9IVE1MRG9jdW1lbnRQYXJzZXIuaAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTERvY3VtZW50UGFy c2VyLmgKQEAgLTE2NCw3ICsxNjQsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGV4ZWN1 dGVTY3JpcHRzV2FpdGluZ0ZvclN0eWxlc2hlZXRzKCk7CiAKICAgICB2aXJ0dWFsIEhUTUxQYXJz ZXIqIGh0bWxQYXJzZXIoKSBjb25zdCB7IHJldHVybiBtX3BhcnNlci5nZXQoKTsgfQotICAgIHZp cnR1YWwgSFRNTERvY3VtZW50UGFyc2VyKiBhc0hUTUxUb2tlbml6ZXIoKSB7IHJldHVybiB0aGlz OyB9CisgICAgdmlydHVhbCBIVE1MRG9jdW1lbnRQYXJzZXIqIGFzSFRNTERvY3VtZW50UGFyc2Vy KCkgeyByZXR1cm4gdGhpczsgfQogCiBwcml2YXRlOgogICAgIGNsYXNzIFN0YXRlOwpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwIGIvV2ViQ29yZS9sb2FkZXIv RG9jdW1lbnRMb2FkZXIuY3BwCmluZGV4IDZjNGY3NmJiNjBhNWM1OWI1MmFjMzdkZWM1OTRlMGIy NzViM2IwNzMuLmE2Mjg1MGNhY2QxZDhjY2U1ZGYwZjlkZWMwY2E0M2JiNWQ0NzQ4NWYgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcAorKysgYi9XZWJDb3JlL2xv YWRlci9Eb2N1bWVudExvYWRlci5jcHAKQEAgLTM5Myw4ICszOTMsOCBAQCBib29sIERvY3VtZW50 TG9hZGVyOjppc0xvYWRpbmdJbkFQSVNlbnNlKCkgY29uc3QKICAgICAgICAgRG9jdW1lbnQqIGRv YyA9IG1fZnJhbWUtPmRvY3VtZW50KCk7CiAgICAgICAgIGlmIChkb2MtPmRvY0xvYWRlcigpLT5y ZXF1ZXN0Q291bnQoKSkKICAgICAgICAgICAgIHJldHVybiB0cnVlOwotICAgICAgICBpZiAoRG9j dW1lbnRQYXJzZXIqIHRvayA9IGRvYy0+cGFyc2VyKCkpCi0gICAgICAgICAgICBpZiAodG9rLT5w cm9jZXNzaW5nRGF0YSgpKQorICAgICAgICBpZiAoRG9jdW1lbnRQYXJzZXIqIHBhcnNlciA9IGRv Yy0+cGFyc2VyKCkpCisgICAgICAgICAgICBpZiAocGFyc2VyLT5wcm9jZXNzaW5nRGF0YSgpKQog ICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KICAgICByZXR1cm4gZnJhbWVMb2Fk ZXIoKS0+c3ViZnJhbWVJc0xvYWRpbmcoKTsK 58606 2010-06-13 17:26:55 -0700 2010-06-13 17:30:50 -0700 Patch for landing bug-40513-20100613172649.patch text/plain 5255 eric ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ODZjNWY4MzM3OWExOWM4MDhjZjJmOTBjZmQ5ZjhlY2ZkMDkyN2RiYi4uMTA3NzAzNmMzYTZjNjNh NDYyZDk5NmFjODM4ZWVhOGYxOTYyZmY2OSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyOSBAQAogMjAxMC0wNi0xMSAgRXJp YyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CiAKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgUmVuYW1lIHRvaywgYXNIVE1MVG9rZW5pemVyIHRvIHBhcnNl ciwgYXNIVE1MRG9jdW1lbnRQYXJzZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTQwNTEzCisKKyAgICAgICAgTGFzdCBzZXQgb2YgVG9rZW5pemVyIHJl bGF0ZWQgcmVuYW1lcywgYWxzbyBkb25lIHZpYSBkby13ZWJjb3JlLXJlbmFtZToKKyAgICAgICAg YXNIVE1MVG9rZW5pemVyID0+IGFzSFRNTERvY3VtZW50UGFyc2VyCisgICAgICAgIHRvayA9PiBw YXJzZXIKKworICAgICAgICBObyBmdW5jdGlvbmFsIGNoYW5nZXMsIHRodXMgbm8gdGVzdHMuCisK KyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6 OndyaXRlKToKKyAgICAgICAgKiBkb20vRG9jdW1lbnRQYXJzZXIuaDoKKyAgICAgICAgKFdlYkNv cmU6OkRvY3VtZW50UGFyc2VyOjphc0hUTUxEb2N1bWVudFBhcnNlcik6CisgICAgICAgICogaHRt bC9IVE1MRG9jdW1lbnRQYXJzZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6cGFyc2VIVE1MRG9j dW1lbnRGcmFnbWVudCk6CisgICAgICAgICogaHRtbC9IVE1MRG9jdW1lbnRQYXJzZXIuaDoKKyAg ICAgICAgKFdlYkNvcmU6OkhUTUxEb2N1bWVudFBhcnNlcjo6YXNIVE1MRG9jdW1lbnRQYXJzZXIp OgorICAgICAgICAqIGxvYWRlci9Eb2N1bWVudExvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpEb2N1bWVudExvYWRlcjo6aXNMb2FkaW5nSW5BUElTZW5zZSk6CisKKzIwMTAtMDYtMTEgIEVy aWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmlu IEFkbGVyLgogCiAgICAgICAgIEZpeCB0aGUgcmVzdCBvZiB0aGUgcmVmZXJlbmNlcyB0byB0aGUg b2xkIFRva2VuaXplciBjbGFzcyAobm93IERvY3VtZW50UGFyc2VyKQpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9kb20vRG9jdW1lbnQuY3BwIGIvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCmluZGV4IDRm NDMwNTU0MmExZTI4NTAyNWZiMmI1OWNjNjY5NTg0YTlkNjEzYzYuLmFjYjU3ZTBmNThjOGFjNGQy MWU4MzZmZWRlMDg2OTViZTNlZmQ3OTMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvZG9tL0RvY3VtZW50 LmNwcAorKysgYi9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTE5NTksNyArMTk1OSw3IEBA IHZvaWQgRG9jdW1lbnQ6OndyaXRlKGNvbnN0IFNlZ21lbnRlZFN0cmluZyYgdGV4dCwgRG9jdW1l bnQqIG93bmVyRG9jdW1lbnQpCiAKICAgICBBU1NFUlQobV9wYXJzZXIpOwogICAgIGJvb2wgd2Fz Rm9yY2VkU3luY2hyb25vdXMgPSBmYWxzZTsKLSAgICBIVE1MRG9jdW1lbnRQYXJzZXIqIHBhcnNl ciA9IG1fcGFyc2VyLT5hc0hUTUxUb2tlbml6ZXIoKTsKKyAgICBIVE1MRG9jdW1lbnRQYXJzZXIq IHBhcnNlciA9IG1fcGFyc2VyLT5hc0hUTUxEb2N1bWVudFBhcnNlcigpOwogICAgIGlmIChwYXJz ZXIpIHsKICAgICAgICAgd2FzRm9yY2VkU3luY2hyb25vdXMgPSBwYXJzZXItPmZvcmNlU3luY2hy b25vdXMoKTsKICAgICAgICAgcGFyc2VyLT5zZXRGb3JjZVN5bmNocm9ub3VzKHRydWUpOwpAQCAt MTk2Nyw3ICsxOTY3LDcgQEAgdm9pZCBEb2N1bWVudDo6d3JpdGUoY29uc3QgU2VnbWVudGVkU3Ry aW5nJiB0ZXh0LCBEb2N1bWVudCogb3duZXJEb2N1bWVudCkKIAogICAgIG1fcGFyc2VyLT53cml0 ZSh0ZXh0LCBmYWxzZSk7CiAKLSAgICBpZiAobV9wYXJzZXIgJiYgcGFyc2VyICYmIG1fcGFyc2Vy LT5hc0hUTUxUb2tlbml6ZXIoKSA9PSBwYXJzZXIpCisgICAgaWYgKG1fcGFyc2VyICYmIHBhcnNl ciAmJiBtX3BhcnNlci0+YXNIVE1MRG9jdW1lbnRQYXJzZXIoKSA9PSBwYXJzZXIpCiAgICAgICAg IHBhcnNlci0+c2V0Rm9yY2VTeW5jaHJvbm91cyh3YXNGb3JjZWRTeW5jaHJvbm91cyk7CiAKICNp ZmRlZiBJTlNUUlVNRU5UX0xBWU9VVF9TQ0hFRFVMSU5HCmRpZmYgLS1naXQgYS9XZWJDb3JlL2Rv bS9Eb2N1bWVudFBhcnNlci5oIGIvV2ViQ29yZS9kb20vRG9jdW1lbnRQYXJzZXIuaAppbmRleCA0 ZTE4YzY3OTM2MDMxYjViNzllYTUxMzY4NGRkZjg0M2Q2ZTU1YmVlLi4yMzRhZTdjNTQyN2RjNGQw YWM4MmU3OGJiNGI5NDkxMTNlMTdkNTI0IDEwMDY0NAotLS0gYS9XZWJDb3JlL2RvbS9Eb2N1bWVu dFBhcnNlci5oCisrKyBiL1dlYkNvcmUvZG9tL0RvY3VtZW50UGFyc2VyLmgKQEAgLTU5LDcgKzU5 LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2aXJ0dWFsIHZvaWQgZXhlY3V0ZVNj cmlwdHNXYWl0aW5nRm9yU3R5bGVzaGVldHMoKSB7fQogCiAgICAgICAgIHZpcnR1YWwgSFRNTFBh cnNlciogaHRtbFBhcnNlcigpIGNvbnN0IHsgcmV0dXJuIDA7IH0KLSAgICAgICAgdmlydHVhbCBI VE1MRG9jdW1lbnRQYXJzZXIqIGFzSFRNTFRva2VuaXplcigpIHsgcmV0dXJuIDA7IH0KKyAgICAg ICAgdmlydHVhbCBIVE1MRG9jdW1lbnRQYXJzZXIqIGFzSFRNTERvY3VtZW50UGFyc2VyKCkgeyBy ZXR1cm4gMDsgfQogCiAgICAgICAgIFhTU0F1ZGl0b3IqIHhzc0F1ZGl0b3IoKSBjb25zdCB7IHJl dHVybiBtX1hTU0F1ZGl0b3I7IH0KICAgICAgICAgdm9pZCBzZXRYU1NBdWRpdG9yKFhTU0F1ZGl0 b3IqIGF1ZGl0b3IpIHsgbV9YU1NBdWRpdG9yID0gYXVkaXRvcjsgfQpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9odG1sL0hUTUxEb2N1bWVudFBhcnNlci5jcHAgYi9XZWJDb3JlL2h0bWwvSFRNTERvY3Vt ZW50UGFyc2VyLmNwcAppbmRleCAwYjI5ZGM5Y2QxZWVkODk3OTM3MTc2YmI2YWI2OGQzYmVmMjBi NTZkLi5iMWVkNjQ5ZTFjZTE0OTc5ZmU2NGNkN2FmYWQ4ODVmNDM3NDJkYTZhIDEwMDY0NAotLS0g YS9XZWJDb3JlL2h0bWwvSFRNTERvY3VtZW50UGFyc2VyLmNwcAorKysgYi9XZWJDb3JlL2h0bWwv SFRNTERvY3VtZW50UGFyc2VyLmNwcApAQCAtMjA5NywxMSArMjA5NywxMSBAQCB2b2lkIEhUTUxE b2N1bWVudFBhcnNlcjo6c2V0U3JjKGNvbnN0IFNlZ21lbnRlZFN0cmluZyYgc291cmNlKQogCiB2 b2lkIHBhcnNlSFRNTERvY3VtZW50RnJhZ21lbnQoY29uc3QgU3RyaW5nJiBzb3VyY2UsIERvY3Vt ZW50RnJhZ21lbnQqIGZyYWdtZW50LCBGcmFnbWVudFNjcmlwdGluZ1Blcm1pc3Npb24gc2NyaXB0 aW5nUGVybWlzc2lvbikKIHsKLSAgICBIVE1MRG9jdW1lbnRQYXJzZXIgdG9rKGZyYWdtZW50LCBz Y3JpcHRpbmdQZXJtaXNzaW9uKTsKLSAgICB0b2suc2V0Rm9yY2VTeW5jaHJvbm91cyh0cnVlKTsK LSAgICB0b2sud3JpdGUoc291cmNlLCB0cnVlKTsKLSAgICB0b2suZmluaXNoKCk7Ci0gICAgQVNT RVJUKCF0b2sucHJvY2Vzc2luZ0RhdGEoKSk7ICAgICAgLy8gbWFrZSBzdXJlIHdlJ3JlIGRvbmUg KHNlZSAzOTYzMTUxKQorICAgIEhUTUxEb2N1bWVudFBhcnNlciBwYXJzZXIoZnJhZ21lbnQsIHNj cmlwdGluZ1Blcm1pc3Npb24pOworICAgIHBhcnNlci5zZXRGb3JjZVN5bmNocm9ub3VzKHRydWUp OworICAgIHBhcnNlci53cml0ZShzb3VyY2UsIHRydWUpOworICAgIHBhcnNlci5maW5pc2goKTsK KyAgICBBU1NFUlQoIXBhcnNlci5wcm9jZXNzaW5nRGF0YSgpKTsgICAgICAvLyBtYWtlIHN1cmUg d2UncmUgZG9uZSAoc2VlIDM5NjMxNTEpCiB9CiAKIFVDaGFyIGRlY29kZU5hbWVkRW50aXR5KGNv bnN0IGNoYXIqIG5hbWUpCmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0bWwvSFRNTERvY3VtZW50UGFy c2VyLmggYi9XZWJDb3JlL2h0bWwvSFRNTERvY3VtZW50UGFyc2VyLmgKaW5kZXggOWNjZWJlNWRj MTc2NjhmMzA4MmRlZTViYjdlYmZkOWYzOTFkMjE2Yy4uMDk1MWMyYTM1OGQwZDgxNDE2NzkyOTMx ZTE2MDFhMjk0MWIyYWYxYyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9odG1sL0hUTUxEb2N1bWVudFBh cnNlci5oCisrKyBiL1dlYkNvcmUvaHRtbC9IVE1MRG9jdW1lbnRQYXJzZXIuaApAQCAtMTY0LDcg KzE2NCw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgZXhlY3V0ZVNjcmlwdHNXYWl0aW5n Rm9yU3R5bGVzaGVldHMoKTsKIAogICAgIHZpcnR1YWwgSFRNTFBhcnNlciogaHRtbFBhcnNlcigp IGNvbnN0IHsgcmV0dXJuIG1fcGFyc2VyLmdldCgpOyB9Ci0gICAgdmlydHVhbCBIVE1MRG9jdW1l bnRQYXJzZXIqIGFzSFRNTFRva2VuaXplcigpIHsgcmV0dXJuIHRoaXM7IH0KKyAgICB2aXJ0dWFs IEhUTUxEb2N1bWVudFBhcnNlciogYXNIVE1MRG9jdW1lbnRQYXJzZXIoKSB7IHJldHVybiB0aGlz OyB9CiAKIHByaXZhdGU6CiAgICAgY2xhc3MgU3RhdGU7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2xv YWRlci9Eb2N1bWVudExvYWRlci5jcHAgYi9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5j cHAKaW5kZXggNmM0Zjc2YmI2MGE1YzU5YjUyYWMzN2RlYzU5NGUwYjI3NWIzYjA3My4uYTYyODUw Y2FjZDFkOGNjZTVkZjBmOWRlYzBjYTQzYmI1ZDQ3NDg1ZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9s b2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCisrKyBiL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9h ZGVyLmNwcApAQCAtMzkzLDggKzM5Myw4IEBAIGJvb2wgRG9jdW1lbnRMb2FkZXI6OmlzTG9hZGlu Z0luQVBJU2Vuc2UoKSBjb25zdAogICAgICAgICBEb2N1bWVudCogZG9jID0gbV9mcmFtZS0+ZG9j dW1lbnQoKTsKICAgICAgICAgaWYgKGRvYy0+ZG9jTG9hZGVyKCktPnJlcXVlc3RDb3VudCgpKQog ICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAgIGlmIChEb2N1bWVudFBhcnNlciogdG9r ID0gZG9jLT5wYXJzZXIoKSkKLSAgICAgICAgICAgIGlmICh0b2stPnByb2Nlc3NpbmdEYXRhKCkp CisgICAgICAgIGlmIChEb2N1bWVudFBhcnNlciogcGFyc2VyID0gZG9jLT5wYXJzZXIoKSkKKyAg ICAgICAgICAgIGlmIChwYXJzZXItPnByb2Nlc3NpbmdEYXRhKCkpCiAgICAgICAgICAgICAgICAg cmV0dXJuIHRydWU7CiAgICAgfQogICAgIHJldHVybiBmcmFtZUxvYWRlcigpLT5zdWJmcmFtZUlz TG9hZGluZygpOwo= 58607 2010-06-13 17:31:29 -0700 2010-06-13 21:44:39 -0700 Patch for landing bug-40513-20100613173118.patch text/plain 5265 eric ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ODZjNWY4MzM3OWExOWM4MDhjZjJmOTBjZmQ5ZjhlY2ZkMDkyN2RiYi4uMTIyMDk2MWZjNWI4ZmJi MTkzZTY2MmU3OGM2NDA4YmU4MmQ2NDVlZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTIsNiArMiwzMCBAQAogCiAgICAgICAgIFJldmll d2VkIGJ5IERhcmluIEFkbGVyLgogCisgICAgICAgIFJlbmFtZSB0b2ssIGFzSFRNTFRva2VuaXpl ciB0byBwYXJzZXIsIGFzSFRNTERvY3VtZW50UGFyc2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MDUxMworCisgICAgICAgIExhc3Qgc2V0IG9mIFRv a2VuaXplciByZWxhdGVkIHJlbmFtZXMsIGFsc28gZG9uZSB2aWEgZG8td2ViY29yZS1yZW5hbWU6 CisgICAgICAgIGFzSFRNTFRva2VuaXplciA9PiBhc0hUTUxEb2N1bWVudFBhcnNlcgorICAgICAg ICB0b2sgPT4gcGFyc2VyCisKKyAgICAgICAgTm8gZnVuY3Rpb25hbCBjaGFuZ2VzLCB0aHVzIG5v IHRlc3RzLgorCisgICAgICAgICogZG9tL0RvY3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkRvY3VtZW50Ojp3cml0ZSk6CisgICAgICAgICogZG9tL0RvY3VtZW50UGFyc2VyLmg6CisgICAg ICAgIChXZWJDb3JlOjpEb2N1bWVudFBhcnNlcjo6YXNIVE1MRG9jdW1lbnRQYXJzZXIpOgorICAg ICAgICAqIGh0bWwvSFRNTERvY3VtZW50UGFyc2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnBh cnNlSFRNTERvY3VtZW50RnJhZ21lbnQpOgorICAgICAgICAqIGh0bWwvSFRNTERvY3VtZW50UGFy c2VyLmg6CisgICAgICAgIChXZWJDb3JlOjpIVE1MRG9jdW1lbnRQYXJzZXI6OmFzSFRNTERvY3Vt ZW50UGFyc2VyKToKKyAgICAgICAgKiBsb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6RG9jdW1lbnRMb2FkZXI6OmlzTG9hZGluZ0luQVBJU2Vuc2UpOgorCisyMDEw LTA2LTExICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdl ZCBieSBEYXJpbiBBZGxlci4KKwogICAgICAgICBGaXggdGhlIHJlc3Qgb2YgdGhlIHJlZmVyZW5j ZXMgdG8gdGhlIG9sZCBUb2tlbml6ZXIgY2xhc3MgKG5vdyBEb2N1bWVudFBhcnNlcikKICAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQwNTEyCiAKZGlmZiAt LWdpdCBhL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCBiL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNw cAppbmRleCA0ZjQzMDU1NDJhMWUyODUwMjVmYjJiNTljYzY2OTU4NGE5ZDYxM2M2Li5hY2I1N2Uw ZjU4YzhhYzRkMjFlODM2ZmVkZTA4Njk1YmUzZWZkNzkzIDEwMDY0NAotLS0gYS9XZWJDb3JlL2Rv bS9Eb2N1bWVudC5jcHAKKysrIGIvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCkBAIC0xOTU5LDcg KzE5NTksNyBAQCB2b2lkIERvY3VtZW50Ojp3cml0ZShjb25zdCBTZWdtZW50ZWRTdHJpbmcmIHRl eHQsIERvY3VtZW50KiBvd25lckRvY3VtZW50KQogCiAgICAgQVNTRVJUKG1fcGFyc2VyKTsKICAg ICBib29sIHdhc0ZvcmNlZFN5bmNocm9ub3VzID0gZmFsc2U7Ci0gICAgSFRNTERvY3VtZW50UGFy c2VyKiBwYXJzZXIgPSBtX3BhcnNlci0+YXNIVE1MVG9rZW5pemVyKCk7CisgICAgSFRNTERvY3Vt ZW50UGFyc2VyKiBwYXJzZXIgPSBtX3BhcnNlci0+YXNIVE1MRG9jdW1lbnRQYXJzZXIoKTsKICAg ICBpZiAocGFyc2VyKSB7CiAgICAgICAgIHdhc0ZvcmNlZFN5bmNocm9ub3VzID0gcGFyc2VyLT5m b3JjZVN5bmNocm9ub3VzKCk7CiAgICAgICAgIHBhcnNlci0+c2V0Rm9yY2VTeW5jaHJvbm91cyh0 cnVlKTsKQEAgLTE5NjcsNyArMTk2Nyw3IEBAIHZvaWQgRG9jdW1lbnQ6OndyaXRlKGNvbnN0IFNl Z21lbnRlZFN0cmluZyYgdGV4dCwgRG9jdW1lbnQqIG93bmVyRG9jdW1lbnQpCiAKICAgICBtX3Bh cnNlci0+d3JpdGUodGV4dCwgZmFsc2UpOwogCi0gICAgaWYgKG1fcGFyc2VyICYmIHBhcnNlciAm JiBtX3BhcnNlci0+YXNIVE1MVG9rZW5pemVyKCkgPT0gcGFyc2VyKQorICAgIGlmIChtX3BhcnNl ciAmJiBwYXJzZXIgJiYgbV9wYXJzZXItPmFzSFRNTERvY3VtZW50UGFyc2VyKCkgPT0gcGFyc2Vy KQogICAgICAgICBwYXJzZXItPnNldEZvcmNlU3luY2hyb25vdXMod2FzRm9yY2VkU3luY2hyb25v dXMpOwogCiAjaWZkZWYgSU5TVFJVTUVOVF9MQVlPVVRfU0NIRURVTElORwpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9kb20vRG9jdW1lbnRQYXJzZXIuaCBiL1dlYkNvcmUvZG9tL0RvY3VtZW50UGFyc2Vy LmgKaW5kZXggNGUxOGM2NzkzNjAzMWI1Yjc5ZWE1MTM2ODRkZGY4NDNkNmU1NWJlZS4uMjM0YWU3 YzU0MjdkYzRkMGFjODJlNzhiYjRiOTQ5MTEzZTE3ZDUyNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9k b20vRG9jdW1lbnRQYXJzZXIuaAorKysgYi9XZWJDb3JlL2RvbS9Eb2N1bWVudFBhcnNlci5oCkBA IC01OSw3ICs1OSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgdmlydHVhbCB2b2lk IGV4ZWN1dGVTY3JpcHRzV2FpdGluZ0ZvclN0eWxlc2hlZXRzKCkge30KIAogICAgICAgICB2aXJ0 dWFsIEhUTUxQYXJzZXIqIGh0bWxQYXJzZXIoKSBjb25zdCB7IHJldHVybiAwOyB9Ci0gICAgICAg IHZpcnR1YWwgSFRNTERvY3VtZW50UGFyc2VyKiBhc0hUTUxUb2tlbml6ZXIoKSB7IHJldHVybiAw OyB9CisgICAgICAgIHZpcnR1YWwgSFRNTERvY3VtZW50UGFyc2VyKiBhc0hUTUxEb2N1bWVudFBh cnNlcigpIHsgcmV0dXJuIDA7IH0KIAogICAgICAgICBYU1NBdWRpdG9yKiB4c3NBdWRpdG9yKCkg Y29uc3QgeyByZXR1cm4gbV9YU1NBdWRpdG9yOyB9CiAgICAgICAgIHZvaWQgc2V0WFNTQXVkaXRv cihYU1NBdWRpdG9yKiBhdWRpdG9yKSB7IG1fWFNTQXVkaXRvciA9IGF1ZGl0b3I7IH0KZGlmZiAt LWdpdCBhL1dlYkNvcmUvaHRtbC9IVE1MRG9jdW1lbnRQYXJzZXIuY3BwIGIvV2ViQ29yZS9odG1s L0hUTUxEb2N1bWVudFBhcnNlci5jcHAKaW5kZXggMGIyOWRjOWNkMWVlZDg5NzkzNzE3NmJiNmFi NjhkM2JlZjIwYjU2ZC4uYjFlZDY0OWUxY2UxNDk3OWZlNjRjZDdhZmFkODg1ZjQzNzQyZGE2YSAx MDA2NDQKLS0tIGEvV2ViQ29yZS9odG1sL0hUTUxEb2N1bWVudFBhcnNlci5jcHAKKysrIGIvV2Vi Q29yZS9odG1sL0hUTUxEb2N1bWVudFBhcnNlci5jcHAKQEAgLTIwOTcsMTEgKzIwOTcsMTEgQEAg dm9pZCBIVE1MRG9jdW1lbnRQYXJzZXI6OnNldFNyYyhjb25zdCBTZWdtZW50ZWRTdHJpbmcmIHNv dXJjZSkKIAogdm9pZCBwYXJzZUhUTUxEb2N1bWVudEZyYWdtZW50KGNvbnN0IFN0cmluZyYgc291 cmNlLCBEb2N1bWVudEZyYWdtZW50KiBmcmFnbWVudCwgRnJhZ21lbnRTY3JpcHRpbmdQZXJtaXNz aW9uIHNjcmlwdGluZ1Blcm1pc3Npb24pCiB7Ci0gICAgSFRNTERvY3VtZW50UGFyc2VyIHRvayhm cmFnbWVudCwgc2NyaXB0aW5nUGVybWlzc2lvbik7Ci0gICAgdG9rLnNldEZvcmNlU3luY2hyb25v dXModHJ1ZSk7Ci0gICAgdG9rLndyaXRlKHNvdXJjZSwgdHJ1ZSk7Ci0gICAgdG9rLmZpbmlzaCgp OwotICAgIEFTU0VSVCghdG9rLnByb2Nlc3NpbmdEYXRhKCkpOyAgICAgIC8vIG1ha2Ugc3VyZSB3 ZSdyZSBkb25lIChzZWUgMzk2MzE1MSkKKyAgICBIVE1MRG9jdW1lbnRQYXJzZXIgcGFyc2VyKGZy YWdtZW50LCBzY3JpcHRpbmdQZXJtaXNzaW9uKTsKKyAgICBwYXJzZXIuc2V0Rm9yY2VTeW5jaHJv bm91cyh0cnVlKTsKKyAgICBwYXJzZXIud3JpdGUoc291cmNlLCB0cnVlKTsKKyAgICBwYXJzZXIu ZmluaXNoKCk7CisgICAgQVNTRVJUKCFwYXJzZXIucHJvY2Vzc2luZ0RhdGEoKSk7ICAgICAgLy8g bWFrZSBzdXJlIHdlJ3JlIGRvbmUgKHNlZSAzOTYzMTUxKQogfQogCiBVQ2hhciBkZWNvZGVOYW1l ZEVudGl0eShjb25zdCBjaGFyKiBuYW1lKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1sL0hUTUxE b2N1bWVudFBhcnNlci5oIGIvV2ViQ29yZS9odG1sL0hUTUxEb2N1bWVudFBhcnNlci5oCmluZGV4 IDljY2ViZTVkYzE3NjY4ZjMwODJkZWU1YmI3ZWJmZDlmMzkxZDIxNmMuLjA5NTFjMmEzNThkMGQ4 MTQxNjc5MjkzMWUxNjAxYTI5NDFiMmFmMWMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1M RG9jdW1lbnRQYXJzZXIuaAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTERvY3VtZW50UGFyc2VyLmgK QEAgLTE2NCw3ICsxNjQsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGV4ZWN1dGVTY3Jp cHRzV2FpdGluZ0ZvclN0eWxlc2hlZXRzKCk7CiAKICAgICB2aXJ0dWFsIEhUTUxQYXJzZXIqIGh0 bWxQYXJzZXIoKSBjb25zdCB7IHJldHVybiBtX3BhcnNlci5nZXQoKTsgfQotICAgIHZpcnR1YWwg SFRNTERvY3VtZW50UGFyc2VyKiBhc0hUTUxUb2tlbml6ZXIoKSB7IHJldHVybiB0aGlzOyB9Cisg ICAgdmlydHVhbCBIVE1MRG9jdW1lbnRQYXJzZXIqIGFzSFRNTERvY3VtZW50UGFyc2VyKCkgeyBy ZXR1cm4gdGhpczsgfQogCiBwcml2YXRlOgogICAgIGNsYXNzIFN0YXRlOwpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwIGIvV2ViQ29yZS9sb2FkZXIvRG9jdW1l bnRMb2FkZXIuY3BwCmluZGV4IDZjNGY3NmJiNjBhNWM1OWI1MmFjMzdkZWM1OTRlMGIyNzViM2Iw NzMuLmE2Mjg1MGNhY2QxZDhjY2U1ZGYwZjlkZWMwY2E0M2JiNWQ0NzQ4NWYgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcAorKysgYi9XZWJDb3JlL2xvYWRlci9E b2N1bWVudExvYWRlci5jcHAKQEAgLTM5Myw4ICszOTMsOCBAQCBib29sIERvY3VtZW50TG9hZGVy Ojppc0xvYWRpbmdJbkFQSVNlbnNlKCkgY29uc3QKICAgICAgICAgRG9jdW1lbnQqIGRvYyA9IG1f ZnJhbWUtPmRvY3VtZW50KCk7CiAgICAgICAgIGlmIChkb2MtPmRvY0xvYWRlcigpLT5yZXF1ZXN0 Q291bnQoKSkKICAgICAgICAgICAgIHJldHVybiB0cnVlOwotICAgICAgICBpZiAoRG9jdW1lbnRQ YXJzZXIqIHRvayA9IGRvYy0+cGFyc2VyKCkpCi0gICAgICAgICAgICBpZiAodG9rLT5wcm9jZXNz aW5nRGF0YSgpKQorICAgICAgICBpZiAoRG9jdW1lbnRQYXJzZXIqIHBhcnNlciA9IGRvYy0+cGFy c2VyKCkpCisgICAgICAgICAgICBpZiAocGFyc2VyLT5wcm9jZXNzaW5nRGF0YSgpKQogICAgICAg ICAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KICAgICByZXR1cm4gZnJhbWVMb2FkZXIoKS0+ c3ViZnJhbWVJc0xvYWRpbmcoKTsK