69613 2011-10-07 03:23:27 -0700 [GTK] Add methods to reload the view to WebKit2 GTK+ API 2011-10-10 02:19:29 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned gustavo pnormand xan.lopez oldest_to_newest 479914 0 cgarcia 2011-10-07 03:23:27 -0700 Add webkit_web_view_reload() and webkit_web_view_reload_bypass_cache() 479915 1 110119 cgarcia 2011-10-07 03:25:03 -0700 Created attachment 110119 Patch 480127 2 110119 mrobinson 2011-10-07 10:48:56 -0700 Comment on attachment 110119 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=110119&action=review > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:285 > + WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView)); > + WKPageReload(toAPI(page)); Might as well make this one line. > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:300 > + WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView)); > + WKPageReloadFromOrigin(toAPI(page)); One line again. 480882 3 cgarcia 2011-10-10 02:19:29 -0700 Committed r97047: <http://trac.webkit.org/changeset/97047> 110119 2011-10-07 03:25:03 -0700 2011-10-07 10:48:56 -0700 Patch wk2-reload.diff text/plain 5506 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA1OWQ5MGU5Li5jMDhiMzc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTEtMTAtMDcgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIEFkZCBtZXRob2RzIHRvIHJlbG9hZCB0aGUgdmlldyB0byBXZWJL aXQyIEdUSysgQVBJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD02OTYxMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5jcHA6CisgICAgICAgICh3ZWJr aXRfd2ViX3ZpZXdfcmVsb2FkKToKKyAgICAgICAgKHdlYmtpdF93ZWJfdmlld19yZWxvYWRfYnlw YXNzX2NhY2hlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3Lmg6 CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvdGVzdGxvYWRpbmcuYzoKKyAgICAg ICAgKGxvYWRSZWxvYWRQcm92aXNpb25hbExvYWRTdGFydGVkKToKKyAgICAgICAgKGxvYWRSZWxv YWRMb2FkRmluaXNoZWQpOgorICAgICAgICAodGVzdExvYWRUaW1lb3V0RmluaXNoTG9vcCk6Cisg ICAgICAgICh0ZXN0TG9hZFJlbG9hZCk6CisgICAgICAgIChtYWluKToKKwogMjAxMS0xMC0wNiAg QnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW1dpbkNhaXJv XSBDb3JyZWN0IGltcHJvcGVyIGlkZW50aWZpY2F0aW9uIG9mIFdLUUMgZXh0ZW5zaW9ucy4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcu Y3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5jcHAK aW5kZXggZTU4ZDBhZC4uMjA4ZTUxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5jcHAKQEAgLTI3MSw2ICsyNzEsMzYgQEAgdm9pZCB3 ZWJraXRfd2ViX3ZpZXdfc3RvcF9sb2FkaW5nKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCiB9CiAK IC8qKgorICogd2Via2l0X3dlYl92aWV3X3JlbG9hZDoKKyAqIEB3ZWJfdmlldzogYSAjV2ViS2l0 V2ViVmlldworICoKKyAqIFJlbG9hZHMgdGhlIGN1cnJlbnQgY29udGVudHMgb2YgQHdlYl92aWV3 LgorICogU2VlIGFsc28gd2Via2l0X3dlYl92aWV3X3JlbG9hZF9ieXBhc3NfY2FjaGUoKS4KKyAq Lwordm9pZCB3ZWJraXRfd2ViX3ZpZXdfcmVsb2FkKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCit7 CisgICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfV0VCX1ZJRVcod2ViVmlldykpOworCisg ICAgV2ViUGFnZVByb3h5KiBwYWdlID0gd2Via2l0V2ViVmlld0Jhc2VHZXRQYWdlKFdFQktJVF9X RUJfVklFV19CQVNFKHdlYlZpZXcpKTsKKyAgICBXS1BhZ2VSZWxvYWQodG9BUEkocGFnZSkpOwor fQorCisvKioKKyAqIHdlYmtpdF93ZWJfdmlld19yZWxvYWRfYnlwYXNzX2NhY2hlOgorICogQHdl YlZpZXc6IGEgI1dlYktpdFdlYlZpZXcKKyAqCisgKiBSZWxvYWRzIHRoZSBjdXJyZW50IGNvbnRl bnRzIG9mIEB3ZWJfdmlldyB3aXRob3V0CisgKiB1c2luZyBhbnkgY2FjaGVkIGRhdGEuCisgKi8K K3ZvaWQgd2Via2l0X3dlYl92aWV3X3JlbG9hZF9ieXBhc3NfY2FjaGUoV2ViS2l0V2ViVmlldyog d2ViVmlldykKK3sKKyAgICBnX3JldHVybl9pZl9mYWlsKFdFQktJVF9JU19XRUJfVklFVyh3ZWJW aWV3KSk7CisKKyAgICBXZWJQYWdlUHJveHkqIHBhZ2UgPSB3ZWJraXRXZWJWaWV3QmFzZUdldFBh Z2UoV0VCS0lUX1dFQl9WSUVXX0JBU0Uod2ViVmlldykpOworICAgIFdLUGFnZVJlbG9hZEZyb21P cmlnaW4odG9BUEkocGFnZSkpOworfQorCisvKioKICAqIHdlYmtpdF93ZWJfdmlld19nb19iYWNr OgogICogQHdlYl92aWV3OiBhICNXZWJLaXRXZWJWaWV3CiAgKgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5oIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5oCmluZGV4IGYxYWUxZGIuLjliZDFl NTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdl YlZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJW aWV3LmgKQEAgLTk4LDYgKzk4LDEyIEBAIFdFQktJVF9BUEkgdm9pZAogd2Via2l0X3dlYl92aWV3 X3N0b3BfbG9hZGluZyAgICAgICAgKFdlYktpdFdlYlZpZXcgICAgICAgICAqd2ViX3ZpZXcpOwog CiBXRUJLSVRfQVBJIHZvaWQKK3dlYmtpdF93ZWJfdmlld19yZWxvYWQgICAgICAgICAgICAgIChX ZWJLaXRXZWJWaWV3ICAgICAgICAgKndlYl92aWV3KTsKKworV0VCS0lUX0FQSSB2b2lkCit3ZWJr aXRfd2ViX3ZpZXdfcmVsb2FkX2J5cGFzc19jYWNoZSAoV2ViS2l0V2ViVmlldyAgICAgICAgICp3 ZWJfdmlldyk7CisKK1dFQktJVF9BUEkgdm9pZAogd2Via2l0X3dlYl92aWV3X2dvX2JhY2sgICAg ICAgICAgICAgKFdlYktpdFdlYlZpZXcgICAgICAgICAqd2ViX3ZpZXcpOwogCiBXRUJLSVRfQVBJ IHZvaWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3Rz L3Rlc3Rsb2FkaW5nLmMgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy90 ZXN0bG9hZGluZy5jCmluZGV4IGRjMDc2MmYuLmMzYzgxNTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL3Rlc3Rsb2FkaW5nLmMKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvdGVzdGxvYWRpbmcuYwpAQCAtMzI1LDYg KzMyNSw2NSBAQCBzdGF0aWMgdm9pZCB0ZXN0TG9hZFByb2dyZXNzKFdlYkxvYWRpbmdGaXh0dXJl ICpmaXh0dXJlLCBnY29uc3Rwb2ludGVyIGRhdGEpCiAgICAgZ19tYWluX2xvb3BfcnVuKGZpeHR1 cmUtPmxvb3ApOwogfQogCitzdGF0aWMgZ2Jvb2xlYW4gbG9hZFJlbG9hZFByb3Zpc2lvbmFsTG9h ZFN0YXJ0ZWQoV2ViS2l0V2ViTG9hZGVyQ2xpZW50ICpjbGllbnQsIFdlYkxvYWRpbmdGaXh0dXJl ICpmaXh0dXJlKQoreworICAgIGdfYXNzZXJ0KCFmaXh0dXJlLT5oYXNCZWVuUHJvdmlzaW9uYWwp OworICAgIGZpeHR1cmUtPmhhc0JlZW5Qcm92aXNpb25hbCA9IFRSVUU7CisKKyAgICByZXR1cm4g VFJVRTsKK30KKworc3RhdGljIGdib29sZWFuIGxvYWRSZWxvYWRMb2FkRmluaXNoZWQoV2ViS2l0 V2ViTG9hZGVyQ2xpZW50ICpjbGllbnQsIFdlYkxvYWRpbmdGaXh0dXJlICpmaXh0dXJlKQorewor ICAgIGdfYXNzZXJ0KCFmaXh0dXJlLT5oYXNCZWVuRmluaXNoZWQpOworICAgIGZpeHR1cmUtPmhh c0JlZW5GaW5pc2hlZCA9IFRSVUU7CisgICAgZ19tYWluX2xvb3BfcXVpdChmaXh0dXJlLT5sb29w KTsKKworICAgIHJldHVybiBUUlVFOworfQorCitzdGF0aWMgZ2Jvb2xlYW4gdGVzdExvYWRUaW1l b3V0RmluaXNoTG9vcChXZWJMb2FkaW5nRml4dHVyZSAqZml4dHVyZSkKK3sKKyAgICBnX21haW5f bG9vcF9xdWl0KGZpeHR1cmUtPmxvb3ApOworCisgICAgcmV0dXJuIEZBTFNFOworfQorCitzdGF0 aWMgdm9pZCB0ZXN0TG9hZFJlbG9hZChXZWJMb2FkaW5nRml4dHVyZSAqZml4dHVyZSwgZ2NvbnN0 cG9pbnRlciBkYXRhKQoreworICAgIGNoYXIgKnVyaVN0cmluZzsKKyAgICBXZWJLaXRXZWJMb2Fk ZXJDbGllbnQgKmNsaWVudCA9IHdlYmtpdF93ZWJfdmlld19nZXRfbG9hZGVyX2NsaWVudChmaXh0 dXJlLT53ZWJWaWV3KTsKKworICAgIGdfc2lnbmFsX2Nvbm5lY3QoY2xpZW50LCAicHJvdmlzaW9u YWwtbG9hZC1zdGFydGVkIiwgR19DQUxMQkFDSyhsb2FkUmVsb2FkUHJvdmlzaW9uYWxMb2FkU3Rh cnRlZCksIGZpeHR1cmUpOworICAgIGdfc2lnbmFsX2Nvbm5lY3QoY2xpZW50LCAibG9hZC1maW5p c2hlZCIsIEdfQ0FMTEJBQ0sobG9hZFJlbG9hZExvYWRGaW5pc2hlZCksIGZpeHR1cmUpOworCisg ICAgLyogQ2hlY2sgbm90aGluZyBoYXBwZW5zIHdoZW4gdGhlcmUncyBub3RoaW5nIHRvIHJlbG9h ZCAqLworICAgIHdlYmtpdF93ZWJfdmlld19yZWxvYWQoZml4dHVyZS0+d2ViVmlldyk7CisgICAg Z190aW1lb3V0X2FkZF9zZWNvbmRzKDEsIChHU291cmNlRnVuYyl0ZXN0TG9hZFRpbWVvdXRGaW5p c2hMb29wLCBmaXh0dXJlKTsKKyAgICBnX21haW5fbG9vcF9ydW4oZml4dHVyZS0+bG9vcCk7CisK KyAgICBnX2Fzc2VydCghZml4dHVyZS0+aGFzQmVlblByb3Zpc2lvbmFsKTsKKyAgICBnX2Fzc2Vy dCghZml4dHVyZS0+aGFzQmVlbkZpbmlzaGVkKTsKKworICAgIHVyaVN0cmluZyA9IGdldFVSSUZv clBhdGgoIi8iKTsKKyAgICB3ZWJraXRfd2ViX3ZpZXdfbG9hZF91cmkoZml4dHVyZS0+d2ViVmll dywgdXJpU3RyaW5nKTsKKyAgICBnX2ZyZWUodXJpU3RyaW5nKTsKKworICAgIGdfbWFpbl9sb29w X3J1bihmaXh0dXJlLT5sb29wKTsKKworICAgIGdfYXNzZXJ0KGZpeHR1cmUtPmhhc0JlZW5Qcm92 aXNpb25hbCk7CisgICAgZ19hc3NlcnQoZml4dHVyZS0+aGFzQmVlbkZpbmlzaGVkKTsKKworICAg IGZpeHR1cmUtPmhhc0JlZW5Qcm92aXNpb25hbCA9IEZBTFNFOworICAgIGZpeHR1cmUtPmhhc0Jl ZW5GaW5pc2hlZCA9IEZBTFNFOworCisgICAgd2Via2l0X3dlYl92aWV3X3JlbG9hZChmaXh0dXJl LT53ZWJWaWV3KTsKKyAgICBnX21haW5fbG9vcF9ydW4oZml4dHVyZS0+bG9vcCk7CisKKyAgICBn X2Fzc2VydChmaXh0dXJlLT5oYXNCZWVuUHJvdmlzaW9uYWwpOworICAgIGdfYXNzZXJ0KGZpeHR1 cmUtPmhhc0JlZW5GaW5pc2hlZCk7Cit9CisKIGludCBtYWluKGludCBhcmdjLCBjaGFyICoqYXJn dikKIHsKICAgICBTb3VwU2VydmVyICpzZXJ2ZXI7CkBAIC0zNjgsNiArNDI3LDExIEBAIGludCBt YWluKGludCBhcmdjLCBjaGFyICoqYXJndikKICAgICAgICAgICAgICAgIHdlYkxvYWRpbmdGaXh0 dXJlU2V0dXAsCiAgICAgICAgICAgICAgICB0ZXN0TG9hZFByb2dyZXNzLAogICAgICAgICAgICAg ICAgd2ViTG9hZGluZ0ZpeHR1cmVUZWFyZG93bik7CisgICAgZ190ZXN0X2FkZCgiL3dlYmtpdDIv bG9hZGluZy9yZWxvYWQiLAorICAgICAgICAgICAgICAgV2ViTG9hZGluZ0ZpeHR1cmUsIE5VTEws CisgICAgICAgICAgICAgICB3ZWJMb2FkaW5nRml4dHVyZVNldHVwLAorICAgICAgICAgICAgICAg dGVzdExvYWRSZWxvYWQsCisgICAgICAgICAgICAgICB3ZWJMb2FkaW5nRml4dHVyZVRlYXJkb3du KTsKIAogICAgIHJldHVybiBnX3Rlc3RfcnVuKCk7CiB9Cg==