57262 2011-03-28 12:47:48 -0700 ResourceError::certificate() should return a PCCERT_CONTEXT 2011-03-28 13:09:34 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Windows 7 RESOLVED FIXED P2 Normal --- 1 jeffm jeffm webkit.review.bot oldest_to_newest 374693 0 jeffm 2011-03-28 12:47:48 -0700 Follow-up to <https://bugs.webkit.org/show_bug.cgi?id=57195>. This allows us to clean up encodeResourceError() in WebCoreArgumentCoders.win.cpp. 374697 1 87183 jeffm 2011-03-28 12:54:26 -0700 Created attachment 87183 Patch 374700 2 webkit.review.bot 2011-03-28 12:57:12 -0700 Attachment 87183 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebKit2/ChangeLog:13: ChangeLog entry has no bug number [changelog/bugnumber] [5] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 374701 3 87183 aroben 2011-03-28 12:58:32 -0700 Comment on attachment 87183 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=87183&action=review > Source/WebCore/platform/network/cf/ResourceErrorCF.cpp:62 > +PCCERT_CONTEXT ResourceError::certificate() const > +{ > + if (!m_certificate) > + return 0; > + > + return reinterpret_cast<PCCERT_CONTEXT>(CFDataGetBytePtr(m_certificate.get())); > +} Now I'm starting to wonder whether making m_certificate itself a PCCERT_CONTEXT would be good. I guess one benefit of using CFDataRef is that we get to use RetainPtr. We don't have a comparable smart pointer for PCCERT_CONTEXT. 374703 4 jeffm 2011-03-28 13:05:19 -0700 (In reply to comment #3) > (From update of attachment 87183 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=87183&action=review > > > Source/WebCore/platform/network/cf/ResourceErrorCF.cpp:62 > > +PCCERT_CONTEXT ResourceError::certificate() const > > +{ > > + if (!m_certificate) > > + return 0; > > + > > + return reinterpret_cast<PCCERT_CONTEXT>(CFDataGetBytePtr(m_certificate.get())); > > +} > > Now I'm starting to wonder whether making m_certificate itself a PCCERT_CONTEXT would be good. I guess one benefit of using CFDataRef is that we get to use RetainPtr. We don't have a comparable smart pointer for PCCERT_CONTEXT. Yes, I originally went down the path of using PCCERT_CONTEXT, but without a comparable smart pointer I would have had to add a destructor, so it seemed cleaner to use a CFDataRef. Plus, we need it in a CFDataRef when we stick it in the user info dictionary in the CFErrorRef. 374704 5 jeffm 2011-03-28 13:07:39 -0700 (In reply to comment #2) > Attachment 87183 [details] did not pass style-queue: > > Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 > > Source/WebKit2/ChangeLog:13: ChangeLog entry has no bug number [changelog/bugnumber] [5] > Total errors found: 1 in 5 files > > > If any of these errors are false positives, please file a bug against check-webkit-style. Another false positive, which I assume is a similar issue to the bug I already filed: https://bugs.webkit.org/show_bug.cgi?id=57250 374706 6 jeffm 2011-03-28 13:09:34 -0700 Committed r82146: <http://trac.webkit.org/changeset/82146> 87183 2011-03-28 12:54:26 -0700 2011-03-28 12:58:32 -0700 Patch bug-57262-20110328125425.patch text/plain 4511 jeffm SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgyMTQ0KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDMtMjggIEplZmYgTWls bGVyICA8amVmZm1AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFJlc291cmNlRXJyb3I6OmNlcnRpZmljYXRlKCkgc2hvdWxkIHJldHVy biBhIFBDQ0VSVF9DT05URVhUCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD01NzI2MgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jZi9SZXNvdXJj ZUVycm9yLmg6IGNlcnRpZmljYXRlKCkgbm93IHJldHVybnMgYSBQQ0NFUlRfQ09OVEVYVC4KKyAg ICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2NmL1Jlc291cmNlRXJyb3JDRi5jcHA6CisgICAgICAg IChXZWJDb3JlOjpSZXNvdXJjZUVycm9yOjpjZXJ0aWZpY2F0ZSk6IEFkZGVkLgorCiAyMDExLTAz LTI4ICBEYXZpZCBIeWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBi eSBTaW1vbiBGcmFzZXIgYW5kIERhcmluIEFkbGVyLgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9jZi9SZXNvdXJjZUVycm9yLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9SZXNvdXJjZUVycm9yLmgJKHJldmlzaW9uIDgyMTQ0 KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9SZXNvdXJjZUVycm9yLmgJ KHdvcmtpbmcgY29weSkKQEAgLTYzLDcgKzYzLDcgQEAgcHVibGljOgogI2lmIFVTRShDRk5FVFdP UkspCiAjaWYgUExBVEZPUk0oV0lOKQogICAgIFJlc291cmNlRXJyb3IoY29uc3QgU3RyaW5nJiBk b21haW4sIGludCBlcnJvckNvZGUsIGNvbnN0IFN0cmluZyYgZmFpbGluZ1VSTCwgY29uc3QgU3Ry aW5nJiBsb2NhbGl6ZWREZXNjcmlwdGlvbiwgQ0ZEYXRhUmVmIGNlcnRpZmljYXRlKTsKLSAgICBD RkRhdGFSZWYgY2VydGlmaWNhdGUoKSBjb25zdCB7IHJldHVybiBtX2NlcnRpZmljYXRlLmdldCgp OyB9CisgICAgUENDRVJUX0NPTlRFWFQgY2VydGlmaWNhdGUoKSBjb25zdDsKICNlbmRpZgogICAg IFJlc291cmNlRXJyb3IoQ0ZTdHJlYW1FcnJvciBlcnJvcik7CiAgICAgQ0ZTdHJlYW1FcnJvciBj ZlN0cmVhbUVycm9yKCkgY29uc3Q7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL2NmL1Jlc291cmNlRXJyb3JDRi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9jZi9SZXNvdXJjZUVycm9yQ0YuY3BwCShyZXZpc2lvbiA4MjE0NCkK KysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2YvUmVzb3VyY2VFcnJvckNGLmNw cAkod29ya2luZyBjb3B5KQpAQCAtNTIsNiArNTIsMTQgQEAgUmVzb3VyY2VFcnJvcjo6UmVzb3Vy Y2VFcnJvcihjb25zdCBTdHJpbgogICAgICwgbV9jZXJ0aWZpY2F0ZShjZXJ0aWZpY2F0ZSkKIHsK IH0KKworUENDRVJUX0NPTlRFWFQgUmVzb3VyY2VFcnJvcjo6Y2VydGlmaWNhdGUoKSBjb25zdAor eworICAgIGlmICghbV9jZXJ0aWZpY2F0ZSkKKyAgICAgICAgcmV0dXJuIDA7CisgICAgCisgICAg cmV0dXJuIHJlaW50ZXJwcmV0X2Nhc3Q8UENDRVJUX0NPTlRFWFQ+KENGRGF0YUdldEJ5dGVQdHIo bV9jZXJ0aWZpY2F0ZS5nZXQoKSkpOworfQogI2VuZGlmIC8vIFBMQVRGT1JNKFdJTikKIAogY29u c3QgQ0ZTdHJpbmdSZWYgZmFpbGluZ1VSTFN0cmluZ0tleSA9IENGU1RSKCJOU0Vycm9yRmFpbGlu Z1VSTFN0cmluZ0tleSIpOwpJbmRleDogU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkocmV2aXNpb24gODIxNDQpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAorMjAx MS0wMy0yOCAgSmVmZiBNaWxsZXIgIDxqZWZmbUBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVzb3VyY2VFcnJvcjo6Y2VydGlmaWNh dGUoKSBzaG91bGQgcmV0dXJuIGEgUENDRVJUX0NPTlRFWFQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3MjYyCisKKyAgICAgICAgKiBTaGFyZWQvd2lu L1BsYXRmb3JtQ2VydGlmaWNhdGVJbmZvLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGxhdGZvcm1D ZXJ0aWZpY2F0ZUluZm86OlBsYXRmb3JtQ2VydGlmaWNhdGVJbmZvKTogRG9uJ3QgYXNzZXJ0IGlm IG5vIFBDQ0VSVF9DT05URVhUIGlzIHNwZWNpZmllZC4KKyAgICAgICAgKiBTaGFyZWQvd2luL1dl YkNvcmVBcmd1bWVudENvZGVyc1dpbi5jcHA6CisgICAgICAgIChDb3JlSVBDOjplbmNvZGVSZXNv dXJjZUVycm9yKTogUmVtb3ZlZCB1bm5lZWRlZCBjb2RlIG5vdyB0aGF0IFJlc291cmNlRXJyb3I6 OmNlcnRpZmljYXRlKCkgcmV0dXJucyBhIFBDQ0VSVF9DT05URVhULgorCiAyMDExLTAzLTI4ICBK ZWZmIE1pbGxlciAgPGplZmZtQGFwcGxlLmNvbT4KIAogICAgICAgICBSdWJiZXItc3RhbXBlZCBi eSBBZGFtIFJvYmVuLgpJbmRleDogU291cmNlL1dlYktpdDIvU2hhcmVkL3dpbi9QbGF0Zm9ybUNl cnRpZmljYXRlSW5mby5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvU2hhcmVkL3dp bi9QbGF0Zm9ybUNlcnRpZmljYXRlSW5mby5jcHAJKHJldmlzaW9uIDgyMTQ0KQorKysgU291cmNl L1dlYktpdDIvU2hhcmVkL3dpbi9QbGF0Zm9ybUNlcnRpZmljYXRlSW5mby5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTc1LDcgKzc1LDYgQEAgUGxhdGZvcm1DZXJ0aWZpY2F0ZUluZm86OlBsYXRmb3Jt Q2VydGlmaQogCiBQbGF0Zm9ybUNlcnRpZmljYXRlSW5mbzo6UGxhdGZvcm1DZXJ0aWZpY2F0ZUlu Zm8oUENDRVJUX0NPTlRFWFQgY2VydGlmaWNhdGVDb250ZXh0KQogewotICAgIEFTU0VSVChjZXJ0 aWZpY2F0ZUNvbnRleHQpOwogICAgIGlmICghY2VydGlmaWNhdGVDb250ZXh0KQogICAgICAgICBy ZXR1cm47CiAgICAgCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvd2luL1dlYkNvcmVBcmd1 bWVudENvZGVyc1dpbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvU2hhcmVkL3dp bi9XZWJDb3JlQXJndW1lbnRDb2RlcnNXaW4uY3BwCShyZXZpc2lvbiA4MjE0NCkKKysrIFNvdXJj ZS9XZWJLaXQyL1NoYXJlZC93aW4vV2ViQ29yZUFyZ3VtZW50Q29kZXJzV2luLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMTIzLDE5ICsxMjMsNyBAQCB2b2lkIGVuY29kZVJlc291cmNlRXJyb3IoQXJn dW1lbnRFbmNvZGVyCiAgICAgZW5jb2Rlci0+ZW5jb2RlKENvcmVJUEM6OkluKHJlc291cmNlRXJy b3IuZG9tYWluKCksIHJlc291cmNlRXJyb3IuZXJyb3JDb2RlKCksIHJlc291cmNlRXJyb3IuZmFp bGluZ1VSTCgpLCByZXNvdXJjZUVycm9yLmxvY2FsaXplZERlc2NyaXB0aW9uKCkpKTsKIAogI2lm IFVTRShDRk5FVFdPUkspCi0gICAgQ0ZEYXRhUmVmIGNlcnRpZmljYXRlRGF0YSA9IHJlc291cmNl RXJyb3IuY2VydGlmaWNhdGUoKTsKLSAgICBpZiAoIWNlcnRpZmljYXRlRGF0YSkgewotICAgICAg ICBlbmNvZGVyLT5lbmNvZGUoV2ViS2l0OjpQbGF0Zm9ybUNlcnRpZmljYXRlSW5mbygpKTsKLSAg ICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIFBDQ0VSVF9DT05URVhUIGNlcnRpZmljYXRlID0g cmVpbnRlcnByZXRfY2FzdDxQQ0NFUlRfQ09OVEVYVD4oQ0ZEYXRhR2V0Qnl0ZVB0cihjZXJ0aWZp Y2F0ZURhdGEpKTsKLSAgICBpZiAoIWNlcnRpZmljYXRlKSB7Ci0gICAgICAgIGVuY29kZXItPmVu Y29kZShXZWJLaXQ6OlBsYXRmb3JtQ2VydGlmaWNhdGVJbmZvKCkpOwotICAgICAgICByZXR1cm47 Ci0gICAgfQotICAgIAotICAgIGVuY29kZXItPmVuY29kZShXZWJLaXQ6OlBsYXRmb3JtQ2VydGlm aWNhdGVJbmZvKGNlcnRpZmljYXRlKSk7CisgICAgZW5jb2Rlci0+ZW5jb2RlKFdlYktpdDo6UGxh dGZvcm1DZXJ0aWZpY2F0ZUluZm8ocmVzb3VyY2VFcnJvci5jZXJ0aWZpY2F0ZSgpKSk7CiAjZW5k aWYKIH0KIAo=