Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/094eb9ae48d1f064bbf8810a2560b344b6dc22cf
...commit
http://git.netsurf-browser.org/netsurf.git/commit/094eb9ae48d1f064bbf8810a2560b344b6dc22cf
...tree
http://git.netsurf-browser.org/netsurf.git/tree/094eb9ae48d1f064bbf8810a2560b344b6dc22cf
The branch, master has been updated
via 094eb9ae48d1f064bbf8810a2560b344b6dc22cf (commit)
from 8615964c3fd381ef6d9a20487b9120135182dfd1 (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=094eb9ae48d1f064bbf8810a2560b344b6dc22cf
commit 094eb9ae48d1f064bbf8810a2560b344b6dc22cf
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
layout: flex: Squash main is usually a function warning
diff --git a/content/handlers/html/layout_flex.c
b/content/handlers/html/layout_flex.c
index 54bab70..07c3b5b 100644
--- a/content/handlers/html/layout_flex.c
+++ b/content/handlers/html/layout_flex.c
@@ -336,21 +336,21 @@ static struct flex_line_data
*layout_flex__build_line(struct flex_ctx *ctx,
while (item_index < ctx->item.count) {
struct flex_item_data *item = &ctx->item.data[item_index];
struct box *b = item->box;
- int main;
+ int pos_main;
- main = ctx->horizontal ?
+ pos_main = ctx->horizontal ?
item->main_size :
b->height + lh__delta_outer_main(ctx->flex, b);
if (ctx->wrap == CSS_FLEX_WRAP_NOWRAP ||
- main + used_main <= available_main ||
+ pos_main + used_main <= available_main ||
lh__box_is_absolute(item->box) ||
available_main == AUTO ||
line->count == 0 ||
- main == 0) {
+ pos_main == 0) {
if (lh__box_is_absolute(item->box) == false) {
line->main_size += item->main_size;
- used_main += main;
+ used_main += pos_main;
}
item->line = ctx->line.count;
line->count++;
-----------------------------------------------------------------------
Summary of changes:
content/handlers/html/layout_flex.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/content/handlers/html/layout_flex.c
b/content/handlers/html/layout_flex.c
index 54bab70..07c3b5b 100644
--- a/content/handlers/html/layout_flex.c
+++ b/content/handlers/html/layout_flex.c
@@ -336,21 +336,21 @@ static struct flex_line_data
*layout_flex__build_line(struct flex_ctx *ctx,
while (item_index < ctx->item.count) {
struct flex_item_data *item = &ctx->item.data[item_index];
struct box *b = item->box;
- int main;
+ int pos_main;
- main = ctx->horizontal ?
+ pos_main = ctx->horizontal ?
item->main_size :
b->height + lh__delta_outer_main(ctx->flex, b);
if (ctx->wrap == CSS_FLEX_WRAP_NOWRAP ||
- main + used_main <= available_main ||
+ pos_main + used_main <= available_main ||
lh__box_is_absolute(item->box) ||
available_main == AUTO ||
line->count == 0 ||
- main == 0) {
+ pos_main == 0) {
if (lh__box_is_absolute(item->box) == false) {
line->main_size += item->main_size;
- used_main += main;
+ used_main += pos_main;
}
item->line = ctx->line.count;
line->count++;
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
