49063 2010-11-05 03:51:05 -0700 [Qt] WebKit2, QWKHistory needs more functionality and QWKHistoryItemPrivate should be shared object. 2010-11-08 18:48:44 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 juha.savolainen webkit-unassigned commit-queue kenneth kling oldest_to_newest 305208 0 juha.savolainen 2010-11-05 03:51:05 -0700 History needs at least these methods: - QWKHistoryItem currentItem() const - QWKHistoryItem backItem() const - QWKHistoryItem forwardItem() const - QWKHistoryItem itemAtIndex(int index) const - QList<QWKHistoryItem> backItems(int maxItems) const - QList<QWKHistoryItem> forwardItems(int maxItems) const Also QWKHistoryItemPrivate should be shared object, because we cannot delete the QWKHistoryItemPrivate pointer in destructor of QWKHistoryItem, there may have other history instances which share the same private implementation. 305209 1 73051 juha.savolainen 2010-11-05 03:57:21 -0700 Created attachment 73051 More functionality to history and QWKHistoryItemPrivate has changed to shared object 305925 2 73051 kling 2010-11-07 19:06:16 -0800 Comment on attachment 73051 More functionality to history and QWKHistoryItemPrivate has changed to shared object View in context: https://bugs.webkit.org/attachment.cgi?id=73051&action=review > WebKit2/UIProcess/API/qt/qwkhistory.cpp:39 > #include <QUrl> > +#include <QSharedData> > #include <WebKit2/WKRetainPtr.h> > +#include <WebKit2/WKArray.h> Include files should be in alphabetical order. > WebKit2/UIProcess/API/qt/qwkhistory.cpp:52 > +QWKHistoryItem::QWKHistoryItem(const QWKHistoryItem &other) Ampersand (&) placement, should be immediately after QWKHistoryItem. > WebKit2/UIProcess/API/qt/qwkhistory.cpp:57 > +QWKHistoryItem& QWKHistoryItem::QWKHistoryItem::operator=(const QWKHistoryItem &other) Ditto. > WebKit2/UIProcess/API/qt/qwkhistory.cpp:139 > + QWKHistoryItem item; > + item.d = new QWKHistoryItemPrivate(itemRef.get()); This pattern is ugly, we should have the QWKHistoryItem constructor initialize its d-pointer instead. > WebKit2/UIProcess/API/qt/qwkhistory.cpp:172 > + for (int i = 0; i < size; i++) { Use prefix increment (++i) > WebKit2/UIProcess/API/qt/qwkhistory.cpp:187 > + for (int i = 0; i < size; i++) { Use prefix increment (++i) > WebKit2/UIProcess/API/qt/qwkhistory.h:44 > + QWKHistoryItem(const QWKHistoryItem &other); > + QWKHistoryItem &operator=(const QWKHistoryItem &other); Ampersand (&) placement, should be immediately after QWKHistoryItem. > WebKit2/UIProcess/API/qt/qwkhistory.h:69 > + QWKHistoryItem itemAtIndex(int index) const; Should be called "itemAt" to match the QWebHistory API. > WebKit2/UIProcess/API/qt/qwkhistory_p.h:32 > +#include <QSharedData> Include files should be in alphabetical order. > WebKit2/UIProcess/API/qt/qwkhistory_p.h:45 > + Adding unnecessary whitespace. 306061 3 73228 juha.savolainen 2010-11-08 02:29:53 -0800 Created attachment 73228 fixed patch 306069 4 73228 kling 2010-11-08 03:23:48 -0800 Comment on attachment 73228 fixed patch r=me 306554 5 73228 commit-queue 2010-11-08 18:48:39 -0800 Comment on attachment 73228 fixed patch Clearing flags on attachment: 73228 Committed r71596: <http://trac.webkit.org/changeset/71596> 306555 6 commit-queue 2010-11-08 18:48:44 -0800 All reviewed patches have been landed. Closing bug. 73051 2010-11-05 03:57:21 -0700 2010-11-07 19:06:16 -0800 More functionality to history and QWKHistoryItemPrivate has changed to shared object historyupdate.patch text/plain 6747 juha.savolainen SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA3MTM5OCkKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjcgQEAKKzIwMTAtMTEtMDUgIEp1aGEgU2F2b2xhaW5lbiAgPGp1aGEuc2F2b2xh aW5lbkB3ZWVnby5maT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBBZGRlZCBuZXcgbWV0aG9kcyB0byBRV0tIaXN0b3J5IGFuZCBtYWRlIFFXS0hpc3Rv cnlJdGVtUHJpdmF0ZSB0byBzaGFyZWQgb2JqZWN0LgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDkwNjMKKworICAgICAgICBBZGRlZCBtb3JlIGZ1bmN0 aW9uYWxpdHkgdG8gdGhlIFFXS0hpc3RvcnkgYW5kIGNoYW5nZWQgUVdLSGlzdG9yeUl0ZW1Qcml2 YXRlIHRvIHNoYXJlZCBvYmplY3QuCisgICAgICAgIFRoaXMgaXMgbmVlZGVkIGJlY2F1c2Ugd2Ug Y2Fubm90IGRlbGV0ZSB0aGUgUVdLSGlzdG9yeUl0ZW1Qcml2YXRlIHBvaW50ZXIgaW4gZGVzdHJ1 Y3RvciBvZiBRV0tIaXN0b3J5SXRlbSwKKyAgICAgICAgdGhlcmUgbWF5IGhhdmUgb3RoZXIgaGlz dG9yeSBpbnN0YW5jZXMgd2hpY2ggc2hhcmUgc2FtZSBwcml2YXRlIGltcGxlbWVudGF0aW9uLgor CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xd2toaXN0b3J5LmNwcDoKKyAgICAgICAgKFFX S0hpc3RvcnlJdGVtUHJpdmF0ZTo6flFXS0hpc3RvcnlJdGVtUHJpdmF0ZSk6CisgICAgICAgIChR V0tIaXN0b3J5SXRlbTo6UVdLSGlzdG9yeUl0ZW0pOgorICAgICAgICAoUVdLSGlzdG9yeUl0ZW06 OlFXS0hpc3RvcnlJdGVtOjpvcGVyYXRvcj0pOgorICAgICAgICAoUVdLSGlzdG9yeTo6Y3VycmVu dEl0ZW0pOiBBZGRlZAorICAgICAgICAoUVdLSGlzdG9yeTo6YmFja0l0ZW0pOiBBZGRlZAorICAg ICAgICAoUVdLSGlzdG9yeTo6Zm9yd2FyZEl0ZW0pOiBBZGRlZAorICAgICAgICAoUVdLSGlzdG9y eTo6aXRlbUF0SW5kZXgpOiBBZGRlZAorICAgICAgICAoUVdLSGlzdG9yeTo6YmFja0l0ZW1zKTog QWRkZWQKKyAgICAgICAgKFFXS0hpc3Rvcnk6OmZvcndhcmRJdGVtcyk6IEFkZGVkCisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9xdC9xd2toaXN0b3J5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9xdC9xd2toaXN0b3J5X3AuaDoKKwogMjAxMC0xMS0wNCAgSmlhIFB1ICA8anB1QGFwcGxlLmNv bT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYW4gQmVybnN0ZWluLgpJbmRleDogV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL3F0L3F3a2hpc3RvcnkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQ cm9jZXNzL0FQSS9xdC9xd2toaXN0b3J5LmNwcAkocmV2aXNpb24gNzEzOTMpCisrKyBXZWJLaXQy L1VJUHJvY2Vzcy9BUEkvcXQvcXdraGlzdG9yeS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM0LDcg KzM0LDkgQEAKICNpbmNsdWRlICJxd2toaXN0b3J5X3AuaCIKICNpbmNsdWRlIDxRU3RyaW5nPgog I2luY2x1ZGUgPFFVcmw+CisjaW5jbHVkZSA8UVNoYXJlZERhdGE+CiAjaW5jbHVkZSA8V2ViS2l0 Mi9XS1JldGFpblB0ci5oPgorI2luY2x1ZGUgPFdlYktpdDIvV0tBcnJheS5oPgogCiB1c2luZyBu YW1lc3BhY2UgV2ViS2l0OwogCkBAIC00Myw2ICs0NSwyMSBAQCBRV0tIaXN0b3J5SXRlbVByaXZh dGU6OlFXS0hpc3RvcnlJdGVtUHJpCiB7CiB9CiAKK1FXS0hpc3RvcnlJdGVtUHJpdmF0ZTo6flFX S0hpc3RvcnlJdGVtUHJpdmF0ZSgpCit7Cit9CisKK1FXS0hpc3RvcnlJdGVtOjpRV0tIaXN0b3J5 SXRlbShjb25zdCBRV0tIaXN0b3J5SXRlbSAmb3RoZXIpCisgICAgOiBkKG90aGVyLmQpIAorewor fQorCitRV0tIaXN0b3J5SXRlbSYgUVdLSGlzdG9yeUl0ZW06OlFXS0hpc3RvcnlJdGVtOjpvcGVy YXRvcj0oY29uc3QgUVdLSGlzdG9yeUl0ZW0gJm90aGVyKSAKK3sgCisgICAgZCA9IG90aGVyLmQ7 CisgICAgcmV0dXJuICp0aGlzOyAKK30KKwogUVdLSGlzdG9yeUl0ZW06OlFXS0hpc3RvcnlJdGVt KCkKIHsKIH0KQEAgLTExNSwzICsxMzIsNjUgQEAgaW50IFFXS0hpc3Rvcnk6OmNvdW50KCkgY29u c3QKICAgICByZXR1cm4gYmFja0xpc3RDb3VudCgpICsgZm9yd2FyZExpc3RDb3VudCgpOwogfQog CitRV0tIaXN0b3J5SXRlbSBRV0tIaXN0b3J5OjpjdXJyZW50SXRlbSgpIGNvbnN0Cit7CisgICAg V0tSZXRhaW5QdHI8V0tCYWNrRm9yd2FyZExpc3RJdGVtUmVmPiBpdGVtUmVmID0gV0tCYWNrRm9y d2FyZExpc3RHZXRDdXJyZW50SXRlbSh0b0FQSShkLT5tX2JhY2tGb3J3YXJkTGlzdCkpOworICAg IFFXS0hpc3RvcnlJdGVtIGl0ZW07CisgICAgaXRlbS5kID0gbmV3IFFXS0hpc3RvcnlJdGVtUHJp dmF0ZShpdGVtUmVmLmdldCgpKTsKKyAgICByZXR1cm4gaXRlbTsKK30KKworUVdLSGlzdG9yeUl0 ZW0gUVdLSGlzdG9yeTo6YmFja0l0ZW0oKSBjb25zdAoreworICAgIFdLUmV0YWluUHRyPFdLQmFj a0ZvcndhcmRMaXN0SXRlbVJlZj4gaXRlbVJlZiA9IFdLQmFja0ZvcndhcmRMaXN0R2V0QmFja0l0 ZW0odG9BUEkoZC0+bV9iYWNrRm9yd2FyZExpc3QpKTsKKyAgICBRV0tIaXN0b3J5SXRlbSBpdGVt OworICAgIGl0ZW0uZCA9IG5ldyBRV0tIaXN0b3J5SXRlbVByaXZhdGUoaXRlbVJlZi5nZXQoKSk7 CisgICAgcmV0dXJuIGl0ZW07Cit9CisKK1FXS0hpc3RvcnlJdGVtIFFXS0hpc3Rvcnk6OmZvcndh cmRJdGVtKCkgY29uc3QKK3sKKyAgICBXS1JldGFpblB0cjxXS0JhY2tGb3J3YXJkTGlzdEl0ZW1S ZWY+IGl0ZW1SZWYgPSBXS0JhY2tGb3J3YXJkTGlzdEdldEZvcndhcmRJdGVtKHRvQVBJKGQtPm1f YmFja0ZvcndhcmRMaXN0KSk7CisgICAgUVdLSGlzdG9yeUl0ZW0gaXRlbTsKKyAgICBpdGVtLmQg PSBuZXcgUVdLSGlzdG9yeUl0ZW1Qcml2YXRlKGl0ZW1SZWYuZ2V0KCkpOworICAgIHJldHVybiBp dGVtOworfQorCitRV0tIaXN0b3J5SXRlbSBRV0tIaXN0b3J5OjppdGVtQXRJbmRleChpbnQgaW5k ZXgpIGNvbnN0Cit7CisgICAgV0tSZXRhaW5QdHI8V0tCYWNrRm9yd2FyZExpc3RJdGVtUmVmPiBp dGVtUmVmID0gV0tCYWNrRm9yd2FyZExpc3RHZXRJdGVtQXRJbmRleCh0b0FQSShkLT5tX2JhY2tG b3J3YXJkTGlzdCksIGluZGV4KTsKKyAgICBRV0tIaXN0b3J5SXRlbSBpdGVtOworICAgIGl0ZW0u ZCA9IG5ldyBRV0tIaXN0b3J5SXRlbVByaXZhdGUoaXRlbVJlZi5nZXQoKSk7CisgICAgcmV0dXJu IGl0ZW07Cit9CisKK1FMaXN0PFFXS0hpc3RvcnlJdGVtPiBRV0tIaXN0b3J5OjpiYWNrSXRlbXMo aW50IG1heEl0ZW1zKSBjb25zdAoreworICAgIFdLQXJyYXlSZWYgYXJyYXlSZWYgPSBXS0JhY2tG b3J3YXJkTGlzdENvcHlCYWNrTGlzdFdpdGhMaW1pdCh0b0FQSShkLT5tX2JhY2tGb3J3YXJkTGlz dCksIG1heEl0ZW1zKTsKKyAgICBpbnQgc2l6ZSA9IFdLQXJyYXlHZXRTaXplKGFycmF5UmVmKTsK KyAgICBRTGlzdDxRV0tIaXN0b3J5SXRlbT4gaXRlbUxpc3Q7CisgICAgZm9yIChpbnQgaSA9IDA7 IGkgPCBzaXplOyBpKyspIHsKKyAgICAgICAgUVdLSGlzdG9yeUl0ZW0gaXRlbTsKKyAgICAgICAg V0tUeXBlUmVmIHdrSGlzdG9yeUl0ZW0gPSBXS0FycmF5R2V0SXRlbUF0SW5kZXgoYXJyYXlSZWYs IGkpOworICAgICAgICBXS0JhY2tGb3J3YXJkTGlzdEl0ZW1SZWYgaXRlbVJlZiA9IHN0YXRpY19j YXN0PFdLQmFja0ZvcndhcmRMaXN0SXRlbVJlZj4od2tIaXN0b3J5SXRlbSk7CisgICAgICAgIGl0 ZW0uZCA9IG5ldyBRV0tIaXN0b3J5SXRlbVByaXZhdGUoaXRlbVJlZik7CisgICAgICAgIGl0ZW1M aXN0LmFwcGVuZChpdGVtKTsKKyAgICB9CisgICAgcmV0dXJuIGl0ZW1MaXN0OworfQorCitRTGlz dDxRV0tIaXN0b3J5SXRlbT4gUVdLSGlzdG9yeTo6Zm9yd2FyZEl0ZW1zKGludCBtYXhJdGVtcykg Y29uc3QKK3sKKyAgICBXS0FycmF5UmVmIGFycmF5UmVmID0gV0tCYWNrRm9yd2FyZExpc3RDb3B5 Rm9yd2FyZExpc3RXaXRoTGltaXQodG9BUEkoZC0+bV9iYWNrRm9yd2FyZExpc3QpLCBtYXhJdGVt cyk7CisgICAgaW50IHNpemUgPSBXS0FycmF5R2V0U2l6ZShhcnJheVJlZik7CisgICAgUUxpc3Q8 UVdLSGlzdG9yeUl0ZW0+IGl0ZW1MaXN0OworICAgIGZvciAoaW50IGkgPSAwOyBpIDwgc2l6ZTsg aSsrKSB7CisgICAgICAgIFFXS0hpc3RvcnlJdGVtIGl0ZW07CisgICAgICAgIFdLVHlwZVJlZiB3 a0hpc3RvcnlJdGVtID0gV0tBcnJheUdldEl0ZW1BdEluZGV4KGFycmF5UmVmLCBpKTsKKyAgICAg ICAgV0tCYWNrRm9yd2FyZExpc3RJdGVtUmVmIGl0ZW1SZWYgPSBzdGF0aWNfY2FzdDxXS0JhY2tG b3J3YXJkTGlzdEl0ZW1SZWY+KHdrSGlzdG9yeUl0ZW0pOworICAgICAgICBpdGVtLmQgPSBuZXcg UVdLSGlzdG9yeUl0ZW1Qcml2YXRlKGl0ZW1SZWYpOworICAgICAgICBpdGVtTGlzdC5hcHBlbmQo aXRlbSk7CisgICAgfQorICAgIHJldHVybiBpdGVtTGlzdDsKK30KKwpJbmRleDogV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL3F0L3F3a2hpc3RvcnkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvcXQvcXdraGlzdG9yeS5oCShyZXZpc2lvbiA3MTM5MykKKysrIFdlYktpdDIvVUlQ cm9jZXNzL0FQSS9xdC9xd2toaXN0b3J5LmgJKHdvcmtpbmcgY29weSkKQEAgLTI3LDYgKzI3LDcg QEAKIAogI2luY2x1ZGUgInF3ZWJraXRnbG9iYWwuaCIKICNpbmNsdWRlIDxRT2JqZWN0PgorI2lu Y2x1ZGUgPFFTaGFyZWREYXRhPgogCiBjbGFzcyBRV0tIaXN0b3J5UHJpdmF0ZTsKIGNsYXNzIFFX S0hpc3RvcnlJdGVtUHJpdmF0ZTsKQEAgLTM5LDYgKzQwLDkgQEAgY2xhc3MgV2ViQmFja0Zvcndh cmRMaXN0OwogCiBjbGFzcyBRV0VCS0lUX0VYUE9SVCBRV0tIaXN0b3J5SXRlbSB7CiBwdWJsaWM6 CisgICAgUVdLSGlzdG9yeUl0ZW0oY29uc3QgUVdLSGlzdG9yeUl0ZW0gJm90aGVyKTsKKyAgICBR V0tIaXN0b3J5SXRlbSAmb3BlcmF0b3I9KGNvbnN0IFFXS0hpc3RvcnlJdGVtICZvdGhlcik7CisK ICAgICB+UVdLSGlzdG9yeUl0ZW0oKTsKICAgICBRU3RyaW5nIHRpdGxlKCkgY29uc3Q7CiAgICAg UVVybCB1cmwoKSBjb25zdDsKQEAgLTQ3LDcgKzUxLDcgQEAgcHVibGljOgogcHJpdmF0ZToKICAg ICBRV0tIaXN0b3J5SXRlbSgpOwogCi0gICAgUVdLSGlzdG9yeUl0ZW1Qcml2YXRlKiBkOworICAg IFFFeHBsaWNpdGx5U2hhcmVkRGF0YVBvaW50ZXI8UVdLSGlzdG9yeUl0ZW1Qcml2YXRlPiBkOwog CiAgICAgZnJpZW5kIGNsYXNzIFFXS0hpc3Rvcnk7CiAgICAgZnJpZW5kIGNsYXNzIFFXS0hpc3Rv cnlJdGVtUHJpdmF0ZTsKQEAgLTU5LDYgKzYzLDEyIEBAIHB1YmxpYzoKICAgICBpbnQgYmFja0xp c3RDb3VudCgpIGNvbnN0OwogICAgIGludCBmb3J3YXJkTGlzdENvdW50KCkgY29uc3Q7CiAgICAg aW50IGNvdW50KCkgY29uc3Q7CisgICAgUVdLSGlzdG9yeUl0ZW0gY3VycmVudEl0ZW0oKSBjb25z dDsKKyAgICBRV0tIaXN0b3J5SXRlbSBiYWNrSXRlbSgpIGNvbnN0OworICAgIFFXS0hpc3RvcnlJ dGVtIGZvcndhcmRJdGVtKCkgY29uc3Q7CisgICAgUVdLSGlzdG9yeUl0ZW0gaXRlbUF0SW5kZXgo aW50IGluZGV4KSBjb25zdDsKKyAgICBRTGlzdDxRV0tIaXN0b3J5SXRlbT4gYmFja0l0ZW1zKGlu dCBtYXhJdGVtcykgY29uc3Q7CisgICAgUUxpc3Q8UVdLSGlzdG9yeUl0ZW0+IGZvcndhcmRJdGVt cyhpbnQgbWF4SXRlbXMpIGNvbnN0OwogCiBwcml2YXRlOgogICAgIFFXS0hpc3RvcnkoKTsKSW5k ZXg6IFdlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2toaXN0b3J5X3AuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdraGlzdG9yeV9wLmgJKHJldmlzaW9uIDcxMzkz KQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3a2hpc3RvcnlfcC5oCSh3b3JraW5nIGNv cHkpCkBAIC0yOSw2ICsyOSw3IEBACiAjaW5jbHVkZSA8V2ViS2l0Mi9XS0Jhc2UuaD4KICNpbmNs dWRlIDxXZWJLaXQyL1dLUmV0YWluUHRyLmg+CiAjaW5jbHVkZSA8d3RmL1Bhc3NSZWZQdHIuaD4K KyNpbmNsdWRlIDxRU2hhcmVkRGF0YT4KIAogbmFtZXNwYWNlIFdlYktpdCB7CiBjbGFzcyBXZWJC YWNrRm9yd2FyZExpc3Q7CkBAIC0zNiwxMCArMzcsMTIgQEAgY2xhc3MgV2ViQmFja0ZvcndhcmRM aXN0OwogCiBjbGFzcyBRV0tIaXN0b3J5OwogCi1jbGFzcyBRV0VCS0lUX0VYUE9SVCBRV0tIaXN0 b3J5SXRlbVByaXZhdGUgeworY2xhc3MgUVdFQktJVF9FWFBPUlQgUVdLSGlzdG9yeUl0ZW1Qcml2 YXRlIDogcHVibGljIFFTaGFyZWREYXRhIHsKK3B1YmxpYzoKKyAgICAgICB+UVdLSGlzdG9yeUl0 ZW1Qcml2YXRlKCk7CiBwcml2YXRlOgogICAgIFFXS0hpc3RvcnlJdGVtUHJpdmF0ZShXS0JhY2tG b3J3YXJkTGlzdEl0ZW1SZWYgbGlzdEl0ZW0pOwotCisgICAgCiAgICAgV0tSZXRhaW5QdHI8V0tC YWNrRm9yd2FyZExpc3RJdGVtUmVmPiBtX2JhY2tGb3J3YXJkTGlzdEl0ZW07CiAKICAgICBmcmll bmQgY2xhc3MgUVdLSGlzdG9yeTsK 73228 2010-11-08 02:29:53 -0800 2010-11-08 18:48:39 -0800 fixed patch historyupdate.diff text/plain 7167 juha.savolainen SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA3MTUwMSkKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjcgQEAKKzIwMTAtMTEtMDggIEp1aGEgU2F2b2xhaW5lbiAgPGp1aGEuc2F2b2xh aW5lbkB3ZWVnby5maT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBbUXRdIEFkZGVkIG5ldyBtZXRob2RzIHRvIFFXS0hpc3RvcnkgYW5kIG1hZGUgUVdL SGlzdG9yeUl0ZW1Qcml2YXRlIHRvIHNoYXJlZCBvYmplY3QuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00OTA2MworCisgICAgICAgIEFkZGVkIG1vcmUg ZnVuY3Rpb25hbGl0eSB0byB0aGUgUVdLSGlzdG9yeSBhbmQgY2hhbmdlZCBRV0tIaXN0b3J5SXRl bVByaXZhdGUgdG8gc2hhcmVkIG9iamVjdC4KKyAgICAgICAgVGhpcyBpcyBuZWVkZWQgYmVjYXVz ZSB3ZSBjYW5ub3QgZGVsZXRlIHRoZSBRV0tIaXN0b3J5SXRlbVByaXZhdGUgcG9pbnRlciBpbiBk ZXN0cnVjdG9yIG9mIFFXS0hpc3RvcnlJdGVtLAorICAgICAgICB0aGVyZSBtYXkgaGF2ZSBvdGhl ciBoaXN0b3J5IGluc3RhbmNlcyB3aGljaCBzaGFyZSBzYW1lIHByaXZhdGUgaW1wbGVtZW50YXRp b24uCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3F3a2hpc3RvcnkuY3BwOgorICAgICAg ICAoUVdLSGlzdG9yeUl0ZW1Qcml2YXRlOjp+UVdLSGlzdG9yeUl0ZW1Qcml2YXRlKToKKyAgICAg ICAgKFFXS0hpc3RvcnlJdGVtOjpRV0tIaXN0b3J5SXRlbSk6CisgICAgICAgIChRV0tIaXN0b3J5 SXRlbTo6UVdLSGlzdG9yeUl0ZW06Om9wZXJhdG9yPSk6CisgICAgICAgIChRV0tIaXN0b3J5Ojpj dXJyZW50SXRlbSk6IEFkZGVkCisgICAgICAgIChRV0tIaXN0b3J5OjpiYWNrSXRlbSk6IEFkZGVk CisgICAgICAgIChRV0tIaXN0b3J5Ojpmb3J3YXJkSXRlbSk6IEFkZGVkCisgICAgICAgIChRV0tI aXN0b3J5OjppdGVtQXQpOiBBZGRlZAorICAgICAgICAoUVdLSGlzdG9yeTo6YmFja0l0ZW1zKTog QWRkZWQKKyAgICAgICAgKFFXS0hpc3Rvcnk6OmZvcndhcmRJdGVtcyk6IEFkZGVkCisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9xdC9xd2toaXN0b3J5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9xdC9xd2toaXN0b3J5X3AuaDoKKwogMjAxMC0xMS0wNyAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3 ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgpJbmRleDogV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3a2hpc3RvcnkuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktp dDIvVUlQcm9jZXNzL0FQSS9xdC9xd2toaXN0b3J5LmNwcAkocmV2aXNpb24gNzE0OTgpCisrKyBX ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdraGlzdG9yeS5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTI1LDE2ICsyNSwxNyBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgInF3a2hpc3Rv cnkuaCIKIAorI2luY2x1ZGUgPFFTaGFyZWREYXRhPgorI2luY2x1ZGUgPFFTdHJpbmc+CisjaW5j bHVkZSA8UVVybD4KKyNpbmNsdWRlICJxd2toaXN0b3J5X3AuaCIKKyNpbmNsdWRlICJXZWJCYWNr Rm9yd2FyZExpc3QuaCIKKyNpbmNsdWRlIDxXZWJLaXQyL1dLQXJyYXkuaD4KKyNpbmNsdWRlIDxX ZWJLaXQyL1dLUmV0YWluUHRyLmg+CiAjaW5jbHVkZSAiV0tCYWNrRm9yd2FyZExpc3QuaCIKLSNp bmNsdWRlICJXS0JhY2tGb3J3YXJkTGlzdEl0ZW0uaCIKICNpbmNsdWRlICJXS1N0cmluZ1F0Lmgi CiAjaW5jbHVkZSAiV0tVUkwuaCIKICNpbmNsdWRlICJXS1VSTFF0LmgiCi0jaW5jbHVkZSAiV2Vi QmFja0ZvcndhcmRMaXN0LmgiCi0jaW5jbHVkZSAicXdraGlzdG9yeV9wLmgiCi0jaW5jbHVkZSA8 UVN0cmluZz4KLSNpbmNsdWRlIDxRVXJsPgotI2luY2x1ZGUgPFdlYktpdDIvV0tSZXRhaW5QdHIu aD4KIAogdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIApAQCAtNDMsNyArNDQsMjMgQEAgUVdLSGlz dG9yeUl0ZW1Qcml2YXRlOjpRV0tIaXN0b3J5SXRlbVByaQogewogfQogCi1RV0tIaXN0b3J5SXRl bTo6UVdLSGlzdG9yeUl0ZW0oKQorUVdLSGlzdG9yeUl0ZW1Qcml2YXRlOjp+UVdLSGlzdG9yeUl0 ZW1Qcml2YXRlKCkKK3sKK30KKworUVdLSGlzdG9yeUl0ZW06OlFXS0hpc3RvcnlJdGVtKGNvbnN0 IFFXS0hpc3RvcnlJdGVtJiBvdGhlcikKKyAgICA6IGQob3RoZXIuZCkgCit7Cit9CisKK1FXS0hp c3RvcnlJdGVtJiBRV0tIaXN0b3J5SXRlbTo6UVdLSGlzdG9yeUl0ZW06Om9wZXJhdG9yPShjb25z dCBRV0tIaXN0b3J5SXRlbSYgb3RoZXIpIAoreyAKKyAgICBkID0gb3RoZXIuZDsKKyAgICByZXR1 cm4gKnRoaXM7IAorfQorCitRV0tIaXN0b3J5SXRlbTo6UVdLSGlzdG9yeUl0ZW0oV0tCYWNrRm9y d2FyZExpc3RJdGVtUmVmIGl0ZW0pCisgICAgOiBkKG5ldyBRV0tIaXN0b3J5SXRlbVByaXZhdGUo aXRlbSkpCiB7CiB9CiAKQEAgLTExNSwzICsxMzIsNTkgQEAgaW50IFFXS0hpc3Rvcnk6OmNvdW50 KCkgY29uc3QKICAgICByZXR1cm4gYmFja0xpc3RDb3VudCgpICsgZm9yd2FyZExpc3RDb3VudCgp OwogfQogCitRV0tIaXN0b3J5SXRlbSBRV0tIaXN0b3J5OjpjdXJyZW50SXRlbSgpIGNvbnN0Cit7 CisgICAgV0tSZXRhaW5QdHI8V0tCYWNrRm9yd2FyZExpc3RJdGVtUmVmPiBpdGVtUmVmID0gV0tC YWNrRm9yd2FyZExpc3RHZXRDdXJyZW50SXRlbSh0b0FQSShkLT5tX2JhY2tGb3J3YXJkTGlzdCkp OworICAgIFFXS0hpc3RvcnlJdGVtIGl0ZW0oaXRlbVJlZi5nZXQoKSk7CisgICAgcmV0dXJuIGl0 ZW07Cit9CisKK1FXS0hpc3RvcnlJdGVtIFFXS0hpc3Rvcnk6OmJhY2tJdGVtKCkgY29uc3QKK3sK KyAgICBXS1JldGFpblB0cjxXS0JhY2tGb3J3YXJkTGlzdEl0ZW1SZWY+IGl0ZW1SZWYgPSBXS0Jh Y2tGb3J3YXJkTGlzdEdldEJhY2tJdGVtKHRvQVBJKGQtPm1fYmFja0ZvcndhcmRMaXN0KSk7Cisg ICAgUVdLSGlzdG9yeUl0ZW0gaXRlbShpdGVtUmVmLmdldCgpKTsKKyAgICByZXR1cm4gaXRlbTsK K30KKworUVdLSGlzdG9yeUl0ZW0gUVdLSGlzdG9yeTo6Zm9yd2FyZEl0ZW0oKSBjb25zdAorewor ICAgIFdLUmV0YWluUHRyPFdLQmFja0ZvcndhcmRMaXN0SXRlbVJlZj4gaXRlbVJlZiA9IFdLQmFj a0ZvcndhcmRMaXN0R2V0Rm9yd2FyZEl0ZW0odG9BUEkoZC0+bV9iYWNrRm9yd2FyZExpc3QpKTsK KyAgICBRV0tIaXN0b3J5SXRlbSBpdGVtKGl0ZW1SZWYuZ2V0KCkpOworICAgIHJldHVybiBpdGVt OworfQorCitRV0tIaXN0b3J5SXRlbSBRV0tIaXN0b3J5OjppdGVtQXQoaW50IGluZGV4KSBjb25z dAoreworICAgIFdLUmV0YWluUHRyPFdLQmFja0ZvcndhcmRMaXN0SXRlbVJlZj4gaXRlbVJlZiA9 IFdLQmFja0ZvcndhcmRMaXN0R2V0SXRlbUF0SW5kZXgodG9BUEkoZC0+bV9iYWNrRm9yd2FyZExp c3QpLCBpbmRleCk7CisgICAgUVdLSGlzdG9yeUl0ZW0gaXRlbShpdGVtUmVmLmdldCgpKTsKKyAg ICByZXR1cm4gaXRlbTsKK30KKworUUxpc3Q8UVdLSGlzdG9yeUl0ZW0+IFFXS0hpc3Rvcnk6OmJh Y2tJdGVtcyhpbnQgbWF4SXRlbXMpIGNvbnN0Cit7CisgICAgV0tBcnJheVJlZiBhcnJheVJlZiA9 IFdLQmFja0ZvcndhcmRMaXN0Q29weUJhY2tMaXN0V2l0aExpbWl0KHRvQVBJKGQtPm1fYmFja0Zv cndhcmRMaXN0KSwgbWF4SXRlbXMpOworICAgIGludCBzaXplID0gV0tBcnJheUdldFNpemUoYXJy YXlSZWYpOworICAgIFFMaXN0PFFXS0hpc3RvcnlJdGVtPiBpdGVtTGlzdDsKKyAgICBmb3IgKGlu dCBpID0gMDsgaSA8IHNpemU7ICsraSkgeworICAgICAgICBXS1R5cGVSZWYgd2tIaXN0b3J5SXRl bSA9IFdLQXJyYXlHZXRJdGVtQXRJbmRleChhcnJheVJlZiwgaSk7CisgICAgICAgIFdLQmFja0Zv cndhcmRMaXN0SXRlbVJlZiBpdGVtUmVmID0gc3RhdGljX2Nhc3Q8V0tCYWNrRm9yd2FyZExpc3RJ dGVtUmVmPih3a0hpc3RvcnlJdGVtKTsKKyAgICAgICAgUVdLSGlzdG9yeUl0ZW0gaXRlbShpdGVt UmVmKTsKKyAgICAgICAgaXRlbUxpc3QuYXBwZW5kKGl0ZW0pOworICAgIH0KKyAgICByZXR1cm4g aXRlbUxpc3Q7Cit9CisKK1FMaXN0PFFXS0hpc3RvcnlJdGVtPiBRV0tIaXN0b3J5Ojpmb3J3YXJk SXRlbXMoaW50IG1heEl0ZW1zKSBjb25zdAoreworICAgIFdLQXJyYXlSZWYgYXJyYXlSZWYgPSBX S0JhY2tGb3J3YXJkTGlzdENvcHlGb3J3YXJkTGlzdFdpdGhMaW1pdCh0b0FQSShkLT5tX2JhY2tG b3J3YXJkTGlzdCksIG1heEl0ZW1zKTsKKyAgICBpbnQgc2l6ZSA9IFdLQXJyYXlHZXRTaXplKGFy cmF5UmVmKTsKKyAgICBRTGlzdDxRV0tIaXN0b3J5SXRlbT4gaXRlbUxpc3Q7CisgICAgZm9yIChp bnQgaSA9IDA7IGkgPCBzaXplOyArK2kpIHsKKyAgICAgICAgV0tUeXBlUmVmIHdrSGlzdG9yeUl0 ZW0gPSBXS0FycmF5R2V0SXRlbUF0SW5kZXgoYXJyYXlSZWYsIGkpOworICAgICAgICBXS0JhY2tG b3J3YXJkTGlzdEl0ZW1SZWYgaXRlbVJlZiA9IHN0YXRpY19jYXN0PFdLQmFja0ZvcndhcmRMaXN0 SXRlbVJlZj4od2tIaXN0b3J5SXRlbSk7CisgICAgICAgIFFXS0hpc3RvcnlJdGVtIGl0ZW0oaXRl bVJlZik7CisgICAgICAgIGl0ZW1MaXN0LmFwcGVuZChpdGVtKTsKKyAgICB9CisgICAgcmV0dXJu IGl0ZW1MaXN0OworfQorCkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdraGlzdG9y eS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2toaXN0b3J5LmgJ KHJldmlzaW9uIDcxNDk4KQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3a2hpc3Rvcnku aAkod29ya2luZyBjb3B5KQpAQCAtMjcsNiArMjcsOCBAQAogCiAjaW5jbHVkZSAicXdlYmtpdGds b2JhbC5oIgogI2luY2x1ZGUgPFFPYmplY3Q+CisjaW5jbHVkZSA8UVNoYXJlZERhdGE+CisjaW5j bHVkZSAiV0tCYWNrRm9yd2FyZExpc3RJdGVtLmgiCiAKIGNsYXNzIFFXS0hpc3RvcnlQcml2YXRl OwogY2xhc3MgUVdLSGlzdG9yeUl0ZW1Qcml2YXRlOwpAQCAtMzksMTUgKzQxLDE4IEBAIGNsYXNz IFdlYkJhY2tGb3J3YXJkTGlzdDsKIAogY2xhc3MgUVdFQktJVF9FWFBPUlQgUVdLSGlzdG9yeUl0 ZW0gewogcHVibGljOgorICAgIFFXS0hpc3RvcnlJdGVtKGNvbnN0IFFXS0hpc3RvcnlJdGVtJiBv dGhlcik7CisgICAgUVdLSGlzdG9yeUl0ZW0gJm9wZXJhdG9yPShjb25zdCBRV0tIaXN0b3J5SXRl bSYgb3RoZXIpOworCiAgICAgflFXS0hpc3RvcnlJdGVtKCk7CiAgICAgUVN0cmluZyB0aXRsZSgp IGNvbnN0OwogICAgIFFVcmwgdXJsKCkgY29uc3Q7CiAgICAgUVVybCBvcmlnaW5hbFVybCgpIGNv bnN0OwogCiBwcml2YXRlOgotICAgIFFXS0hpc3RvcnlJdGVtKCk7CisgICAgUVdLSGlzdG9yeUl0 ZW0oV0tCYWNrRm9yd2FyZExpc3RJdGVtUmVmIGl0ZW0pOwogCi0gICAgUVdLSGlzdG9yeUl0ZW1Q cml2YXRlKiBkOworICAgIFFFeHBsaWNpdGx5U2hhcmVkRGF0YVBvaW50ZXI8UVdLSGlzdG9yeUl0 ZW1Qcml2YXRlPiBkOwogCiAgICAgZnJpZW5kIGNsYXNzIFFXS0hpc3Rvcnk7CiAgICAgZnJpZW5k IGNsYXNzIFFXS0hpc3RvcnlJdGVtUHJpdmF0ZTsKQEAgLTU5LDYgKzY0LDEyIEBAIHB1YmxpYzoK ICAgICBpbnQgYmFja0xpc3RDb3VudCgpIGNvbnN0OwogICAgIGludCBmb3J3YXJkTGlzdENvdW50 KCkgY29uc3Q7CiAgICAgaW50IGNvdW50KCkgY29uc3Q7CisgICAgUVdLSGlzdG9yeUl0ZW0gY3Vy cmVudEl0ZW0oKSBjb25zdDsKKyAgICBRV0tIaXN0b3J5SXRlbSBiYWNrSXRlbSgpIGNvbnN0Owor ICAgIFFXS0hpc3RvcnlJdGVtIGZvcndhcmRJdGVtKCkgY29uc3Q7CisgICAgUVdLSGlzdG9yeUl0 ZW0gaXRlbUF0KGludCBpbmRleCkgY29uc3Q7CisgICAgUUxpc3Q8UVdLSGlzdG9yeUl0ZW0+IGJh Y2tJdGVtcyhpbnQgbWF4SXRlbXMpIGNvbnN0OworICAgIFFMaXN0PFFXS0hpc3RvcnlJdGVtPiBm b3J3YXJkSXRlbXMoaW50IG1heEl0ZW1zKSBjb25zdDsKIAogcHJpdmF0ZToKICAgICBRV0tIaXN0 b3J5KCk7CkBAIC02OCw1ICs3OSw0IEBAIHByaXZhdGU6CiAgICAgZnJpZW5kIGNsYXNzIFFXS0hp c3RvcnlQcml2YXRlOwogICAgIGZyaWVuZCBjbGFzcyBRV0tQYWdlUHJpdmF0ZTsKIH07Ci0KICNl bmRpZiAvKiBxd2toaXN0b3J5X2ggKi8KSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9x d2toaXN0b3J5X3AuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdr aGlzdG9yeV9wLmgJKHJldmlzaW9uIDcxNDk4KQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0 L3F3a2hpc3RvcnlfcC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNSw2ICsyNSw3IEBACiAjaWZuZGVm IHF3a2hpc3RvcnlfcF9oCiAjZGVmaW5lIHF3a2hpc3RvcnlfcF9oCiAKKyNpbmNsdWRlIDxRU2hh cmVkRGF0YT4KICNpbmNsdWRlICJxd2Via2l0Z2xvYmFsLmgiCiAjaW5jbHVkZSA8V2ViS2l0Mi9X S0Jhc2UuaD4KICNpbmNsdWRlIDxXZWJLaXQyL1dLUmV0YWluUHRyLmg+CkBAIC0zNiwxMCArMzcs MTEgQEAgY2xhc3MgV2ViQmFja0ZvcndhcmRMaXN0OwogCiBjbGFzcyBRV0tIaXN0b3J5OwogCi1j bGFzcyBRV0VCS0lUX0VYUE9SVCBRV0tIaXN0b3J5SXRlbVByaXZhdGUgeworY2xhc3MgUVdFQktJ VF9FWFBPUlQgUVdLSGlzdG9yeUl0ZW1Qcml2YXRlIDogcHVibGljIFFTaGFyZWREYXRhIHsKK3B1 YmxpYzoKKyAgICAgICB+UVdLSGlzdG9yeUl0ZW1Qcml2YXRlKCk7CiBwcml2YXRlOgogICAgIFFX S0hpc3RvcnlJdGVtUHJpdmF0ZShXS0JhY2tGb3J3YXJkTGlzdEl0ZW1SZWYgbGlzdEl0ZW0pOwot CiAgICAgV0tSZXRhaW5QdHI8V0tCYWNrRm9yd2FyZExpc3RJdGVtUmVmPiBtX2JhY2tGb3J3YXJk TGlzdEl0ZW07CiAKICAgICBmcmllbmQgY2xhc3MgUVdLSGlzdG9yeTsK