113601 2013-03-29 13:22:11 -0700 Make a bunch of DocumentLoader functions private 2013-04-01 09:52:41 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 japhet japhet abarth ap koivisto webkit.review.bot oldest_to_newest 866328 0 japhet 2013-03-29 13:22:11 -0700 After merging MainResourceLoader into DocumentLoader (http://trac.webkit.org/changeset/146449), several functions that were only public for MainResourceLoader's use can now be private. Also, a couple of functions are declared but unused. 866329 1 195787 japhet 2013-03-29 13:25:39 -0700 Created attachment 195787 patch 866419 2 195787 webkit.review.bot 2013-03-29 15:13:33 -0700 Comment on attachment 195787 patch Rejecting attachment 195787 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=webkit-commit-queue.appspot.com', '--bot-id=gce-cq-03', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 195787, '--port=chromium-xvfb']" exit_code: 2 cwd: /mnt/git/webkit-commit-queue Last 500 characters of output: t/git/webkit-commit-queue/Source/WebKit/chromium/v8 --revision 14075 --non-interactive --force --accept theirs-conflict --ignore-externals' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' 55>At revision 14075. ________ running '/usr/bin/python tools/clang/scripts/update.py --mac-only' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' ________ running '/usr/bin/python gyp_webkit' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' Updating webkit projects from gyp files... Full output: http://webkit-commit-queue.appspot.com/results/17300493 866626 3 195787 abarth 2013-03-30 10:49:37 -0700 Comment on attachment 195787 patch Looks like you're missing a ChangeLog. 867168 4 japhet 2013-04-01 09:28:33 -0700 (In reply to comment #3) > (From update of attachment 195787 [details]) > Looks like you're missing a ChangeLog. Yeah, I tried to get clever with diffing and failed. Re-uploading now. 867170 5 195981 japhet 2013-04-01 09:33:44 -0700 Created attachment 195981 Patch for landing 867189 6 195981 webkit.review.bot 2013-04-01 09:52:37 -0700 Comment on attachment 195981 Patch for landing Clearing flags on attachment: 195981 Committed r147336: <http://trac.webkit.org/changeset/147336> 867190 7 webkit.review.bot 2013-04-01 09:52:41 -0700 All reviewed patches have been landed. Closing bug. 195787 2013-03-29 13:25:39 -0700 2013-04-01 09:33:41 -0700 patch dl.txt text/plain 5837 japhet SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcAkocmV2aXNpb24g MTQ3MjMyKQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcAkod29y a2luZyBjb3B5KQpAQCAtNDUyLDcgKzQ1Miw3IEBACiAKIHZvaWQgRG9jdW1lbnRMb2FkZXI6Omhh bmRsZVN1YnN0aXR1dGVEYXRhTG9hZFNvb24oKQogewotICAgIGlmIChkZWZlck1haW5SZXNvdXJj ZURhdGFMb2FkKCkpCisgICAgaWYgKG1fZGVmZXJNYWluUmVzb3VyY2VEYXRhTG9hZCkKICAgICAg ICAgc3RhcnREYXRhTG9hZFRpbWVyKCk7CiAgICAgZWxzZQogICAgICAgICBoYW5kbGVTdWJzdGl0 dXRlRGF0YUxvYWROb3coMCk7CkBAIC02MTIsNyArNjEyLDcgQEAKICAgICAgICAgbV9pc0xvYWRp bmdNdWx0aXBhcnRDb250ZW50ID0gdHJ1ZTsKICAgICB9CiAKLSAgICBzZXRSZXNwb25zZShyZXNw b25zZSk7CisgICAgbV9yZXNwb25zZSA9IHJlc3BvbnNlOwogCiAgICAgaWYgKG1faWRlbnRpZmll ckZvckxvYWRXaXRob3V0UmVzb3VyY2VMb2FkZXIpCiAgICAgICAgIGZyYW1lTG9hZGVyKCktPm5v dGlmaWVyKCktPmRpc3BhdGNoRGlkUmVjZWl2ZVJlc3BvbnNlKHRoaXMsIG1faWRlbnRpZmllckZv ckxvYWRXaXRob3V0UmVzb3VyY2VMb2FkZXIsIG1fcmVzcG9uc2UsIDApOwpAQCAtODQ1LDcgKzg0 NSw3IEBACiAjaWYgVVNFKENGTkVUV09SSykgfHwgUExBVEZPUk0oTUFDKQogICAgIC8vIFdvcmth cm91bmQgZm9yIDxyZGFyOi8vcHJvYmxlbS82MDYwNzgyPgogICAgIGlmIChtX3Jlc3BvbnNlLmlz TnVsbCgpKQotICAgICAgICBzZXRSZXNwb25zZShSZXNvdXJjZVJlc3BvbnNlKEtVUkwoKSwgInRl eHQvaHRtbCIsIDAsIFN0cmluZygpLCBTdHJpbmcoKSkpOworICAgICAgICBtX3Jlc3BvbnNlID0g UmVzb3VyY2VSZXNwb25zZShLVVJMKCksICJ0ZXh0L2h0bWwiLCAwLCBTdHJpbmcoKSwgU3RyaW5n KCkpOwogI2VuZGlmCiAKICAgICAvLyBUaGVyZSBpcyBhIGJ1ZyBpbiBDRk5ldHdvcmsgd2hlcmUg Y2FsbGJhY2tzIGNhbiBiZSBkaXNwYXRjaGVkIGV2ZW4gd2hlbiBsb2FkcyBhcmUgZGVmZXJyZWQu CkBAIC0xMjcwLDcgKzEyNzAsNyBAQAogICAgIGlmICh1cmwuaXNFbXB0eSgpKQogICAgICAgICB1 cmwgPSByZXF1ZXN0VVJMKCk7CiAgICAgaWYgKHVybC5pc0VtcHR5KCkpCi0gICAgICAgIHVybCA9 IHJlc3BvbnNlVVJMKCk7CisgICAgICAgIHVybCA9IG1fcmVzcG9uc2UudXJsKCk7CiAgICAgcmV0 dXJuIHVybDsKIH0KIApAQCAtMTM2Myw3ICsxMzYzLDcgQEAKICAgICBpZiAobV9yZXF1ZXN0LnVy bCgpLmlzRW1wdHkoKSAmJiAhZnJhbWVMb2FkZXIoKS0+c3RhdGVNYWNoaW5lKCktPmNyZWF0aW5n SW5pdGlhbEVtcHR5RG9jdW1lbnQoKSkKICAgICAgICAgbV9yZXF1ZXN0LnNldFVSTChibGFua1VS TCgpKTsKICAgICBTdHJpbmcgbWltZVR5cGUgPSBzaG91bGRMb2FkRW1wdHkgPyAidGV4dC9odG1s IiA6IGZyYW1lTG9hZGVyKCktPmNsaWVudCgpLT5nZW5lcmF0ZWRNSU1FVHlwZUZvclVSTFNjaGVt ZShtX3JlcXVlc3QudXJsKCkucHJvdG9jb2woKSk7Ci0gICAgc2V0UmVzcG9uc2UoUmVzb3VyY2VS ZXNwb25zZShtX3JlcXVlc3QudXJsKCksIG1pbWVUeXBlLCAwLCBTdHJpbmcoKSwgU3RyaW5nKCkp KTsKKyAgICBtX3Jlc3BvbnNlID0gUmVzb3VyY2VSZXNwb25zZShtX3JlcXVlc3QudXJsKCksIG1p bWVUeXBlLCAwLCBTdHJpbmcoKSwgU3RyaW5nKCkpOwogICAgIGZpbmlzaGVkTG9hZGluZyhtb25v dG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUoKSk7CiAgICAgcmV0dXJuIHRydWU7CiB9CkluZGV4OiBT b3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuaAkocmV2aXNpb24gMTQ3MjMyKQorKysg U291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmgJKHdvcmtpbmcgY29weSkKQEAg LTk2LDE0ICs5NiwxMiBAQAogICAgICAgICBQYXNzUmVmUHRyPFJlc291cmNlQnVmZmVyPiBtYWlu UmVzb3VyY2VEYXRhKCkgY29uc3Q7CiAgICAgICAgIAogICAgICAgICBEb2N1bWVudFdyaXRlciog d3JpdGVyKCkgY29uc3QgeyByZXR1cm4gJm1fd3JpdGVyOyB9Ci0gICAgICAgIERvY3VtZW50KiBk b2N1bWVudCgpIGNvbnN0OwogCiAgICAgICAgIGNvbnN0IFJlc291cmNlUmVxdWVzdCYgb3JpZ2lu YWxSZXF1ZXN0KCkgY29uc3Q7CiAgICAgICAgIGNvbnN0IFJlc291cmNlUmVxdWVzdCYgb3JpZ2lu YWxSZXF1ZXN0Q29weSgpIGNvbnN0OwogCiAgICAgICAgIGNvbnN0IFJlc291cmNlUmVxdWVzdCYg cmVxdWVzdCgpIGNvbnN0OwogICAgICAgICBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QoKTsKLSAg ICAgICAgdm9pZCBzZXRSZXF1ZXN0KGNvbnN0IFJlc291cmNlUmVxdWVzdCYpOwogCiAgICAgICAg IENhY2hlZFJlc291cmNlTG9hZGVyKiBjYWNoZWRSZXNvdXJjZUxvYWRlcigpIGNvbnN0IHsgcmV0 dXJuIG1fY2FjaGVkUmVzb3VyY2VMb2FkZXIuZ2V0KCk7IH0KIApAQCAtMTEzLDkgKzExMSw2IEBA CiAgICAgICAgIGNvbnN0IEtVUkwmIHVybCgpIGNvbnN0OwogICAgICAgICBjb25zdCBLVVJMJiB1 bnJlYWNoYWJsZVVSTCgpIGNvbnN0OwogCi0gICAgICAgIC8vIFRoZSBVUkwgb2YgdGhlIGRvY3Vt ZW50IHJlc3VsdGluZyBmcm9tIHRoaXMgRG9jdW1lbnRMb2FkZXIuCi0gICAgICAgIEtVUkwgZG9j dW1lbnRVUkwoKSBjb25zdDsKLQogICAgICAgICBjb25zdCBLVVJMJiBvcmlnaW5hbFVSTCgpIGNv bnN0OwogICAgICAgICBjb25zdCBLVVJMJiByZXF1ZXN0VVJMKCkgY29uc3Q7CiAgICAgICAgIGNv bnN0IEtVUkwmIHJlc3BvbnNlVVJMKCkgY29uc3Q7CkBAIC0xMjcsMTMgKzEyMiw4IEBACiAgICAg ICAgIHZvaWQgc2V0Q29tbWl0dGVkKGJvb2wgY29tbWl0dGVkKSB7IG1fY29tbWl0dGVkID0gY29t bWl0dGVkOyB9CiAgICAgICAgIGJvb2wgaXNDb21taXR0ZWQoKSBjb25zdCB7IHJldHVybiBtX2Nv bW1pdHRlZDsgfQogICAgICAgICBib29sIGlzTG9hZGluZygpIGNvbnN0OwotICAgICAgICB2b2lk IHJlY2VpdmVkRGF0YShjb25zdCBjaGFyKiwgaW50KTsKLSAgICAgICAgdm9pZCBzZXR1cEZvclJl cGxhY2UoKTsKLSAgICAgICAgdm9pZCBmaW5pc2hlZExvYWRpbmcoZG91YmxlIGZpbmlzaFRpbWUp OwogICAgICAgICBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSgpIGNvbnN0IHsgcmV0 dXJuIG1fcmVzcG9uc2U7IH0KICAgICAgICAgY29uc3QgUmVzb3VyY2VFcnJvciYgbWFpbkRvY3Vt ZW50RXJyb3IoKSBjb25zdCB7IHJldHVybiBtX21haW5Eb2N1bWVudEVycm9yOyB9Ci0gICAgICAg IHZvaWQgbWFpblJlY2VpdmVkRXJyb3IoY29uc3QgUmVzb3VyY2VFcnJvciYpOwotICAgICAgICB2 b2lkIHNldFJlc3BvbnNlKGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlKSB7IG1fcmVz cG9uc2UgPSByZXNwb25zZTsgfQogICAgICAgICBib29sIGlzQ2xpZW50UmVkaXJlY3QoKSBjb25z dCB7IHJldHVybiBtX2lzQ2xpZW50UmVkaXJlY3Q7IH0KICAgICAgICAgdm9pZCBzZXRJc0NsaWVu dFJlZGlyZWN0KGJvb2wgaXNDbGllbnRSZWRpcmVjdCkgeyBtX2lzQ2xpZW50UmVkaXJlY3QgPSBp c0NsaWVudFJlZGlyZWN0OyB9CiAgICAgICAgIHZvaWQgaGFuZGxlZE9ubG9hZEV2ZW50cygpOwpA QCAtMjMwLDEwICsyMjAsNyBAQAogCiAgICAgICAgIHZvaWQgc3VicmVzb3VyY2VMb2FkZXJGaW5p c2hlZExvYWRpbmdPbmVQYXJ0KFJlc291cmNlTG9hZGVyKik7CiAKLSAgICAgICAgdm9pZCBtYXli ZUZpbmlzaExvYWRpbmdNdWx0aXBhcnRDb250ZW50KCk7Ci0KICAgICAgICAgdm9pZCBzZXREZWZl ck1haW5SZXNvdXJjZURhdGFMb2FkKGJvb2wgZGVmZXIpIHsgbV9kZWZlck1haW5SZXNvdXJjZURh dGFMb2FkID0gZGVmZXI7IH0KLSAgICAgICAgYm9vbCBkZWZlck1haW5SZXNvdXJjZURhdGFMb2Fk KCkgY29uc3QgeyByZXR1cm4gbV9kZWZlck1haW5SZXNvdXJjZURhdGFMb2FkOyB9CiAgICAgICAg IAogICAgICAgICB2b2lkIGRpZFRlbGxDbGllbnRBYm91dExvYWQoY29uc3QgU3RyaW5nJiB1cmwp CiAgICAgICAgIHsgCkBAIC0yNTMsOCArMjQwLDYgQEAKICAgICAgICAgRG9jdW1lbnRMb2FkVGlt aW5nKiB0aW1pbmcoKSB7IHJldHVybiAmbV9kb2N1bWVudExvYWRUaW1pbmc7IH0KICAgICAgICAg dm9pZCByZXNldFRpbWluZygpIHsgbV9kb2N1bWVudExvYWRUaW1pbmcgPSBEb2N1bWVudExvYWRU aW1pbmcoKTsgfQogCi0gICAgICAgIHZvaWQgcmVzcG9uc2VSZWNlaXZlZChjb25zdCBSZXNvdXJj ZVJlc3BvbnNlJik7Ci0KICAgICAgICAgLy8gVGhlIFdlYktpdCBsYXllciBjYWxscyB0aGlzIGZ1 bmN0aW9uIHdoZW4gaXQncyByZWFkeSBmb3IgdGhlIGRhdGEgdG8KICAgICAgICAgLy8gYWN0dWFs bHkgYmUgYWRkZWQgdG8gdGhlIGRvY3VtZW50LgogICAgICAgICB2b2lkIGNvbW1pdERhdGEoY29u c3QgY2hhciogYnl0ZXMsIHNpemVfdCBsZW5ndGgpOwpAQCAtMjcwLDEwICsyNTUsMjAgQEAKICAg ICAgICAgYm9vbCBtX2RlZmVyTWFpblJlc291cmNlRGF0YUxvYWQ7CiAKICAgICBwcml2YXRlOgor CisgICAgICAgIC8vIFRoZSBVUkwgb2YgdGhlIGRvY3VtZW50IHJlc3VsdGluZyBmcm9tIHRoaXMg RG9jdW1lbnRMb2FkZXIuCisgICAgICAgIEtVUkwgZG9jdW1lbnRVUkwoKSBjb25zdDsKKyAgICAg ICAgRG9jdW1lbnQqIGRvY3VtZW50KCkgY29uc3Q7CisKKyAgICAgICAgdm9pZCBzZXRSZXF1ZXN0 KGNvbnN0IFJlc291cmNlUmVxdWVzdCYpOworCiAgICAgICAgIHZvaWQgY29tbWl0SWZSZWFkeSgp OwogICAgICAgICB2b2lkIHNldE1haW5Eb2N1bWVudEVycm9yKGNvbnN0IFJlc291cmNlRXJyb3Im KTsKICAgICAgICAgdm9pZCBjb21taXRMb2FkKGNvbnN0IGNoYXIqLCBpbnQpOwogICAgICAgICB2 b2lkIGNsZWFyTWFpblJlc291cmNlTG9hZGVyKCk7CisKKyAgICAgICAgdm9pZCBzZXR1cEZvclJl cGxhY2UoKTsKKyAgICAgICAgdm9pZCBtYXliZUZpbmlzaExvYWRpbmdNdWx0aXBhcnRDb250ZW50 KCk7CiAgICAgICAgIAogICAgICAgICBib29sIG1heWJlQ3JlYXRlQXJjaGl2ZSgpOwogI2lmIEVO QUJMRShXRUJfQVJDSElWRSkgfHwgRU5BQkxFKE1IVE1MKQpAQCAtMjgxLDYgKzI3Niw4IEBACiAj ZW5kaWYKIAogICAgICAgICB2b2lkIHdpbGxTZW5kUmVxdWVzdChSZXNvdXJjZVJlcXVlc3QmLCBj b25zdCBSZXNvdXJjZVJlc3BvbnNlJik7CisgICAgICAgIHZvaWQgZmluaXNoZWRMb2FkaW5nKGRv dWJsZSBmaW5pc2hUaW1lKTsKKyAgICAgICAgdm9pZCBtYWluUmVjZWl2ZWRFcnJvcihjb25zdCBS ZXNvdXJjZUVycm9yJik7CiAgICAgICAgIHZpcnR1YWwgdm9pZCByZWRpcmVjdFJlY2VpdmVkKENh Y2hlZFJlc291cmNlKiwgUmVzb3VyY2VSZXF1ZXN0JiwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYp IE9WRVJSSURFOwogICAgICAgICB2aXJ0dWFsIHZvaWQgcmVzcG9uc2VSZWNlaXZlZChDYWNoZWRS ZXNvdXJjZSosIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmKSBPVkVSUklERTsKICAgICAgICAgdmly dHVhbCB2b2lkIGRhdGFSZWNlaXZlZChDYWNoZWRSZXNvdXJjZSosIGNvbnN0IGNoYXIqIGRhdGEs IGludCBsZW5ndGgpIE9WRVJSSURFOwo= 195981 2013-04-01 09:33:44 -0700 2013-04-01 09:52:37 -0700 Patch for landing bug-113601-20130401093337.patch text/plain 6858 japhet SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0NzI0NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDEzLTAzLTI5ICBOYXRlIENo YXBpbiAgPGphcGhldEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgTWFrZSBhIGJ1bmNoIG9mIERv Y3VtZW50TG9hZGVyIGZ1bmN0aW9ucyBwcml2YXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTM2MDEKKworICAgICAgICBSZXZpZXdlZCBieSBBbGV4 ZXkgUHJvc2t1cnlha292LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgY2xlYW51cCBvbmx5Lgor CisgICAgICAgICogbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcDoKKyAgICAgICAgKiBsb2FkZXIv RG9jdW1lbnRMb2FkZXIuaDoKKwogMjAxMy0wMy0xOSAgT2phbiBWYWZhaSAgPG9qYW5AY2hyb21p dW0ub3JnPgogCiAgICAgICAgIG1pbi13aWR0aC9tYXgtd2lkdGggb2YgbWluLWNvbnRlbnQvbWF4 LWNvbnRlbnQgZG9uJ3Qgd29yayBjb3JyZWN0bHkgaWYgd2lkdGggaXMgc3BlY2lmaWVkCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAJKHJldmlzaW9uIDE0NzIz MikKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTQ1Miw3ICs0NTIsNyBAQCB2b2lkIERvY3VtZW50TG9hZGVyOjpzdGFydERhdGFM b2FkVGltZXIoCiAKIHZvaWQgRG9jdW1lbnRMb2FkZXI6OmhhbmRsZVN1YnN0aXR1dGVEYXRhTG9h ZFNvb24oKQogewotICAgIGlmIChkZWZlck1haW5SZXNvdXJjZURhdGFMb2FkKCkpCisgICAgaWYg KG1fZGVmZXJNYWluUmVzb3VyY2VEYXRhTG9hZCkKICAgICAgICAgc3RhcnREYXRhTG9hZFRpbWVy KCk7CiAgICAgZWxzZQogICAgICAgICBoYW5kbGVTdWJzdGl0dXRlRGF0YUxvYWROb3coMCk7CkBA IC02MTIsNyArNjEyLDcgQEAgdm9pZCBEb2N1bWVudExvYWRlcjo6cmVzcG9uc2VSZWNlaXZlZChD YQogICAgICAgICBtX2lzTG9hZGluZ011bHRpcGFydENvbnRlbnQgPSB0cnVlOwogICAgIH0KIAot ICAgIHNldFJlc3BvbnNlKHJlc3BvbnNlKTsKKyAgICBtX3Jlc3BvbnNlID0gcmVzcG9uc2U7CiAK ICAgICBpZiAobV9pZGVudGlmaWVyRm9yTG9hZFdpdGhvdXRSZXNvdXJjZUxvYWRlcikKICAgICAg ICAgZnJhbWVMb2FkZXIoKS0+bm90aWZpZXIoKS0+ZGlzcGF0Y2hEaWRSZWNlaXZlUmVzcG9uc2Uo dGhpcywgbV9pZGVudGlmaWVyRm9yTG9hZFdpdGhvdXRSZXNvdXJjZUxvYWRlciwgbV9yZXNwb25z ZSwgMCk7CkBAIC04NDUsNyArODQ1LDcgQEAgdm9pZCBEb2N1bWVudExvYWRlcjo6ZGF0YVJlY2Vp dmVkKENhY2hlZAogI2lmIFVTRShDRk5FVFdPUkspIHx8IFBMQVRGT1JNKE1BQykKICAgICAvLyBX b3JrYXJvdW5kIGZvciA8cmRhcjovL3Byb2JsZW0vNjA2MDc4Mj4KICAgICBpZiAobV9yZXNwb25z ZS5pc051bGwoKSkKLSAgICAgICAgc2V0UmVzcG9uc2UoUmVzb3VyY2VSZXNwb25zZShLVVJMKCks ICJ0ZXh0L2h0bWwiLCAwLCBTdHJpbmcoKSwgU3RyaW5nKCkpKTsKKyAgICAgICAgbV9yZXNwb25z ZSA9IFJlc291cmNlUmVzcG9uc2UoS1VSTCgpLCAidGV4dC9odG1sIiwgMCwgU3RyaW5nKCksIFN0 cmluZygpKTsKICNlbmRpZgogCiAgICAgLy8gVGhlcmUgaXMgYSBidWcgaW4gQ0ZOZXR3b3JrIHdo ZXJlIGNhbGxiYWNrcyBjYW4gYmUgZGlzcGF0Y2hlZCBldmVuIHdoZW4gbG9hZHMgYXJlIGRlZmVy cmVkLgpAQCAtMTI3MCw3ICsxMjcwLDcgQEAgS1VSTCBEb2N1bWVudExvYWRlcjo6ZG9jdW1lbnRV UkwoKSBjb25zdAogICAgIGlmICh1cmwuaXNFbXB0eSgpKQogICAgICAgICB1cmwgPSByZXF1ZXN0 VVJMKCk7CiAgICAgaWYgKHVybC5pc0VtcHR5KCkpCi0gICAgICAgIHVybCA9IHJlc3BvbnNlVVJM KCk7CisgICAgICAgIHVybCA9IG1fcmVzcG9uc2UudXJsKCk7CiAgICAgcmV0dXJuIHVybDsKIH0K IApAQCAtMTM2Myw3ICsxMzYzLDcgQEAgYm9vbCBEb2N1bWVudExvYWRlcjo6bWF5YmVMb2FkRW1w dHkoKQogICAgIGlmIChtX3JlcXVlc3QudXJsKCkuaXNFbXB0eSgpICYmICFmcmFtZUxvYWRlcigp LT5zdGF0ZU1hY2hpbmUoKS0+Y3JlYXRpbmdJbml0aWFsRW1wdHlEb2N1bWVudCgpKQogICAgICAg ICBtX3JlcXVlc3Quc2V0VVJMKGJsYW5rVVJMKCkpOwogICAgIFN0cmluZyBtaW1lVHlwZSA9IHNo b3VsZExvYWRFbXB0eSA/ICJ0ZXh0L2h0bWwiIDogZnJhbWVMb2FkZXIoKS0+Y2xpZW50KCktPmdl bmVyYXRlZE1JTUVUeXBlRm9yVVJMU2NoZW1lKG1fcmVxdWVzdC51cmwoKS5wcm90b2NvbCgpKTsK LSAgICBzZXRSZXNwb25zZShSZXNvdXJjZVJlc3BvbnNlKG1fcmVxdWVzdC51cmwoKSwgbWltZVR5 cGUsIDAsIFN0cmluZygpLCBTdHJpbmcoKSkpOworICAgIG1fcmVzcG9uc2UgPSBSZXNvdXJjZVJl c3BvbnNlKG1fcmVxdWVzdC51cmwoKSwgbWltZVR5cGUsIDAsIFN0cmluZygpLCBTdHJpbmcoKSk7 CiAgICAgZmluaXNoZWRMb2FkaW5nKG1vbm90b25pY2FsbHlJbmNyZWFzaW5nVGltZSgpKTsKICAg ICByZXR1cm4gdHJ1ZTsKIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExv YWRlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRl ci5oCShyZXZpc2lvbiAxNDcyMzIpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRM b2FkZXIuaAkod29ya2luZyBjb3B5KQpAQCAtOTYsMTQgKzk2LDEyIEBAIG5hbWVzcGFjZSBXZWJD b3JlIHsKICAgICAgICAgUGFzc1JlZlB0cjxSZXNvdXJjZUJ1ZmZlcj4gbWFpblJlc291cmNlRGF0 YSgpIGNvbnN0OwogICAgICAgICAKICAgICAgICAgRG9jdW1lbnRXcml0ZXIqIHdyaXRlcigpIGNv bnN0IHsgcmV0dXJuICZtX3dyaXRlcjsgfQotICAgICAgICBEb2N1bWVudCogZG9jdW1lbnQoKSBj b25zdDsKIAogICAgICAgICBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIG9yaWdpbmFsUmVxdWVzdCgp IGNvbnN0OwogICAgICAgICBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIG9yaWdpbmFsUmVxdWVzdENv cHkoKSBjb25zdDsKIAogICAgICAgICBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QoKSBj b25zdDsKICAgICAgICAgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KCk7Ci0gICAgICAgIHZvaWQg c2V0UmVxdWVzdChjb25zdCBSZXNvdXJjZVJlcXVlc3QmKTsKIAogICAgICAgICBDYWNoZWRSZXNv dXJjZUxvYWRlciogY2FjaGVkUmVzb3VyY2VMb2FkZXIoKSBjb25zdCB7IHJldHVybiBtX2NhY2hl ZFJlc291cmNlTG9hZGVyLmdldCgpOyB9CiAKQEAgLTExMyw5ICsxMTEsNiBAQCBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAgICAgICAgIGNvbnN0IEtVUkwmIHVybCgpIGNvbnN0OwogICAgICAgICBjb25z dCBLVVJMJiB1bnJlYWNoYWJsZVVSTCgpIGNvbnN0OwogCi0gICAgICAgIC8vIFRoZSBVUkwgb2Yg dGhlIGRvY3VtZW50IHJlc3VsdGluZyBmcm9tIHRoaXMgRG9jdW1lbnRMb2FkZXIuCi0gICAgICAg IEtVUkwgZG9jdW1lbnRVUkwoKSBjb25zdDsKLQogICAgICAgICBjb25zdCBLVVJMJiBvcmlnaW5h bFVSTCgpIGNvbnN0OwogICAgICAgICBjb25zdCBLVVJMJiByZXF1ZXN0VVJMKCkgY29uc3Q7CiAg ICAgICAgIGNvbnN0IEtVUkwmIHJlc3BvbnNlVVJMKCkgY29uc3Q7CkBAIC0xMjcsMTMgKzEyMiw4 IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgdm9pZCBzZXRDb21taXR0ZWQoYm9vbCBj b21taXR0ZWQpIHsgbV9jb21taXR0ZWQgPSBjb21taXR0ZWQ7IH0KICAgICAgICAgYm9vbCBpc0Nv bW1pdHRlZCgpIGNvbnN0IHsgcmV0dXJuIG1fY29tbWl0dGVkOyB9CiAgICAgICAgIGJvb2wgaXNM b2FkaW5nKCkgY29uc3Q7Ci0gICAgICAgIHZvaWQgcmVjZWl2ZWREYXRhKGNvbnN0IGNoYXIqLCBp bnQpOwotICAgICAgICB2b2lkIHNldHVwRm9yUmVwbGFjZSgpOwotICAgICAgICB2b2lkIGZpbmlz aGVkTG9hZGluZyhkb3VibGUgZmluaXNoVGltZSk7CiAgICAgICAgIGNvbnN0IFJlc291cmNlUmVz cG9uc2UmIHJlc3BvbnNlKCkgY29uc3QgeyByZXR1cm4gbV9yZXNwb25zZTsgfQogICAgICAgICBj b25zdCBSZXNvdXJjZUVycm9yJiBtYWluRG9jdW1lbnRFcnJvcigpIGNvbnN0IHsgcmV0dXJuIG1f bWFpbkRvY3VtZW50RXJyb3I7IH0KLSAgICAgICAgdm9pZCBtYWluUmVjZWl2ZWRFcnJvcihjb25z dCBSZXNvdXJjZUVycm9yJik7Ci0gICAgICAgIHZvaWQgc2V0UmVzcG9uc2UoY29uc3QgUmVzb3Vy Y2VSZXNwb25zZSYgcmVzcG9uc2UpIHsgbV9yZXNwb25zZSA9IHJlc3BvbnNlOyB9CiAgICAgICAg IGJvb2wgaXNDbGllbnRSZWRpcmVjdCgpIGNvbnN0IHsgcmV0dXJuIG1faXNDbGllbnRSZWRpcmVj dDsgfQogICAgICAgICB2b2lkIHNldElzQ2xpZW50UmVkaXJlY3QoYm9vbCBpc0NsaWVudFJlZGly ZWN0KSB7IG1faXNDbGllbnRSZWRpcmVjdCA9IGlzQ2xpZW50UmVkaXJlY3Q7IH0KICAgICAgICAg dm9pZCBoYW5kbGVkT25sb2FkRXZlbnRzKCk7CkBAIC0yMzAsMTAgKzIyMCw3IEBAIG5hbWVzcGFj ZSBXZWJDb3JlIHsKIAogICAgICAgICB2b2lkIHN1YnJlc291cmNlTG9hZGVyRmluaXNoZWRMb2Fk aW5nT25lUGFydChSZXNvdXJjZUxvYWRlciopOwogCi0gICAgICAgIHZvaWQgbWF5YmVGaW5pc2hM b2FkaW5nTXVsdGlwYXJ0Q29udGVudCgpOwotCiAgICAgICAgIHZvaWQgc2V0RGVmZXJNYWluUmVz b3VyY2VEYXRhTG9hZChib29sIGRlZmVyKSB7IG1fZGVmZXJNYWluUmVzb3VyY2VEYXRhTG9hZCA9 IGRlZmVyOyB9Ci0gICAgICAgIGJvb2wgZGVmZXJNYWluUmVzb3VyY2VEYXRhTG9hZCgpIGNvbnN0 IHsgcmV0dXJuIG1fZGVmZXJNYWluUmVzb3VyY2VEYXRhTG9hZDsgfQogICAgICAgICAKICAgICAg ICAgdm9pZCBkaWRUZWxsQ2xpZW50QWJvdXRMb2FkKGNvbnN0IFN0cmluZyYgdXJsKQogICAgICAg ICB7IApAQCAtMjUzLDggKzI0MCw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgRG9j dW1lbnRMb2FkVGltaW5nKiB0aW1pbmcoKSB7IHJldHVybiAmbV9kb2N1bWVudExvYWRUaW1pbmc7 IH0KICAgICAgICAgdm9pZCByZXNldFRpbWluZygpIHsgbV9kb2N1bWVudExvYWRUaW1pbmcgPSBE b2N1bWVudExvYWRUaW1pbmcoKTsgfQogCi0gICAgICAgIHZvaWQgcmVzcG9uc2VSZWNlaXZlZChj b25zdCBSZXNvdXJjZVJlc3BvbnNlJik7Ci0KICAgICAgICAgLy8gVGhlIFdlYktpdCBsYXllciBj YWxscyB0aGlzIGZ1bmN0aW9uIHdoZW4gaXQncyByZWFkeSBmb3IgdGhlIGRhdGEgdG8KICAgICAg ICAgLy8gYWN0dWFsbHkgYmUgYWRkZWQgdG8gdGhlIGRvY3VtZW50LgogICAgICAgICB2b2lkIGNv bW1pdERhdGEoY29uc3QgY2hhciogYnl0ZXMsIHNpemVfdCBsZW5ndGgpOwpAQCAtMjcwLDEwICsy NTUsMjAgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBib29sIG1fZGVmZXJNYWluUmVz b3VyY2VEYXRhTG9hZDsKIAogICAgIHByaXZhdGU6CisKKyAgICAgICAgLy8gVGhlIFVSTCBvZiB0 aGUgZG9jdW1lbnQgcmVzdWx0aW5nIGZyb20gdGhpcyBEb2N1bWVudExvYWRlci4KKyAgICAgICAg S1VSTCBkb2N1bWVudFVSTCgpIGNvbnN0OworICAgICAgICBEb2N1bWVudCogZG9jdW1lbnQoKSBj b25zdDsKKworICAgICAgICB2b2lkIHNldFJlcXVlc3QoY29uc3QgUmVzb3VyY2VSZXF1ZXN0Jik7 CisKICAgICAgICAgdm9pZCBjb21taXRJZlJlYWR5KCk7CiAgICAgICAgIHZvaWQgc2V0TWFpbkRv Y3VtZW50RXJyb3IoY29uc3QgUmVzb3VyY2VFcnJvciYpOwogICAgICAgICB2b2lkIGNvbW1pdExv YWQoY29uc3QgY2hhciosIGludCk7CiAgICAgICAgIHZvaWQgY2xlYXJNYWluUmVzb3VyY2VMb2Fk ZXIoKTsKKworICAgICAgICB2b2lkIHNldHVwRm9yUmVwbGFjZSgpOworICAgICAgICB2b2lkIG1h eWJlRmluaXNoTG9hZGluZ011bHRpcGFydENvbnRlbnQoKTsKICAgICAgICAgCiAgICAgICAgIGJv b2wgbWF5YmVDcmVhdGVBcmNoaXZlKCk7CiAjaWYgRU5BQkxFKFdFQl9BUkNISVZFKSB8fCBFTkFC TEUoTUhUTUwpCkBAIC0yODEsNiArMjc2LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogI2VuZGlm CiAKICAgICAgICAgdm9pZCB3aWxsU2VuZFJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0JiwgY29uc3Qg UmVzb3VyY2VSZXNwb25zZSYpOworICAgICAgICB2b2lkIGZpbmlzaGVkTG9hZGluZyhkb3VibGUg ZmluaXNoVGltZSk7CisgICAgICAgIHZvaWQgbWFpblJlY2VpdmVkRXJyb3IoY29uc3QgUmVzb3Vy Y2VFcnJvciYpOwogICAgICAgICB2aXJ0dWFsIHZvaWQgcmVkaXJlY3RSZWNlaXZlZChDYWNoZWRS ZXNvdXJjZSosIFJlc291cmNlUmVxdWVzdCYsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmKSBPVkVS UklERTsKICAgICAgICAgdmlydHVhbCB2b2lkIHJlc3BvbnNlUmVjZWl2ZWQoQ2FjaGVkUmVzb3Vy Y2UqLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJikgT1ZFUlJJREU7CiAgICAgICAgIHZpcnR1YWwg dm9pZCBkYXRhUmVjZWl2ZWQoQ2FjaGVkUmVzb3VyY2UqLCBjb25zdCBjaGFyKiBkYXRhLCBpbnQg bGVuZ3RoKSBPVkVSUklERTsK