84328 2012-04-19 04:33:58 -0700 Media Stream API: Piece of code cleanup for the chromium port 2012-04-19 20:29:58 -0700 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) All All RESOLVED FIXED P3 Normal --- 0 yujie.mao webkit-unassigned abarth dglazkov eric.carlson eric feature-media-reviews fishd jamesr rniwa tkent tkent+wkapi tommyw webkit.review.bot oldest_to_newest 605494 0 137877 yujie.mao 2012-04-19 04:33:58 -0700 Created attachment 137877 Patch Remove some dead code, please see the attachment. 605496 1 webkit.review.bot 2012-04-19 04:35:56 -0700 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 605498 2 137877 webkit.review.bot 2012-04-19 04:39:32 -0700 Comment on attachment 137877 Patch Attachment 137877 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/12297282 605508 3 137880 yujie.mao 2012-04-19 05:12:13 -0700 Created attachment 137880 Patch 605510 4 137881 yujie.mao 2012-04-19 05:16:17 -0700 Created attachment 137881 Patch Fix a typo 606075 5 137881 tkent 2012-04-19 16:04:31 -0700 Comment on attachment 137881 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=137881&action=review > Tools/DumpRenderTree/chromium/WebUserMediaClientMock.h:53 > + virtual void requestUserMedia(const WebUserMediaRequest&, const WebVector<WebMediaStreamSource>&, const WebVector<WebMediaStreamSource>&); We had better append 'OVERRIDE' to this. 606269 6 138023 yujie.mao 2012-04-19 18:36:05 -0700 Created attachment 138023 Patch 606272 7 yujie.mao 2012-04-19 18:36:57 -0700 (In reply to comment #5) > (From update of attachment 137881 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=137881&action=review > > > Tools/DumpRenderTree/chromium/WebUserMediaClientMock.h:53 > > + virtual void requestUserMedia(const WebUserMediaRequest&, const WebVector<WebMediaStreamSource>&, const WebVector<WebMediaStreamSource>&); > > We had better append 'OVERRIDE' to this. Fixed 606274 8 137881 tkent 2012-04-19 18:39:39 -0700 Comment on attachment 137881 Patch please use "webkit-patch upload" to upload a patch. 606275 9 138023 webkit.review.bot 2012-04-19 18:40:40 -0700 Comment on attachment 138023 Patch Rejecting attachment 138023 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 1 Last 500 characters of output: r_text(self._author_text) File "/mnt/git/webkit-commit-queue/Tools/Scripts/webkitpy/common/checkout/changelog.py", line 156, in _parse_author_text return [ChangeLogEntry._parse_author_name_and_email(author) for author in authors] File "/mnt/git/webkit-commit-queue/Tools/Scripts/webkitpy/common/checkout/changelog.py", line 148, in _parse_author_name_and_email return {'name': match.group("name"), 'email': match.group("email")} AttributeError: 'NoneType' object has no attribute 'group' Full output: http://queues.webkit.org/results/12460092 606292 10 138026 yujie.mao 2012-04-19 19:18:07 -0700 Created attachment 138026 Patch 606298 11 138026 tkent 2012-04-19 19:30:43 -0700 Comment on attachment 138026 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=138026&action=review > Source/WebKit/chromium/ChangeLog:1 > +2012-04-19 Mao, Yujie <yujie.mao@intel.com> Unfortunately our tool doesn't accept ',' in a person name. 606299 12 eric 2012-04-19 19:32:40 -0700 Looks like a bug in webkitpy's ChangeLog handling code. 606306 13 yujie.mao 2012-04-19 19:42:04 -0700 (In reply to comment #11) > (From update of attachment 138026 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=138026&action=review > > > Source/WebKit/chromium/ChangeLog:1 > > +2012-04-19 Mao, Yujie <yujie.mao@intel.com> > > Unfortunately our tool doesn't accept ',' in a person name. :) It's ok, I will remove ',' in my name. 606308 14 138030 yujie.mao 2012-04-19 19:48:25 -0700 Created attachment 138030 Patch 606327 15 138030 webkit.review.bot 2012-04-19 20:29:52 -0700 Comment on attachment 138030 Patch Clearing flags on attachment: 138030 Committed r114714: <http://trac.webkit.org/changeset/114714> 606328 16 webkit.review.bot 2012-04-19 20:29:58 -0700 All reviewed patches have been landed. Closing bug. 137877 2012-04-19 04:33:58 -0700 2012-04-19 05:12:13 -0700 Patch cleanup.patch text/plain 3416 yujie.mao ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlVzZXJNZWRpYUNs aWVudC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVXNlck1lZGlhQ2xpZW50 LmgKaW5kZXggMjk5ODE1OS4uYmJkZWExOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9wdWJsaWMvV2ViVXNlck1lZGlhQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJv bWl1bS9wdWJsaWMvV2ViVXNlck1lZGlhQ2xpZW50LmgKQEAgLTQxLDkgKzQxLDYgQEAgY2xhc3Mg V2ViVXNlck1lZGlhQ2xpZW50IHsKIHB1YmxpYzoKICAgICB2aXJ0dWFsIH5XZWJVc2VyTWVkaWFD bGllbnQoKSB7IH0KIAotICAgIC8vIERFUFJFQ0FURUQKLSAgICB2aXJ0dWFsIHZvaWQgcmVxdWVz dFVzZXJNZWRpYShjb25zdCBXZWJVc2VyTWVkaWFSZXF1ZXN0JiwgY29uc3QgV2ViVmVjdG9yPFdl Yk1lZGlhU3RyZWFtU291cmNlPiYpIHsgfQotCiAgICAgdmlydHVhbCB2b2lkIHJlcXVlc3RVc2Vy TWVkaWEoY29uc3QgV2ViVXNlck1lZGlhUmVxdWVzdCYsIGNvbnN0IFdlYlZlY3RvcjxXZWJNZWRp YVN0cmVhbVNvdXJjZT4mIGF1ZGlvU291cmNlcywgY29uc3QgV2ViVmVjdG9yPFdlYk1lZGlhU3Ry ZWFtU291cmNlPiYgdmlkZW9Tb3VyY2VzKSB7IH0KIAogICAgIHZpcnR1YWwgdm9pZCBjYW5jZWxV c2VyTWVkaWFSZXF1ZXN0KGNvbnN0IFdlYlVzZXJNZWRpYVJlcXVlc3QmKSA9IDA7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJVc2VyTWVkaWFSZXF1ZXN0Lmgg Yi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJVc2VyTWVkaWFSZXF1ZXN0LmgKaW5k ZXggN2Q4NGNkYy4uYjlhNGZlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9w dWJsaWMvV2ViVXNlck1lZGlhUmVxdWVzdC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v cHVibGljL1dlYlVzZXJNZWRpYVJlcXVlc3QuaApAQCAtNjgsOSArNjgsNiBAQCBwdWJsaWM6CiAg ICAgV0VCS0lUX0VYUE9SVCBib29sIGNhbWVyYVByZWZlcmVuY2VFbnZpcm9ubWVudCgpIGNvbnN0 OwogICAgIFdFQktJVF9FWFBPUlQgV2ViU2VjdXJpdHlPcmlnaW4gc2VjdXJpdHlPcmlnaW4oKSBj b25zdDsKIAotICAgIC8vIERFUFJFQ0FURUQKLSAgICBXRUJLSVRfRVhQT1JUIHZvaWQgcmVxdWVz dFN1Y2NlZWRlZChjb25zdCBXZWJWZWN0b3I8V2ViTWVkaWFTdHJlYW1Tb3VyY2U+Jik7Ci0KICAg ICBXRUJLSVRfRVhQT1JUIHZvaWQgcmVxdWVzdFN1Y2NlZWRlZChjb25zdCBXZWJWZWN0b3I8V2Vi TWVkaWFTdHJlYW1Tb3VyY2U+JiBhdWRpb1NvdXJjZXMsIGNvbnN0IFdlYlZlY3RvcjxXZWJNZWRp YVN0cmVhbVNvdXJjZT4mIHZpZGVvU291cmNlcyk7CiAgICAgV0VCS0lUX0VYUE9SVCB2b2lkIHJl cXVlc3RGYWlsZWQoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv VXNlck1lZGlhQ2xpZW50SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Vc2Vy TWVkaWFDbGllbnRJbXBsLmNwcAppbmRleCA5YzBiZjU4Li5jYThhOThkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Vc2VyTWVkaWFDbGllbnRJbXBsLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Vc2VyTWVkaWFDbGllbnRJbXBsLmNwcApAQCAtNTgs MTIgKzU4LDYgQEAgdm9pZCBVc2VyTWVkaWFDbGllbnRJbXBsOjpyZXF1ZXN0VXNlck1lZGlhKFBh c3NSZWZQdHI8VXNlck1lZGlhUmVxdWVzdD4gcHJwUmVxdWUKICAgICBpZiAobV9jbGllbnQpIHsK ICAgICAgICAgUmVmUHRyPFVzZXJNZWRpYVJlcXVlc3Q+IHJlcXVlc3QgPSBwcnBSZXF1ZXN0Owog Ci0gICAgICAgIC8vIEZJWE1FOiBDbGVhbnVwIHdoZW4gdGhlIGNocm9taXVtIGNvZGUgaGFzIHN3 aXRjaGVkIHRvIHRoZSBzcGxpdCBzb3VyY2VzIGltcGxlbWVudGF0aW9uLgotICAgICAgICBNZWRp YVN0cmVhbVNvdXJjZVZlY3RvciBjb21iaW5lZFNvdXJjZXM7Ci0gICAgICAgIGNvbWJpbmVkU291 cmNlcy5hcHBlbmQoYXVkaW9Tb3VyY2VzKTsKLSAgICAgICAgY29tYmluZWRTb3VyY2VzLmFwcGVu ZCh2aWRlb1NvdXJjZXMpOwotICAgICAgICBtX2NsaWVudC0+cmVxdWVzdFVzZXJNZWRpYShQYXNz UmVmUHRyPFVzZXJNZWRpYVJlcXVlc3Q+KHJlcXVlc3QuZ2V0KCkpLCBjb21iaW5lZFNvdXJjZXMp OwotCiAgICAgICAgIG1fY2xpZW50LT5yZXF1ZXN0VXNlck1lZGlhKHJlcXVlc3QucmVsZWFzZSgp LCBhdWRpb1NvdXJjZXMsIHZpZGVvU291cmNlcyk7CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVXNlck1lZGlhUmVxdWVzdC5jcHAgYi9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJVc2VyTWVkaWFSZXF1ZXN0LmNwcAppbmRleCA1YTc2Yzgz Li5hNzg1MzJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJVc2Vy TWVkaWFSZXF1ZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJVc2Vy TWVkaWFSZXF1ZXN0LmNwcApAQCAtMTA1LDI0ICsxMDUsNiBAQCB2b2lkIFdlYlVzZXJNZWRpYVJl cXVlc3Q6OnJlcXVlc3RTdWNjZWVkZWQoY29uc3QgV2ViVmVjdG9yPFdlYk1lZGlhU3RyZWFtU291 cmNlPgogICAgIG1fcHJpdmF0ZS0+c3VjY2VlZChhdWRpbywgdmlkZW8pOwogfQogCi0vLyBGSVhN RTogQ2xlYW51cCB3aGVuIHRoZSBjaHJvbWl1bSBjb2RlIGhhcyBzd2l0Y2hlZCB0byB0aGUgc3Bs aXQgc291cmNlcyBpbXBsZW1lbnRhdGlvbi4KLXZvaWQgV2ViVXNlck1lZGlhUmVxdWVzdDo6cmVx dWVzdFN1Y2NlZWRlZChjb25zdCBXZWJWZWN0b3I8V2ViTWVkaWFTdHJlYW1Tb3VyY2U+JiBzb3Vy Y2VzKQotewotICAgIGlmIChtX3ByaXZhdGUuaXNOdWxsKCkpCi0gICAgICAgIHJldHVybjsKLQot ICAgIE1lZGlhU3RyZWFtU291cmNlVmVjdG9yIGF1ZGlvLCB2aWRlbzsKLSAgICBmb3IgKHNpemVf dCBpID0gMDsgaSA8IHNvdXJjZXMuc2l6ZSgpOyArK2kpIHsKLSAgICAgICAgTWVkaWFTdHJlYW1T b3VyY2UqIGN1cnIgPSBzb3VyY2VzW2ldOwotICAgICAgICBpZiAoY3Vyci0+dHlwZSgpID09IE1l ZGlhU3RyZWFtU291cmNlOjpUeXBlQXVkaW8pCi0gICAgICAgICAgICBhdWRpby5hcHBlbmQoY3Vy cik7Ci0gICAgICAgIGVsc2UgaWYgKGN1cnItPnR5cGUoKSA9PSBNZWRpYVN0cmVhbVNvdXJjZTo6 VHlwZVZpZGVvKQotICAgICAgICAgICAgdmlkZW8uYXBwZW5kKGN1cnIpOwotICAgIH0KLQotICAg IG1fcHJpdmF0ZS0+c3VjY2VlZChhdWRpbywgdmlkZW8pOwotfQotCiB2b2lkIFdlYlVzZXJNZWRp YVJlcXVlc3Q6OnJlcXVlc3RGYWlsZWQoKQogewogICAgIG1fcHJpdmF0ZS0+ZmFpbCgpOwo= 137880 2012-04-19 05:12:13 -0700 2012-04-19 16:04:47 -0700 Patch cleanup.patch text/plain 7328 yujie.mao ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggNzYwY2RhNS4uYmNiY2UyMSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMi0wNC0xOSAgTWFvLCBZdWpp ZSAgPHl1amllLm1hb0BpbnRlbC5jb20+CisKKyAgICAgICAgW0Nocm9taXVtXSBSZW1vdmUgcGll Y2Ugb2YgZGVhbCBjb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD04NDMyOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIE5vIG5ldyB0ZXN0cy4gTm8gYmVoYXZpb3IgY2hhbmdlcy4KKworICAgICAgICAqIHB1 YmxpYy9XZWJVc2VyTWVkaWFDbGllbnQuaDoKKyAgICAgICAgKiBwdWJsaWMvV2ViVXNlck1lZGlh UmVxdWVzdC5oOgorICAgICAgICAoV2ViVXNlck1lZGlhUmVxdWVzdCk6CisgICAgICAgICogc3Jj L1VzZXJNZWRpYUNsaWVudEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpVc2VyTWVkaWFDbGll bnRJbXBsOjpyZXF1ZXN0VXNlck1lZGlhKToKKyAgICAgICAgKiBzcmMvV2ViVXNlck1lZGlhUmVx dWVzdC5jcHA6CisKIDIwMTItMDQtMTcgIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFtDaHJvbWl1bV0gQ2FsZW5kYXIgUGlja2VyOiBQb3B1cCBwb3NpdGlvbiBp cyB3cm9uZyB3aGVuIHRoZXJlIGFyZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9wdWJsaWMvV2ViVXNlck1lZGlhQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1 YmxpYy9XZWJVc2VyTWVkaWFDbGllbnQuaAppbmRleCAyOTk4MTU5Li5iYmRlYTE4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJVc2VyTWVkaWFDbGllbnQuaAor KysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJVc2VyTWVkaWFDbGllbnQuaApA QCAtNDEsOSArNDEsNiBAQCBjbGFzcyBXZWJVc2VyTWVkaWFDbGllbnQgewogcHVibGljOgogICAg IHZpcnR1YWwgfldlYlVzZXJNZWRpYUNsaWVudCgpIHsgfQogCi0gICAgLy8gREVQUkVDQVRFRAot ICAgIHZpcnR1YWwgdm9pZCByZXF1ZXN0VXNlck1lZGlhKGNvbnN0IFdlYlVzZXJNZWRpYVJlcXVl c3QmLCBjb25zdCBXZWJWZWN0b3I8V2ViTWVkaWFTdHJlYW1Tb3VyY2U+JikgeyB9Ci0KICAgICB2 aXJ0dWFsIHZvaWQgcmVxdWVzdFVzZXJNZWRpYShjb25zdCBXZWJVc2VyTWVkaWFSZXF1ZXN0Jiwg Y29uc3QgV2ViVmVjdG9yPFdlYk1lZGlhU3RyZWFtU291cmNlPiYgYXVkaW9Tb3VyY2VzLCBjb25z dCBXZWJWZWN0b3I8V2ViTWVkaWFTdHJlYW1Tb3VyY2U+JiB2aWRlb1NvdXJjZXMpIHsgfQogCiAg ICAgdmlydHVhbCB2b2lkIGNhbmNlbFVzZXJNZWRpYVJlcXVlc3QoY29uc3QgV2ViVXNlck1lZGlh UmVxdWVzdCYpID0gMDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGlj L1dlYlVzZXJNZWRpYVJlcXVlc3QuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dl YlVzZXJNZWRpYVJlcXVlc3QuaAppbmRleCA3ZDg0Y2RjLi5iOWE0ZmVkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJVc2VyTWVkaWFSZXF1ZXN0LmgKKysrIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVXNlck1lZGlhUmVxdWVzdC5oCkBAIC02 OCw5ICs2OCw2IEBAIHB1YmxpYzoKICAgICBXRUJLSVRfRVhQT1JUIGJvb2wgY2FtZXJhUHJlZmVy ZW5jZUVudmlyb25tZW50KCkgY29uc3Q7CiAgICAgV0VCS0lUX0VYUE9SVCBXZWJTZWN1cml0eU9y aWdpbiBzZWN1cml0eU9yaWdpbigpIGNvbnN0OwogCi0gICAgLy8gREVQUkVDQVRFRAotICAgIFdF QktJVF9FWFBPUlQgdm9pZCByZXF1ZXN0U3VjY2VlZGVkKGNvbnN0IFdlYlZlY3RvcjxXZWJNZWRp YVN0cmVhbVNvdXJjZT4mKTsKLQogICAgIFdFQktJVF9FWFBPUlQgdm9pZCByZXF1ZXN0U3VjY2Vl ZGVkKGNvbnN0IFdlYlZlY3RvcjxXZWJNZWRpYVN0cmVhbVNvdXJjZT4mIGF1ZGlvU291cmNlcywg Y29uc3QgV2ViVmVjdG9yPFdlYk1lZGlhU3RyZWFtU291cmNlPiYgdmlkZW9Tb3VyY2VzKTsKICAg ICBXRUJLSVRfRVhQT1JUIHZvaWQgcmVxdWVzdEZhaWxlZCgpOwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Vc2VyTWVkaWFDbGllbnRJbXBsLmNwcCBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL1VzZXJNZWRpYUNsaWVudEltcGwuY3BwCmluZGV4IDljMGJmNTgu LmNhOGE5OGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1VzZXJNZWRp YUNsaWVudEltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1VzZXJNZWRp YUNsaWVudEltcGwuY3BwCkBAIC01OCwxMiArNTgsNiBAQCB2b2lkIFVzZXJNZWRpYUNsaWVudElt cGw6OnJlcXVlc3RVc2VyTWVkaWEoUGFzc1JlZlB0cjxVc2VyTWVkaWFSZXF1ZXN0PiBwcnBSZXF1 ZQogICAgIGlmIChtX2NsaWVudCkgewogICAgICAgICBSZWZQdHI8VXNlck1lZGlhUmVxdWVzdD4g cmVxdWVzdCA9IHBycFJlcXVlc3Q7CiAKLSAgICAgICAgLy8gRklYTUU6IENsZWFudXAgd2hlbiB0 aGUgY2hyb21pdW0gY29kZSBoYXMgc3dpdGNoZWQgdG8gdGhlIHNwbGl0IHNvdXJjZXMgaW1wbGVt ZW50YXRpb24uCi0gICAgICAgIE1lZGlhU3RyZWFtU291cmNlVmVjdG9yIGNvbWJpbmVkU291cmNl czsKLSAgICAgICAgY29tYmluZWRTb3VyY2VzLmFwcGVuZChhdWRpb1NvdXJjZXMpOwotICAgICAg ICBjb21iaW5lZFNvdXJjZXMuYXBwZW5kKHZpZGVvU291cmNlcyk7Ci0gICAgICAgIG1fY2xpZW50 LT5yZXF1ZXN0VXNlck1lZGlhKFBhc3NSZWZQdHI8VXNlck1lZGlhUmVxdWVzdD4ocmVxdWVzdC5n ZXQoKSksIGNvbWJpbmVkU291cmNlcyk7Ci0KICAgICAgICAgbV9jbGllbnQtPnJlcXVlc3RVc2Vy TWVkaWEocmVxdWVzdC5yZWxlYXNlKCksIGF1ZGlvU291cmNlcywgdmlkZW9Tb3VyY2VzKTsKICAg ICB9CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJVc2VyTWVk aWFSZXF1ZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlVzZXJNZWRpYVJl cXVlc3QuY3BwCmluZGV4IDVhNzZjODMuLmE3ODUzMmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYlVzZXJNZWRpYVJlcXVlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYlVzZXJNZWRpYVJlcXVlc3QuY3BwCkBAIC0xMDUsMjQgKzEwNSw2 IEBAIHZvaWQgV2ViVXNlck1lZGlhUmVxdWVzdDo6cmVxdWVzdFN1Y2NlZWRlZChjb25zdCBXZWJW ZWN0b3I8V2ViTWVkaWFTdHJlYW1Tb3VyY2U+CiAgICAgbV9wcml2YXRlLT5zdWNjZWVkKGF1ZGlv LCB2aWRlbyk7CiB9CiAKLS8vIEZJWE1FOiBDbGVhbnVwIHdoZW4gdGhlIGNocm9taXVtIGNvZGUg aGFzIHN3aXRjaGVkIHRvIHRoZSBzcGxpdCBzb3VyY2VzIGltcGxlbWVudGF0aW9uLgotdm9pZCBX ZWJVc2VyTWVkaWFSZXF1ZXN0OjpyZXF1ZXN0U3VjY2VlZGVkKGNvbnN0IFdlYlZlY3RvcjxXZWJN ZWRpYVN0cmVhbVNvdXJjZT4mIHNvdXJjZXMpCi17Ci0gICAgaWYgKG1fcHJpdmF0ZS5pc051bGwo KSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgTWVkaWFTdHJlYW1Tb3VyY2VWZWN0b3IgYXVkaW8s IHZpZGVvOwotICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgc291cmNlcy5zaXplKCk7ICsraSkg ewotICAgICAgICBNZWRpYVN0cmVhbVNvdXJjZSogY3VyciA9IHNvdXJjZXNbaV07Ci0gICAgICAg IGlmIChjdXJyLT50eXBlKCkgPT0gTWVkaWFTdHJlYW1Tb3VyY2U6OlR5cGVBdWRpbykKLSAgICAg ICAgICAgIGF1ZGlvLmFwcGVuZChjdXJyKTsKLSAgICAgICAgZWxzZSBpZiAoY3Vyci0+dHlwZSgp ID09IE1lZGlhU3RyZWFtU291cmNlOjpUeXBlVmlkZW8pCi0gICAgICAgICAgICB2aWRlby5hcHBl bmQoY3Vycik7Ci0gICAgfQotCi0gICAgbV9wcml2YXRlLT5zdWNjZWVkKGF1ZGlvLCB2aWRlbyk7 Ci19Ci0KIHZvaWQgV2ViVXNlck1lZGlhUmVxdWVzdDo6cmVxdWVzdEZhaWxlZCgpCiB7CiAgICAg bV9wcml2YXRlLT5mYWlsKCk7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9D aGFuZ2VMb2cKaW5kZXggMWFjNDFhZS4uMTdmZmJkNyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdl TG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA0LTE5ICBN YW8sIFl1amllICA8eXVqaWUubWFvQGludGVsLmNvbT4KKworICAgICAgICBbQ2hyb21pdW1dIE1v ZGlmeSB0ZXN0IGNhc2UgdG8gc3luYyB3aXRoIG5ldyBwdWJsaWMgQVBJCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDMyOAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21p dW0vV2ViVXNlck1lZGlhQ2xpZW50TW9jay5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlVzZXJN ZWRpYUNsaWVudE1vY2s6OnJlcXVlc3RVc2VyTWVkaWEpOgorICAgICAgICAqIER1bXBSZW5kZXJU cmVlL2Nocm9taXVtL1dlYlVzZXJNZWRpYUNsaWVudE1vY2suaDoKKyAgICAgICAgKFdlYlVzZXJN ZWRpYUNsaWVudE1vY2spOgorCiAyMDEyLTA0LTE3ICBDaHJpc3RvcGhlIER1bWV6ICA8Y2hyaXN0 b3BoZS5kdW1lekBpbnRlbC5jb20+CiAKICAgICAgICAgW0VGTF0gRFJUIHNob3VsZCBzdXBwb3J0 IExheW91dFRlc3RDb250cm9sbGVyJ3MgZHVtcEZyYW1lTG9hZENhbGxiYWNrcygpCmRpZmYgLS1n aXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJVc2VyTWVkaWFDbGllbnRNb2Nr LmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlVzZXJNZWRpYUNsaWVudE1v Y2suY3BwCmluZGV4IDI0ZmMxNDQuLjcyMjE5MjMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5k ZXJUcmVlL2Nocm9taXVtL1dlYlVzZXJNZWRpYUNsaWVudE1vY2suY3BwCisrKyBiL1Rvb2xzL0R1 bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlVzZXJNZWRpYUNsaWVudE1vY2suY3BwCkBAIC02NSwx NyArNjUsMjAgQEAgYm9vbCBXZWJVc2VyTWVkaWFDbGllbnRNb2NrOjpJc01vY2tTdHJlYW0oY29u c3QgV2ViVVJMJiB1cmwpCiAgICAgcmV0dXJuIHRyYWNrSWQuZXF1YWxzKCJtZWRpYXN0cmVhbXRl c3QiKTsKIH0KIAotdm9pZCBXZWJVc2VyTWVkaWFDbGllbnRNb2NrOjpyZXF1ZXN0VXNlck1lZGlh KGNvbnN0IFdlYlVzZXJNZWRpYVJlcXVlc3QmIHN0cmVhbVJlcXVlc3QsIGNvbnN0IFdlYlZlY3Rv cjxXZWJNZWRpYVN0cmVhbVNvdXJjZT4mIHN0cmVhbVNvdXJjZVZlY3RvcikKK3ZvaWQgV2ViVXNl ck1lZGlhQ2xpZW50TW9jazo6cmVxdWVzdFVzZXJNZWRpYShjb25zdCBXZWJVc2VyTWVkaWFSZXF1 ZXN0JiBzdHJlYW1SZXF1ZXN0LCBjb25zdCBXZWJWZWN0b3I8V2ViTWVkaWFTdHJlYW1Tb3VyY2U+ JiBhdWRpb1NvdXJjZXNWZWN0b3IsIGNvbnN0IFdlYlZlY3RvcjxXZWJNZWRpYVN0cmVhbVNvdXJj ZT4mIHZpZGVvU291cmNlc1ZlY3RvcikKIHsKICAgICBBU1NFUlQoIXN0cmVhbVJlcXVlc3QuaXNO dWxsKCkpOwogCiAgICAgV2ViVXNlck1lZGlhUmVxdWVzdCByZXF1ZXN0ID0gc3RyZWFtUmVxdWVz dDsKICAgICBjb25zdCBzaXplX3Qgc2l6ZSA9IDE7Ci0gICAgV2ViVmVjdG9yPFdlYk1lZGlhU3Ry ZWFtU291cmNlPiBzb3VyY2VWZWN0b3Ioc2l6ZSk7CisgICAgV2ViVmVjdG9yPFdlYk1lZGlhU3Ry ZWFtU291cmNlPiBhdWRpb1NvdXJjZXMoc2l6ZSk7CisgICAgV2ViVmVjdG9yPFdlYk1lZGlhU3Ry ZWFtU291cmNlPiB2aWRlb1NvdXJjZXMoc2l6ZSk7CiAgICAgV2ViU3RyaW5nIHRyYWNrSWQoIm1l ZGlhc3RyZWFtdGVzdCIpOwotICAgIFdlYlN0cmluZyB0cmFja05hbWUoIlZpZGVvQ2FwdHVyZSIp OwotICAgIHNvdXJjZVZlY3RvclswXS5pbml0aWFsaXplKHRyYWNrSWQsIFdlYk1lZGlhU3RyZWFt U291cmNlOjpUeXBlVmlkZW8sIHRyYWNrTmFtZSk7Ci0gICAgcmVxdWVzdC5yZXF1ZXN0U3VjY2Vl ZGVkKHNvdXJjZVZlY3Rvcik7CisgICAgV2ViU3RyaW5nIGF1ZGlvVHJhY2tOYW1lKCJBdWRpb1Jl Y29yZCIpOworICAgIFdlYlN0cmluZyB2aWRlb1RyYWNrTmFtZSgiVmlkZW9DYXB0dXJlIik7Cisg ICAgYXVkaW9Tb3VyY2VzWzBdLmluaXRpYWxpemUodHJhY2tJZCwgV2ViTWVkaWFTdHJlYW1Tb3Vy Y2U6OlR5cGVBdWRpbywgYXVkaW9UcmFja05hbWUpOworICAgIHZpZGVvU291cmNlc1swXS5pbml0 aWFsaXplKHRyYWNrSWQsIFdlYk1lZGlhU3RyZWFtU291cmNlOjpUeXBlVmlkZW8sIHZpZGVvVHJh Y2tOYW1lKTsKKyAgICByZXF1ZXN0LnJlcXVlc3RTdWNjZWVkZWQoYXVkaW9Tb3VyY2VzLCB2aWRl b1NvdXJjZXMpOwogfQogCiB2b2lkIFdlYlVzZXJNZWRpYUNsaWVudE1vY2s6OmNhbmNlbFVzZXJN ZWRpYVJlcXVlc3QoY29uc3QgV2ViVXNlck1lZGlhUmVxdWVzdCYpCmRpZmYgLS1naXQgYS9Ub29s cy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJVc2VyTWVkaWFDbGllbnRNb2NrLmggYi9Ub29s cy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJVc2VyTWVkaWFDbGllbnRNb2NrLmgKaW5kZXgg MTk0MmUzYi4uNWM2ZDlhMyAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21p dW0vV2ViVXNlck1lZGlhQ2xpZW50TW9jay5oCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2No cm9taXVtL1dlYlVzZXJNZWRpYUNsaWVudE1vY2suaApAQCAtNTAsNyArNTAsNyBAQCBwdWJsaWM6 CiAKICAgICBib29sIElzTW9ja1N0cmVhbShjb25zdCBXZWJVUkwmKTsKIAotICAgIHZpcnR1YWwg dm9pZCByZXF1ZXN0VXNlck1lZGlhKGNvbnN0IFdlYlVzZXJNZWRpYVJlcXVlc3QmLCBjb25zdCBX ZWJWZWN0b3I8V2ViTWVkaWFTdHJlYW1Tb3VyY2U+Jik7CisgICAgdmlydHVhbCB2b2lkIHJlcXVl c3RVc2VyTWVkaWEoY29uc3QgV2ViVXNlck1lZGlhUmVxdWVzdCYsIGNvbnN0IFdlYlZlY3RvcjxX ZWJNZWRpYVN0cmVhbVNvdXJjZT4mLCBjb25zdCBXZWJWZWN0b3I8V2ViTWVkaWFTdHJlYW1Tb3Vy Y2U+Jik7CiAgICAgdmlydHVhbCB2b2lkIGNhbmNlbFVzZXJNZWRpYVJlcXVlc3QoY29uc3QgV2Vi VXNlck1lZGlhUmVxdWVzdCYpOwogCiBwcml2YXRlOgo= 137881 2012-04-19 05:16:17 -0700 2012-04-19 18:39:38 -0700 Patch cleanup.patch text/plain 7328 yujie.mao ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggNzYwY2RhNS4uYmNiY2UyMSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMi0wNC0xOSAgTWFvLCBZdWpp ZSAgPHl1amllLm1hb0BpbnRlbC5jb20+CisKKyAgICAgICAgW0Nocm9taXVtXSBSZW1vdmUgcGll Y2Ugb2YgZGVhZCBjb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD04NDMyOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIE5vIG5ldyB0ZXN0cy4gTm8gYmVoYXZpb3IgY2hhbmdlcy4KKworICAgICAgICAqIHB1 YmxpYy9XZWJVc2VyTWVkaWFDbGllbnQuaDoKKyAgICAgICAgKiBwdWJsaWMvV2ViVXNlck1lZGlh UmVxdWVzdC5oOgorICAgICAgICAoV2ViVXNlck1lZGlhUmVxdWVzdCk6CisgICAgICAgICogc3Jj L1VzZXJNZWRpYUNsaWVudEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpVc2VyTWVkaWFDbGll bnRJbXBsOjpyZXF1ZXN0VXNlck1lZGlhKToKKyAgICAgICAgKiBzcmMvV2ViVXNlck1lZGlhUmVx dWVzdC5jcHA6CisKIDIwMTItMDQtMTcgIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFtDaHJvbWl1bV0gQ2FsZW5kYXIgUGlja2VyOiBQb3B1cCBwb3NpdGlvbiBp cyB3cm9uZyB3aGVuIHRoZXJlIGFyZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9wdWJsaWMvV2ViVXNlck1lZGlhQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1 YmxpYy9XZWJVc2VyTWVkaWFDbGllbnQuaAppbmRleCAyOTk4MTU5Li5iYmRlYTE4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJVc2VyTWVkaWFDbGllbnQuaAor KysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJVc2VyTWVkaWFDbGllbnQuaApA QCAtNDEsOSArNDEsNiBAQCBjbGFzcyBXZWJVc2VyTWVkaWFDbGllbnQgewogcHVibGljOgogICAg IHZpcnR1YWwgfldlYlVzZXJNZWRpYUNsaWVudCgpIHsgfQogCi0gICAgLy8gREVQUkVDQVRFRAot ICAgIHZpcnR1YWwgdm9pZCByZXF1ZXN0VXNlck1lZGlhKGNvbnN0IFdlYlVzZXJNZWRpYVJlcXVl c3QmLCBjb25zdCBXZWJWZWN0b3I8V2ViTWVkaWFTdHJlYW1Tb3VyY2U+JikgeyB9Ci0KICAgICB2 aXJ0dWFsIHZvaWQgcmVxdWVzdFVzZXJNZWRpYShjb25zdCBXZWJVc2VyTWVkaWFSZXF1ZXN0Jiwg Y29uc3QgV2ViVmVjdG9yPFdlYk1lZGlhU3RyZWFtU291cmNlPiYgYXVkaW9Tb3VyY2VzLCBjb25z dCBXZWJWZWN0b3I8V2ViTWVkaWFTdHJlYW1Tb3VyY2U+JiB2aWRlb1NvdXJjZXMpIHsgfQogCiAg ICAgdmlydHVhbCB2b2lkIGNhbmNlbFVzZXJNZWRpYVJlcXVlc3QoY29uc3QgV2ViVXNlck1lZGlh UmVxdWVzdCYpID0gMDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGlj L1dlYlVzZXJNZWRpYVJlcXVlc3QuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dl YlVzZXJNZWRpYVJlcXVlc3QuaAppbmRleCA3ZDg0Y2RjLi5iOWE0ZmVkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJVc2VyTWVkaWFSZXF1ZXN0LmgKKysrIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVXNlck1lZGlhUmVxdWVzdC5oCkBAIC02 OCw5ICs2OCw2IEBAIHB1YmxpYzoKICAgICBXRUJLSVRfRVhQT1JUIGJvb2wgY2FtZXJhUHJlZmVy ZW5jZUVudmlyb25tZW50KCkgY29uc3Q7CiAgICAgV0VCS0lUX0VYUE9SVCBXZWJTZWN1cml0eU9y aWdpbiBzZWN1cml0eU9yaWdpbigpIGNvbnN0OwogCi0gICAgLy8gREVQUkVDQVRFRAotICAgIFdF QktJVF9FWFBPUlQgdm9pZCByZXF1ZXN0U3VjY2VlZGVkKGNvbnN0IFdlYlZlY3RvcjxXZWJNZWRp YVN0cmVhbVNvdXJjZT4mKTsKLQogICAgIFdFQktJVF9FWFBPUlQgdm9pZCByZXF1ZXN0U3VjY2Vl ZGVkKGNvbnN0IFdlYlZlY3RvcjxXZWJNZWRpYVN0cmVhbVNvdXJjZT4mIGF1ZGlvU291cmNlcywg Y29uc3QgV2ViVmVjdG9yPFdlYk1lZGlhU3RyZWFtU291cmNlPiYgdmlkZW9Tb3VyY2VzKTsKICAg ICBXRUJLSVRfRVhQT1JUIHZvaWQgcmVxdWVzdEZhaWxlZCgpOwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Vc2VyTWVkaWFDbGllbnRJbXBsLmNwcCBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL1VzZXJNZWRpYUNsaWVudEltcGwuY3BwCmluZGV4IDljMGJmNTgu LmNhOGE5OGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1VzZXJNZWRp YUNsaWVudEltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1VzZXJNZWRp YUNsaWVudEltcGwuY3BwCkBAIC01OCwxMiArNTgsNiBAQCB2b2lkIFVzZXJNZWRpYUNsaWVudElt cGw6OnJlcXVlc3RVc2VyTWVkaWEoUGFzc1JlZlB0cjxVc2VyTWVkaWFSZXF1ZXN0PiBwcnBSZXF1 ZQogICAgIGlmIChtX2NsaWVudCkgewogICAgICAgICBSZWZQdHI8VXNlck1lZGlhUmVxdWVzdD4g cmVxdWVzdCA9IHBycFJlcXVlc3Q7CiAKLSAgICAgICAgLy8gRklYTUU6IENsZWFudXAgd2hlbiB0 aGUgY2hyb21pdW0gY29kZSBoYXMgc3dpdGNoZWQgdG8gdGhlIHNwbGl0IHNvdXJjZXMgaW1wbGVt ZW50YXRpb24uCi0gICAgICAgIE1lZGlhU3RyZWFtU291cmNlVmVjdG9yIGNvbWJpbmVkU291cmNl czsKLSAgICAgICAgY29tYmluZWRTb3VyY2VzLmFwcGVuZChhdWRpb1NvdXJjZXMpOwotICAgICAg ICBjb21iaW5lZFNvdXJjZXMuYXBwZW5kKHZpZGVvU291cmNlcyk7Ci0gICAgICAgIG1fY2xpZW50 LT5yZXF1ZXN0VXNlck1lZGlhKFBhc3NSZWZQdHI8VXNlck1lZGlhUmVxdWVzdD4ocmVxdWVzdC5n ZXQoKSksIGNvbWJpbmVkU291cmNlcyk7Ci0KICAgICAgICAgbV9jbGllbnQtPnJlcXVlc3RVc2Vy TWVkaWEocmVxdWVzdC5yZWxlYXNlKCksIGF1ZGlvU291cmNlcywgdmlkZW9Tb3VyY2VzKTsKICAg ICB9CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJVc2VyTWVk aWFSZXF1ZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlVzZXJNZWRpYVJl cXVlc3QuY3BwCmluZGV4IDVhNzZjODMuLmE3ODUzMmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYlVzZXJNZWRpYVJlcXVlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYlVzZXJNZWRpYVJlcXVlc3QuY3BwCkBAIC0xMDUsMjQgKzEwNSw2 IEBAIHZvaWQgV2ViVXNlck1lZGlhUmVxdWVzdDo6cmVxdWVzdFN1Y2NlZWRlZChjb25zdCBXZWJW ZWN0b3I8V2ViTWVkaWFTdHJlYW1Tb3VyY2U+CiAgICAgbV9wcml2YXRlLT5zdWNjZWVkKGF1ZGlv LCB2aWRlbyk7CiB9CiAKLS8vIEZJWE1FOiBDbGVhbnVwIHdoZW4gdGhlIGNocm9taXVtIGNvZGUg aGFzIHN3aXRjaGVkIHRvIHRoZSBzcGxpdCBzb3VyY2VzIGltcGxlbWVudGF0aW9uLgotdm9pZCBX ZWJVc2VyTWVkaWFSZXF1ZXN0OjpyZXF1ZXN0U3VjY2VlZGVkKGNvbnN0IFdlYlZlY3RvcjxXZWJN ZWRpYVN0cmVhbVNvdXJjZT4mIHNvdXJjZXMpCi17Ci0gICAgaWYgKG1fcHJpdmF0ZS5pc051bGwo KSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgTWVkaWFTdHJlYW1Tb3VyY2VWZWN0b3IgYXVkaW8s IHZpZGVvOwotICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgc291cmNlcy5zaXplKCk7ICsraSkg ewotICAgICAgICBNZWRpYVN0cmVhbVNvdXJjZSogY3VyciA9IHNvdXJjZXNbaV07Ci0gICAgICAg IGlmIChjdXJyLT50eXBlKCkgPT0gTWVkaWFTdHJlYW1Tb3VyY2U6OlR5cGVBdWRpbykKLSAgICAg ICAgICAgIGF1ZGlvLmFwcGVuZChjdXJyKTsKLSAgICAgICAgZWxzZSBpZiAoY3Vyci0+dHlwZSgp ID09IE1lZGlhU3RyZWFtU291cmNlOjpUeXBlVmlkZW8pCi0gICAgICAgICAgICB2aWRlby5hcHBl bmQoY3Vycik7Ci0gICAgfQotCi0gICAgbV9wcml2YXRlLT5zdWNjZWVkKGF1ZGlvLCB2aWRlbyk7 Ci19Ci0KIHZvaWQgV2ViVXNlck1lZGlhUmVxdWVzdDo6cmVxdWVzdEZhaWxlZCgpCiB7CiAgICAg bV9wcml2YXRlLT5mYWlsKCk7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9D aGFuZ2VMb2cKaW5kZXggMWFjNDFhZS4uMTdmZmJkNyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdl TG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA0LTE5ICBN YW8sIFl1amllICA8eXVqaWUubWFvQGludGVsLmNvbT4KKworICAgICAgICBbQ2hyb21pdW1dIE1v ZGlmeSB0ZXN0IGNhc2UgdG8gc3luYyB3aXRoIG5ldyBwdWJsaWMgQVBJCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDMyOAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21p dW0vV2ViVXNlck1lZGlhQ2xpZW50TW9jay5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlVzZXJN ZWRpYUNsaWVudE1vY2s6OnJlcXVlc3RVc2VyTWVkaWEpOgorICAgICAgICAqIER1bXBSZW5kZXJU cmVlL2Nocm9taXVtL1dlYlVzZXJNZWRpYUNsaWVudE1vY2suaDoKKyAgICAgICAgKFdlYlVzZXJN ZWRpYUNsaWVudE1vY2spOgorCiAyMDEyLTA0LTE3ICBDaHJpc3RvcGhlIER1bWV6ICA8Y2hyaXN0 b3BoZS5kdW1lekBpbnRlbC5jb20+CiAKICAgICAgICAgW0VGTF0gRFJUIHNob3VsZCBzdXBwb3J0 IExheW91dFRlc3RDb250cm9sbGVyJ3MgZHVtcEZyYW1lTG9hZENhbGxiYWNrcygpCmRpZmYgLS1n aXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJVc2VyTWVkaWFDbGllbnRNb2Nr LmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlVzZXJNZWRpYUNsaWVudE1v Y2suY3BwCmluZGV4IDI0ZmMxNDQuLjcyMjE5MjMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5k ZXJUcmVlL2Nocm9taXVtL1dlYlVzZXJNZWRpYUNsaWVudE1vY2suY3BwCisrKyBiL1Rvb2xzL0R1 bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlVzZXJNZWRpYUNsaWVudE1vY2suY3BwCkBAIC02NSwx NyArNjUsMjAgQEAgYm9vbCBXZWJVc2VyTWVkaWFDbGllbnRNb2NrOjpJc01vY2tTdHJlYW0oY29u c3QgV2ViVVJMJiB1cmwpCiAgICAgcmV0dXJuIHRyYWNrSWQuZXF1YWxzKCJtZWRpYXN0cmVhbXRl c3QiKTsKIH0KIAotdm9pZCBXZWJVc2VyTWVkaWFDbGllbnRNb2NrOjpyZXF1ZXN0VXNlck1lZGlh KGNvbnN0IFdlYlVzZXJNZWRpYVJlcXVlc3QmIHN0cmVhbVJlcXVlc3QsIGNvbnN0IFdlYlZlY3Rv cjxXZWJNZWRpYVN0cmVhbVNvdXJjZT4mIHN0cmVhbVNvdXJjZVZlY3RvcikKK3ZvaWQgV2ViVXNl ck1lZGlhQ2xpZW50TW9jazo6cmVxdWVzdFVzZXJNZWRpYShjb25zdCBXZWJVc2VyTWVkaWFSZXF1 ZXN0JiBzdHJlYW1SZXF1ZXN0LCBjb25zdCBXZWJWZWN0b3I8V2ViTWVkaWFTdHJlYW1Tb3VyY2U+ JiBhdWRpb1NvdXJjZXNWZWN0b3IsIGNvbnN0IFdlYlZlY3RvcjxXZWJNZWRpYVN0cmVhbVNvdXJj ZT4mIHZpZGVvU291cmNlc1ZlY3RvcikKIHsKICAgICBBU1NFUlQoIXN0cmVhbVJlcXVlc3QuaXNO dWxsKCkpOwogCiAgICAgV2ViVXNlck1lZGlhUmVxdWVzdCByZXF1ZXN0ID0gc3RyZWFtUmVxdWVz dDsKICAgICBjb25zdCBzaXplX3Qgc2l6ZSA9IDE7Ci0gICAgV2ViVmVjdG9yPFdlYk1lZGlhU3Ry ZWFtU291cmNlPiBzb3VyY2VWZWN0b3Ioc2l6ZSk7CisgICAgV2ViVmVjdG9yPFdlYk1lZGlhU3Ry ZWFtU291cmNlPiBhdWRpb1NvdXJjZXMoc2l6ZSk7CisgICAgV2ViVmVjdG9yPFdlYk1lZGlhU3Ry ZWFtU291cmNlPiB2aWRlb1NvdXJjZXMoc2l6ZSk7CiAgICAgV2ViU3RyaW5nIHRyYWNrSWQoIm1l ZGlhc3RyZWFtdGVzdCIpOwotICAgIFdlYlN0cmluZyB0cmFja05hbWUoIlZpZGVvQ2FwdHVyZSIp OwotICAgIHNvdXJjZVZlY3RvclswXS5pbml0aWFsaXplKHRyYWNrSWQsIFdlYk1lZGlhU3RyZWFt U291cmNlOjpUeXBlVmlkZW8sIHRyYWNrTmFtZSk7Ci0gICAgcmVxdWVzdC5yZXF1ZXN0U3VjY2Vl ZGVkKHNvdXJjZVZlY3Rvcik7CisgICAgV2ViU3RyaW5nIGF1ZGlvVHJhY2tOYW1lKCJBdWRpb1Jl Y29yZCIpOworICAgIFdlYlN0cmluZyB2aWRlb1RyYWNrTmFtZSgiVmlkZW9DYXB0dXJlIik7Cisg ICAgYXVkaW9Tb3VyY2VzWzBdLmluaXRpYWxpemUodHJhY2tJZCwgV2ViTWVkaWFTdHJlYW1Tb3Vy Y2U6OlR5cGVBdWRpbywgYXVkaW9UcmFja05hbWUpOworICAgIHZpZGVvU291cmNlc1swXS5pbml0 aWFsaXplKHRyYWNrSWQsIFdlYk1lZGlhU3RyZWFtU291cmNlOjpUeXBlVmlkZW8sIHZpZGVvVHJh Y2tOYW1lKTsKKyAgICByZXF1ZXN0LnJlcXVlc3RTdWNjZWVkZWQoYXVkaW9Tb3VyY2VzLCB2aWRl b1NvdXJjZXMpOwogfQogCiB2b2lkIFdlYlVzZXJNZWRpYUNsaWVudE1vY2s6OmNhbmNlbFVzZXJN ZWRpYVJlcXVlc3QoY29uc3QgV2ViVXNlck1lZGlhUmVxdWVzdCYpCmRpZmYgLS1naXQgYS9Ub29s cy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJVc2VyTWVkaWFDbGllbnRNb2NrLmggYi9Ub29s cy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJVc2VyTWVkaWFDbGllbnRNb2NrLmgKaW5kZXgg MTk0MmUzYi4uNWM2ZDlhMyAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21p dW0vV2ViVXNlck1lZGlhQ2xpZW50TW9jay5oCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2No cm9taXVtL1dlYlVzZXJNZWRpYUNsaWVudE1vY2suaApAQCAtNTAsNyArNTAsNyBAQCBwdWJsaWM6 CiAKICAgICBib29sIElzTW9ja1N0cmVhbShjb25zdCBXZWJVUkwmKTsKIAotICAgIHZpcnR1YWwg dm9pZCByZXF1ZXN0VXNlck1lZGlhKGNvbnN0IFdlYlVzZXJNZWRpYVJlcXVlc3QmLCBjb25zdCBX ZWJWZWN0b3I8V2ViTWVkaWFTdHJlYW1Tb3VyY2U+Jik7CisgICAgdmlydHVhbCB2b2lkIHJlcXVl c3RVc2VyTWVkaWEoY29uc3QgV2ViVXNlck1lZGlhUmVxdWVzdCYsIGNvbnN0IFdlYlZlY3RvcjxX ZWJNZWRpYVN0cmVhbVNvdXJjZT4mLCBjb25zdCBXZWJWZWN0b3I8V2ViTWVkaWFTdHJlYW1Tb3Vy Y2U+Jik7CiAgICAgdmlydHVhbCB2b2lkIGNhbmNlbFVzZXJNZWRpYVJlcXVlc3QoY29uc3QgV2Vi VXNlck1lZGlhUmVxdWVzdCYpOwogCiBwcml2YXRlOgo= 138023 2012-04-19 18:36:05 -0700 2012-04-19 19:49:53 -0700 Patch cleanup.patch text/plain 7930 yujie.mao ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggNzYwY2RhNS4uMTBkM2UyZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAxMi0wNC0xOSAgTWFvLCBZdWpp ZSAgPHl1amllLm1hb0BpbnRlbC5jb20+CisKKyAgICAgICAgW0Nocm9taXVtXSBNZWRpYVN0cmVh bUFQSTogQ2xlYW51cCBzb21lIGRlcHJlY2F0ZWQgaW50ZXJmYWNlCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDMyOAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gTm8gYmVoYXZpb3Ig Y2hhbmdlcy4KKworICAgICAgICAqIHB1YmxpYy9XZWJVc2VyTWVkaWFDbGllbnQuaDoKKyAgICAg ICAgKFdlYktpdDo6V2ViVXNlck1lZGlhQ2xpZW50OjpyZXF1ZXN0VXNlck1lZGlhKToKKyAgICAg ICAgUmVtb3ZlIGRlcHJlY2F0ZWQgcmVxdWVzdFVzZXJNZWRpYSBpbnRlcmZhY2UuCisgICAgICAg ICogcHVibGljL1dlYlVzZXJNZWRpYVJlcXVlc3QuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViVXNl ck1lZGlhUmVxdWVzdDo6cmVxdWVzdFN1Y2NlZWRlZCk6CisgICAgICAgIFJlbW92ZSBkZXByZWNh dGVkIHJlcXVlc3RTdWNjZWVkZWQgaW50ZXJmYWNlLgorICAgICAgICAqIHNyYy9Vc2VyTWVkaWFD bGllbnRJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6VXNlck1lZGlhQ2xpZW50SW1wbDo6cmVx dWVzdFVzZXJNZWRpYSk6CisgICAgICAgIFVzZSB0aGUgcmVxdWVzdFVzZXJNZWRpYSBzcGxpdCBz b3VyY2VzIGltcGxlbWVudGF0aW9uLgorICAgICAgICAqIHNyYy9XZWJVc2VyTWVkaWFSZXF1ZXN0 LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVXNlck1lZGlhUmVxdWVzdDo6cmVxdWVzdFN1Y2Nl ZWRlZCk6CisgICAgICAgIFJlbW92ZSBkZXByZWNhdGVkIHJlcXVlc3RTdWNjZWVkZWQgaW1wbGVt ZW50YXRpb24uCisKIDIwMTItMDQtMTcgIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFtDaHJvbWl1bV0gQ2FsZW5kYXIgUGlja2VyOiBQb3B1cCBwb3NpdGlvbiBp cyB3cm9uZyB3aGVuIHRoZXJlIGFyZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9wdWJsaWMvV2ViVXNlck1lZGlhQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1 YmxpYy9XZWJVc2VyTWVkaWFDbGllbnQuaAppbmRleCAyOTk4MTU5Li5iYmRlYTE4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJVc2VyTWVkaWFDbGllbnQuaAor KysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJVc2VyTWVkaWFDbGllbnQuaApA QCAtNDEsOSArNDEsNiBAQCBjbGFzcyBXZWJVc2VyTWVkaWFDbGllbnQgewogcHVibGljOgogICAg IHZpcnR1YWwgfldlYlVzZXJNZWRpYUNsaWVudCgpIHsgfQogCi0gICAgLy8gREVQUkVDQVRFRAot ICAgIHZpcnR1YWwgdm9pZCByZXF1ZXN0VXNlck1lZGlhKGNvbnN0IFdlYlVzZXJNZWRpYVJlcXVl c3QmLCBjb25zdCBXZWJWZWN0b3I8V2ViTWVkaWFTdHJlYW1Tb3VyY2U+JikgeyB9Ci0KICAgICB2 aXJ0dWFsIHZvaWQgcmVxdWVzdFVzZXJNZWRpYShjb25zdCBXZWJVc2VyTWVkaWFSZXF1ZXN0Jiwg Y29uc3QgV2ViVmVjdG9yPFdlYk1lZGlhU3RyZWFtU291cmNlPiYgYXVkaW9Tb3VyY2VzLCBjb25z dCBXZWJWZWN0b3I8V2ViTWVkaWFTdHJlYW1Tb3VyY2U+JiB2aWRlb1NvdXJjZXMpIHsgfQogCiAg ICAgdmlydHVhbCB2b2lkIGNhbmNlbFVzZXJNZWRpYVJlcXVlc3QoY29uc3QgV2ViVXNlck1lZGlh UmVxdWVzdCYpID0gMDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGlj L1dlYlVzZXJNZWRpYVJlcXVlc3QuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dl YlVzZXJNZWRpYVJlcXVlc3QuaAppbmRleCA3ZDg0Y2RjLi5iOWE0ZmVkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJVc2VyTWVkaWFSZXF1ZXN0LmgKKysrIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVXNlck1lZGlhUmVxdWVzdC5oCkBAIC02 OCw5ICs2OCw2IEBAIHB1YmxpYzoKICAgICBXRUJLSVRfRVhQT1JUIGJvb2wgY2FtZXJhUHJlZmVy ZW5jZUVudmlyb25tZW50KCkgY29uc3Q7CiAgICAgV0VCS0lUX0VYUE9SVCBXZWJTZWN1cml0eU9y aWdpbiBzZWN1cml0eU9yaWdpbigpIGNvbnN0OwogCi0gICAgLy8gREVQUkVDQVRFRAotICAgIFdF QktJVF9FWFBPUlQgdm9pZCByZXF1ZXN0U3VjY2VlZGVkKGNvbnN0IFdlYlZlY3RvcjxXZWJNZWRp YVN0cmVhbVNvdXJjZT4mKTsKLQogICAgIFdFQktJVF9FWFBPUlQgdm9pZCByZXF1ZXN0U3VjY2Vl ZGVkKGNvbnN0IFdlYlZlY3RvcjxXZWJNZWRpYVN0cmVhbVNvdXJjZT4mIGF1ZGlvU291cmNlcywg Y29uc3QgV2ViVmVjdG9yPFdlYk1lZGlhU3RyZWFtU291cmNlPiYgdmlkZW9Tb3VyY2VzKTsKICAg ICBXRUJLSVRfRVhQT1JUIHZvaWQgcmVxdWVzdEZhaWxlZCgpOwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Vc2VyTWVkaWFDbGllbnRJbXBsLmNwcCBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL1VzZXJNZWRpYUNsaWVudEltcGwuY3BwCmluZGV4IDljMGJmNTgu LmNhOGE5OGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1VzZXJNZWRp YUNsaWVudEltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1VzZXJNZWRp YUNsaWVudEltcGwuY3BwCkBAIC01OCwxMiArNTgsNiBAQCB2b2lkIFVzZXJNZWRpYUNsaWVudElt cGw6OnJlcXVlc3RVc2VyTWVkaWEoUGFzc1JlZlB0cjxVc2VyTWVkaWFSZXF1ZXN0PiBwcnBSZXF1 ZQogICAgIGlmIChtX2NsaWVudCkgewogICAgICAgICBSZWZQdHI8VXNlck1lZGlhUmVxdWVzdD4g cmVxdWVzdCA9IHBycFJlcXVlc3Q7CiAKLSAgICAgICAgLy8gRklYTUU6IENsZWFudXAgd2hlbiB0 aGUgY2hyb21pdW0gY29kZSBoYXMgc3dpdGNoZWQgdG8gdGhlIHNwbGl0IHNvdXJjZXMgaW1wbGVt ZW50YXRpb24uCi0gICAgICAgIE1lZGlhU3RyZWFtU291cmNlVmVjdG9yIGNvbWJpbmVkU291cmNl czsKLSAgICAgICAgY29tYmluZWRTb3VyY2VzLmFwcGVuZChhdWRpb1NvdXJjZXMpOwotICAgICAg ICBjb21iaW5lZFNvdXJjZXMuYXBwZW5kKHZpZGVvU291cmNlcyk7Ci0gICAgICAgIG1fY2xpZW50 LT5yZXF1ZXN0VXNlck1lZGlhKFBhc3NSZWZQdHI8VXNlck1lZGlhUmVxdWVzdD4ocmVxdWVzdC5n ZXQoKSksIGNvbWJpbmVkU291cmNlcyk7Ci0KICAgICAgICAgbV9jbGllbnQtPnJlcXVlc3RVc2Vy TWVkaWEocmVxdWVzdC5yZWxlYXNlKCksIGF1ZGlvU291cmNlcywgdmlkZW9Tb3VyY2VzKTsKICAg ICB9CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJVc2VyTWVk aWFSZXF1ZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlVzZXJNZWRpYVJl cXVlc3QuY3BwCmluZGV4IDVhNzZjODMuLmE3ODUzMmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYlVzZXJNZWRpYVJlcXVlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYlVzZXJNZWRpYVJlcXVlc3QuY3BwCkBAIC0xMDUsMjQgKzEwNSw2 IEBAIHZvaWQgV2ViVXNlck1lZGlhUmVxdWVzdDo6cmVxdWVzdFN1Y2NlZWRlZChjb25zdCBXZWJW ZWN0b3I8V2ViTWVkaWFTdHJlYW1Tb3VyY2U+CiAgICAgbV9wcml2YXRlLT5zdWNjZWVkKGF1ZGlv LCB2aWRlbyk7CiB9CiAKLS8vIEZJWE1FOiBDbGVhbnVwIHdoZW4gdGhlIGNocm9taXVtIGNvZGUg aGFzIHN3aXRjaGVkIHRvIHRoZSBzcGxpdCBzb3VyY2VzIGltcGxlbWVudGF0aW9uLgotdm9pZCBX ZWJVc2VyTWVkaWFSZXF1ZXN0OjpyZXF1ZXN0U3VjY2VlZGVkKGNvbnN0IFdlYlZlY3RvcjxXZWJN ZWRpYVN0cmVhbVNvdXJjZT4mIHNvdXJjZXMpCi17Ci0gICAgaWYgKG1fcHJpdmF0ZS5pc051bGwo KSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgTWVkaWFTdHJlYW1Tb3VyY2VWZWN0b3IgYXVkaW8s IHZpZGVvOwotICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgc291cmNlcy5zaXplKCk7ICsraSkg ewotICAgICAgICBNZWRpYVN0cmVhbVNvdXJjZSogY3VyciA9IHNvdXJjZXNbaV07Ci0gICAgICAg IGlmIChjdXJyLT50eXBlKCkgPT0gTWVkaWFTdHJlYW1Tb3VyY2U6OlR5cGVBdWRpbykKLSAgICAg ICAgICAgIGF1ZGlvLmFwcGVuZChjdXJyKTsKLSAgICAgICAgZWxzZSBpZiAoY3Vyci0+dHlwZSgp ID09IE1lZGlhU3RyZWFtU291cmNlOjpUeXBlVmlkZW8pCi0gICAgICAgICAgICB2aWRlby5hcHBl bmQoY3Vycik7Ci0gICAgfQotCi0gICAgbV9wcml2YXRlLT5zdWNjZWVkKGF1ZGlvLCB2aWRlbyk7 Ci19Ci0KIHZvaWQgV2ViVXNlck1lZGlhUmVxdWVzdDo6cmVxdWVzdEZhaWxlZCgpCiB7CiAgICAg bV9wcml2YXRlLT5mYWlsKCk7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9D aGFuZ2VMb2cKaW5kZXggMWFjNDFhZS4uYjc1NzU3NCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdl TG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA0LTE5ICBN YW8sIFl1amllICA8eXVqaWUubWFvQGludGVsLmNvbT4KKworICAgICAgICBbQ2hyb21pdW1dIE1v ZGlmeSB0ZXN0IGNhc2UgdG8gYWxpZ24gd2l0aCBpdHMgbmV3IGludGVyZmFjZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQzMjgKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWJVc2VyTWVkaWFDbGllbnRN b2NrIHVzZSBhbiBvbGQgcmVxdWVzdFVzZXJNZWRpYSBpbnRlcmZhY2UgYW5kCisgICAgICAgIFJl cGxhY2UgaXQgd2l0aCB0aGUgbmV3IGludGVyZmFjZS4KKworICAgICAgICAqIER1bXBSZW5kZXJU cmVlL2Nocm9taXVtL1dlYlVzZXJNZWRpYUNsaWVudE1vY2suY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJVc2VyTWVkaWFDbGllbnRNb2NrOjpyZXF1ZXN0VXNlck1lZGlhKToKKyAgICAgICAgUmVt b3ZlIHRoZSBvbGQgcmVxdWVzdFVzZXJNZWRpYSBhbmQgcmVwbGFjZSBpdCB3aXRoIHRoZSBuZXcu CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVXNlck1lZGlhQ2xpZW50TW9j ay5oOgorICAgICAgICAoV2ViVXNlck1lZGlhQ2xpZW50TW9jayk6CisKIDIwMTItMDQtMTcgIENo cmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KIAogICAgICAgICBb RUZMXSBEUlQgc2hvdWxkIHN1cHBvcnQgTGF5b3V0VGVzdENvbnRyb2xsZXIncyBkdW1wRnJhbWVM b2FkQ2FsbGJhY2tzKCkKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVt L1dlYlVzZXJNZWRpYUNsaWVudE1vY2suY3BwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21p dW0vV2ViVXNlck1lZGlhQ2xpZW50TW9jay5jcHAKaW5kZXggMjRmYzE0NC4uNzIyMTkyMyAxMDA2 NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVXNlck1lZGlhQ2xpZW50 TW9jay5jcHAKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVXNlck1lZGlh Q2xpZW50TW9jay5jcHAKQEAgLTY1LDE3ICs2NSwyMCBAQCBib29sIFdlYlVzZXJNZWRpYUNsaWVu dE1vY2s6OklzTW9ja1N0cmVhbShjb25zdCBXZWJVUkwmIHVybCkKICAgICByZXR1cm4gdHJhY2tJ ZC5lcXVhbHMoIm1lZGlhc3RyZWFtdGVzdCIpOwogfQogCi12b2lkIFdlYlVzZXJNZWRpYUNsaWVu dE1vY2s6OnJlcXVlc3RVc2VyTWVkaWEoY29uc3QgV2ViVXNlck1lZGlhUmVxdWVzdCYgc3RyZWFt UmVxdWVzdCwgY29uc3QgV2ViVmVjdG9yPFdlYk1lZGlhU3RyZWFtU291cmNlPiYgc3RyZWFtU291 cmNlVmVjdG9yKQordm9pZCBXZWJVc2VyTWVkaWFDbGllbnRNb2NrOjpyZXF1ZXN0VXNlck1lZGlh KGNvbnN0IFdlYlVzZXJNZWRpYVJlcXVlc3QmIHN0cmVhbVJlcXVlc3QsIGNvbnN0IFdlYlZlY3Rv cjxXZWJNZWRpYVN0cmVhbVNvdXJjZT4mIGF1ZGlvU291cmNlc1ZlY3RvciwgY29uc3QgV2ViVmVj dG9yPFdlYk1lZGlhU3RyZWFtU291cmNlPiYgdmlkZW9Tb3VyY2VzVmVjdG9yKQogewogICAgIEFT U0VSVCghc3RyZWFtUmVxdWVzdC5pc051bGwoKSk7CiAKICAgICBXZWJVc2VyTWVkaWFSZXF1ZXN0 IHJlcXVlc3QgPSBzdHJlYW1SZXF1ZXN0OwogICAgIGNvbnN0IHNpemVfdCBzaXplID0gMTsKLSAg ICBXZWJWZWN0b3I8V2ViTWVkaWFTdHJlYW1Tb3VyY2U+IHNvdXJjZVZlY3RvcihzaXplKTsKKyAg ICBXZWJWZWN0b3I8V2ViTWVkaWFTdHJlYW1Tb3VyY2U+IGF1ZGlvU291cmNlcyhzaXplKTsKKyAg ICBXZWJWZWN0b3I8V2ViTWVkaWFTdHJlYW1Tb3VyY2U+IHZpZGVvU291cmNlcyhzaXplKTsKICAg ICBXZWJTdHJpbmcgdHJhY2tJZCgibWVkaWFzdHJlYW10ZXN0Iik7Ci0gICAgV2ViU3RyaW5nIHRy YWNrTmFtZSgiVmlkZW9DYXB0dXJlIik7Ci0gICAgc291cmNlVmVjdG9yWzBdLmluaXRpYWxpemUo dHJhY2tJZCwgV2ViTWVkaWFTdHJlYW1Tb3VyY2U6OlR5cGVWaWRlbywgdHJhY2tOYW1lKTsKLSAg ICByZXF1ZXN0LnJlcXVlc3RTdWNjZWVkZWQoc291cmNlVmVjdG9yKTsKKyAgICBXZWJTdHJpbmcg YXVkaW9UcmFja05hbWUoIkF1ZGlvUmVjb3JkIik7CisgICAgV2ViU3RyaW5nIHZpZGVvVHJhY2tO YW1lKCJWaWRlb0NhcHR1cmUiKTsKKyAgICBhdWRpb1NvdXJjZXNbMF0uaW5pdGlhbGl6ZSh0cmFj a0lkLCBXZWJNZWRpYVN0cmVhbVNvdXJjZTo6VHlwZUF1ZGlvLCBhdWRpb1RyYWNrTmFtZSk7Cisg ICAgdmlkZW9Tb3VyY2VzWzBdLmluaXRpYWxpemUodHJhY2tJZCwgV2ViTWVkaWFTdHJlYW1Tb3Vy Y2U6OlR5cGVWaWRlbywgdmlkZW9UcmFja05hbWUpOworICAgIHJlcXVlc3QucmVxdWVzdFN1Y2Nl ZWRlZChhdWRpb1NvdXJjZXMsIHZpZGVvU291cmNlcyk7CiB9CiAKIHZvaWQgV2ViVXNlck1lZGlh Q2xpZW50TW9jazo6Y2FuY2VsVXNlck1lZGlhUmVxdWVzdChjb25zdCBXZWJVc2VyTWVkaWFSZXF1 ZXN0JikKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlVzZXJN ZWRpYUNsaWVudE1vY2suaCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlVzZXJN ZWRpYUNsaWVudE1vY2suaAppbmRleCAxOTQyZTNiLi45YzQ5NzBiIDEwMDY0NAotLS0gYS9Ub29s cy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJVc2VyTWVkaWFDbGllbnRNb2NrLmgKKysrIGIv VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVXNlck1lZGlhQ2xpZW50TW9jay5oCkBA IC01MCw3ICs1MCw3IEBAIHB1YmxpYzoKIAogICAgIGJvb2wgSXNNb2NrU3RyZWFtKGNvbnN0IFdl YlVSTCYpOwogCi0gICAgdmlydHVhbCB2b2lkIHJlcXVlc3RVc2VyTWVkaWEoY29uc3QgV2ViVXNl ck1lZGlhUmVxdWVzdCYsIGNvbnN0IFdlYlZlY3RvcjxXZWJNZWRpYVN0cmVhbVNvdXJjZT4mKTsK KyAgICB2aXJ0dWFsIHZvaWQgcmVxdWVzdFVzZXJNZWRpYShjb25zdCBXZWJVc2VyTWVkaWFSZXF1 ZXN0JiwgY29uc3QgV2ViVmVjdG9yPFdlYk1lZGlhU3RyZWFtU291cmNlPiYsIGNvbnN0IFdlYlZl Y3RvcjxXZWJNZWRpYVN0cmVhbVNvdXJjZT4mKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIHZvaWQg Y2FuY2VsVXNlck1lZGlhUmVxdWVzdChjb25zdCBXZWJVc2VyTWVkaWFSZXF1ZXN0Jik7CiAKIHBy aXZhdGU6Cg== 138026 2012-04-19 19:18:07 -0700 2012-04-19 19:50:05 -0700 Patch bug-84328-20120420102006.patch text/plain 8362 yujie.mao U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0Mzc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDc2MGNkYTU0M2YwNWZjOGQxYzE5MzFhZDdiZWM3MzVhNjRjNDY0OGIuLjMzMmM4MjY0ZTI1YjNj Yjc0ZDc4Y2JkNzY1ZGRkMDhhMWE4MDUxNTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjQgQEAKKzIwMTItMDQtMTkgIE1hbywgWXVqaWUgIDx5dWppZS5tYW9AaW50ZWwu Y29tPgorCisgICAgICAgIE1lZGlhIFN0cmVhbSBBUEk6IFBpZWNlIG9mIGNvZGUgY2xlYW51cCBm b3IgdGhlIGNocm9taXVtIHBvcnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTg0MzI4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgUmVtb3ZlIHNvbWUgZGVwcmVjYXRlZCBpbnRlcmZhY2VzLgorCisgICAgICAg IE5vIG5ldyB0ZXN0cy4gTm8gYmVoYXZpb3IgY2hhbmdlcy4KKworICAgICAgICAqIHB1YmxpYy9X ZWJVc2VyTWVkaWFDbGllbnQuaDoKKyAgICAgICAgUmVtb3ZlIGRlcHJlY2F0ZWQgcmVxdWVzdFVz ZXJNZWRpYSBpbnRlcmZhY2UuCisgICAgICAgICogcHVibGljL1dlYlVzZXJNZWRpYVJlcXVlc3Qu aDoKKyAgICAgICAgUmVtb3ZlIGRlcHJlY2F0ZWQgcmVxdWVzdFN1Y2NlZWRlZCBpbnRlcmZhY2Uu CisgICAgICAgICogc3JjL1VzZXJNZWRpYUNsaWVudEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0 OjpVc2VyTWVkaWFDbGllbnRJbXBsOjpyZXF1ZXN0VXNlck1lZGlhKToKKyAgICAgICAgVXNlIHRo ZSByZXF1ZXN0VXNlck1lZGlhIHNwbGl0IHNvdXJjZXMgaW1wbGVtZW50YXRpb24uCisgICAgICAg ICogc3JjL1dlYlVzZXJNZWRpYVJlcXVlc3QuY3BwOgorICAgICAgICBSZW1vdmUgZGVwcmVjYXRl ZCByZXF1ZXN0U3VjY2VlZGVkIGltcGxlbWVudGF0aW9uLgorCiAyMDEyLTA0LTE3ICBLZW50IFRh bXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KIAogICAgICAgICBbQ2hyb21pdW1dIENhbGVuZGFy IFBpY2tlcjogUG9wdXAgcG9zaXRpb24gaXMgd3Jvbmcgd2hlbiB0aGVyZSBhcmUKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlVzZXJNZWRpYUNsaWVudC5oIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVXNlck1lZGlhQ2xpZW50LmgKaW5kZXgg Mjk5ODE1OWVlODA2MzkzYWY0OTJiZjdlNWMwOGJhNTcwODA1MTYxMC4uYmJkZWExOGMxYzVmMGZk NDAwMTdlOWRkYzI4N2U1YWE3NTc0Nzc4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9wdWJsaWMvV2ViVXNlck1lZGlhQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJv bWl1bS9wdWJsaWMvV2ViVXNlck1lZGlhQ2xpZW50LmgKQEAgLTQxLDkgKzQxLDYgQEAgY2xhc3Mg V2ViVXNlck1lZGlhQ2xpZW50IHsKIHB1YmxpYzoKICAgICB2aXJ0dWFsIH5XZWJVc2VyTWVkaWFD bGllbnQoKSB7IH0KIAotICAgIC8vIERFUFJFQ0FURUQKLSAgICB2aXJ0dWFsIHZvaWQgcmVxdWVz dFVzZXJNZWRpYShjb25zdCBXZWJVc2VyTWVkaWFSZXF1ZXN0JiwgY29uc3QgV2ViVmVjdG9yPFdl Yk1lZGlhU3RyZWFtU291cmNlPiYpIHsgfQotCiAgICAgdmlydHVhbCB2b2lkIHJlcXVlc3RVc2Vy TWVkaWEoY29uc3QgV2ViVXNlck1lZGlhUmVxdWVzdCYsIGNvbnN0IFdlYlZlY3RvcjxXZWJNZWRp YVN0cmVhbVNvdXJjZT4mIGF1ZGlvU291cmNlcywgY29uc3QgV2ViVmVjdG9yPFdlYk1lZGlhU3Ry ZWFtU291cmNlPiYgdmlkZW9Tb3VyY2VzKSB7IH0KIAogICAgIHZpcnR1YWwgdm9pZCBjYW5jZWxV c2VyTWVkaWFSZXF1ZXN0KGNvbnN0IFdlYlVzZXJNZWRpYVJlcXVlc3QmKSA9IDA7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJVc2VyTWVkaWFSZXF1ZXN0Lmgg Yi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJVc2VyTWVkaWFSZXF1ZXN0LmgKaW5k ZXggN2Q4NGNkY2YwNjQwMmRhOGUxMTQ3ZDAwM2U1N2I4ZTNjYTcyZDQxYi4uYjlhNGZlZGRhOGQ4 ZjdiZDBiYTFjMTAyN2Q1ODk5ZGYzNDg2NTc0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViVXNlck1lZGlhUmVxdWVzdC5oCisrKyBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vcHVibGljL1dlYlVzZXJNZWRpYVJlcXVlc3QuaApAQCAtNjgsOSArNjgsNiBAQCBw dWJsaWM6CiAgICAgV0VCS0lUX0VYUE9SVCBib29sIGNhbWVyYVByZWZlcmVuY2VFbnZpcm9ubWVu dCgpIGNvbnN0OwogICAgIFdFQktJVF9FWFBPUlQgV2ViU2VjdXJpdHlPcmlnaW4gc2VjdXJpdHlP cmlnaW4oKSBjb25zdDsKIAotICAgIC8vIERFUFJFQ0FURUQKLSAgICBXRUJLSVRfRVhQT1JUIHZv aWQgcmVxdWVzdFN1Y2NlZWRlZChjb25zdCBXZWJWZWN0b3I8V2ViTWVkaWFTdHJlYW1Tb3VyY2U+ Jik7Ci0KICAgICBXRUJLSVRfRVhQT1JUIHZvaWQgcmVxdWVzdFN1Y2NlZWRlZChjb25zdCBXZWJW ZWN0b3I8V2ViTWVkaWFTdHJlYW1Tb3VyY2U+JiBhdWRpb1NvdXJjZXMsIGNvbnN0IFdlYlZlY3Rv cjxXZWJNZWRpYVN0cmVhbVNvdXJjZT4mIHZpZGVvU291cmNlcyk7CiAgICAgV0VCS0lUX0VYUE9S VCB2b2lkIHJlcXVlc3RGYWlsZWQoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvVXNlck1lZGlhQ2xpZW50SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9Vc2VyTWVkaWFDbGllbnRJbXBsLmNwcAppbmRleCA5YzBiZjU4ZTEyNDQ2NjMyOTQ1ZTNj YjQ4Nzg1MTUwNTY1NWUyNjJhLi5jYThhOThkY2IyMTZhMDg2YmM2ODI2OTQ1NjFlMWE3ODk4ZDJh NWNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Vc2VyTWVkaWFDbGll bnRJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Vc2VyTWVkaWFDbGll bnRJbXBsLmNwcApAQCAtNTgsMTIgKzU4LDYgQEAgdm9pZCBVc2VyTWVkaWFDbGllbnRJbXBsOjpy ZXF1ZXN0VXNlck1lZGlhKFBhc3NSZWZQdHI8VXNlck1lZGlhUmVxdWVzdD4gcHJwUmVxdWUKICAg ICBpZiAobV9jbGllbnQpIHsKICAgICAgICAgUmVmUHRyPFVzZXJNZWRpYVJlcXVlc3Q+IHJlcXVl c3QgPSBwcnBSZXF1ZXN0OwogCi0gICAgICAgIC8vIEZJWE1FOiBDbGVhbnVwIHdoZW4gdGhlIGNo cm9taXVtIGNvZGUgaGFzIHN3aXRjaGVkIHRvIHRoZSBzcGxpdCBzb3VyY2VzIGltcGxlbWVudGF0 aW9uLgotICAgICAgICBNZWRpYVN0cmVhbVNvdXJjZVZlY3RvciBjb21iaW5lZFNvdXJjZXM7Ci0g ICAgICAgIGNvbWJpbmVkU291cmNlcy5hcHBlbmQoYXVkaW9Tb3VyY2VzKTsKLSAgICAgICAgY29t YmluZWRTb3VyY2VzLmFwcGVuZCh2aWRlb1NvdXJjZXMpOwotICAgICAgICBtX2NsaWVudC0+cmVx dWVzdFVzZXJNZWRpYShQYXNzUmVmUHRyPFVzZXJNZWRpYVJlcXVlc3Q+KHJlcXVlc3QuZ2V0KCkp LCBjb21iaW5lZFNvdXJjZXMpOwotCiAgICAgICAgIG1fY2xpZW50LT5yZXF1ZXN0VXNlck1lZGlh KHJlcXVlc3QucmVsZWFzZSgpLCBhdWRpb1NvdXJjZXMsIHZpZGVvU291cmNlcyk7CiAgICAgfQog fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVXNlck1lZGlhUmVx dWVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJVc2VyTWVkaWFSZXF1ZXN0 LmNwcAppbmRleCA1YTc2YzgzYjBkZTg4ZGQwNWJhZWU5NDRiZmNmZTk1Y2UxMWI2MTI1Li5hNzg1 MzJhZmM2NTA5MDA5MGM5M2VlNjI1YzFkYzA3OWVmZWQ1MWI5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJVc2VyTWVkaWFSZXF1ZXN0LmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJVc2VyTWVkaWFSZXF1ZXN0LmNwcApAQCAtMTA1LDI0ICsx MDUsNiBAQCB2b2lkIFdlYlVzZXJNZWRpYVJlcXVlc3Q6OnJlcXVlc3RTdWNjZWVkZWQoY29uc3Qg V2ViVmVjdG9yPFdlYk1lZGlhU3RyZWFtU291cmNlPgogICAgIG1fcHJpdmF0ZS0+c3VjY2VlZChh dWRpbywgdmlkZW8pOwogfQogCi0vLyBGSVhNRTogQ2xlYW51cCB3aGVuIHRoZSBjaHJvbWl1bSBj b2RlIGhhcyBzd2l0Y2hlZCB0byB0aGUgc3BsaXQgc291cmNlcyBpbXBsZW1lbnRhdGlvbi4KLXZv aWQgV2ViVXNlck1lZGlhUmVxdWVzdDo6cmVxdWVzdFN1Y2NlZWRlZChjb25zdCBXZWJWZWN0b3I8 V2ViTWVkaWFTdHJlYW1Tb3VyY2U+JiBzb3VyY2VzKQotewotICAgIGlmIChtX3ByaXZhdGUuaXNO dWxsKCkpCi0gICAgICAgIHJldHVybjsKLQotICAgIE1lZGlhU3RyZWFtU291cmNlVmVjdG9yIGF1 ZGlvLCB2aWRlbzsKLSAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHNvdXJjZXMuc2l6ZSgpOyAr K2kpIHsKLSAgICAgICAgTWVkaWFTdHJlYW1Tb3VyY2UqIGN1cnIgPSBzb3VyY2VzW2ldOwotICAg ICAgICBpZiAoY3Vyci0+dHlwZSgpID09IE1lZGlhU3RyZWFtU291cmNlOjpUeXBlQXVkaW8pCi0g ICAgICAgICAgICBhdWRpby5hcHBlbmQoY3Vycik7Ci0gICAgICAgIGVsc2UgaWYgKGN1cnItPnR5 cGUoKSA9PSBNZWRpYVN0cmVhbVNvdXJjZTo6VHlwZVZpZGVvKQotICAgICAgICAgICAgdmlkZW8u YXBwZW5kKGN1cnIpOwotICAgIH0KLQotICAgIG1fcHJpdmF0ZS0+c3VjY2VlZChhdWRpbywgdmlk ZW8pOwotfQotCiB2b2lkIFdlYlVzZXJNZWRpYVJlcXVlc3Q6OnJlcXVlc3RGYWlsZWQoKQogewog ICAgIG1fcHJpdmF0ZS0+ZmFpbCgpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9v bHMvQ2hhbmdlTG9nCmluZGV4IDFhYzQxYWUzZTljZTI4MWYyZmI2MGU0YTRhZWRlOGRiZTRhYzAz YTQuLmU2NWFiNjgwOWZiNzAzNDUyN2RiOWFiZTkxOGMwYjBlODhiYWQwNjMgMTAwNjQ0Ci0tLSBh L1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAor MjAxMi0wNC0xOSAgTWFvLCBZdWppZSAgPHl1amllLm1hb0BpbnRlbC5jb20+CisKKyAgICAgICAg TWVkaWEgU3RyZWFtIEFQSTogUGllY2Ugb2YgY29kZSBjbGVhbnVwIGZvciB0aGUgY2hyb21pdW0g cG9ydAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQz MjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWJV c2VyTWVkaWFDbGllbnRNb2NrIHVzZSBhbiBvbGQgcmVxdWVzdFVzZXJNZWRpYSBpbnRlcmZhY2Ug YW5kCisgICAgICAgIFJlcGxhY2UgaXQgd2l0aCB0aGUgbmV3IGludGVyZmFjZS4KKworICAgICAg ICAqIER1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlVzZXJNZWRpYUNsaWVudE1vY2suY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJVc2VyTWVkaWFDbGllbnRNb2NrOjpyZXF1ZXN0VXNlck1lZGlh KToKKyAgICAgICAgUmVtb3ZlIHRoZSBvbGQgcmVxdWVzdFVzZXJNZWRpYSBhbmQgcmVwbGFjZSBp dCB3aXRoIHRoZSBuZXcuCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVXNl ck1lZGlhQ2xpZW50TW9jay5oOgorICAgICAgICAoV2ViVXNlck1lZGlhQ2xpZW50TW9jayk6CisK IDIwMTItMDQtMTcgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNv bT4KIAogICAgICAgICBbRUZMXSBEUlQgc2hvdWxkIHN1cHBvcnQgTGF5b3V0VGVzdENvbnRyb2xs ZXIncyBkdW1wRnJhbWVMb2FkQ2FsbGJhY2tzKCkKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5k ZXJUcmVlL2Nocm9taXVtL1dlYlVzZXJNZWRpYUNsaWVudE1vY2suY3BwIGIvVG9vbHMvRHVtcFJl bmRlclRyZWUvY2hyb21pdW0vV2ViVXNlck1lZGlhQ2xpZW50TW9jay5jcHAKaW5kZXggMjRmYzE0 NGNiYzM3NDZjOGU5ZWEyNjUxMTY2ZjA4M2E5YjA1OGM5MC4uNzIyMTkyMzc2NDU0ODMxYjdkNzJm M2YzM2NkZTcwZjI0ZmQ3YWY5MyAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hy b21pdW0vV2ViVXNlck1lZGlhQ2xpZW50TW9jay5jcHAKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRy ZWUvY2hyb21pdW0vV2ViVXNlck1lZGlhQ2xpZW50TW9jay5jcHAKQEAgLTY1LDE3ICs2NSwyMCBA QCBib29sIFdlYlVzZXJNZWRpYUNsaWVudE1vY2s6OklzTW9ja1N0cmVhbShjb25zdCBXZWJVUkwm IHVybCkKICAgICByZXR1cm4gdHJhY2tJZC5lcXVhbHMoIm1lZGlhc3RyZWFtdGVzdCIpOwogfQog Ci12b2lkIFdlYlVzZXJNZWRpYUNsaWVudE1vY2s6OnJlcXVlc3RVc2VyTWVkaWEoY29uc3QgV2Vi VXNlck1lZGlhUmVxdWVzdCYgc3RyZWFtUmVxdWVzdCwgY29uc3QgV2ViVmVjdG9yPFdlYk1lZGlh U3RyZWFtU291cmNlPiYgc3RyZWFtU291cmNlVmVjdG9yKQordm9pZCBXZWJVc2VyTWVkaWFDbGll bnRNb2NrOjpyZXF1ZXN0VXNlck1lZGlhKGNvbnN0IFdlYlVzZXJNZWRpYVJlcXVlc3QmIHN0cmVh bVJlcXVlc3QsIGNvbnN0IFdlYlZlY3RvcjxXZWJNZWRpYVN0cmVhbVNvdXJjZT4mIGF1ZGlvU291 cmNlc1ZlY3RvciwgY29uc3QgV2ViVmVjdG9yPFdlYk1lZGlhU3RyZWFtU291cmNlPiYgdmlkZW9T b3VyY2VzVmVjdG9yKQogewogICAgIEFTU0VSVCghc3RyZWFtUmVxdWVzdC5pc051bGwoKSk7CiAK ICAgICBXZWJVc2VyTWVkaWFSZXF1ZXN0IHJlcXVlc3QgPSBzdHJlYW1SZXF1ZXN0OwogICAgIGNv bnN0IHNpemVfdCBzaXplID0gMTsKLSAgICBXZWJWZWN0b3I8V2ViTWVkaWFTdHJlYW1Tb3VyY2U+ IHNvdXJjZVZlY3RvcihzaXplKTsKKyAgICBXZWJWZWN0b3I8V2ViTWVkaWFTdHJlYW1Tb3VyY2U+ IGF1ZGlvU291cmNlcyhzaXplKTsKKyAgICBXZWJWZWN0b3I8V2ViTWVkaWFTdHJlYW1Tb3VyY2U+ IHZpZGVvU291cmNlcyhzaXplKTsKICAgICBXZWJTdHJpbmcgdHJhY2tJZCgibWVkaWFzdHJlYW10 ZXN0Iik7Ci0gICAgV2ViU3RyaW5nIHRyYWNrTmFtZSgiVmlkZW9DYXB0dXJlIik7Ci0gICAgc291 cmNlVmVjdG9yWzBdLmluaXRpYWxpemUodHJhY2tJZCwgV2ViTWVkaWFTdHJlYW1Tb3VyY2U6OlR5 cGVWaWRlbywgdHJhY2tOYW1lKTsKLSAgICByZXF1ZXN0LnJlcXVlc3RTdWNjZWVkZWQoc291cmNl VmVjdG9yKTsKKyAgICBXZWJTdHJpbmcgYXVkaW9UcmFja05hbWUoIkF1ZGlvUmVjb3JkIik7Cisg ICAgV2ViU3RyaW5nIHZpZGVvVHJhY2tOYW1lKCJWaWRlb0NhcHR1cmUiKTsKKyAgICBhdWRpb1Nv dXJjZXNbMF0uaW5pdGlhbGl6ZSh0cmFja0lkLCBXZWJNZWRpYVN0cmVhbVNvdXJjZTo6VHlwZUF1 ZGlvLCBhdWRpb1RyYWNrTmFtZSk7CisgICAgdmlkZW9Tb3VyY2VzWzBdLmluaXRpYWxpemUodHJh Y2tJZCwgV2ViTWVkaWFTdHJlYW1Tb3VyY2U6OlR5cGVWaWRlbywgdmlkZW9UcmFja05hbWUpOwor ICAgIHJlcXVlc3QucmVxdWVzdFN1Y2NlZWRlZChhdWRpb1NvdXJjZXMsIHZpZGVvU291cmNlcyk7 CiB9CiAKIHZvaWQgV2ViVXNlck1lZGlhQ2xpZW50TW9jazo6Y2FuY2VsVXNlck1lZGlhUmVxdWVz dChjb25zdCBXZWJVc2VyTWVkaWFSZXF1ZXN0JikKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5k ZXJUcmVlL2Nocm9taXVtL1dlYlVzZXJNZWRpYUNsaWVudE1vY2suaCBiL1Rvb2xzL0R1bXBSZW5k ZXJUcmVlL2Nocm9taXVtL1dlYlVzZXJNZWRpYUNsaWVudE1vY2suaAppbmRleCAxOTQyZTNiZGNh MTVjMTc1MDRiMmFiMDZhMDdhMTlkZDQ0NzM2MTcxLi45YzQ5NzBiOGNjZThlMjUyNWNjN2JmY2Vi NTczZGU5ZDNiZmFiZTJkIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1 bS9XZWJVc2VyTWVkaWFDbGllbnRNb2NrLmgKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hy b21pdW0vV2ViVXNlck1lZGlhQ2xpZW50TW9jay5oCkBAIC01MCw3ICs1MCw3IEBAIHB1YmxpYzoK IAogICAgIGJvb2wgSXNNb2NrU3RyZWFtKGNvbnN0IFdlYlVSTCYpOwogCi0gICAgdmlydHVhbCB2 b2lkIHJlcXVlc3RVc2VyTWVkaWEoY29uc3QgV2ViVXNlck1lZGlhUmVxdWVzdCYsIGNvbnN0IFdl YlZlY3RvcjxXZWJNZWRpYVN0cmVhbVNvdXJjZT4mKTsKKyAgICB2aXJ0dWFsIHZvaWQgcmVxdWVz dFVzZXJNZWRpYShjb25zdCBXZWJVc2VyTWVkaWFSZXF1ZXN0JiwgY29uc3QgV2ViVmVjdG9yPFdl Yk1lZGlhU3RyZWFtU291cmNlPiYsIGNvbnN0IFdlYlZlY3RvcjxXZWJNZWRpYVN0cmVhbVNvdXJj ZT4mKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIHZvaWQgY2FuY2VsVXNlck1lZGlhUmVxdWVzdChj b25zdCBXZWJVc2VyTWVkaWFSZXF1ZXN0Jik7CiAKIHByaXZhdGU6Cg== 138030 2012-04-19 19:48:25 -0700 2012-04-19 20:29:52 -0700 Patch bug-84328-20120420105024.patch text/plain 8362 yujie.mao U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0Mzc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDc2MGNkYTU0M2YwNWZjOGQxYzE5MzFhZDdiZWM3MzVhNjRjNDY0OGIuLjM3MjMzNDU4OWU0YzEx NzU0NWM5ZDcyZTEyNDI4M2M4MzA0YjljYWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjQgQEAKKzIwMTItMDQtMTkgIEplcmVteSBNYW8gIDx5dWppZS5tYW9AaW50ZWwu Y29tPgorCisgICAgICAgIE1lZGlhIFN0cmVhbSBBUEk6IFBpZWNlIG9mIGNvZGUgY2xlYW51cCBm b3IgdGhlIGNocm9taXVtIHBvcnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTg0MzI4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgUmVtb3ZlIHNvbWUgZGVwcmVjYXRlZCBpbnRlcmZhY2VzLgorCisgICAgICAg IE5vIG5ldyB0ZXN0cy4gTm8gYmVoYXZpb3IgY2hhbmdlcy4KKworICAgICAgICAqIHB1YmxpYy9X ZWJVc2VyTWVkaWFDbGllbnQuaDoKKyAgICAgICAgUmVtb3ZlIGRlcHJlY2F0ZWQgcmVxdWVzdFVz ZXJNZWRpYSBpbnRlcmZhY2UuCisgICAgICAgICogcHVibGljL1dlYlVzZXJNZWRpYVJlcXVlc3Qu aDoKKyAgICAgICAgUmVtb3ZlIGRlcHJlY2F0ZWQgcmVxdWVzdFN1Y2NlZWRlZCBpbnRlcmZhY2Uu CisgICAgICAgICogc3JjL1VzZXJNZWRpYUNsaWVudEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0 OjpVc2VyTWVkaWFDbGllbnRJbXBsOjpyZXF1ZXN0VXNlck1lZGlhKToKKyAgICAgICAgVXNlIHRo ZSByZXF1ZXN0VXNlck1lZGlhIHNwbGl0IHNvdXJjZXMgaW1wbGVtZW50YXRpb24uCisgICAgICAg ICogc3JjL1dlYlVzZXJNZWRpYVJlcXVlc3QuY3BwOgorICAgICAgICBSZW1vdmUgZGVwcmVjYXRl ZCByZXF1ZXN0U3VjY2VlZGVkIGltcGxlbWVudGF0aW9uLgorCiAyMDEyLTA0LTE3ICBLZW50IFRh bXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KIAogICAgICAgICBbQ2hyb21pdW1dIENhbGVuZGFy IFBpY2tlcjogUG9wdXAgcG9zaXRpb24gaXMgd3Jvbmcgd2hlbiB0aGVyZSBhcmUKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlVzZXJNZWRpYUNsaWVudC5oIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVXNlck1lZGlhQ2xpZW50LmgKaW5kZXgg Mjk5ODE1OWVlODA2MzkzYWY0OTJiZjdlNWMwOGJhNTcwODA1MTYxMC4uYmJkZWExOGMxYzVmMGZk NDAwMTdlOWRkYzI4N2U1YWE3NTc0Nzc4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9wdWJsaWMvV2ViVXNlck1lZGlhQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJv bWl1bS9wdWJsaWMvV2ViVXNlck1lZGlhQ2xpZW50LmgKQEAgLTQxLDkgKzQxLDYgQEAgY2xhc3Mg V2ViVXNlck1lZGlhQ2xpZW50IHsKIHB1YmxpYzoKICAgICB2aXJ0dWFsIH5XZWJVc2VyTWVkaWFD bGllbnQoKSB7IH0KIAotICAgIC8vIERFUFJFQ0FURUQKLSAgICB2aXJ0dWFsIHZvaWQgcmVxdWVz dFVzZXJNZWRpYShjb25zdCBXZWJVc2VyTWVkaWFSZXF1ZXN0JiwgY29uc3QgV2ViVmVjdG9yPFdl Yk1lZGlhU3RyZWFtU291cmNlPiYpIHsgfQotCiAgICAgdmlydHVhbCB2b2lkIHJlcXVlc3RVc2Vy TWVkaWEoY29uc3QgV2ViVXNlck1lZGlhUmVxdWVzdCYsIGNvbnN0IFdlYlZlY3RvcjxXZWJNZWRp YVN0cmVhbVNvdXJjZT4mIGF1ZGlvU291cmNlcywgY29uc3QgV2ViVmVjdG9yPFdlYk1lZGlhU3Ry ZWFtU291cmNlPiYgdmlkZW9Tb3VyY2VzKSB7IH0KIAogICAgIHZpcnR1YWwgdm9pZCBjYW5jZWxV c2VyTWVkaWFSZXF1ZXN0KGNvbnN0IFdlYlVzZXJNZWRpYVJlcXVlc3QmKSA9IDA7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJVc2VyTWVkaWFSZXF1ZXN0Lmgg Yi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJVc2VyTWVkaWFSZXF1ZXN0LmgKaW5k ZXggN2Q4NGNkY2YwNjQwMmRhOGUxMTQ3ZDAwM2U1N2I4ZTNjYTcyZDQxYi4uYjlhNGZlZGRhOGQ4 ZjdiZDBiYTFjMTAyN2Q1ODk5ZGYzNDg2NTc0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViVXNlck1lZGlhUmVxdWVzdC5oCisrKyBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vcHVibGljL1dlYlVzZXJNZWRpYVJlcXVlc3QuaApAQCAtNjgsOSArNjgsNiBAQCBw dWJsaWM6CiAgICAgV0VCS0lUX0VYUE9SVCBib29sIGNhbWVyYVByZWZlcmVuY2VFbnZpcm9ubWVu dCgpIGNvbnN0OwogICAgIFdFQktJVF9FWFBPUlQgV2ViU2VjdXJpdHlPcmlnaW4gc2VjdXJpdHlP cmlnaW4oKSBjb25zdDsKIAotICAgIC8vIERFUFJFQ0FURUQKLSAgICBXRUJLSVRfRVhQT1JUIHZv aWQgcmVxdWVzdFN1Y2NlZWRlZChjb25zdCBXZWJWZWN0b3I8V2ViTWVkaWFTdHJlYW1Tb3VyY2U+ Jik7Ci0KICAgICBXRUJLSVRfRVhQT1JUIHZvaWQgcmVxdWVzdFN1Y2NlZWRlZChjb25zdCBXZWJW ZWN0b3I8V2ViTWVkaWFTdHJlYW1Tb3VyY2U+JiBhdWRpb1NvdXJjZXMsIGNvbnN0IFdlYlZlY3Rv cjxXZWJNZWRpYVN0cmVhbVNvdXJjZT4mIHZpZGVvU291cmNlcyk7CiAgICAgV0VCS0lUX0VYUE9S VCB2b2lkIHJlcXVlc3RGYWlsZWQoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvVXNlck1lZGlhQ2xpZW50SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9Vc2VyTWVkaWFDbGllbnRJbXBsLmNwcAppbmRleCA5YzBiZjU4ZTEyNDQ2NjMyOTQ1ZTNj YjQ4Nzg1MTUwNTY1NWUyNjJhLi5jYThhOThkY2IyMTZhMDg2YmM2ODI2OTQ1NjFlMWE3ODk4ZDJh NWNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Vc2VyTWVkaWFDbGll bnRJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Vc2VyTWVkaWFDbGll bnRJbXBsLmNwcApAQCAtNTgsMTIgKzU4LDYgQEAgdm9pZCBVc2VyTWVkaWFDbGllbnRJbXBsOjpy ZXF1ZXN0VXNlck1lZGlhKFBhc3NSZWZQdHI8VXNlck1lZGlhUmVxdWVzdD4gcHJwUmVxdWUKICAg ICBpZiAobV9jbGllbnQpIHsKICAgICAgICAgUmVmUHRyPFVzZXJNZWRpYVJlcXVlc3Q+IHJlcXVl c3QgPSBwcnBSZXF1ZXN0OwogCi0gICAgICAgIC8vIEZJWE1FOiBDbGVhbnVwIHdoZW4gdGhlIGNo cm9taXVtIGNvZGUgaGFzIHN3aXRjaGVkIHRvIHRoZSBzcGxpdCBzb3VyY2VzIGltcGxlbWVudGF0 aW9uLgotICAgICAgICBNZWRpYVN0cmVhbVNvdXJjZVZlY3RvciBjb21iaW5lZFNvdXJjZXM7Ci0g ICAgICAgIGNvbWJpbmVkU291cmNlcy5hcHBlbmQoYXVkaW9Tb3VyY2VzKTsKLSAgICAgICAgY29t YmluZWRTb3VyY2VzLmFwcGVuZCh2aWRlb1NvdXJjZXMpOwotICAgICAgICBtX2NsaWVudC0+cmVx dWVzdFVzZXJNZWRpYShQYXNzUmVmUHRyPFVzZXJNZWRpYVJlcXVlc3Q+KHJlcXVlc3QuZ2V0KCkp LCBjb21iaW5lZFNvdXJjZXMpOwotCiAgICAgICAgIG1fY2xpZW50LT5yZXF1ZXN0VXNlck1lZGlh KHJlcXVlc3QucmVsZWFzZSgpLCBhdWRpb1NvdXJjZXMsIHZpZGVvU291cmNlcyk7CiAgICAgfQog fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVXNlck1lZGlhUmVx dWVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJVc2VyTWVkaWFSZXF1ZXN0 LmNwcAppbmRleCA1YTc2YzgzYjBkZTg4ZGQwNWJhZWU5NDRiZmNmZTk1Y2UxMWI2MTI1Li5hNzg1 MzJhZmM2NTA5MDA5MGM5M2VlNjI1YzFkYzA3OWVmZWQ1MWI5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJVc2VyTWVkaWFSZXF1ZXN0LmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJVc2VyTWVkaWFSZXF1ZXN0LmNwcApAQCAtMTA1LDI0ICsx MDUsNiBAQCB2b2lkIFdlYlVzZXJNZWRpYVJlcXVlc3Q6OnJlcXVlc3RTdWNjZWVkZWQoY29uc3Qg V2ViVmVjdG9yPFdlYk1lZGlhU3RyZWFtU291cmNlPgogICAgIG1fcHJpdmF0ZS0+c3VjY2VlZChh dWRpbywgdmlkZW8pOwogfQogCi0vLyBGSVhNRTogQ2xlYW51cCB3aGVuIHRoZSBjaHJvbWl1bSBj b2RlIGhhcyBzd2l0Y2hlZCB0byB0aGUgc3BsaXQgc291cmNlcyBpbXBsZW1lbnRhdGlvbi4KLXZv aWQgV2ViVXNlck1lZGlhUmVxdWVzdDo6cmVxdWVzdFN1Y2NlZWRlZChjb25zdCBXZWJWZWN0b3I8 V2ViTWVkaWFTdHJlYW1Tb3VyY2U+JiBzb3VyY2VzKQotewotICAgIGlmIChtX3ByaXZhdGUuaXNO dWxsKCkpCi0gICAgICAgIHJldHVybjsKLQotICAgIE1lZGlhU3RyZWFtU291cmNlVmVjdG9yIGF1 ZGlvLCB2aWRlbzsKLSAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHNvdXJjZXMuc2l6ZSgpOyAr K2kpIHsKLSAgICAgICAgTWVkaWFTdHJlYW1Tb3VyY2UqIGN1cnIgPSBzb3VyY2VzW2ldOwotICAg ICAgICBpZiAoY3Vyci0+dHlwZSgpID09IE1lZGlhU3RyZWFtU291cmNlOjpUeXBlQXVkaW8pCi0g ICAgICAgICAgICBhdWRpby5hcHBlbmQoY3Vycik7Ci0gICAgICAgIGVsc2UgaWYgKGN1cnItPnR5 cGUoKSA9PSBNZWRpYVN0cmVhbVNvdXJjZTo6VHlwZVZpZGVvKQotICAgICAgICAgICAgdmlkZW8u YXBwZW5kKGN1cnIpOwotICAgIH0KLQotICAgIG1fcHJpdmF0ZS0+c3VjY2VlZChhdWRpbywgdmlk ZW8pOwotfQotCiB2b2lkIFdlYlVzZXJNZWRpYVJlcXVlc3Q6OnJlcXVlc3RGYWlsZWQoKQogewog ICAgIG1fcHJpdmF0ZS0+ZmFpbCgpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9v bHMvQ2hhbmdlTG9nCmluZGV4IDFhYzQxYWUzZTljZTI4MWYyZmI2MGU0YTRhZWRlOGRiZTRhYzAz YTQuLjNjNzUwZDdkNmM3MzQwNmNhMTJjMWNiOTg0YzZhYzU0NzUxY2NlNmUgMTAwNjQ0Ci0tLSBh L1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAor MjAxMi0wNC0xOSAgSmVyZW15IE1hbyAgPHl1amllLm1hb0BpbnRlbC5jb20+CisKKyAgICAgICAg TWVkaWEgU3RyZWFtIEFQSTogUGllY2Ugb2YgY29kZSBjbGVhbnVwIGZvciB0aGUgY2hyb21pdW0g cG9ydAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQz MjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWJV c2VyTWVkaWFDbGllbnRNb2NrIHVzZSBhbiBvbGQgcmVxdWVzdFVzZXJNZWRpYSBpbnRlcmZhY2Ug YW5kCisgICAgICAgIFJlcGxhY2UgaXQgd2l0aCB0aGUgbmV3IGludGVyZmFjZS4KKworICAgICAg ICAqIER1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlVzZXJNZWRpYUNsaWVudE1vY2suY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJVc2VyTWVkaWFDbGllbnRNb2NrOjpyZXF1ZXN0VXNlck1lZGlh KToKKyAgICAgICAgUmVtb3ZlIHRoZSBvbGQgcmVxdWVzdFVzZXJNZWRpYSBhbmQgcmVwbGFjZSBp dCB3aXRoIHRoZSBuZXcuCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVXNl ck1lZGlhQ2xpZW50TW9jay5oOgorICAgICAgICAoV2ViVXNlck1lZGlhQ2xpZW50TW9jayk6CisK IDIwMTItMDQtMTcgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNv bT4KIAogICAgICAgICBbRUZMXSBEUlQgc2hvdWxkIHN1cHBvcnQgTGF5b3V0VGVzdENvbnRyb2xs ZXIncyBkdW1wRnJhbWVMb2FkQ2FsbGJhY2tzKCkKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5k ZXJUcmVlL2Nocm9taXVtL1dlYlVzZXJNZWRpYUNsaWVudE1vY2suY3BwIGIvVG9vbHMvRHVtcFJl bmRlclRyZWUvY2hyb21pdW0vV2ViVXNlck1lZGlhQ2xpZW50TW9jay5jcHAKaW5kZXggMjRmYzE0 NGNiYzM3NDZjOGU5ZWEyNjUxMTY2ZjA4M2E5YjA1OGM5MC4uNzIyMTkyMzc2NDU0ODMxYjdkNzJm M2YzM2NkZTcwZjI0ZmQ3YWY5MyAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hy b21pdW0vV2ViVXNlck1lZGlhQ2xpZW50TW9jay5jcHAKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRy ZWUvY2hyb21pdW0vV2ViVXNlck1lZGlhQ2xpZW50TW9jay5jcHAKQEAgLTY1LDE3ICs2NSwyMCBA QCBib29sIFdlYlVzZXJNZWRpYUNsaWVudE1vY2s6OklzTW9ja1N0cmVhbShjb25zdCBXZWJVUkwm IHVybCkKICAgICByZXR1cm4gdHJhY2tJZC5lcXVhbHMoIm1lZGlhc3RyZWFtdGVzdCIpOwogfQog Ci12b2lkIFdlYlVzZXJNZWRpYUNsaWVudE1vY2s6OnJlcXVlc3RVc2VyTWVkaWEoY29uc3QgV2Vi VXNlck1lZGlhUmVxdWVzdCYgc3RyZWFtUmVxdWVzdCwgY29uc3QgV2ViVmVjdG9yPFdlYk1lZGlh U3RyZWFtU291cmNlPiYgc3RyZWFtU291cmNlVmVjdG9yKQordm9pZCBXZWJVc2VyTWVkaWFDbGll bnRNb2NrOjpyZXF1ZXN0VXNlck1lZGlhKGNvbnN0IFdlYlVzZXJNZWRpYVJlcXVlc3QmIHN0cmVh bVJlcXVlc3QsIGNvbnN0IFdlYlZlY3RvcjxXZWJNZWRpYVN0cmVhbVNvdXJjZT4mIGF1ZGlvU291 cmNlc1ZlY3RvciwgY29uc3QgV2ViVmVjdG9yPFdlYk1lZGlhU3RyZWFtU291cmNlPiYgdmlkZW9T b3VyY2VzVmVjdG9yKQogewogICAgIEFTU0VSVCghc3RyZWFtUmVxdWVzdC5pc051bGwoKSk7CiAK ICAgICBXZWJVc2VyTWVkaWFSZXF1ZXN0IHJlcXVlc3QgPSBzdHJlYW1SZXF1ZXN0OwogICAgIGNv bnN0IHNpemVfdCBzaXplID0gMTsKLSAgICBXZWJWZWN0b3I8V2ViTWVkaWFTdHJlYW1Tb3VyY2U+ IHNvdXJjZVZlY3RvcihzaXplKTsKKyAgICBXZWJWZWN0b3I8V2ViTWVkaWFTdHJlYW1Tb3VyY2U+ IGF1ZGlvU291cmNlcyhzaXplKTsKKyAgICBXZWJWZWN0b3I8V2ViTWVkaWFTdHJlYW1Tb3VyY2U+ IHZpZGVvU291cmNlcyhzaXplKTsKICAgICBXZWJTdHJpbmcgdHJhY2tJZCgibWVkaWFzdHJlYW10 ZXN0Iik7Ci0gICAgV2ViU3RyaW5nIHRyYWNrTmFtZSgiVmlkZW9DYXB0dXJlIik7Ci0gICAgc291 cmNlVmVjdG9yWzBdLmluaXRpYWxpemUodHJhY2tJZCwgV2ViTWVkaWFTdHJlYW1Tb3VyY2U6OlR5 cGVWaWRlbywgdHJhY2tOYW1lKTsKLSAgICByZXF1ZXN0LnJlcXVlc3RTdWNjZWVkZWQoc291cmNl VmVjdG9yKTsKKyAgICBXZWJTdHJpbmcgYXVkaW9UcmFja05hbWUoIkF1ZGlvUmVjb3JkIik7Cisg ICAgV2ViU3RyaW5nIHZpZGVvVHJhY2tOYW1lKCJWaWRlb0NhcHR1cmUiKTsKKyAgICBhdWRpb1Nv dXJjZXNbMF0uaW5pdGlhbGl6ZSh0cmFja0lkLCBXZWJNZWRpYVN0cmVhbVNvdXJjZTo6VHlwZUF1 ZGlvLCBhdWRpb1RyYWNrTmFtZSk7CisgICAgdmlkZW9Tb3VyY2VzWzBdLmluaXRpYWxpemUodHJh Y2tJZCwgV2ViTWVkaWFTdHJlYW1Tb3VyY2U6OlR5cGVWaWRlbywgdmlkZW9UcmFja05hbWUpOwor ICAgIHJlcXVlc3QucmVxdWVzdFN1Y2NlZWRlZChhdWRpb1NvdXJjZXMsIHZpZGVvU291cmNlcyk7 CiB9CiAKIHZvaWQgV2ViVXNlck1lZGlhQ2xpZW50TW9jazo6Y2FuY2VsVXNlck1lZGlhUmVxdWVz dChjb25zdCBXZWJVc2VyTWVkaWFSZXF1ZXN0JikKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5k ZXJUcmVlL2Nocm9taXVtL1dlYlVzZXJNZWRpYUNsaWVudE1vY2suaCBiL1Rvb2xzL0R1bXBSZW5k ZXJUcmVlL2Nocm9taXVtL1dlYlVzZXJNZWRpYUNsaWVudE1vY2suaAppbmRleCAxOTQyZTNiZGNh MTVjMTc1MDRiMmFiMDZhMDdhMTlkZDQ0NzM2MTcxLi45YzQ5NzBiOGNjZThlMjUyNWNjN2JmY2Vi NTczZGU5ZDNiZmFiZTJkIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1 bS9XZWJVc2VyTWVkaWFDbGllbnRNb2NrLmgKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hy b21pdW0vV2ViVXNlck1lZGlhQ2xpZW50TW9jay5oCkBAIC01MCw3ICs1MCw3IEBAIHB1YmxpYzoK IAogICAgIGJvb2wgSXNNb2NrU3RyZWFtKGNvbnN0IFdlYlVSTCYpOwogCi0gICAgdmlydHVhbCB2 b2lkIHJlcXVlc3RVc2VyTWVkaWEoY29uc3QgV2ViVXNlck1lZGlhUmVxdWVzdCYsIGNvbnN0IFdl YlZlY3RvcjxXZWJNZWRpYVN0cmVhbVNvdXJjZT4mKTsKKyAgICB2aXJ0dWFsIHZvaWQgcmVxdWVz dFVzZXJNZWRpYShjb25zdCBXZWJVc2VyTWVkaWFSZXF1ZXN0JiwgY29uc3QgV2ViVmVjdG9yPFdl Yk1lZGlhU3RyZWFtU291cmNlPiYsIGNvbnN0IFdlYlZlY3RvcjxXZWJNZWRpYVN0cmVhbVNvdXJj ZT4mKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIHZvaWQgY2FuY2VsVXNlck1lZGlhUmVxdWVzdChj b25zdCBXZWJVc2VyTWVkaWFSZXF1ZXN0Jik7CiAKIHByaXZhdGU6Cg==