22071 2008-11-04 16:22:11 -0800 [Qt] Unable to retrieve meta data from a frame 2008-11-06 05:20:26 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 sriram.yadavalli webkit-unassigned hausmann sriram.yadavalli oldest_to_newest 97636 0 sriram.yadavalli 2008-11-04 16:22:11 -0800 Provide API to get meta data from a frame 97637 1 24901 sriram.yadavalli 2008-11-04 16:23:17 -0800 Created attachment 24901 Patch to add meta data API to QWebFrame 97690 2 24901 hausmann 2008-11-05 08:30:25 -0800 Comment on attachment 24901 Patch to add meta data API to QWebFrame > Index: qwebframe.cpp > =================================================================== > --- qwebframe.cpp (revision 38051) > +++ qwebframe.cpp (working copy) > @@ -8,7 +8,7 @@ > version 2 of the License, or (at your option) any later version. > > This library is distributed in the hope that it will be useful, > - but WITHOUT ANY WARRANTY; without even the implied warranty of > + but WITHOUT ANY WARRANTY; without paeven the implied warranty of This looks like an unintended typo :) > MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > Library General Public License for more details. > > @@ -70,6 +70,7 @@ > #include <qevent.h> > #include <qfileinfo.h> > #include <qpainter.h> > +#include <QMultiMap> > #if QT_VERSION >= 0x040400 > #include <qnetworkrequest.h> > #else > @@ -77,6 +78,8 @@ > #endif > #include <qregion.h> > #include <qprinter.h> > +#include "HTMLMetaElement.h" > +#include "NodeList.h" > > using namespace WebCore; > > @@ -280,6 +283,26 @@ > else return QString(); > } > > +/*! Can you add a \since 4.5 here? thanks :) (sorry, small nitpick) > + \brief Returns the meta data in this frame > + \sa metaData() > +*/ The patch looks great. It's just missing a ChangeLog entry. And perhaps you could write a little bit more in the docs of the function. But this is really just a nitpick, I could add that while committing. The ChangeLog entry is missing though. I think Yael could help with that, too :) I'll r- for now, but with a ChangeLog entry and the typo in the copyright I'll r+ it :) In pri 97740 3 24921 sriram.yadavalli 2008-11-05 15:07:04 -0800 Created attachment 24921 Patch with change log included and copyright typo excluded 97742 4 24922 sriram.yadavalli 2008-11-05 15:27:30 -0800 Created attachment 24922 Patch with ChangeLog and modified comments 97789 5 24922 hausmann 2008-11-06 01:48:50 -0800 Comment on attachment 24922 Patch with ChangeLog and modified comments There are some small issues left, but I'll r+ it and fix it while comitting. 97790 6 24922 hausmann 2008-11-06 01:51:42 -0800 Comment on attachment 24922 Patch with ChangeLog and modified comments Landed in r38159 97791 7 hausmann 2008-11-06 01:53:34 -0800 Sriram, I did a few small fixups to your patch: * The ChangeLog was missing a description * The '*' was misplaced in the implementation * There was a space missing between QMultiMap<QString,QString> I also submitted r38160 and r38161 to enhance the documentation a little bit and to add a unit test for this feature. 97798 8 sriram.yadavalli 2008-11-06 05:20:26 -0800 Thanks Simon..I ll keep the changes in mind going forward 24901 2008-11-04 16:23:17 -0800 2008-11-05 08:30:25 -0800 Patch to add meta data API to QWebFrame MetaData.patch text/plain 1977 sriram.yadavalli SW5kZXg6IHF3ZWJmcmFtZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gcXdlYmZyYW1lLmNwcAkocmV2aXNp b24gMzgwNTEpCisrKyBxd2ViZnJhbWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04LDcgKzgsNyBA QAogICAgIHZlcnNpb24gMiBvZiB0aGUgTGljZW5zZSwgb3IgKGF0IHlvdXIgb3B0aW9uKSBhbnkg bGF0ZXIgdmVyc2lvbi4KIAogICAgIFRoaXMgbGlicmFyeSBpcyBkaXN0cmlidXRlZCBpbiB0aGUg aG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVsLAotICAgIGJ1dCBXSVRIT1VUIEFOWSBXQVJSQU5U WTsgd2l0aG91dCBldmVuIHRoZSBpbXBsaWVkIHdhcnJhbnR5IG9mCisgICAgYnV0IFdJVEhPVVQg QU5ZIFdBUlJBTlRZOyB3aXRob3V0IHBhZXZlbiB0aGUgaW1wbGllZCB3YXJyYW50eSBvZgogICAg IE1FUkNIQU5UQUJJTElUWSBvciBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4gIFNl ZSB0aGUgR05VCiAgICAgTGlicmFyeSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZvciBtb3JlIGRl dGFpbHMuCiAKQEAgLTcwLDYgKzcwLDcgQEAKICNpbmNsdWRlIDxxZXZlbnQuaD4KICNpbmNsdWRl IDxxZmlsZWluZm8uaD4KICNpbmNsdWRlIDxxcGFpbnRlci5oPgorI2luY2x1ZGUgPFFNdWx0aU1h cD4KICNpZiBRVF9WRVJTSU9OID49IDB4MDQwNDAwCiAjaW5jbHVkZSA8cW5ldHdvcmtyZXF1ZXN0 Lmg+CiAjZWxzZQpAQCAtNzcsNiArNzgsOCBAQAogI2VuZGlmCiAjaW5jbHVkZSA8cXJlZ2lvbi5o PgogI2luY2x1ZGUgPHFwcmludGVyLmg+CisjaW5jbHVkZSAiSFRNTE1ldGFFbGVtZW50LmgiCisj aW5jbHVkZSAiTm9kZUxpc3QuaCIKIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKQEAgLTI4 MCw2ICsyODMsMjYgQEAKICAgICBlbHNlIHJldHVybiBRU3RyaW5nKCk7CiB9CiAKKy8qIQorICAg IFxicmllZiBSZXR1cm5zIHRoZSBtZXRhIGRhdGEgaW4gdGhpcyBmcmFtZQorICAgIFxzYSBtZXRh RGF0YSgpCisqLworUU11bHRpTWFwPFFTdHJpbmcsUVN0cmluZz4gUVdlYkZyYW1lOjptZXRhRGF0 YSgpIGNvbnN0Cit7CisgICAgaWYoIWQtPmZyYW1lLT5kb2N1bWVudCgpKQorICAgICAgIHJldHVy biBRTWFwPFFTdHJpbmcsUVN0cmluZz4oKTsKKworICAgIFFNdWx0aU1hcDxRU3RyaW5nLFFTdHJp bmc+IG1hcDsKKyAgICBEb2N1bWVudCAqZG9jID0gZC0+ZnJhbWUtPmRvY3VtZW50KCk7CisgICAg UmVmUHRyPE5vZGVMaXN0PiBsaXN0ID0gZG9jLT5nZXRFbGVtZW50c0J5VGFnTmFtZSgibWV0YSIp OworICAgIHVuc2lnbmVkIGxlbiA9IGxpc3QtPmxlbmd0aCgpOworICAgIGZvciAodW5zaWduZWQg aSA9IDA7IGkgPCBsZW47IGkrKykgeworICAgICAgICBIVE1MTWV0YUVsZW1lbnQgKm1ldGEgPSBz dGF0aWNfY2FzdDxIVE1MTWV0YUVsZW1lbnQgKj4obGlzdC0+aXRlbShpKSk7CisgICAgICAgIG1h cC5pbnNlcnQobWV0YS0+bmFtZSgpLG1ldGEtPmNvbnRlbnQoKSk7CisgICAgfQorICAgIHJldHVy biBtYXA7Cit9CisKIHN0YXRpYyBpbmxpbmUgUVVybCBlbnN1cmVBYnNvbHV0ZVVybChjb25zdCBR VXJsICZ1cmwpCiB7CiAgICAgaWYgKCF1cmwuaXNSZWxhdGl2ZSgpKQpJbmRleDogcXdlYmZyYW1l LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gcXdlYmZyYW1lLmgJKHJldmlzaW9uIDM4MDUxKQorKysgcXdlYmZy YW1lLmgJKHdvcmtpbmcgY29weSkKQEAgLTEzMiw2ICsxMzIsNyBAQAogICAgIHZvaWQgc2V0VXJs KGNvbnN0IFFVcmwgJnVybCk7CiAgICAgUVVybCB1cmwoKSBjb25zdDsKICAgICBRSWNvbiBpY29u KCkgY29uc3Q7CisgICAgUU11bHRpTWFwPFFTdHJpbmcsUVN0cmluZz4gbWV0YURhdGEoKSBjb25z dDsKIAogICAgIFFTdHJpbmcgZnJhbWVOYW1lKCkgY29uc3Q7CiAK 24921 2008-11-05 15:07:04 -0800 2008-11-05 15:09:38 -0800 Patch with change log included and copyright typo excluded MetaData.patch text/plain 2063 sriram.yadavalli SW5kZXg6IHF0L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBxdC9DaGFuZ2VMb2cJKHJldmlzaW9u IDM4MTM1KQorKysgcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTEgQEAK KzIwMDgtMTEtMDUgIFNyaXJhbSBZYWRhdmFsbGkgPHNyaXJhbS55YWRhdmFsbGlAbm9raWEuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEhhdXNtYW5uLgorCisgICAgICAgICogQXBp L3F3ZWJmcmFtZS5jcHA6CisgICAgICAgIChRV2ViRnJhbWU6Om1ldGFEYXRhKToKKyAgICAgICAg KiBBcGkvcXdlYmZyYW1lLmg6CisKIDIwMDgtMTAtMjQgIFlhZWwgQWhhcm9uIDx5YWVsLmFoYXJv bkBub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gSGF1c21hbm4uCkluZGV4 OiBxdC9BcGkvcXdlYmZyYW1lLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBxdC9BcGkvcXdlYmZyYW1lLmNw cAkocmV2aXNpb24gMzgwNTEpCisrKyBxdC9BcGkvcXdlYmZyYW1lLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtNzAsNiArNzAsNyBAQAogI2luY2x1ZGUgPHFldmVudC5oPgogI2luY2x1ZGUgPHFmaWxl aW5mby5oPgogI2luY2x1ZGUgPHFwYWludGVyLmg+CisjaW5jbHVkZSA8UU11bHRpTWFwPgogI2lm IFFUX1ZFUlNJT04gPj0gMHgwNDA0MDAKICNpbmNsdWRlIDxxbmV0d29ya3JlcXVlc3QuaD4KICNl bHNlCkBAIC03Nyw2ICs3OCw4IEBACiAjZW5kaWYKICNpbmNsdWRlIDxxcmVnaW9uLmg+CiAjaW5j bHVkZSA8cXByaW50ZXIuaD4KKyNpbmNsdWRlICJIVE1MTWV0YUVsZW1lbnQuaCIKKyNpbmNsdWRl ICJOb2RlTGlzdC5oIgogCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIApAQCAtMjgwLDYgKzI4 MywyNiBAQAogICAgIGVsc2UgcmV0dXJuIFFTdHJpbmcoKTsKIH0KIAorLyohCisgICAgXGJyaWVm IFJldHVybnMgdGhlIG1ldGEgZGF0YSBpbiB0aGlzIGZyYW1lIGFzIGEgUU11bHRpTWFwCisgICAg XHNhIG1ldGFEYXRhKCkKKyovCitRTXVsdGlNYXA8UVN0cmluZyxRU3RyaW5nPiBRV2ViRnJhbWU6 Om1ldGFEYXRhKCkgY29uc3QKK3sKKyAgICBpZighZC0+ZnJhbWUtPmRvY3VtZW50KCkpCisgICAg ICAgcmV0dXJuIFFNYXA8UVN0cmluZyxRU3RyaW5nPigpOworCisgICAgUU11bHRpTWFwPFFTdHJp bmcsUVN0cmluZz4gbWFwOworICAgIERvY3VtZW50ICpkb2MgPSBkLT5mcmFtZS0+ZG9jdW1lbnQo KTsKKyAgICBSZWZQdHI8Tm9kZUxpc3Q+IGxpc3QgPSBkb2MtPmdldEVsZW1lbnRzQnlUYWdOYW1l KCJtZXRhIik7CisgICAgdW5zaWduZWQgbGVuID0gbGlzdC0+bGVuZ3RoKCk7CisgICAgZm9yICh1 bnNpZ25lZCBpID0gMDsgaSA8IGxlbjsgaSsrKSB7CisgICAgICAgIEhUTUxNZXRhRWxlbWVudCAq bWV0YSA9IHN0YXRpY19jYXN0PEhUTUxNZXRhRWxlbWVudCAqPihsaXN0LT5pdGVtKGkpKTsKKyAg ICAgICAgbWFwLmluc2VydChtZXRhLT5uYW1lKCksbWV0YS0+Y29udGVudCgpKTsKKyAgICB9Cisg ICAgcmV0dXJuIG1hcDsKK30KKwogc3RhdGljIGlubGluZSBRVXJsIGVuc3VyZUFic29sdXRlVXJs KGNvbnN0IFFVcmwgJnVybCkKIHsKICAgICBpZiAoIXVybC5pc1JlbGF0aXZlKCkpCkluZGV4OiBx dC9BcGkvcXdlYmZyYW1lLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gcXQvQXBpL3F3ZWJmcmFtZS5oCShyZXZp c2lvbiAzODA1MSkKKysrIHF0L0FwaS9xd2ViZnJhbWUuaAkod29ya2luZyBjb3B5KQpAQCAtMTMy LDYgKzEzMiw3IEBACiAgICAgdm9pZCBzZXRVcmwoY29uc3QgUVVybCAmdXJsKTsKICAgICBRVXJs IHVybCgpIGNvbnN0OwogICAgIFFJY29uIGljb24oKSBjb25zdDsKKyAgICBRTXVsdGlNYXA8UVN0 cmluZyxRU3RyaW5nPiBtZXRhRGF0YSgpIGNvbnN0OwogCiAgICAgUVN0cmluZyBmcmFtZU5hbWUo KSBjb25zdDsKIAo= 24922 2008-11-05 15:27:30 -0800 2008-11-06 01:51:42 -0800 Patch with ChangeLog and modified comments MetaData.patch text/plain 2144 sriram.yadavalli SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gMzgxMzUpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTIgQEAKKworMjAwOC0xMS0wNSAgU3JpcmFtIFlhZGF2YWxsaSA8c3Jp cmFtLnlhZGF2YWxsaUBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gSGF1 c21hbm4uCisKKyAgICAgICAgKiBBcGkvcXdlYmZyYW1lLmNwcDoKKyAgICAgICAgKFFXZWJGcmFt ZTo6bWV0YURhdGEpOgorICAgICAgICAqIEFwaS9xd2ViZnJhbWUuaDoKKwogMjAwOC0xMC0yNCAg WWFlbCBBaGFyb24gPHlhZWwuYWhhcm9uQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBi eSBTaW1vbiBIYXVzbWFubi4KSW5kZXg6IFdlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAJKHJldmlzaW9uIDM4MDUxKQor KysgV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03MCw2ICs3 MCw3IEBACiAjaW5jbHVkZSA8cWV2ZW50Lmg+CiAjaW5jbHVkZSA8cWZpbGVpbmZvLmg+CiAjaW5j bHVkZSA8cXBhaW50ZXIuaD4KKyNpbmNsdWRlIDxRTXVsdGlNYXA+CiAjaWYgUVRfVkVSU0lPTiA+ PSAweDA0MDQwMAogI2luY2x1ZGUgPHFuZXR3b3JrcmVxdWVzdC5oPgogI2Vsc2UKQEAgLTc3LDYg Kzc4LDggQEAKICNlbmRpZgogI2luY2x1ZGUgPHFyZWdpb24uaD4KICNpbmNsdWRlIDxxcHJpbnRl ci5oPgorI2luY2x1ZGUgIkhUTUxNZXRhRWxlbWVudC5oIgorI2luY2x1ZGUgIk5vZGVMaXN0Lmgi CiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCkBAIC0yODAsNiArMjgzLDI3IEBACiAgICAg ZWxzZSByZXR1cm4gUVN0cmluZygpOwogfQogCisvKiEKKyAgICBcc2luY2UgNC41CisgICAgXGJy aWVmIFJldHVybnMgdGhlIG1ldGEgZGF0YSBpbiB0aGlzIGZyYW1lIGFzIGEgUU11bHRpTWFwCisg ICAgXHNhIG1ldGFEYXRhKCkKKyovCitRTXVsdGlNYXA8UVN0cmluZyxRU3RyaW5nPiBRV2ViRnJh bWU6Om1ldGFEYXRhKCkgY29uc3QKK3sKKyAgICBpZighZC0+ZnJhbWUtPmRvY3VtZW50KCkpCisg ICAgICAgcmV0dXJuIFFNYXA8UVN0cmluZyxRU3RyaW5nPigpOworCisgICAgUU11bHRpTWFwPFFT dHJpbmcsUVN0cmluZz4gbWFwOworICAgIERvY3VtZW50ICpkb2MgPSBkLT5mcmFtZS0+ZG9jdW1l bnQoKTsKKyAgICBSZWZQdHI8Tm9kZUxpc3Q+IGxpc3QgPSBkb2MtPmdldEVsZW1lbnRzQnlUYWdO YW1lKCJtZXRhIik7CisgICAgdW5zaWduZWQgbGVuID0gbGlzdC0+bGVuZ3RoKCk7CisgICAgZm9y ICh1bnNpZ25lZCBpID0gMDsgaSA8IGxlbjsgaSsrKSB7CisgICAgICAgIEhUTUxNZXRhRWxlbWVu dCAqbWV0YSA9IHN0YXRpY19jYXN0PEhUTUxNZXRhRWxlbWVudCAqPihsaXN0LT5pdGVtKGkpKTsK KyAgICAgICAgbWFwLmluc2VydChtZXRhLT5uYW1lKCksbWV0YS0+Y29udGVudCgpKTsKKyAgICB9 CisgICAgcmV0dXJuIG1hcDsKK30KKwogc3RhdGljIGlubGluZSBRVXJsIGVuc3VyZUFic29sdXRl VXJsKGNvbnN0IFFVcmwgJnVybCkKIHsKICAgICBpZiAoIXVybC5pc1JlbGF0aXZlKCkpCkluZGV4 OiBXZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9xdC9BcGkv cXdlYmZyYW1lLmgJKHJldmlzaW9uIDM4MDUxKQorKysgV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUu aAkod29ya2luZyBjb3B5KQpAQCAtMTMyLDYgKzEzMiw3IEBACiAgICAgdm9pZCBzZXRVcmwoY29u c3QgUVVybCAmdXJsKTsKICAgICBRVXJsIHVybCgpIGNvbnN0OwogICAgIFFJY29uIGljb24oKSBj b25zdDsKKyAgICBRTXVsdGlNYXA8UVN0cmluZyxRU3RyaW5nPiBtZXRhRGF0YSgpIGNvbnN0Owog CiAgICAgUVN0cmluZyBmcmFtZU5hbWUoKSBjb25zdDsKIAo=