netsurf: branch master updated. release/3.10-269-g40acd62
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/40acd620b50f9cc81305c...
...commit http://git.netsurf-browser.org/netsurf.git/commit/40acd620b50f9cc81305c56...
...tree http://git.netsurf-browser.org/netsurf.git/tree/40acd620b50f9cc81305c564c...
The branch, master has been updated
via 40acd620b50f9cc81305c564cee45cbb3de880f9 (commit)
from c6eea438ac6698f60bc4c7f1d490db1c599f5488 (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=40acd620b50f9cc8130...
commit 40acd620b50f9cc81305c564cee45cbb3de880f9
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
Ensure image cache logging does not cause division by zero at exit
diff --git a/content/handlers/image/image_cache.c b/content/handlers/image/image_cache.c
index 6ce6b52..ae53192 100644
--- a/content/handlers/image/image_cache.c
+++ b/content/handlers/image/image_cache.c
@@ -438,6 +438,7 @@ image_cache_init(const struct image_cache_parameters *image_cache_parameters)
nserror image_cache_fini(void)
{
unsigned int op_count;
+ uint64_t op_size;
guit->misc->schedule(-1, image_cache__background_update, image_cache);
@@ -452,6 +453,10 @@ nserror image_cache_fini(void)
image_cache->miss_count +
image_cache->fail_count;
+ op_size = image_cache->hit_size +
+ image_cache->miss_size +
+ image_cache->fail_size;
+
NSLOG(netsurf, INFO, "Age %ds", image_cache->current_age / 1000);
NSLOG(netsurf, INFO, "Peak size %"PRIsizet" (in %d)",
image_cache->max_bitmap_size,
@@ -460,12 +465,7 @@ nserror image_cache_fini(void)
image_cache->max_bitmap_count,
image_cache->max_bitmap_count_size);
- if (op_count > 0) {
- uint64_t op_size;
-
- op_size = image_cache->hit_size +
- image_cache->miss_size +
- image_cache->fail_size;
+ if ((op_count > 0) && (op_size >0)) {
NSLOG(netsurf, INFO,
"Cache total/hit/miss/fail (counts) %d/%d/%d/%d (100%%/%d%%/%d%%/%d%%)",
-----------------------------------------------------------------------
Summary of changes:
content/handlers/image/image_cache.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/content/handlers/image/image_cache.c b/content/handlers/image/image_cache.c
index 6ce6b52..ae53192 100644
--- a/content/handlers/image/image_cache.c
+++ b/content/handlers/image/image_cache.c
@@ -438,6 +438,7 @@ image_cache_init(const struct image_cache_parameters *image_cache_parameters)
nserror image_cache_fini(void)
{
unsigned int op_count;
+ uint64_t op_size;
guit->misc->schedule(-1, image_cache__background_update, image_cache);
@@ -452,6 +453,10 @@ nserror image_cache_fini(void)
image_cache->miss_count +
image_cache->fail_count;
+ op_size = image_cache->hit_size +
+ image_cache->miss_size +
+ image_cache->fail_size;
+
NSLOG(netsurf, INFO, "Age %ds", image_cache->current_age / 1000);
NSLOG(netsurf, INFO, "Peak size %"PRIsizet" (in %d)",
image_cache->max_bitmap_size,
@@ -460,12 +465,7 @@ nserror image_cache_fini(void)
image_cache->max_bitmap_count,
image_cache->max_bitmap_count_size);
- if (op_count > 0) {
- uint64_t op_size;
-
- op_size = image_cache->hit_size +
- image_cache->miss_size +
- image_cache->fail_size;
+ if ((op_count > 0) && (op_size >0)) {
NSLOG(netsurf, INFO,
"Cache total/hit/miss/fail (counts) %d/%d/%d/%d (100%%/%d%%/%d%%/%d%%)",
--
NetSurf Browser
6 months, 2 weeks
- 1
- 0
netsurf: branch master updated. release/3.10-268-gc6eea43
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/c6eea438ac6698f60bc4c...
...commit http://git.netsurf-browser.org/netsurf.git/commit/c6eea438ac6698f60bc4c7f...
...tree http://git.netsurf-browser.org/netsurf.git/tree/c6eea438ac6698f60bc4c7f1d...
The branch, master has been updated
via c6eea438ac6698f60bc4c7f1d490db1c599f5488 (commit)
from 7c89bc0d53b4b9a4d23fabed13d323eab3544b24 (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=c6eea438ac6698f60bc...
commit c6eea438ac6698f60bc4c7f1d490db1c599f5488
Author: John-Mark Bell <jmb(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
RISC OS: Allow text selection in URL bar (RO5.28 onwards)
diff --git a/frontends/riscos/gui/url_bar.c b/frontends/riscos/gui/url_bar.c
index 8802db7..99a90f5 100644
--- a/frontends/riscos/gui/url_bar.c
+++ b/frontends/riscos/gui/url_bar.c
@@ -351,9 +351,12 @@ static bool ro_gui_url_bar_icon_update(struct url_bar *url_bar)
if (url_bar->display) {
icon.icon.flags |= (wimp_BUTTON_NEVER <<
wimp_ICON_BUTTON_TYPE_SHIFT);
- } else {
+ } else if (!ns_wimp_has_text_selection()) {
icon.icon.flags |= (wimp_BUTTON_WRITE_CLICK_DRAG <<
wimp_ICON_BUTTON_TYPE_SHIFT);
+ } else {
+ icon.icon.flags |= (wimp_BUTTON_WRITABLE <<
+ wimp_ICON_BUTTON_TYPE_SHIFT);
}
error = xwimp_create_icon(&icon, &url_bar->text.icon);
if (error) {
-----------------------------------------------------------------------
Summary of changes:
frontends/riscos/gui/url_bar.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/frontends/riscos/gui/url_bar.c b/frontends/riscos/gui/url_bar.c
index 8802db7..99a90f5 100644
--- a/frontends/riscos/gui/url_bar.c
+++ b/frontends/riscos/gui/url_bar.c
@@ -351,9 +351,12 @@ static bool ro_gui_url_bar_icon_update(struct url_bar *url_bar)
if (url_bar->display) {
icon.icon.flags |= (wimp_BUTTON_NEVER <<
wimp_ICON_BUTTON_TYPE_SHIFT);
- } else {
+ } else if (!ns_wimp_has_text_selection()) {
icon.icon.flags |= (wimp_BUTTON_WRITE_CLICK_DRAG <<
wimp_ICON_BUTTON_TYPE_SHIFT);
+ } else {
+ icon.icon.flags |= (wimp_BUTTON_WRITABLE <<
+ wimp_ICON_BUTTON_TYPE_SHIFT);
}
error = xwimp_create_icon(&icon, &url_bar->text.icon);
if (error) {
--
NetSurf Browser
6 months, 3 weeks
- 1
- 0
- ← Newer
- 1
- Older →