Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/e87bc1bfdacd145f106bc2598997b91f4b177092
...commit
http://git.netsurf-browser.org/netsurf.git/commit/e87bc1bfdacd145f106bc2598997b91f4b177092
...tree
http://git.netsurf-browser.org/netsurf.git/tree/e87bc1bfdacd145f106bc2598997b91f4b177092
The branch, master has been updated
via e87bc1bfdacd145f106bc2598997b91f4b177092 (commit)
via 277c1550f516b59ffd14cdbd102ca559c1e145e6 (commit)
from c9e5fa9bc12252ba9dedf35a8b219423dea7ba44 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=e87bc1bfdacd145f106bc2598997b91f4b177092
commit e87bc1bfdacd145f106bc2598997b91f4b177092
Author: Daniel Silverstone <[email protected]>
Commit: Daniel Silverstone <[email protected]>
GTK: Remove hack for url bar refresh on throbber stop
Signed-off-by: Daniel Silverstone <[email protected]>
diff --git a/frontends/gtk/toolbar.c b/frontends/gtk/toolbar.c
index 16e5f1f..f2b1d05 100644
--- a/frontends/gtk/toolbar.c
+++ b/frontends/gtk/toolbar.c
@@ -3592,9 +3592,6 @@ nserror nsgtk_toolbar_throbber(struct nsgtk_toolbar *tb,
bool active)
browser_window_history_forward_available(bw));
nsgtk_local_history_hide();
- /* update the url bar, for the final time */
- browser_window_refresh_url_bar(bw);
-
return res;
}
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=277c1550f516b59ffd14cdbd102ca559c1e145e6
commit 277c1550f516b59ffd14cdbd102ca559c1e145e6
Author: Daniel Silverstone <[email protected]>
Commit: Daniel Silverstone <[email protected]>
browser_window: Inform GUI about redirects and final URL
To correctly have the GUI know about all url bar updates, we
should inform it during the processing of redirects and we should
ensure that when we're in the ready-but-not-done phase we do not
use the fetch parameters but instead the content's known URL
Signed-off-by: Daniel Silverstone <[email protected]>
diff --git a/desktop/browser_window.c b/desktop/browser_window.c
index 2a3948f..dba3d31 100644
--- a/desktop/browser_window.c
+++ b/desktop/browser_window.c
@@ -1320,6 +1320,27 @@ browser_window__handle_error(struct browser_window *bw,
/**
+ * Update URL bar for a given browser window to given URL
+ *
+ * \param bw Browser window to update URL bar for.
+ * \param url URL for content displayed by bw including any fragment.
+ */
+static inline nserror
+browser_window_refresh_url_bar_internal(struct browser_window *bw, nsurl *url)
+{
+ assert(bw);
+ assert(url);
+
+ if ((bw->parent != NULL) || (bw->window == NULL)) {
+ /* Not root window or no gui window so do not set a URL */
+ return NSERROR_OK;
+ }
+
+ return guit->window->set_url(bw->window, url);
+}
+
+
+/**
* Browser window content event callback handler.
*/
static nserror
@@ -1393,6 +1414,7 @@ browser_window_callback(hlcache_handle *c, const
hlcache_event *event, void *pw)
if (urldb_add_url(event->data.redirect.from)) {
urldb_update_url_visit_data(event->data.redirect.from);
}
+ browser_window_refresh_url_bar_internal(bw,
event->data.redirect.to);
break;
case CONTENT_MSG_STATUS:
@@ -1774,27 +1796,6 @@ static void browser_window_destroy_internal(struct
browser_window *bw)
/**
- * Update URL bar for a given browser window to given URL
- *
- * \param bw Browser window to update URL bar for.
- * \param url URL for content displayed by bw including any fragment.
- */
-static inline nserror
-browser_window_refresh_url_bar_internal(struct browser_window *bw, nsurl *url)
-{
- assert(bw);
- assert(url);
-
- if ((bw->parent != NULL) || (bw->window == NULL)) {
- /* Not root window or no gui window so do not set a URL */
- return NSERROR_OK;
- }
-
- return guit->window->set_url(bw->window, url);
-}
-
-
-/**
* scroll to a fragment if present
*
* \param bw browser window
@@ -3165,15 +3166,9 @@ nserror browser_window_refresh_url_bar(struct
browser_window *bw)
/* no content so return about:blank */
ret = browser_window_refresh_url_bar_internal(bw,
corestring_nsurl_about_blank);
- } else if (bw->throbbing) {
- /* We're throbbing, so show the loading parameters url,
- * or if there isn't one, the current parameters url
- */
- if (bw->loading_parameters.url != NULL) {
- url = bw->loading_parameters.url;
- } else {
- url = bw->current_parameters.url;
- }
+ } else if (bw->throbbing && bw->loading_parameters.url != NULL) {
+ /* Throbbing and we have loading parameters, use those */
+ url = bw->loading_parameters.url;
ret = browser_window_refresh_url_bar_internal(bw, url);
} else if (bw->frag_id == NULL) {
if (bw->internal_nav) {
-----------------------------------------------------------------------
Summary of changes:
desktop/browser_window.c | 55 +++++++++++++++++++++-------------------------
frontends/gtk/toolbar.c | 3 ---
2 files changed, 25 insertions(+), 33 deletions(-)
diff --git a/desktop/browser_window.c b/desktop/browser_window.c
index 2a3948f..dba3d31 100644
--- a/desktop/browser_window.c
+++ b/desktop/browser_window.c
@@ -1320,6 +1320,27 @@ browser_window__handle_error(struct browser_window *bw,
/**
+ * Update URL bar for a given browser window to given URL
+ *
+ * \param bw Browser window to update URL bar for.
+ * \param url URL for content displayed by bw including any fragment.
+ */
+static inline nserror
+browser_window_refresh_url_bar_internal(struct browser_window *bw, nsurl *url)
+{
+ assert(bw);
+ assert(url);
+
+ if ((bw->parent != NULL) || (bw->window == NULL)) {
+ /* Not root window or no gui window so do not set a URL */
+ return NSERROR_OK;
+ }
+
+ return guit->window->set_url(bw->window, url);
+}
+
+
+/**
* Browser window content event callback handler.
*/
static nserror
@@ -1393,6 +1414,7 @@ browser_window_callback(hlcache_handle *c, const
hlcache_event *event, void *pw)
if (urldb_add_url(event->data.redirect.from)) {
urldb_update_url_visit_data(event->data.redirect.from);
}
+ browser_window_refresh_url_bar_internal(bw,
event->data.redirect.to);
break;
case CONTENT_MSG_STATUS:
@@ -1774,27 +1796,6 @@ static void browser_window_destroy_internal(struct
browser_window *bw)
/**
- * Update URL bar for a given browser window to given URL
- *
- * \param bw Browser window to update URL bar for.
- * \param url URL for content displayed by bw including any fragment.
- */
-static inline nserror
-browser_window_refresh_url_bar_internal(struct browser_window *bw, nsurl *url)
-{
- assert(bw);
- assert(url);
-
- if ((bw->parent != NULL) || (bw->window == NULL)) {
- /* Not root window or no gui window so do not set a URL */
- return NSERROR_OK;
- }
-
- return guit->window->set_url(bw->window, url);
-}
-
-
-/**
* scroll to a fragment if present
*
* \param bw browser window
@@ -3165,15 +3166,9 @@ nserror browser_window_refresh_url_bar(struct
browser_window *bw)
/* no content so return about:blank */
ret = browser_window_refresh_url_bar_internal(bw,
corestring_nsurl_about_blank);
- } else if (bw->throbbing) {
- /* We're throbbing, so show the loading parameters url,
- * or if there isn't one, the current parameters url
- */
- if (bw->loading_parameters.url != NULL) {
- url = bw->loading_parameters.url;
- } else {
- url = bw->current_parameters.url;
- }
+ } else if (bw->throbbing && bw->loading_parameters.url != NULL) {
+ /* Throbbing and we have loading parameters, use those */
+ url = bw->loading_parameters.url;
ret = browser_window_refresh_url_bar_internal(bw, url);
} else if (bw->frag_id == NULL) {
if (bw->internal_nav) {
diff --git a/frontends/gtk/toolbar.c b/frontends/gtk/toolbar.c
index 16e5f1f..f2b1d05 100644
--- a/frontends/gtk/toolbar.c
+++ b/frontends/gtk/toolbar.c
@@ -3592,9 +3592,6 @@ nserror nsgtk_toolbar_throbber(struct nsgtk_toolbar *tb,
bool active)
browser_window_history_forward_available(bw));
nsgtk_local_history_hide();
- /* update the url bar, for the final time */
- browser_window_refresh_url_bar(bw);
-
return res;
}
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
