82248 2012-03-26 14:49:26 -0700 Don't manually set an identifier for main resource loads in FrameLoader 2012-03-27 13:31:22 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 japhet japhet abarth ap webkit.review.bot oldest_to_newest 588153 0 japhet 2012-03-26 14:49:26 -0700 Currently, we create an identifier and assign it to the ResourceRequest for a main resource load in FrameLoader just before we create the MainResourceLoader. We then pass the identifier into the MainResourceLoader immediately after it is created. Given that the MainResourceLoader would have created and set an identifier shortly thereafter (when willSendRequest is called for the initial request), I can't figure out why we need this extra code in FrameLoader. 588162 1 133898 japhet 2012-03-26 14:55:35 -0700 Created attachment 133898 patch 588178 2 133904 japhet 2012-03-26 15:12:03 -0700 Created attachment 133904 Hopefully EWS-able now 589209 3 133904 abarth 2012-03-27 13:21:45 -0700 Comment on attachment 133904 Hopefully EWS-able now Thanks for digging through the history to figure out when this code was added. 589213 4 133904 webkit.review.bot 2012-03-27 13:23:49 -0700 Comment on attachment 133904 Hopefully EWS-able now Rejecting attachment 133904 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: ueue/Tools/Scripts/webkitpy/tool/commands/stepsequence.py", line 70, in run_and_handle_errors self._run(tool, options, state) File "/mnt/git/webkit-commit-queue/Tools/Scripts/webkitpy/tool/commands/stepsequence.py", line 64, in _run step(tool, options).run(state) File "/mnt/git/webkit-commit-queue/Tools/Scripts/webkitpy/tool/steps/validatereviewer.py", line 50, in run if changelog_entry.has_valid_reviewer(): AttributeError: 'NoneType' object has no attribute 'has_valid_reviewer' Full output: http://queues.webkit.org/results/12142691 589221 5 japhet 2012-03-27 13:31:22 -0700 (In reply to comment #4) > (From update of attachment 133904 [details]) > Rejecting attachment 133904 [details] 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: > ueue/Tools/Scripts/webkitpy/tool/commands/stepsequence.py", line 70, in run_and_handle_errors > self._run(tool, options, state) > File "/mnt/git/webkit-commit-queue/Tools/Scripts/webkitpy/tool/commands/stepsequence.py", line 64, in _run > step(tool, options).run(state) > File "/mnt/git/webkit-commit-queue/Tools/Scripts/webkitpy/tool/steps/validatereviewer.py", line 50, in run > if changelog_entry.has_valid_reviewer(): > AttributeError: 'NoneType' object has no attribute 'has_valid_reviewer' > > Full output: http://queues.webkit.org/results/12142691 Landed manually: http://trac.webkit.org/changeset/112308 133898 2012-03-26 14:55:35 -0700 2012-03-26 15:12:03 -0700 patch ident.txt text/plain 4179 japhet SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMjE0NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDI3IEBACisgMjAxMi0wMy0yNiAgTmF0ZSBD aGFwaW4gIDxqYXBoZXRAY2hyb21pdW0ub3JnPgorCisgICAgICAgIERvbid0IG1hbnVhbGx5IHNl dCBhbiBpZGVudGlmaWVyIGZvciBtYWluIHJlc291cmNlCisgICAgICAgIGxvYWRzIGluIEZyYW1l TG9hZGVyLiBSZXNvdXJjZUxvYWRlcjo6d2lsbFNlbmRSZXF1ZXN0KCkKKyAgICAgICAgd2lsbCBz ZXQgYW4gaWRlbnRpZmllciBmb3IgdGhlIHJlcXVlc3QgaWYgb25lIGlzbid0IGZvdW5kLAorICAg ICAgICBzbyB0aGlzIGNvZGUgYXBwZWFycyB0byBiZSB1bm5lY2Vzc2FyeSBkdXBsaWNhdGlvbi4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgyMjQ4CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRl c3RzLCBubyBmdW5jdGlvbmFsaXR5IGNoYW5nZSBpbnRlbmRlZC4KKworICAgICAgICAqIGxvYWRl ci9Eb2N1bWVudExvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudExvYWRlcjo6 c3RhcnRMb2FkaW5nTWFpblJlc291cmNlKTogTWFyayBuYXZpZ2F0aW9uIHN0YXJ0CisgICAgICAg ICAgICBoZXJlLCBzaW5jZSBpdCdzIGNvbmNlcHR1YWxseSBwYXJ0IG9mIHN0YXJ0aW5nIHRoZSBt YWluIHJlc291cmNlIGxvYWQuCisgICAgICAgICogbG9hZGVyL0RvY3VtZW50TG9hZGVyLmg6Cisg ICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1l TG9hZGVyOjpjb250aW51ZUxvYWRBZnRlcldpbGxTdWJtaXRGb3JtKTogUmVtb3ZlIGR1cGxpY2F0 ZSBpZGVudGlmaWVyCisgICAgICAgICAgICBsb2dpYywgYW5kIG1vdmUgbmF2aWdhdGlvbiB0aW1p bmcgY2FsbCB0byBzdGFydExvYWRpbmdNYWluUmVzb3VyY2UsIHNpbmNlCisgICAgICAgICAgICBp dCBmaXRzIGJldHRlciBsb2dpY2FsbHkgdGhlcmUuCisgICAgICAgICogbG9hZGVyL1Jlc291cmNl TG9hZGVyLmg6IE5vIGNhbGxlcnMgb2Ygc2V0SWRlbnRpZmllcigpIHJlbWFpbiwgc28gZGVsZXRl IGl0LgorCiAyMDEyLTAzLTI2ICBOYXRlIENoYXBpbiAgPGphcGhldEBjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgU2ltcGxpZnkgc2V0dGluZyBsb2FkaW5nIHN0YXRlIGluIERvY3VtZW50TG9hZGVy CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MjA5OQog CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAJKHJldmlzaW9uIDExMjE0 NCkKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTIzMDQsMTYgKzIzMDQsNyBAQAogICAgICAgICByZXR1cm47CiAKICAgICBtX2xvYWRp bmdGcm9tQ2FjaGVkUGFnZSA9IGZhbHNlOwotCi0gICAgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVy ID0gMDsKLQotICAgIGlmIChQYWdlKiBwYWdlID0gbV9mcmFtZS0+cGFnZSgpKSB7Ci0gICAgICAg IGlkZW50aWZpZXIgPSBwYWdlLT5wcm9ncmVzcygpLT5jcmVhdGVVbmlxdWVJZGVudGlmaWVyKCk7 Ci0gICAgICAgIG5vdGlmaWVyKCktPmFzc2lnbklkZW50aWZpZXJUb0luaXRpYWxSZXF1ZXN0KGlk ZW50aWZpZXIsIG1fcHJvdmlzaW9uYWxEb2N1bWVudExvYWRlci5nZXQoKSwgbV9wcm92aXNpb25h bERvY3VtZW50TG9hZGVyLT5vcmlnaW5hbFJlcXVlc3QoKSk7Ci0gICAgfQotCi0gICAgbV9wcm92 aXNpb25hbERvY3VtZW50TG9hZGVyLT50aW1pbmcoKS0+bWFya05hdmlnYXRpb25TdGFydChmcmFt ZSgpKTsKLSAgICBtX3Byb3Zpc2lvbmFsRG9jdW1lbnRMb2FkZXItPnN0YXJ0TG9hZGluZ01haW5S ZXNvdXJjZShpZGVudGlmaWVyKTsKKyAgICBtX3Byb3Zpc2lvbmFsRG9jdW1lbnRMb2FkZXItPnN0 YXJ0TG9hZGluZ01haW5SZXNvdXJjZSgpOwogfQogCiBzdGF0aWMgS1VSTCBvcmlnaW5hdGluZ1VS TEZyb21CYWNrRm9yd2FyZExpc3QoUGFnZSogcGFnZSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xv YWRlci9Eb2N1bWVudExvYWRlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRl ci9Eb2N1bWVudExvYWRlci5oCShyZXZpc2lvbiAxMTIxNDQpCisrKyBTb3VyY2UvV2ViQ29yZS9s b2FkZXIvRG9jdW1lbnRMb2FkZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMTkzLDcgKzE5Myw3IEBA CiAgICAgICAgIAogICAgICAgICB2b2lkIHNldERlZmVyc0xvYWRpbmcoYm9vbCk7CiAKLSAgICAg ICAgdm9pZCBzdGFydExvYWRpbmdNYWluUmVzb3VyY2UodW5zaWduZWQgbG9uZyBpZGVudGlmaWVy KTsKKyAgICAgICAgdm9pZCBzdGFydExvYWRpbmdNYWluUmVzb3VyY2UoKTsKICAgICAgICAgdm9p ZCBjYW5jZWxNYWluUmVzb3VyY2VMb2FkKGNvbnN0IFJlc291cmNlRXJyb3ImKTsKICAgICAgICAg CiAgICAgICAgIC8vIFN1cHBvcnQgaWNvbkRhdGFiYXNlIGluIHN5bmNocm9ub3VzIG1vZGUuCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAJKHJldmlzaW9uIDEx MjE0NCkKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTc5MSwxMSArNzkxLDExIEBACiAgICAgcmV0dXJuIG1fbWFpblJlc291cmNl TG9hZGVyICYmIG1fbWFpblJlc291cmNlTG9hZGVyLT5pc0xvYWRpbmdNdWx0aXBhcnRDb250ZW50 KCk7CiB9CiAKLXZvaWQgRG9jdW1lbnRMb2FkZXI6OnN0YXJ0TG9hZGluZ01haW5SZXNvdXJjZSh1 bnNpZ25lZCBsb25nIGlkZW50aWZpZXIpCit2b2lkIERvY3VtZW50TG9hZGVyOjpzdGFydExvYWRp bmdNYWluUmVzb3VyY2UoKQogeworICAgIHRpbWluZygpLT5tYXJrTmF2aWdhdGlvblN0YXJ0KG1f ZnJhbWUpOwogICAgIEFTU0VSVCghbV9tYWluUmVzb3VyY2VMb2FkZXIpOwogICAgIG1fbWFpblJl c291cmNlTG9hZGVyID0gTWFpblJlc291cmNlTG9hZGVyOjpjcmVhdGUobV9mcmFtZSk7Ci0gICAg bV9tYWluUmVzb3VyY2VMb2FkZXItPnNldElkZW50aWZpZXIoaWRlbnRpZmllcik7CiAKICAgICAv LyBGSVhNRTogSXMgdGhlcmUgYW55IHdheSB0aGUgZXh0cmEgZmllbGRzIGNvdWxkIGhhdmUgbm90 IGJlZW4gYWRkZWQgYnkgbm93PwogICAgIC8vIElmIG5vdCwgaXQgd291bGQgYmUgZ3JlYXQgdG8g cmVtb3ZlIHRoaXMgbGluZSBvZiBjb2RlLgpJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jl c291cmNlTG9hZGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291 cmNlTG9hZGVyLmgJKHJldmlzaW9uIDExMjE0NCkKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9S ZXNvdXJjZUxvYWRlci5oCSh3b3JraW5nIGNvcHkpCkBAIC02Niw3ICs2Niw2IEBACiAgICAgICAg IAogICAgICAgICB2aXJ0dWFsIHZvaWQgc2V0RGVmZXJzTG9hZGluZyhib29sKTsKIAotICAgICAg ICB2b2lkIHNldElkZW50aWZpZXIodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyKSB7IG1faWRlbnRp ZmllciA9IGlkZW50aWZpZXI7IH0KICAgICAgICAgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyKCkg Y29uc3QgeyByZXR1cm4gbV9pZGVudGlmaWVyOyB9CiAKICAgICAgICAgdmlydHVhbCB2b2lkIHJl bGVhc2VSZXNvdXJjZXMoKTsK 133904 2012-03-26 15:12:03 -0700 2012-03-27 13:23:49 -0700 Hopefully EWS-able now ident.txt text/plain 4144 japhet SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMjE1MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisgMjAxMi0wMy0yNiAgTmF0ZSBD aGFwaW4gIDxqYXBoZXRAY2hyb21pdW0ub3JnPgorCisgICAgICAgIERvbid0IG1hbnVhbGx5IHNl dCBhbiBpZGVudGlmaWVyIGZvciBtYWluIHJlc291cmNlCisgICAgICAgIGxvYWRzIGluIEZyYW1l TG9hZGVyLiBSZXNvdXJjZUxvYWRlcjo6d2lsbFNlbmRSZXF1ZXN0KCkKKyAgICAgICAgd2lsbCBz ZXQgYW4gaWRlbnRpZmllciBmb3IgdGhlIHJlcXVlc3QgaWYgb25lIGlzbid0IGZvdW5kLAorICAg ICAgICBzbyB0aGlzIGNvZGUgYXBwZWFycyB0byBiZSB1bm5lY2Vzc2FyeSBkdXBsaWNhdGlvbi4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgyMjQ4CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRl c3RzLCBubyBmdW5jdGlvbmFsaXR5IGNoYW5nZSBpbnRlbmRlZC4KKworICAgICAgICAqIGxvYWRl ci9Eb2N1bWVudExvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudExvYWRlcjo6 c3RhcnRMb2FkaW5nTWFpblJlc291cmNlKTogTWFyayBuYXZpZ2F0aW9uIHN0YXJ0CisgICAgICAg ICAgICBoZXJlLCBzaW5jZSBpdCdzIGNvbmNlcHR1YWxseSBwYXJ0IG9mIHN0YXJ0aW5nIHRoZSBt YWluIHJlc291cmNlIGxvYWQuCisgICAgICAgICogbG9hZGVyL0RvY3VtZW50TG9hZGVyLmg6Cisg ICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1l TG9hZGVyOjpjb250aW51ZUxvYWRBZnRlcldpbGxTdWJtaXRGb3JtKTogUmVtb3ZlIGR1cGxpY2F0 ZSBpZGVudGlmaWVyCisgICAgICAgICAgICBsb2dpYywgYW5kIG1vdmUgbmF2aWdhdGlvbiB0aW1p bmcgY2FsbCB0byBzdGFydExvYWRpbmdNYWluUmVzb3VyY2UsIHNpbmNlCisgICAgICAgICAgICBp dCBmaXRzIGJldHRlciBsb2dpY2FsbHkgdGhlcmUuCisgICAgICAgICogbG9hZGVyL1Jlc291cmNl TG9hZGVyLmg6IE5vIGNhbGxlcnMgb2Ygc2V0SWRlbnRpZmllcigpIHJlbWFpbiwgc28gZGVsZXRl IGl0LgorCiAyMDEyLTAzLTI2ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+ CiAKICAgICAgICAgRmluZCBpbiBwYWdlIG92ZXJsYXkgYW5kIGJvdW5jeSBhcmUgbm90IGFsd2F5 cyBwb3NpdGlvbmVkIGNvcnJlY3RseQpJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1l TG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2Fk ZXIuY3BwCShyZXZpc2lvbiAxMTIxNTEpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVM b2FkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMzA0LDE2ICsyMzA0LDcgQEAKICAgICAgICAg cmV0dXJuOwogCiAgICAgbV9sb2FkaW5nRnJvbUNhY2hlZFBhZ2UgPSBmYWxzZTsKLQotICAgIHVu c2lnbmVkIGxvbmcgaWRlbnRpZmllciA9IDA7Ci0KLSAgICBpZiAoUGFnZSogcGFnZSA9IG1fZnJh bWUtPnBhZ2UoKSkgewotICAgICAgICBpZGVudGlmaWVyID0gcGFnZS0+cHJvZ3Jlc3MoKS0+Y3Jl YXRlVW5pcXVlSWRlbnRpZmllcigpOwotICAgICAgICBub3RpZmllcigpLT5hc3NpZ25JZGVudGlm aWVyVG9Jbml0aWFsUmVxdWVzdChpZGVudGlmaWVyLCBtX3Byb3Zpc2lvbmFsRG9jdW1lbnRMb2Fk ZXIuZ2V0KCksIG1fcHJvdmlzaW9uYWxEb2N1bWVudExvYWRlci0+b3JpZ2luYWxSZXF1ZXN0KCkp OwotICAgIH0KLQotICAgIG1fcHJvdmlzaW9uYWxEb2N1bWVudExvYWRlci0+dGltaW5nKCktPm1h cmtOYXZpZ2F0aW9uU3RhcnQoZnJhbWUoKSk7Ci0gICAgbV9wcm92aXNpb25hbERvY3VtZW50TG9h ZGVyLT5zdGFydExvYWRpbmdNYWluUmVzb3VyY2UoaWRlbnRpZmllcik7CisgICAgbV9wcm92aXNp b25hbERvY3VtZW50TG9hZGVyLT5zdGFydExvYWRpbmdNYWluUmVzb3VyY2UoKTsKIH0KIAogc3Rh dGljIEtVUkwgb3JpZ2luYXRpbmdVUkxGcm9tQmFja0ZvcndhcmRMaXN0KFBhZ2UqIHBhZ2UpCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuaAkocmV2aXNpb24gMTEyMTUx KQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmgJKHdvcmtpbmcgY29w eSkKQEAgLTE5Myw3ICsxOTMsNyBAQAogICAgICAgICAKICAgICAgICAgdm9pZCBzZXREZWZlcnNM b2FkaW5nKGJvb2wpOwogCi0gICAgICAgIHZvaWQgc3RhcnRMb2FkaW5nTWFpblJlc291cmNlKHVu c2lnbmVkIGxvbmcgaWRlbnRpZmllcik7CisgICAgICAgIHZvaWQgc3RhcnRMb2FkaW5nTWFpblJl c291cmNlKCk7CiAgICAgICAgIHZvaWQgY2FuY2VsTWFpblJlc291cmNlTG9hZChjb25zdCBSZXNv dXJjZUVycm9yJik7CiAgICAgICAgIAogICAgICAgICAvLyBTdXBwb3J0IGljb25EYXRhYmFzZSBp biBzeW5jaHJvbm91cyBtb2RlLgpJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50 TG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRM b2FkZXIuY3BwCShyZXZpc2lvbiAxMTIxNTEpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9j dW1lbnRMb2FkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03OTEsMTEgKzc5MSwxMSBAQAogICAg IHJldHVybiBtX21haW5SZXNvdXJjZUxvYWRlciAmJiBtX21haW5SZXNvdXJjZUxvYWRlci0+aXNM b2FkaW5nTXVsdGlwYXJ0Q29udGVudCgpOwogfQogCi12b2lkIERvY3VtZW50TG9hZGVyOjpzdGFy dExvYWRpbmdNYWluUmVzb3VyY2UodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyKQordm9pZCBEb2N1 bWVudExvYWRlcjo6c3RhcnRMb2FkaW5nTWFpblJlc291cmNlKCkKIHsKKyAgICB0aW1pbmcoKS0+ bWFya05hdmlnYXRpb25TdGFydChtX2ZyYW1lKTsKICAgICBBU1NFUlQoIW1fbWFpblJlc291cmNl TG9hZGVyKTsKICAgICBtX21haW5SZXNvdXJjZUxvYWRlciA9IE1haW5SZXNvdXJjZUxvYWRlcjo6 Y3JlYXRlKG1fZnJhbWUpOwotICAgIG1fbWFpblJlc291cmNlTG9hZGVyLT5zZXRJZGVudGlmaWVy KGlkZW50aWZpZXIpOwogCiAgICAgLy8gRklYTUU6IElzIHRoZXJlIGFueSB3YXkgdGhlIGV4dHJh IGZpZWxkcyBjb3VsZCBoYXZlIG5vdCBiZWVuIGFkZGVkIGJ5IG5vdz8KICAgICAvLyBJZiBub3Qs IGl0IHdvdWxkIGJlIGdyZWF0IHRvIHJlbW92ZSB0aGlzIGxpbmUgb2YgY29kZS4KSW5kZXg6IFNv dXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRlci5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRlci5oCShyZXZpc2lvbiAxMTIxNTEpCisrKyBT b3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkZXIuaAkod29ya2luZyBjb3B5KQpAQCAt NjYsNyArNjYsNiBAQAogICAgICAgICAKICAgICAgICAgdmlydHVhbCB2b2lkIHNldERlZmVyc0xv YWRpbmcoYm9vbCk7CiAKLSAgICAgICAgdm9pZCBzZXRJZGVudGlmaWVyKHVuc2lnbmVkIGxvbmcg aWRlbnRpZmllcikgeyBtX2lkZW50aWZpZXIgPSBpZGVudGlmaWVyOyB9CiAgICAgICAgIHVuc2ln bmVkIGxvbmcgaWRlbnRpZmllcigpIGNvbnN0IHsgcmV0dXJuIG1faWRlbnRpZmllcjsgfQogCiAg ICAgICAgIHZpcnR1YWwgdm9pZCByZWxlYXNlUmVzb3VyY2VzKCk7Cg==