111352 2013-03-04 11:58:57 -0800 Small BlobResourceHandle cleanup 2013-03-04 14:08:02 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ap ap dglazkov webkit.review.bot oldest_to_newest 846694 0 ap 2013-03-04 11:58:57 -0800 Just a few touches. 846698 1 191284 ap 2013-03-04 12:01:18 -0800 Created attachment 191284 proposed patch 846700 2 webkit.review.bot 2013-03-04 12:04:50 -0800 Attachment 191284 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/platform/network/BlobRegistryImpl.cpp', u'Source/WebCore/platform/network/BlobRegistryImpl.h', u'Source/WebCore/platform/network/BlobResourceHandle.cpp', u'Source/WebCore/platform/network/BlobResourceHandle.h', u'Source/WebCore/platform/network/FormData.cpp', u'Source/WebCore/platform/network/ResourceHandle.cpp', u'Source/WebCore/platform/network/ResourceHandle.h']" exit_code: 1 Source/WebCore/platform/network/BlobResourceHandle.h:55: The parameter name "request" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebCore/platform/network/BlobResourceHandle.h:55: The parameter name "error" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebCore/platform/network/BlobResourceHandle.h:55: The parameter name "response" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 3 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 846730 3 191284 webkit.review.bot 2013-03-04 12:30:37 -0800 Comment on attachment 191284 proposed patch Attachment 191284 did not pass cr-linux-debug-ews (chromium-xvfb): Output: http://webkit-commit-queue.appspot.com/results/16964051 846737 4 191284 webkit.review.bot 2013-03-04 12:36:45 -0800 Comment on attachment 191284 proposed patch Attachment 191284 did not pass chromium-ews (chromium-xvfb): Output: http://webkit-commit-queue.appspot.com/results/16851465 846741 5 191293 ap 2013-03-04 12:41:14 -0800 Created attachment 191293 fix chromium fork 846747 6 webkit.review.bot 2013-03-04 12:45:09 -0800 Attachment 191293 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/platform/network/BlobRegistryImpl.cpp', u'Source/WebCore/platform/network/BlobRegistryImpl.h', u'Source/WebCore/platform/network/BlobResourceHandle.cpp', u'Source/WebCore/platform/network/BlobResourceHandle.h', u'Source/WebCore/platform/network/FormData.cpp', u'Source/WebCore/platform/network/ResourceHandle.cpp', u'Source/WebCore/platform/network/ResourceHandle.h', u'Source/WebCore/platform/network/chromium/ResourceHandle.cpp']" exit_code: 1 Source/WebCore/platform/network/BlobResourceHandle.h:55: The parameter name "request" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebCore/platform/network/BlobResourceHandle.h:55: The parameter name "error" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebCore/platform/network/BlobResourceHandle.h:55: The parameter name "response" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 3 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 846838 7 191293 webkit.review.bot 2013-03-04 14:07:58 -0800 Comment on attachment 191293 fix chromium fork Clearing flags on attachment: 191293 Committed r144671: <http://trac.webkit.org/changeset/144671> 846839 8 webkit.review.bot 2013-03-04 14:08:02 -0800 All reviewed patches have been landed. Closing bug. 191284 2013-03-04 12:01:18 -0800 2013-03-04 12:41:14 -0800 proposed patch SmallCleanup.txt text/plain 9618 ap SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0NDU0NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBACisyMDEzLTAzLTAyICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIFNtYWxsIEJsb2JSZXNvdXJj ZUhhbmRsZSBjbGVhbnVwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMTEzNTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAxLiBEb24ndCB1c2UgUGFzc1JlZlB0cjxCbG9iU3RvcmFnZURhdGE+IHdoZW4gb3du ZXJzaGlwIGlzIG5vdCBiZWluZyBwYXNzZWQuCisgICAgICAgIDIuIEFkZGVkIE9WRVJSSURFIHRv IHNvbWUgZnVuY3Rpb25zLgorICAgICAgICAzLiBBZGRlZCBjb25zdCB0byBSZXNvdXJjZUhhbmRs ZTo6Zmlyc3RSZXF1ZXN0KCkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL0Jsb2JSZWdp c3RyeUltcGwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6bG9hZFJlc291cmNlU3luY2hyb25vdXNs eSk6CisgICAgICAgIChXZWJDb3JlOjpCbG9iUmVnaXN0cnlJbXBsOjpjcmVhdGVSZXNvdXJjZUhh bmRsZSk6CisgICAgICAgIChXZWJDb3JlOjpCbG9iUmVnaXN0cnlJbXBsOjpnZXRCbG9iRGF0YUZy b21VUkwpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvQmxvYlJlZ2lzdHJ5SW1wbC5oOgor ICAgICAgICAoQmxvYlJlZ2lzdHJ5SW1wbCk6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9C bG9iUmVzb3VyY2VIYW5kbGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QmxvYlJlc291cmNlSGFu ZGxlOjpjcmVhdGVBc3luYyk6CisgICAgICAgIChXZWJDb3JlOjpCbG9iUmVzb3VyY2VIYW5kbGU6 OmxvYWRSZXNvdXJjZVN5bmNocm9ub3VzbHkpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsv QmxvYlJlc291cmNlSGFuZGxlLmg6CisgICAgICAgIChCbG9iUmVzb3VyY2VIYW5kbGUpOgorICAg ICAgICAqIHBsYXRmb3JtL25ldHdvcmsvRm9ybURhdGEuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 YXBwZW5kQmxvYlJlc29sdmVkKToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNl SGFuZGxlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlOjpmaXJzdFJlcXVl c3QpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VIYW5kbGUuaDoKKyAgICAg ICAgKFJlc291cmNlSGFuZGxlKToKKwogMjAxMy0wMy0wMiAgRXJpYyBTZWlkZWwgIDxlcmljQHdl YmtpdC5vcmc+CiAKICAgICAgICAgUmVtb3ZlIHR3byB1bm5lY2Vzc2FyeSBtYWxsb2NzIGZyb20g dGhlIG1haW4tdGhyZWFkLXBhcnNlciBjb2RlIHBhdGgKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL25ldHdvcmsvQmxvYlJlZ2lzdHJ5SW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9CbG9iUmVnaXN0cnlJbXBsLmNwcAkocmV2aXNpb24g MTQ0NTQ0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9CbG9iUmVnaXN0cnlJ bXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTcsNyArNTcsNyBAQCBzdGF0aWMgUGFzc1JlZlB0 cjxSZXNvdXJjZUhhbmRsZT4gY3JlYXRlCiAKIHN0YXRpYyB2b2lkIGxvYWRSZXNvdXJjZVN5bmNo cm9ub3VzbHkoTmV0d29ya2luZ0NvbnRleHQqLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVl c3QsIFN0b3JlZENyZWRlbnRpYWxzLCBSZXNvdXJjZUVycm9yJiBlcnJvciwgUmVzb3VyY2VSZXNw b25zZSYgcmVzcG9uc2UsIFZlY3RvcjxjaGFyPiYgZGF0YSkKIHsKLSAgICBSZWZQdHI8QmxvYlN0 b3JhZ2VEYXRhPiBibG9iRGF0YSA9IHN0YXRpY19jYXN0PEJsb2JSZWdpc3RyeUltcGwmPihibG9i UmVnaXN0cnkoKSkuZ2V0QmxvYkRhdGFGcm9tVVJMKHJlcXVlc3QudXJsKCkpOworICAgIEJsb2JT dG9yYWdlRGF0YSogYmxvYkRhdGEgPSBzdGF0aWNfY2FzdDxCbG9iUmVnaXN0cnlJbXBsJj4oYmxv YlJlZ2lzdHJ5KCkpLmdldEJsb2JEYXRhRnJvbVVSTChyZXF1ZXN0LnVybCgpKTsKICAgICBCbG9i UmVzb3VyY2VIYW5kbGU6OmxvYWRSZXNvdXJjZVN5bmNocm9ub3VzbHkoYmxvYkRhdGEsIHJlcXVl c3QsIGVycm9yLCByZXNwb25zZSwgZGF0YSk7CiB9CiAKQEAgLTgwLDcgKzgwLDcgQEAgc3RhdGlj IHZvaWQgcmVnaXN0ZXJCbG9iUmVzb3VyY2VIYW5kbGVDbwogCiBQYXNzUmVmUHRyPFJlc291cmNl SGFuZGxlPiBCbG9iUmVnaXN0cnlJbXBsOjpjcmVhdGVSZXNvdXJjZUhhbmRsZShjb25zdCBSZXNv dXJjZVJlcXVlc3QmIHJlcXVlc3QsIFJlc291cmNlSGFuZGxlQ2xpZW50KiBjbGllbnQpCiB7Ci0g ICAgUmVmUHRyPEJsb2JSZXNvdXJjZUhhbmRsZT4gaGFuZGxlID0gQmxvYlJlc291cmNlSGFuZGxl OjpjcmVhdGVBc3luYyhtX2Jsb2JzLmdldChyZXF1ZXN0LnVybCgpLnN0cmluZygpKSwgcmVxdWVz dCwgY2xpZW50KTsKKyAgICBSZWZQdHI8QmxvYlJlc291cmNlSGFuZGxlPiBoYW5kbGUgPSBCbG9i UmVzb3VyY2VIYW5kbGU6OmNyZWF0ZUFzeW5jKGdldEJsb2JEYXRhRnJvbVVSTChyZXF1ZXN0LnVy bCgpKSwgcmVxdWVzdCwgY2xpZW50KTsKICAgICBpZiAoIWhhbmRsZSkKICAgICAgICAgcmV0dXJu IDA7CiAKQEAgLTE5MSwxMCArMTkxLDEwIEBAIHZvaWQgQmxvYlJlZ2lzdHJ5SW1wbDo6dW5yZWdp c3RlckJsb2JVUkwKICAgICBtX2Jsb2JzLnJlbW92ZSh1cmwuc3RyaW5nKCkpOwogfQogCi1QYXNz UmVmUHRyPEJsb2JTdG9yYWdlRGF0YT4gQmxvYlJlZ2lzdHJ5SW1wbDo6Z2V0QmxvYkRhdGFGcm9t VVJMKGNvbnN0IEtVUkwmIHVybCkgY29uc3QKK0Jsb2JTdG9yYWdlRGF0YSogQmxvYlJlZ2lzdHJ5 SW1wbDo6Z2V0QmxvYkRhdGFGcm9tVVJMKGNvbnN0IEtVUkwmIHVybCkgY29uc3QKIHsKICAgICBB U1NFUlQoaXNNYWluVGhyZWFkKCkpOwotICAgIHJldHVybiBtX2Jsb2JzLmdldCh1cmwuc3RyaW5n KCkpOworICAgIHJldHVybiBtX2Jsb2JzLmdldCh1cmwuc3RyaW5nKCkpLmdldCgpOwogfQogCiB9 IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL0Jsb2JSZWdpc3RyeUltcGwuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL0Jsb2JSZWdpc3RyeUltcGwuaAkocmV2aXNpb24gMTQ0NTQ0KQorKysgU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9CbG9iUmVnaXN0cnlJbXBsLmgJKHdvcmtpbmcg Y29weSkKQEAgLTUwLDcgKzUwLDcgQEAgY2xhc3MgQmxvYlJlZ2lzdHJ5SW1wbCA6IHB1YmxpYyBC bG9iUmVnaQogcHVibGljOgogICAgIHZpcnR1YWwgfkJsb2JSZWdpc3RyeUltcGwoKTsKIAotICAg IFBhc3NSZWZQdHI8QmxvYlN0b3JhZ2VEYXRhPiBnZXRCbG9iRGF0YUZyb21VUkwoY29uc3QgS1VS TCYpIGNvbnN0OworICAgIEJsb2JTdG9yYWdlRGF0YSogZ2V0QmxvYkRhdGFGcm9tVVJMKGNvbnN0 IEtVUkwmKSBjb25zdDsKIAogICAgIFBhc3NSZWZQdHI8UmVzb3VyY2VIYW5kbGU+IGNyZWF0ZVJl c291cmNlSGFuZGxlKGNvbnN0IFJlc291cmNlUmVxdWVzdCYsIFJlc291cmNlSGFuZGxlQ2xpZW50 Kik7CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvQmxvYlJlc291cmNl SGFuZGxlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L0Jsb2JSZXNvdXJjZUhhbmRsZS5jcHAJKHJldmlzaW9uIDE0NDU0NCkKKysrIFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL25ldHdvcmsvQmxvYlJlc291cmNlSGFuZGxlLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtODIsMTAgKzgyLDEwIEBAIGNsYXNzIEJsb2JSZXNvdXJjZVN5bmNocm9ub3VzTG9hZGVy IDogcHUKIHB1YmxpYzoKICAgICBCbG9iUmVzb3VyY2VTeW5jaHJvbm91c0xvYWRlcihSZXNvdXJj ZUVycm9yJiwgUmVzb3VyY2VSZXNwb25zZSYsIFZlY3RvcjxjaGFyPiYpOwogCi0gICAgdmlydHVh bCB2b2lkIGRpZFJlY2VpdmVSZXNwb25zZShSZXNvdXJjZUhhbmRsZSosIGNvbnN0IFJlc291cmNl UmVzcG9uc2UmKTsKLSAgICB2aXJ0dWFsIHZvaWQgZGlkUmVjZWl2ZURhdGEoUmVzb3VyY2VIYW5k bGUqLCBjb25zdCBjaGFyKiwgaW50LCBpbnQgLyplbmNvZGVkRGF0YUxlbmd0aCovKTsKLSAgICB2 aXJ0dWFsIHZvaWQgZGlkRmluaXNoTG9hZGluZyhSZXNvdXJjZUhhbmRsZSosIGRvdWJsZSAvKmZp bmlzaFRpbWUqLyk7Ci0gICAgdmlydHVhbCB2b2lkIGRpZEZhaWwoUmVzb3VyY2VIYW5kbGUqLCBj b25zdCBSZXNvdXJjZUVycm9yJik7CisgICAgdmlydHVhbCB2b2lkIGRpZFJlY2VpdmVSZXNwb25z ZShSZXNvdXJjZUhhbmRsZSosIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmKSBPVkVSUklERTsKKyAg ICB2aXJ0dWFsIHZvaWQgZGlkUmVjZWl2ZURhdGEoUmVzb3VyY2VIYW5kbGUqLCBjb25zdCBjaGFy KiwgaW50LCBpbnQgLyplbmNvZGVkRGF0YUxlbmd0aCovKSBPVkVSUklERTsKKyAgICB2aXJ0dWFs IHZvaWQgZGlkRmluaXNoTG9hZGluZyhSZXNvdXJjZUhhbmRsZSosIGRvdWJsZSAvKmZpbmlzaFRp bWUqLykgT1ZFUlJJREU7CisgICAgdmlydHVhbCB2b2lkIGRpZEZhaWwoUmVzb3VyY2VIYW5kbGUq LCBjb25zdCBSZXNvdXJjZUVycm9yJikgT1ZFUlJJREU7CiAKIHByaXZhdGU6CiAgICAgUmVzb3Vy Y2VFcnJvciYgbV9lcnJvcjsKQEAgLTEzMyw3ICsxMzMsNyBAQCB2b2lkIEJsb2JSZXNvdXJjZVN5 bmNocm9ub3VzTG9hZGVyOjpkaWRGCiAvLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vCiAvLyBCbG9iUmVz b3VyY2VIYW5kbGUKIAotUGFzc1JlZlB0cjxCbG9iUmVzb3VyY2VIYW5kbGU+IEJsb2JSZXNvdXJj ZUhhbmRsZTo6Y3JlYXRlQXN5bmMoUGFzc1JlZlB0cjxCbG9iU3RvcmFnZURhdGE+IGJsb2JEYXRh LCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIFJlc291cmNlSGFuZGxlQ2xpZW50KiBj bGllbnQpCitQYXNzUmVmUHRyPEJsb2JSZXNvdXJjZUhhbmRsZT4gQmxvYlJlc291cmNlSGFuZGxl OjpjcmVhdGVBc3luYyhCbG9iU3RvcmFnZURhdGEqIGJsb2JEYXRhLCBjb25zdCBSZXNvdXJjZVJl cXVlc3QmIHJlcXVlc3QsIFJlc291cmNlSGFuZGxlQ2xpZW50KiBjbGllbnQpCiB7CiAgICAgLy8g RklYTUU6IFNob3VsZCBwcm9iYWJseSBjYWxsIGRpZEZhaWwoKSBpbnN0ZWFkIG9mIGJsb2NraW5n IHRoZSBsb2FkIHdpdGhvdXQgZXhwbGFuYXRpb24uCiAgICAgaWYgKCFlcXVhbElnbm9yaW5nQ2Fz ZShyZXF1ZXN0Lmh0dHBNZXRob2QoKSwgIkdFVCIpKQpAQCAtMTQyLDcgKzE0Miw3IEBAIFBhc3NS ZWZQdHI8QmxvYlJlc291cmNlSGFuZGxlPiBCbG9iUmVzb3UKICAgICByZXR1cm4gYWRvcHRSZWYo bmV3IEJsb2JSZXNvdXJjZUhhbmRsZShibG9iRGF0YSwgcmVxdWVzdCwgY2xpZW50LCB0cnVlKSk7 CiB9CiAKLXZvaWQgQmxvYlJlc291cmNlSGFuZGxlOjpsb2FkUmVzb3VyY2VTeW5jaHJvbm91c2x5 KFBhc3NSZWZQdHI8QmxvYlN0b3JhZ2VEYXRhPiBibG9iRGF0YSwgY29uc3QgUmVzb3VyY2VSZXF1 ZXN0JiByZXF1ZXN0LCBSZXNvdXJjZUVycm9yJiBlcnJvciwgUmVzb3VyY2VSZXNwb25zZSYgcmVz cG9uc2UsIFZlY3RvcjxjaGFyPiYgZGF0YSkKK3ZvaWQgQmxvYlJlc291cmNlSGFuZGxlOjpsb2Fk UmVzb3VyY2VTeW5jaHJvbm91c2x5KEJsb2JTdG9yYWdlRGF0YSogYmxvYkRhdGEsIGNvbnN0IFJl c291cmNlUmVxdWVzdCYgcmVxdWVzdCwgUmVzb3VyY2VFcnJvciYgZXJyb3IsIFJlc291cmNlUmVz cG9uc2UmIHJlc3BvbnNlLCBWZWN0b3I8Y2hhcj4mIGRhdGEpCiB7CiAgICAgaWYgKCFlcXVhbEln bm9yaW5nQ2FzZShyZXF1ZXN0Lmh0dHBNZXRob2QoKSwgIkdFVCIpKSB7CiAgICAgICAgIGVycm9y ID0gUmVzb3VyY2VFcnJvcih3ZWJLaXRCbG9iUmVzb3VyY2VEb21haW4sIG1ldGhvZE5vdEFsbG93 ZWQsIHJlc3BvbnNlLnVybCgpLCAiUmVxdWVzdCBtZXRob2QgbXVzdCBiZSBHRVQiKTsKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvQmxvYlJlc291cmNlSGFuZGxlLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9CbG9iUmVzb3VyY2VI YW5kbGUuaAkocmV2aXNpb24gMTQ0NTQ0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9CbG9iUmVzb3VyY2VIYW5kbGUuaAkod29ya2luZyBjb3B5KQpAQCAtNTAsMTcgKzUwLDE3 IEBAIHN0cnVjdCBCbG9iRGF0YUl0ZW07CiAKIGNsYXNzIEJsb2JSZXNvdXJjZUhhbmRsZSA6IHB1 YmxpYyBGaWxlU3RyZWFtQ2xpZW50LCBwdWJsaWMgUmVzb3VyY2VIYW5kbGUgIHsKIHB1YmxpYzoK LSAgICBzdGF0aWMgUGFzc1JlZlB0cjxCbG9iUmVzb3VyY2VIYW5kbGU+IGNyZWF0ZUFzeW5jKFBh c3NSZWZQdHI8QmxvYlN0b3JhZ2VEYXRhPiwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiwgUmVzb3Vy Y2VIYW5kbGVDbGllbnQqKTsKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxCbG9iUmVzb3VyY2VIYW5k bGU+IGNyZWF0ZUFzeW5jKEJsb2JTdG9yYWdlRGF0YSosIGNvbnN0IFJlc291cmNlUmVxdWVzdCYs IFJlc291cmNlSGFuZGxlQ2xpZW50Kik7CiAKLSAgICBzdGF0aWMgdm9pZCBsb2FkUmVzb3VyY2VT eW5jaHJvbm91c2x5KFBhc3NSZWZQdHI8QmxvYlN0b3JhZ2VEYXRhPiBibG9iRGF0YSwgY29uc3Qg UmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBSZXNvdXJjZUVycm9yJiBlcnJvciwgUmVzb3VyY2VS ZXNwb25zZSYgcmVzcG9uc2UsIFZlY3RvcjxjaGFyPiYgZGF0YSk7CisgICAgc3RhdGljIHZvaWQg bG9hZFJlc291cmNlU3luY2hyb25vdXNseShCbG9iU3RvcmFnZURhdGEqIGJsb2JEYXRhLCBjb25z dCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIFJlc291cmNlRXJyb3ImIGVycm9yLCBSZXNvdXJj ZVJlc3BvbnNlJiByZXNwb25zZSwgVmVjdG9yPGNoYXI+JiBkYXRhKTsKIAogICAgIC8vIEZpbGVT dHJlYW1DbGllbnQgbWV0aG9kcy4KLSAgICB2aXJ0dWFsIHZvaWQgZGlkR2V0U2l6ZShsb25nIGxv bmcpOwotICAgIHZpcnR1YWwgdm9pZCBkaWRPcGVuKGJvb2wpOwotICAgIHZpcnR1YWwgdm9pZCBk aWRSZWFkKGludCk7CisgICAgdmlydHVhbCB2b2lkIGRpZEdldFNpemUobG9uZyBsb25nKSBPVkVS UklERTsKKyAgICB2aXJ0dWFsIHZvaWQgZGlkT3Blbihib29sKSBPVkVSUklERTsKKyAgICB2aXJ0 dWFsIHZvaWQgZGlkUmVhZChpbnQpIE9WRVJSSURFOwogCiAgICAgLy8gUmVzb3VyY2VIYW5kbGUg bWV0aG9kcy4KLSAgICB2aXJ0dWFsIHZvaWQgY2FuY2VsKCk7CisgICAgdmlydHVhbCB2b2lkIGNh bmNlbCgpIE9WRVJSSURFOwogCiAgICAgdm9pZCBzdGFydCgpOwogICAgIGludCByZWFkU3luYyhj aGFyKiwgaW50KTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvRm9ybURh dGEuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvRm9y bURhdGEuY3BwCShyZXZpc2lvbiAxNDQ1NDQpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL0Zvcm1EYXRhLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzI2LDcgKzMyNiw3IEBAIHN0 YXRpYyB2b2lkIGFwcGVuZEJsb2JSZXNvbHZlZChGb3JtRGF0YSoKICAgICAgICAgTE9HX0VSUk9S KCJUcmllZCB0byByZXNvbHZlIGEgYmxvYiB3aXRob3V0IGEgdXNhYmxlIHJlZ2lzdHJ5Iik7CiAg ICAgICAgIHJldHVybjsKICAgICB9Ci0gICAgUmVmUHRyPEJsb2JTdG9yYWdlRGF0YT4gYmxvYkRh dGEgPSBzdGF0aWNfY2FzdDxCbG9iUmVnaXN0cnlJbXBsJj4oYmxvYlJlZ2lzdHJ5KCkpLmdldEJs b2JEYXRhRnJvbVVSTChLVVJMKFBhcnNlZFVSTFN0cmluZywgdXJsKSk7CisgICAgQmxvYlN0b3Jh Z2VEYXRhKiBibG9iRGF0YSA9IHN0YXRpY19jYXN0PEJsb2JSZWdpc3RyeUltcGwmPihibG9iUmVn aXN0cnkoKSkuZ2V0QmxvYkRhdGFGcm9tVVJMKEtVUkwoUGFyc2VkVVJMU3RyaW5nLCB1cmwpKTsK ICAgICBpZiAoIWJsb2JEYXRhKSB7CiAgICAgICAgIExPR19FUlJPUigiQ291bGQgbm90IGdldCBi bG9iIGRhdGEgZnJvbSBhIHJlZ2lzdHJ5Iik7CiAgICAgICAgIHJldHVybjsKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VIYW5kbGUuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VIYW5kbGUuY3BwCShy ZXZpc2lvbiAxNDQ1NDQpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291 cmNlSGFuZGxlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQ3LDcgKzE0Nyw3IEBAIHZvaWQgUmVz b3VyY2VIYW5kbGU6OnNldENsaWVudChSZXNvdXJjZUgKICAgICBkLT5tX2NsaWVudCA9IGNsaWVu dDsKIH0KIAotUmVzb3VyY2VSZXF1ZXN0JiBSZXNvdXJjZUhhbmRsZTo6Zmlyc3RSZXF1ZXN0KCkK K1Jlc291cmNlUmVxdWVzdCYgUmVzb3VyY2VIYW5kbGU6OmZpcnN0UmVxdWVzdCgpIGNvbnN0CiB7 CiAgICAgcmV0dXJuIGQtPm1fZmlyc3RSZXF1ZXN0OwogfQpJbmRleDogU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZUhhbmRsZS5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VIYW5kbGUuaAkocmV2aXNpb24gMTQ0NTQ0 KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZUhhbmRsZS5oCSh3 b3JraW5nIGNvcHkpCkBAIC0xOTQsNyArMTk0LDcgQEAgcHVibGljOgogCiAgICAgdm9pZCBkaWRD aGFuZ2VQcmlvcml0eShSZXNvdXJjZUxvYWRQcmlvcml0eSk7CiAKLSAgICBSZXNvdXJjZVJlcXVl c3QmIGZpcnN0UmVxdWVzdCgpOworICAgIFJlc291cmNlUmVxdWVzdCYgZmlyc3RSZXF1ZXN0KCkg Y29uc3Q7CiAgICAgY29uc3QgU3RyaW5nJiBsYXN0SFRUUE1ldGhvZCgpIGNvbnN0OwogCiAgICAg dm9pZCBmaXJlRmFpbHVyZShUaW1lcjxSZXNvdXJjZUhhbmRsZT4qKTsK 191293 2013-03-04 12:41:14 -0800 2013-03-04 14:07:58 -0800 fix chromium fork SmallCleanup.txt text/plain 10131 ap SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0NDU0NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBACisyMDEzLTAzLTAyICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIFNtYWxsIEJsb2JSZXNvdXJj ZUhhbmRsZSBjbGVhbnVwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMTEzNTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAxLiBEb24ndCB1c2UgUGFzc1JlZlB0cjxCbG9iU3RvcmFnZURhdGE+IHdoZW4gb3du ZXJzaGlwIGlzIG5vdCBiZWluZyBwYXNzZWQuCisgICAgICAgIDIuIEFkZGVkIE9WRVJSSURFIHRv IHNvbWUgZnVuY3Rpb25zLgorICAgICAgICAzLiBBZGRlZCBjb25zdCB0byBSZXNvdXJjZUhhbmRs ZTo6Zmlyc3RSZXF1ZXN0KCkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL0Jsb2JSZWdp c3RyeUltcGwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6bG9hZFJlc291cmNlU3luY2hyb25vdXNs eSk6CisgICAgICAgIChXZWJDb3JlOjpCbG9iUmVnaXN0cnlJbXBsOjpjcmVhdGVSZXNvdXJjZUhh bmRsZSk6CisgICAgICAgIChXZWJDb3JlOjpCbG9iUmVnaXN0cnlJbXBsOjpnZXRCbG9iRGF0YUZy b21VUkwpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvQmxvYlJlZ2lzdHJ5SW1wbC5oOgor ICAgICAgICAoQmxvYlJlZ2lzdHJ5SW1wbCk6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9C bG9iUmVzb3VyY2VIYW5kbGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QmxvYlJlc291cmNlSGFu ZGxlOjpjcmVhdGVBc3luYyk6CisgICAgICAgIChXZWJDb3JlOjpCbG9iUmVzb3VyY2VIYW5kbGU6 OmxvYWRSZXNvdXJjZVN5bmNocm9ub3VzbHkpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsv QmxvYlJlc291cmNlSGFuZGxlLmg6CisgICAgICAgIChCbG9iUmVzb3VyY2VIYW5kbGUpOgorICAg ICAgICAqIHBsYXRmb3JtL25ldHdvcmsvRm9ybURhdGEuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 YXBwZW5kQmxvYlJlc29sdmVkKToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNl SGFuZGxlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlOjpmaXJzdFJlcXVl c3QpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VIYW5kbGUuaDoKKyAgICAg ICAgKFJlc291cmNlSGFuZGxlKToKKwogMjAxMy0wMy0wMiAgRXJpYyBTZWlkZWwgIDxlcmljQHdl YmtpdC5vcmc+CiAKICAgICAgICAgUmVtb3ZlIHR3byB1bm5lY2Vzc2FyeSBtYWxsb2NzIGZyb20g dGhlIG1haW4tdGhyZWFkLXBhcnNlciBjb2RlIHBhdGgKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL25ldHdvcmsvQmxvYlJlZ2lzdHJ5SW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9CbG9iUmVnaXN0cnlJbXBsLmNwcAkocmV2aXNpb24g MTQ0NTQ0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9CbG9iUmVnaXN0cnlJ bXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTcsNyArNTcsNyBAQCBzdGF0aWMgUGFzc1JlZlB0 cjxSZXNvdXJjZUhhbmRsZT4gY3JlYXRlCiAKIHN0YXRpYyB2b2lkIGxvYWRSZXNvdXJjZVN5bmNo cm9ub3VzbHkoTmV0d29ya2luZ0NvbnRleHQqLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVl c3QsIFN0b3JlZENyZWRlbnRpYWxzLCBSZXNvdXJjZUVycm9yJiBlcnJvciwgUmVzb3VyY2VSZXNw b25zZSYgcmVzcG9uc2UsIFZlY3RvcjxjaGFyPiYgZGF0YSkKIHsKLSAgICBSZWZQdHI8QmxvYlN0 b3JhZ2VEYXRhPiBibG9iRGF0YSA9IHN0YXRpY19jYXN0PEJsb2JSZWdpc3RyeUltcGwmPihibG9i UmVnaXN0cnkoKSkuZ2V0QmxvYkRhdGFGcm9tVVJMKHJlcXVlc3QudXJsKCkpOworICAgIEJsb2JT dG9yYWdlRGF0YSogYmxvYkRhdGEgPSBzdGF0aWNfY2FzdDxCbG9iUmVnaXN0cnlJbXBsJj4oYmxv YlJlZ2lzdHJ5KCkpLmdldEJsb2JEYXRhRnJvbVVSTChyZXF1ZXN0LnVybCgpKTsKICAgICBCbG9i UmVzb3VyY2VIYW5kbGU6OmxvYWRSZXNvdXJjZVN5bmNocm9ub3VzbHkoYmxvYkRhdGEsIHJlcXVl c3QsIGVycm9yLCByZXNwb25zZSwgZGF0YSk7CiB9CiAKQEAgLTgwLDcgKzgwLDcgQEAgc3RhdGlj IHZvaWQgcmVnaXN0ZXJCbG9iUmVzb3VyY2VIYW5kbGVDbwogCiBQYXNzUmVmUHRyPFJlc291cmNl SGFuZGxlPiBCbG9iUmVnaXN0cnlJbXBsOjpjcmVhdGVSZXNvdXJjZUhhbmRsZShjb25zdCBSZXNv dXJjZVJlcXVlc3QmIHJlcXVlc3QsIFJlc291cmNlSGFuZGxlQ2xpZW50KiBjbGllbnQpCiB7Ci0g ICAgUmVmUHRyPEJsb2JSZXNvdXJjZUhhbmRsZT4gaGFuZGxlID0gQmxvYlJlc291cmNlSGFuZGxl OjpjcmVhdGVBc3luYyhtX2Jsb2JzLmdldChyZXF1ZXN0LnVybCgpLnN0cmluZygpKSwgcmVxdWVz dCwgY2xpZW50KTsKKyAgICBSZWZQdHI8QmxvYlJlc291cmNlSGFuZGxlPiBoYW5kbGUgPSBCbG9i UmVzb3VyY2VIYW5kbGU6OmNyZWF0ZUFzeW5jKGdldEJsb2JEYXRhRnJvbVVSTChyZXF1ZXN0LnVy bCgpKSwgcmVxdWVzdCwgY2xpZW50KTsKICAgICBpZiAoIWhhbmRsZSkKICAgICAgICAgcmV0dXJu IDA7CiAKQEAgLTE5MSwxMCArMTkxLDEwIEBAIHZvaWQgQmxvYlJlZ2lzdHJ5SW1wbDo6dW5yZWdp c3RlckJsb2JVUkwKICAgICBtX2Jsb2JzLnJlbW92ZSh1cmwuc3RyaW5nKCkpOwogfQogCi1QYXNz UmVmUHRyPEJsb2JTdG9yYWdlRGF0YT4gQmxvYlJlZ2lzdHJ5SW1wbDo6Z2V0QmxvYkRhdGFGcm9t VVJMKGNvbnN0IEtVUkwmIHVybCkgY29uc3QKK0Jsb2JTdG9yYWdlRGF0YSogQmxvYlJlZ2lzdHJ5 SW1wbDo6Z2V0QmxvYkRhdGFGcm9tVVJMKGNvbnN0IEtVUkwmIHVybCkgY29uc3QKIHsKICAgICBB U1NFUlQoaXNNYWluVGhyZWFkKCkpOwotICAgIHJldHVybiBtX2Jsb2JzLmdldCh1cmwuc3RyaW5n KCkpOworICAgIHJldHVybiBtX2Jsb2JzLmdldCh1cmwuc3RyaW5nKCkpLmdldCgpOwogfQogCiB9 IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL0Jsb2JSZWdpc3RyeUltcGwuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL0Jsb2JSZWdpc3RyeUltcGwuaAkocmV2aXNpb24gMTQ0NTQ0KQorKysgU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9CbG9iUmVnaXN0cnlJbXBsLmgJKHdvcmtpbmcg Y29weSkKQEAgLTUwLDcgKzUwLDcgQEAgY2xhc3MgQmxvYlJlZ2lzdHJ5SW1wbCA6IHB1YmxpYyBC bG9iUmVnaQogcHVibGljOgogICAgIHZpcnR1YWwgfkJsb2JSZWdpc3RyeUltcGwoKTsKIAotICAg IFBhc3NSZWZQdHI8QmxvYlN0b3JhZ2VEYXRhPiBnZXRCbG9iRGF0YUZyb21VUkwoY29uc3QgS1VS TCYpIGNvbnN0OworICAgIEJsb2JTdG9yYWdlRGF0YSogZ2V0QmxvYkRhdGFGcm9tVVJMKGNvbnN0 IEtVUkwmKSBjb25zdDsKIAogICAgIFBhc3NSZWZQdHI8UmVzb3VyY2VIYW5kbGU+IGNyZWF0ZVJl c291cmNlSGFuZGxlKGNvbnN0IFJlc291cmNlUmVxdWVzdCYsIFJlc291cmNlSGFuZGxlQ2xpZW50 Kik7CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvQmxvYlJlc291cmNl SGFuZGxlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L0Jsb2JSZXNvdXJjZUhhbmRsZS5jcHAJKHJldmlzaW9uIDE0NDU0NCkKKysrIFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL25ldHdvcmsvQmxvYlJlc291cmNlSGFuZGxlLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtODIsMTAgKzgyLDEwIEBAIGNsYXNzIEJsb2JSZXNvdXJjZVN5bmNocm9ub3VzTG9hZGVy IDogcHUKIHB1YmxpYzoKICAgICBCbG9iUmVzb3VyY2VTeW5jaHJvbm91c0xvYWRlcihSZXNvdXJj ZUVycm9yJiwgUmVzb3VyY2VSZXNwb25zZSYsIFZlY3RvcjxjaGFyPiYpOwogCi0gICAgdmlydHVh bCB2b2lkIGRpZFJlY2VpdmVSZXNwb25zZShSZXNvdXJjZUhhbmRsZSosIGNvbnN0IFJlc291cmNl UmVzcG9uc2UmKTsKLSAgICB2aXJ0dWFsIHZvaWQgZGlkUmVjZWl2ZURhdGEoUmVzb3VyY2VIYW5k bGUqLCBjb25zdCBjaGFyKiwgaW50LCBpbnQgLyplbmNvZGVkRGF0YUxlbmd0aCovKTsKLSAgICB2 aXJ0dWFsIHZvaWQgZGlkRmluaXNoTG9hZGluZyhSZXNvdXJjZUhhbmRsZSosIGRvdWJsZSAvKmZp bmlzaFRpbWUqLyk7Ci0gICAgdmlydHVhbCB2b2lkIGRpZEZhaWwoUmVzb3VyY2VIYW5kbGUqLCBj b25zdCBSZXNvdXJjZUVycm9yJik7CisgICAgdmlydHVhbCB2b2lkIGRpZFJlY2VpdmVSZXNwb25z ZShSZXNvdXJjZUhhbmRsZSosIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmKSBPVkVSUklERTsKKyAg ICB2aXJ0dWFsIHZvaWQgZGlkUmVjZWl2ZURhdGEoUmVzb3VyY2VIYW5kbGUqLCBjb25zdCBjaGFy KiwgaW50LCBpbnQgLyplbmNvZGVkRGF0YUxlbmd0aCovKSBPVkVSUklERTsKKyAgICB2aXJ0dWFs IHZvaWQgZGlkRmluaXNoTG9hZGluZyhSZXNvdXJjZUhhbmRsZSosIGRvdWJsZSAvKmZpbmlzaFRp bWUqLykgT1ZFUlJJREU7CisgICAgdmlydHVhbCB2b2lkIGRpZEZhaWwoUmVzb3VyY2VIYW5kbGUq LCBjb25zdCBSZXNvdXJjZUVycm9yJikgT1ZFUlJJREU7CiAKIHByaXZhdGU6CiAgICAgUmVzb3Vy Y2VFcnJvciYgbV9lcnJvcjsKQEAgLTEzMyw3ICsxMzMsNyBAQCB2b2lkIEJsb2JSZXNvdXJjZVN5 bmNocm9ub3VzTG9hZGVyOjpkaWRGCiAvLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vCiAvLyBCbG9iUmVz b3VyY2VIYW5kbGUKIAotUGFzc1JlZlB0cjxCbG9iUmVzb3VyY2VIYW5kbGU+IEJsb2JSZXNvdXJj ZUhhbmRsZTo6Y3JlYXRlQXN5bmMoUGFzc1JlZlB0cjxCbG9iU3RvcmFnZURhdGE+IGJsb2JEYXRh LCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIFJlc291cmNlSGFuZGxlQ2xpZW50KiBj bGllbnQpCitQYXNzUmVmUHRyPEJsb2JSZXNvdXJjZUhhbmRsZT4gQmxvYlJlc291cmNlSGFuZGxl OjpjcmVhdGVBc3luYyhCbG9iU3RvcmFnZURhdGEqIGJsb2JEYXRhLCBjb25zdCBSZXNvdXJjZVJl cXVlc3QmIHJlcXVlc3QsIFJlc291cmNlSGFuZGxlQ2xpZW50KiBjbGllbnQpCiB7CiAgICAgLy8g RklYTUU6IFNob3VsZCBwcm9iYWJseSBjYWxsIGRpZEZhaWwoKSBpbnN0ZWFkIG9mIGJsb2NraW5n IHRoZSBsb2FkIHdpdGhvdXQgZXhwbGFuYXRpb24uCiAgICAgaWYgKCFlcXVhbElnbm9yaW5nQ2Fz ZShyZXF1ZXN0Lmh0dHBNZXRob2QoKSwgIkdFVCIpKQpAQCAtMTQyLDcgKzE0Miw3IEBAIFBhc3NS ZWZQdHI8QmxvYlJlc291cmNlSGFuZGxlPiBCbG9iUmVzb3UKICAgICByZXR1cm4gYWRvcHRSZWYo bmV3IEJsb2JSZXNvdXJjZUhhbmRsZShibG9iRGF0YSwgcmVxdWVzdCwgY2xpZW50LCB0cnVlKSk7 CiB9CiAKLXZvaWQgQmxvYlJlc291cmNlSGFuZGxlOjpsb2FkUmVzb3VyY2VTeW5jaHJvbm91c2x5 KFBhc3NSZWZQdHI8QmxvYlN0b3JhZ2VEYXRhPiBibG9iRGF0YSwgY29uc3QgUmVzb3VyY2VSZXF1 ZXN0JiByZXF1ZXN0LCBSZXNvdXJjZUVycm9yJiBlcnJvciwgUmVzb3VyY2VSZXNwb25zZSYgcmVz cG9uc2UsIFZlY3RvcjxjaGFyPiYgZGF0YSkKK3ZvaWQgQmxvYlJlc291cmNlSGFuZGxlOjpsb2Fk UmVzb3VyY2VTeW5jaHJvbm91c2x5KEJsb2JTdG9yYWdlRGF0YSogYmxvYkRhdGEsIGNvbnN0IFJl c291cmNlUmVxdWVzdCYgcmVxdWVzdCwgUmVzb3VyY2VFcnJvciYgZXJyb3IsIFJlc291cmNlUmVz cG9uc2UmIHJlc3BvbnNlLCBWZWN0b3I8Y2hhcj4mIGRhdGEpCiB7CiAgICAgaWYgKCFlcXVhbEln bm9yaW5nQ2FzZShyZXF1ZXN0Lmh0dHBNZXRob2QoKSwgIkdFVCIpKSB7CiAgICAgICAgIGVycm9y ID0gUmVzb3VyY2VFcnJvcih3ZWJLaXRCbG9iUmVzb3VyY2VEb21haW4sIG1ldGhvZE5vdEFsbG93 ZWQsIHJlc3BvbnNlLnVybCgpLCAiUmVxdWVzdCBtZXRob2QgbXVzdCBiZSBHRVQiKTsKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvQmxvYlJlc291cmNlSGFuZGxlLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9CbG9iUmVzb3VyY2VI YW5kbGUuaAkocmV2aXNpb24gMTQ0NTQ0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9CbG9iUmVzb3VyY2VIYW5kbGUuaAkod29ya2luZyBjb3B5KQpAQCAtNTAsMTcgKzUwLDE3 IEBAIHN0cnVjdCBCbG9iRGF0YUl0ZW07CiAKIGNsYXNzIEJsb2JSZXNvdXJjZUhhbmRsZSA6IHB1 YmxpYyBGaWxlU3RyZWFtQ2xpZW50LCBwdWJsaWMgUmVzb3VyY2VIYW5kbGUgIHsKIHB1YmxpYzoK LSAgICBzdGF0aWMgUGFzc1JlZlB0cjxCbG9iUmVzb3VyY2VIYW5kbGU+IGNyZWF0ZUFzeW5jKFBh c3NSZWZQdHI8QmxvYlN0b3JhZ2VEYXRhPiwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiwgUmVzb3Vy Y2VIYW5kbGVDbGllbnQqKTsKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxCbG9iUmVzb3VyY2VIYW5k bGU+IGNyZWF0ZUFzeW5jKEJsb2JTdG9yYWdlRGF0YSosIGNvbnN0IFJlc291cmNlUmVxdWVzdCYs IFJlc291cmNlSGFuZGxlQ2xpZW50Kik7CiAKLSAgICBzdGF0aWMgdm9pZCBsb2FkUmVzb3VyY2VT eW5jaHJvbm91c2x5KFBhc3NSZWZQdHI8QmxvYlN0b3JhZ2VEYXRhPiBibG9iRGF0YSwgY29uc3Qg UmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBSZXNvdXJjZUVycm9yJiBlcnJvciwgUmVzb3VyY2VS ZXNwb25zZSYgcmVzcG9uc2UsIFZlY3RvcjxjaGFyPiYgZGF0YSk7CisgICAgc3RhdGljIHZvaWQg bG9hZFJlc291cmNlU3luY2hyb25vdXNseShCbG9iU3RvcmFnZURhdGEqIGJsb2JEYXRhLCBjb25z dCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIFJlc291cmNlRXJyb3ImIGVycm9yLCBSZXNvdXJj ZVJlc3BvbnNlJiByZXNwb25zZSwgVmVjdG9yPGNoYXI+JiBkYXRhKTsKIAogICAgIC8vIEZpbGVT dHJlYW1DbGllbnQgbWV0aG9kcy4KLSAgICB2aXJ0dWFsIHZvaWQgZGlkR2V0U2l6ZShsb25nIGxv bmcpOwotICAgIHZpcnR1YWwgdm9pZCBkaWRPcGVuKGJvb2wpOwotICAgIHZpcnR1YWwgdm9pZCBk aWRSZWFkKGludCk7CisgICAgdmlydHVhbCB2b2lkIGRpZEdldFNpemUobG9uZyBsb25nKSBPVkVS UklERTsKKyAgICB2aXJ0dWFsIHZvaWQgZGlkT3Blbihib29sKSBPVkVSUklERTsKKyAgICB2aXJ0 dWFsIHZvaWQgZGlkUmVhZChpbnQpIE9WRVJSSURFOwogCiAgICAgLy8gUmVzb3VyY2VIYW5kbGUg bWV0aG9kcy4KLSAgICB2aXJ0dWFsIHZvaWQgY2FuY2VsKCk7CisgICAgdmlydHVhbCB2b2lkIGNh bmNlbCgpIE9WRVJSSURFOwogCiAgICAgdm9pZCBzdGFydCgpOwogICAgIGludCByZWFkU3luYyhj aGFyKiwgaW50KTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvRm9ybURh dGEuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvRm9y bURhdGEuY3BwCShyZXZpc2lvbiAxNDQ1NDQpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL0Zvcm1EYXRhLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzI2LDcgKzMyNiw3IEBAIHN0 YXRpYyB2b2lkIGFwcGVuZEJsb2JSZXNvbHZlZChGb3JtRGF0YSoKICAgICAgICAgTE9HX0VSUk9S KCJUcmllZCB0byByZXNvbHZlIGEgYmxvYiB3aXRob3V0IGEgdXNhYmxlIHJlZ2lzdHJ5Iik7CiAg ICAgICAgIHJldHVybjsKICAgICB9Ci0gICAgUmVmUHRyPEJsb2JTdG9yYWdlRGF0YT4gYmxvYkRh dGEgPSBzdGF0aWNfY2FzdDxCbG9iUmVnaXN0cnlJbXBsJj4oYmxvYlJlZ2lzdHJ5KCkpLmdldEJs b2JEYXRhRnJvbVVSTChLVVJMKFBhcnNlZFVSTFN0cmluZywgdXJsKSk7CisgICAgQmxvYlN0b3Jh Z2VEYXRhKiBibG9iRGF0YSA9IHN0YXRpY19jYXN0PEJsb2JSZWdpc3RyeUltcGwmPihibG9iUmVn aXN0cnkoKSkuZ2V0QmxvYkRhdGFGcm9tVVJMKEtVUkwoUGFyc2VkVVJMU3RyaW5nLCB1cmwpKTsK ICAgICBpZiAoIWJsb2JEYXRhKSB7CiAgICAgICAgIExPR19FUlJPUigiQ291bGQgbm90IGdldCBi bG9iIGRhdGEgZnJvbSBhIHJlZ2lzdHJ5Iik7CiAgICAgICAgIHJldHVybjsKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VIYW5kbGUuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VIYW5kbGUuY3BwCShy ZXZpc2lvbiAxNDQ1NDQpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291 cmNlSGFuZGxlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQ3LDcgKzE0Nyw3IEBAIHZvaWQgUmVz b3VyY2VIYW5kbGU6OnNldENsaWVudChSZXNvdXJjZUgKICAgICBkLT5tX2NsaWVudCA9IGNsaWVu dDsKIH0KIAotUmVzb3VyY2VSZXF1ZXN0JiBSZXNvdXJjZUhhbmRsZTo6Zmlyc3RSZXF1ZXN0KCkK K1Jlc291cmNlUmVxdWVzdCYgUmVzb3VyY2VIYW5kbGU6OmZpcnN0UmVxdWVzdCgpIGNvbnN0CiB7 CiAgICAgcmV0dXJuIGQtPm1fZmlyc3RSZXF1ZXN0OwogfQpJbmRleDogU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZUhhbmRsZS5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VIYW5kbGUuaAkocmV2aXNpb24gMTQ0NTQ0 KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZUhhbmRsZS5oCSh3 b3JraW5nIGNvcHkpCkBAIC0xOTQsNyArMTk0LDcgQEAgcHVibGljOgogCiAgICAgdm9pZCBkaWRD aGFuZ2VQcmlvcml0eShSZXNvdXJjZUxvYWRQcmlvcml0eSk7CiAKLSAgICBSZXNvdXJjZVJlcXVl c3QmIGZpcnN0UmVxdWVzdCgpOworICAgIFJlc291cmNlUmVxdWVzdCYgZmlyc3RSZXF1ZXN0KCkg Y29uc3Q7CiAgICAgY29uc3QgU3RyaW5nJiBsYXN0SFRUUE1ldGhvZCgpIGNvbnN0OwogCiAgICAg dm9pZCBmaXJlRmFpbHVyZShUaW1lcjxSZXNvdXJjZUhhbmRsZT4qKTsKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVzb3VyY2VIYW5kbGUuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVzb3Vy Y2VIYW5kbGUuY3BwCShyZXZpc2lvbiAxNDQ1NDQpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlSGFuZGxlLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MjAyLDcgKzIwMiw3IEBAIFBhc3NSZWZQdHI8UmVzb3VyY2VIYW5kbGU+IFJlc291cmNlSGFuZGwK ICAgICByZXR1cm4gMDsKIH0KIAotUmVzb3VyY2VSZXF1ZXN0JiBSZXNvdXJjZUhhbmRsZTo6Zmly c3RSZXF1ZXN0KCkKK1Jlc291cmNlUmVxdWVzdCYgUmVzb3VyY2VIYW5kbGU6OmZpcnN0UmVxdWVz dCgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIGQtPnJlcXVlc3QoKTsKIH0K