14806 2007-07-29 14:10:11 -0700 [gtk] [patch] Implement can_go_backward and can_go_forward in webkitgtkpage.cpp 2007-07-29 21:50:50 -0700 1 1 1 Unclassified WebKit WebKit API 523.x (Safari 3) PC Linux RESOLVED FIXED Gtk P2 Normal --- 0 diegoe webkit-unassigned diegoe oldest_to_newest 3495 0 diegoe 2007-07-29 14:10:11 -0700 Hacking on Epiphany's webkit backend I discovered that webkitgtkpage.h announces the webkit_gtk_page_can_go_backward and webkit_gtk_page_can_go_forward functions but they are not implemented. I just dived into the code and added the corresponding wrappers. Patch attached. 3496 1 15726 diegoe 2007-07-29 14:11:22 -0700 Created attachment 15726 Implements the wrappers for can_go_forward|backward Pretty simple. 3500 2 15726 aroben 2007-07-29 14:31:02 -0700 Comment on attachment 15726 Implements the wrappers for can_go_forward|backward The implementation looks good. Just a few comments to bring this patch in line with <http://webkit.org/coding/coding-style.html> } +gboolean webkit_gtk_page_can_go_backward (WebKitGtkPage* page) +{ There should be an empty line before/after all functions. Please remove the space before the open parenthesis. + WebKitGtkPagePrivate* page_data = WEBKIT_GTK_PAGE_GET_PRIVATE(page); + WebKitGtkFramePrivate* frame_data = WEBKIT_GTK_FRAME_GET_PRIVATE(page_data->main_frame); After talking with Holger, I think we're going to move towards maintaining the WebKit camelCase style for variable names within the WebKit/gtk implementation files. So these variables should be called pageData and frameData. I know it's inconsistent with the rest of the file, but that will be cleaned up later. You also need a ChangeLog entry to go along with your patch. See <http://webkit.org/coding/contributing.html> for instructions on how to generate one. Once these are addressed, I think we can get this landed! 3474 3 15735 diegoe 2007-07-29 18:45:34 -0700 Created attachment 15735 Updated patch, corrects style This should be enough! 3475 4 15735 aroben 2007-07-29 18:50:16 -0700 Comment on attachment 15735 Updated patch, corrects style r=me Thanks for the cleanup! 3471 5 15735 diegoe 2007-07-29 19:05:12 -0700 Comment on attachment 15735 Updated patch, corrects style >Index: gtk/Api/webkitgtkpage.cpp >=================================================================== >--- gtk/Api/webkitgtkpage.cpp (revision 24766) >+++ gtk/Api/webkitgtkpage.cpp (working copy) >@@ -328,6 +328,20 @@ void webkit_gtk_page_go_forward(WebKitGt > frame_data->frame->loader()->goBackOrForward(1); > } > >+gboolean webkit_gtk_page_can_go_backward(WebKitGtkPage* page) >+{ >+ WebKitGtkPagePrivate* pageData = WEBKIT_GTK_PAGE_GET_PRIVATE(page); >+ WebKitGtkFramePrivate* frameData = WEBKIT_GTK_FRAME_GET_PRIVATE(page_data->main_frame); Oops, should be pageData. >+ return frame_data->frame->loader()->canGoBackOrForward(-1); Oops, should be frameData Same in the other function. 15726 2007-07-29 14:11:22 -0700 2007-07-29 18:45:34 -0700 Implements the wrappers for can_go_forward|backward webkit-can-go-wherever.diff text/plain 1102 diegoe SW5kZXg6IFdlYktpdC9ndGsvQXBpL3dlYmtpdGd0a3BhZ2UuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YktpdC9ndGsvQXBpL3dlYmtpdGd0a3BhZ2UuY3BwCShyZXZpc2lvbiAyNDY1NikKKysrIFdlYktp dC9ndGsvQXBpL3dlYmtpdGd0a3BhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMjcsNiArMzI3 LDE4IEBAIHZvaWQgd2Via2l0X2d0a19wYWdlX2dvX2ZvcndhcmQoV2ViS2l0R3QKICAgICBXZWJL aXRHdGtGcmFtZVByaXZhdGUqIGZyYW1lX2RhdGEgPSBXRUJLSVRfR1RLX0ZSQU1FX0dFVF9QUklW QVRFKHBhZ2VfZGF0YS0+bWFpbl9mcmFtZSk7CiAgICAgZnJhbWVfZGF0YS0+ZnJhbWUtPmxvYWRl cigpLT5nb0JhY2tPckZvcndhcmQoMSk7CiB9CitnYm9vbGVhbiB3ZWJraXRfZ3RrX3BhZ2VfY2Fu X2dvX2JhY2t3YXJkIChXZWJLaXRHdGtQYWdlKiBwYWdlKQoreworICAgIFdlYktpdEd0a1BhZ2VQ cml2YXRlKiBwYWdlX2RhdGEgPSBXRUJLSVRfR1RLX1BBR0VfR0VUX1BSSVZBVEUocGFnZSk7Cisg ICAgV2ViS2l0R3RrRnJhbWVQcml2YXRlKiBmcmFtZV9kYXRhID0gV0VCS0lUX0dUS19GUkFNRV9H RVRfUFJJVkFURShwYWdlX2RhdGEtPm1haW5fZnJhbWUpOworICAgIHJldHVybiBmcmFtZV9kYXRh LT5mcmFtZS0+bG9hZGVyKCktPmNhbkdvQmFja09yRm9yd2FyZCgtMSk7Cit9CitnYm9vbGVhbiB3 ZWJraXRfZ3RrX3BhZ2VfY2FuX2dvX2ZvcndhcmQgKFdlYktpdEd0a1BhZ2UqIHBhZ2UpCit7Cisg ICAgV2ViS2l0R3RrUGFnZVByaXZhdGUqIHBhZ2VfZGF0YSA9IFdFQktJVF9HVEtfUEFHRV9HRVRf UFJJVkFURShwYWdlKTsKKyAgICBXZWJLaXRHdGtGcmFtZVByaXZhdGUqIGZyYW1lX2RhdGEgPSBX RUJLSVRfR1RLX0ZSQU1FX0dFVF9QUklWQVRFKHBhZ2VfZGF0YS0+bWFpbl9mcmFtZSk7CisgICAg cmV0dXJuIGZyYW1lX2RhdGEtPmZyYW1lLT5sb2FkZXIoKS0+Y2FuR29CYWNrT3JGb3J3YXJkKDEp OworfQogCiB2b2lkIHdlYmtpdF9ndGtfcGFnZV9vcGVuKFdlYktpdEd0a1BhZ2UqIHBhZ2UsIGNv bnN0IGdjaGFyKiB1cmwpCiB7Cg== 15735 2007-07-29 18:45:34 -0700 2007-07-29 18:50:16 -0700 Updated patch, corrects style bwo_14806_can-go-back-ford.diff text/plain 1532 diegoe SW5kZXg6IGd0ay9BcGkvd2Via2l0Z3RrcGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gZ3RrL0FwaS93 ZWJraXRndGtwYWdlLmNwcAkocmV2aXNpb24gMjQ3NjYpCisrKyBndGsvQXBpL3dlYmtpdGd0a3Bh Z2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMjgsNiArMzI4LDIwIEBAIHZvaWQgd2Via2l0X2d0 a19wYWdlX2dvX2ZvcndhcmQoV2ViS2l0R3QKICAgICBmcmFtZV9kYXRhLT5mcmFtZS0+bG9hZGVy KCktPmdvQmFja09yRm9yd2FyZCgxKTsKIH0KIAorZ2Jvb2xlYW4gd2Via2l0X2d0a19wYWdlX2Nh bl9nb19iYWNrd2FyZChXZWJLaXRHdGtQYWdlKiBwYWdlKQoreworICAgIFdlYktpdEd0a1BhZ2VQ cml2YXRlKiBwYWdlRGF0YSA9IFdFQktJVF9HVEtfUEFHRV9HRVRfUFJJVkFURShwYWdlKTsKKyAg ICBXZWJLaXRHdGtGcmFtZVByaXZhdGUqIGZyYW1lRGF0YSA9IFdFQktJVF9HVEtfRlJBTUVfR0VU X1BSSVZBVEUocGFnZV9kYXRhLT5tYWluX2ZyYW1lKTsKKyAgICByZXR1cm4gZnJhbWVfZGF0YS0+ ZnJhbWUtPmxvYWRlcigpLT5jYW5Hb0JhY2tPckZvcndhcmQoLTEpOworfQorCitnYm9vbGVhbiB3 ZWJraXRfZ3RrX3BhZ2VfY2FuX2dvX2ZvcndhcmQoV2ViS2l0R3RrUGFnZSogcGFnZSkKK3sKKyAg ICBXZWJLaXRHdGtQYWdlUHJpdmF0ZSogcGFnZURhdGEgPSBXRUJLSVRfR1RLX1BBR0VfR0VUX1BS SVZBVEUocGFnZSk7CisgICAgV2ViS2l0R3RrRnJhbWVQcml2YXRlKiBmcmFtZURhdGEgPSBXRUJL SVRfR1RLX0ZSQU1FX0dFVF9QUklWQVRFKHBhZ2VfZGF0YS0+bWFpbl9mcmFtZSk7CisgICAgcmV0 dXJuIGZyYW1lX2RhdGEtPmZyYW1lLT5sb2FkZXIoKS0+Y2FuR29CYWNrT3JGb3J3YXJkKDEpOwor fQorCiB2b2lkIHdlYmtpdF9ndGtfcGFnZV9vcGVuKFdlYktpdEd0a1BhZ2UqIHBhZ2UsIGNvbnN0 IGdjaGFyKiB1cmwpCiB7CiAgICAgV2ViS2l0R3RrUGFnZVByaXZhdGUqIHBhZ2VfZGF0YSA9IFdF QktJVF9HVEtfUEFHRV9HRVRfUFJJVkFURShwYWdlKTsKSW5kZXg6IENoYW5nZUxvZwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDI0NzY2KQorKysgQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTIgQEAKKzIwMDctMDctMjkgIERpZWdvIEVzY2FsYW50ZSBVcnJl bG8gIDxkaWVnb2VAZ25vbWUub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogZ3RrL0FwaS93ZWJraXRndGtwYWdlLmNwcDoKKworCUltcGxlbWVu dCB3ZWJraXRfZ3RrX3BhZ2VfY2FuX2dvX2JhY2t3YXJkKCkgYW5kCisJd2Via2l0X2d0a19wYWdl X2Nhbl9nb19mb3J3YXJkKCkgZnVuY3Rpb25zLgorCiAyMDA3LTA3LTI5ICBBZGVsZSBQZXRlcnNv biAgPGFkZWxlQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBKb2huLgo=