29537 2009-09-21 02:59:06 -0700 Web Inspector: Expose InspectorResource fields 2009-09-21 15:15:46 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman timothy oldest_to_newest 148619 0 pfeldman 2009-09-21 02:59:06 -0700 Currently InspectorResource has all of its members private. Expose them via the API for potential processing in C++ (as agreed with Timothy long ago). 148620 1 39845 pfeldman 2009-09-21 03:04:41 -0700 Created attachment 39845 patch 148840 2 39845 timothy 2009-09-21 14:46:41 -0700 Comment on attachment 39845 patch > - > - if (!buffer) > - return String(); > - > - TextEncoding encoding(textEncodingName); > - if (!encoding.isValid()) > - encoding = WindowsLatin1Encoding(); > - return encoding.decode(buffer->data(), buffer->size()); > } I think an explicit return 0; would be good here, I think it happens anyway because PassRefPtr is uesed, but I had to think about where there was no final return here. 148854 3 pfeldman 2009-09-21 14:56:05 -0700 > I think an explicit return 0; would be good here, I think it happens anyway > because PassRefPtr is uesed, but I had to think about where there was no final > return here. Not sure what you are talking about (patch might look confusing). All branches have explicit returns. Here is the resulting snippet: PassRefPtr<SharedBuffer> InspectorResource::resourceData(String* textEncodingName) const { if (m_requestURL == m_loader->requestURL()) { *textEncodingName = m_frame->document()->inputEncoding(); return m_loader->mainResourceData(); } else { CachedResource* cachedResource = m_frame->document()->docLoader()->cachedResource(requestURL()); if (!cachedResource) return 0; if (cachedResource->isPurgeable()) { // If the resource is purgeable then make it unpurgeable to get // get its data. This might fail, in which case we return an // empty String. // FIXME: should we do something else in the case of a purged // resource that informs the user why there is no data in the // inspector? if (!cachedResource->makePurgeable(false)) return 0; } *textEncodingName = cachedResource->encoding(); return cachedResource->data(); } } 148858 4 timothy 2009-09-21 15:01:27 -0700 (In reply to comment #3) > > I think an explicit return 0; would be good here, I think it happens anyway > > because PassRefPtr is uesed, but I had to think about where there was no final > > return here. > > Not sure what you are talking about (patch might look confusing). All branches > have explicit returns. Here is the resulting snippet: > > PassRefPtr<SharedBuffer> InspectorResource::resourceData(String* > textEncodingName) const { > if (m_requestURL == m_loader->requestURL()) { > *textEncodingName = m_frame->document()->inputEncoding(); > return m_loader->mainResourceData(); > } else { > CachedResource* cachedResource = > m_frame->document()->docLoader()->cachedResource(requestURL()); > if (!cachedResource) > return 0; > > if (cachedResource->isPurgeable()) { > // If the resource is purgeable then make it unpurgeable to get > // get its data. This might fail, in which case we return an > // empty String. > // FIXME: should we do something else in the case of a purged > // resource that informs the user why there is no data in the > // inspector? > if (!cachedResource->makePurgeable(false)) > return 0; > } > > *textEncodingName = cachedResource->encoding(); > return cachedResource->data(); > } > } OK, I see. Then that else should be removed. We don't do "else" after a return in WebKit. 148861 5 pfeldman 2009-09-21 15:07:06 -0700 (In reply to comment #4) > OK, I see. Then that else should be removed. We don't do "else" after a return > in WebKit. Done. 148864 6 pfeldman 2009-09-21 15:15:46 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/inspector/InspectorResource.cpp M WebCore/inspector/InspectorResource.h Committed r48606 39845 2009-09-21 03:04:41 -0700 2009-09-21 14:46:40 -0700 patch expose_api text/plain 4475 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NTIxMzVlMS4uMDljMzc2ZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAwOS0wOS0yMSAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBUaW1vdGh5 IEhhdGNoZXIuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRXhwb3NlIEluc3BlY3RvclJlc291 cmNlIGZpZWxkcy4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9Mjk1MzcKKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JSZXNvdXJjZTo6c291cmNlU3RyaW5nKToKKyAg ICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclJlc291cmNlOjpyZXNvdXJjZURhdGEpOgorICAgICAg ICAqIGluc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZS5oOgorICAgICAgICAoV2ViQ29yZTo6SW5z cGVjdG9yUmVzb3VyY2U6OnJlcXVlc3RIZWFkZXJGaWVsZHMpOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yUmVzb3VyY2U6OnJlc3BvbnNlSGVhZGVyRmllbGRzKToKKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3RvclJlc291cmNlOjpyZXNwb25zZVN0YXR1c0NvZGUpOgorICAgICAgICAoV2Vi Q29yZTo6SW5zcGVjdG9yUmVzb3VyY2U6OnJlcXVlc3RNZXRob2QpOgorICAgICAgICAoV2ViQ29y ZTo6SW5zcGVjdG9yUmVzb3VyY2U6OnJlcXVlc3RGb3JtRGF0YSk6CisKIDIwMDktMDktMjAgIEFk YW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBNYWNp ZWogU3RhY2hvd2lhay4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJl c291cmNlLmNwcCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlLmNwcAppbmRl eCA1NGQ5ZjkyLi43M2UyMGNmIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JSZXNvdXJjZS5jcHAKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2Uu Y3BwCkBAIC0yNjQsMTYgKzI2NCwyNSBAQCBTdHJpbmcgSW5zcGVjdG9yUmVzb3VyY2U6OnNvdXJj ZVN0cmluZygpIGNvbnN0CiAgICAgaWYgKCFtX3htbEh0dHBSZXNwb25zZVRleHQuaXNOdWxsKCkp CiAgICAgICAgIHJldHVybiBTdHJpbmcobV94bWxIdHRwUmVzcG9uc2VUZXh0KTsKIAotICAgIFJl ZlB0cjxTaGFyZWRCdWZmZXI+IGJ1ZmZlcjsKICAgICBTdHJpbmcgdGV4dEVuY29kaW5nTmFtZTsK KyAgICBSZWZQdHI8U2hhcmVkQnVmZmVyPiBidWZmZXIgPSByZXNvdXJjZURhdGEoJnRleHRFbmNv ZGluZ05hbWUpOworICAgIGlmICghYnVmZmVyKQorICAgICAgICByZXR1cm4gU3RyaW5nKCk7CisK KyAgICBUZXh0RW5jb2RpbmcgZW5jb2RpbmcodGV4dEVuY29kaW5nTmFtZSk7CisgICAgaWYgKCFl bmNvZGluZy5pc1ZhbGlkKCkpCisgICAgICAgIGVuY29kaW5nID0gV2luZG93c0xhdGluMUVuY29k aW5nKCk7CisgICAgcmV0dXJuIGVuY29kaW5nLmRlY29kZShidWZmZXItPmRhdGEoKSwgYnVmZmVy LT5zaXplKCkpOworfQogCitQYXNzUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gSW5zcGVjdG9yUmVzb3Vy Y2U6OnJlc291cmNlRGF0YShTdHJpbmcqIHRleHRFbmNvZGluZ05hbWUpIGNvbnN0IHsKICAgICBp ZiAobV9yZXF1ZXN0VVJMID09IG1fbG9hZGVyLT5yZXF1ZXN0VVJMKCkpIHsKLSAgICAgICAgYnVm ZmVyID0gbV9sb2FkZXItPm1haW5SZXNvdXJjZURhdGEoKTsKLSAgICAgICAgdGV4dEVuY29kaW5n TmFtZSA9IG1fZnJhbWUtPmRvY3VtZW50KCktPmlucHV0RW5jb2RpbmcoKTsKKyAgICAgICAgKnRl eHRFbmNvZGluZ05hbWUgPSBtX2ZyYW1lLT5kb2N1bWVudCgpLT5pbnB1dEVuY29kaW5nKCk7Cisg ICAgICAgIHJldHVybiBtX2xvYWRlci0+bWFpblJlc291cmNlRGF0YSgpOwogICAgIH0gZWxzZSB7 CiAgICAgICAgIENhY2hlZFJlc291cmNlKiBjYWNoZWRSZXNvdXJjZSA9IG1fZnJhbWUtPmRvY3Vt ZW50KCktPmRvY0xvYWRlcigpLT5jYWNoZWRSZXNvdXJjZShyZXF1ZXN0VVJMKCkpOwogICAgICAg ICBpZiAoIWNhY2hlZFJlc291cmNlKQotICAgICAgICAgICAgcmV0dXJuIFN0cmluZygpOworICAg ICAgICAgICAgcmV0dXJuIDA7CiAKICAgICAgICAgaWYgKGNhY2hlZFJlc291cmNlLT5pc1B1cmdl YWJsZSgpKSB7CiAgICAgICAgICAgICAvLyBJZiB0aGUgcmVzb3VyY2UgaXMgcHVyZ2VhYmxlIHRo ZW4gbWFrZSBpdCB1bnB1cmdlYWJsZSB0byBnZXQKQEAgLTI4MywyMCArMjkyLDEyIEBAIFN0cmlu ZyBJbnNwZWN0b3JSZXNvdXJjZTo6c291cmNlU3RyaW5nKCkgY29uc3QKICAgICAgICAgICAgIC8v IHJlc291cmNlIHRoYXQgaW5mb3JtcyB0aGUgdXNlciB3aHkgdGhlcmUgaXMgbm8gZGF0YSBpbiB0 aGUKICAgICAgICAgICAgIC8vIGluc3BlY3Rvcj8KICAgICAgICAgICAgIGlmICghY2FjaGVkUmVz b3VyY2UtPm1ha2VQdXJnZWFibGUoZmFsc2UpKQotICAgICAgICAgICAgICAgIHJldHVybiBTdHJp bmcoKTsKKyAgICAgICAgICAgICAgICByZXR1cm4gMDsKICAgICAgICAgfQogCi0gICAgICAgIGJ1 ZmZlciA9IGNhY2hlZFJlc291cmNlLT5kYXRhKCk7Ci0gICAgICAgIHRleHRFbmNvZGluZ05hbWUg PSBjYWNoZWRSZXNvdXJjZS0+ZW5jb2RpbmcoKTsKKyAgICAgICAgKnRleHRFbmNvZGluZ05hbWUg PSBjYWNoZWRSZXNvdXJjZS0+ZW5jb2RpbmcoKTsKKyAgICAgICAgcmV0dXJuIGNhY2hlZFJlc291 cmNlLT5kYXRhKCk7CiAgICAgfQotCi0gICAgaWYgKCFidWZmZXIpCi0gICAgICAgIHJldHVybiBT dHJpbmcoKTsKLQotICAgIFRleHRFbmNvZGluZyBlbmNvZGluZyh0ZXh0RW5jb2RpbmdOYW1lKTsK LSAgICBpZiAoIWVuY29kaW5nLmlzVmFsaWQoKSkKLSAgICAgICAgZW5jb2RpbmcgPSBXaW5kb3dz TGF0aW4xRW5jb2RpbmcoKTsKLSAgICByZXR1cm4gZW5jb2RpbmcuZGVjb2RlKGJ1ZmZlci0+ZGF0 YSgpLCBidWZmZXItPnNpemUoKSk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yUmVzb3VyY2U6OnN0YXJ0 VGltaW5nKCkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNl LmggYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZS5oCmluZGV4IDRjODUzMTUu LjVlMzdlNDEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNl LmgKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2UuaApAQCAtODcsMTIg Kzg3LDIwIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgdm9pZCBzZXRYTUxIdHRwUmVz cG9uc2VUZXh0KGNvbnN0IFNjcmlwdFN0cmluZyYgZGF0YSk7CiAKICAgICAgICAgU3RyaW5nIHNv dXJjZVN0cmluZygpIGNvbnN0OworICAgICAgICBQYXNzUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gcmVz b3VyY2VEYXRhKFN0cmluZyogdGV4dEVuY29kaW5nTmFtZSkgY29uc3Q7CisKICAgICAgICAgYm9v bCBpc1NhbWVMb2FkZXIoRG9jdW1lbnRMb2FkZXIqIGxvYWRlcikgY29uc3QgeyByZXR1cm4gbG9h ZGVyID09IG1fbG9hZGVyOyB9CiAgICAgICAgIHZvaWQgbWFya01haW5SZXNvdXJjZSgpIHsgbV9p c01haW5SZXNvdXJjZSA9IHRydWU7IH0KICAgICAgICAgbG9uZyBsb25nIGlkZW50aWZpZXIoKSBj b25zdCB7IHJldHVybiBtX2lkZW50aWZpZXI7IH0KICAgICAgICAgU3RyaW5nIHJlcXVlc3RVUkwo KSBjb25zdCB7IHJldHVybiBtX3JlcXVlc3RVUkwuc3RyaW5nKCk7IH0KICAgICAgICAgRnJhbWUq IGZyYW1lKCkgY29uc3QgeyByZXR1cm4gbV9mcmFtZS5nZXQoKTsgfQogICAgICAgICBjb25zdCBT dHJpbmcmIG1pbWVUeXBlKCkgY29uc3QgeyByZXR1cm4gbV9taW1lVHlwZTsgfQorICAgICAgICBj b25zdCBIVFRQSGVhZGVyTWFwJiByZXF1ZXN0SGVhZGVyRmllbGRzKCkgY29uc3QgeyByZXR1cm4g bV9yZXF1ZXN0SGVhZGVyRmllbGRzOyB9CisgICAgICAgIGNvbnN0IEhUVFBIZWFkZXJNYXAmIHJl c3BvbnNlSGVhZGVyRmllbGRzKCkgY29uc3QgeyByZXR1cm4gbV9yZXNwb25zZUhlYWRlckZpZWxk czsgfQorICAgICAgICBpbnQgcmVzcG9uc2VTdGF0dXNDb2RlKCkgY29uc3QgeyByZXR1cm4gbV9y ZXNwb25zZVN0YXR1c0NvZGU7IH0KKyAgICAgICAgU3RyaW5nIHJlcXVlc3RNZXRob2QoKSBjb25z dCB7IHJldHVybiBtX3JlcXVlc3RNZXRob2Q7IH0KKyAgICAgICAgU3RyaW5nIHJlcXVlc3RGb3Jt RGF0YSgpIGNvbnN0IHsgcmV0dXJuIG1fcmVxdWVzdEZvcm1EYXRhOyB9CisKICAgICAgICAgdm9p ZCBzdGFydFRpbWluZygpOwogICAgICAgICB2b2lkIG1hcmtSZXNwb25zZVJlY2VpdmVkVGltZSgp OwogICAgICAgICB2b2lkIGVuZFRpbWluZygpOwo=