Gitweb links:
...log
http://git.netsurf-browser.org/libcss.git/shortlog/dbed3e2b11e9a7c9f3b8d7c8b18e3e6be77ede97
...commit
http://git.netsurf-browser.org/libcss.git/commit/dbed3e2b11e9a7c9f3b8d7c8b18e3e6be77ede97
...tree
http://git.netsurf-browser.org/libcss.git/tree/dbed3e2b11e9a7c9f3b8d7c8b18e3e6be77ede97
The branch, lcneves/select-autogen has been updated
via dbed3e2b11e9a7c9f3b8d7c8b18e3e6be77ede97 (commit)
from 9dbc87e8f86654b041d5428bd15975e7df5dcea9 (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/libcss.git/commit/?id=dbed3e2b11e9a7c9f3b8d7c8b18e3e6be77ede97
commit dbed3e2b11e9a7c9f3b8d7c8b18e3e6be77ede97
Author: Lucas Neves <[email protected]>
Commit: Lucas Neves <[email protected]>
Select: Bug fixes in the generator.
diff --git a/src/select/overrides.py b/src/select/overrides.py
index fc2117b..c8d1a2a 100644
--- a/src/select/overrides.py
+++ b/src/select/overrides.py
@@ -32,16 +32,16 @@ static inline uint8_t get_clip(
rect->top_auto = (bits & 0x20);
rect->top = style->i.uncommon->i.clip_a;
- rect->tunit = bits & 0x3e00000;
+ rect->tunit = bits & 0x3e00000 >> 21;
rect->right = style->i.uncommon->i.clip_b;
- rect->runit = bits & 0x1f0000;
+ rect->runit = bits & 0x1f0000 >> 16;
rect->bottom = style->i.uncommon->i.clip_c;
- rect->bunit = bits & 0xf800;
+ rect->bunit = (bits & 0xf800) >> 11;
rect->left = style->i.uncommon->i.clip_d;
- rect->lunit = bits & 0x7c0;
+ rect->lunit = (bits & 0x7c0) >> 6;
}
return (bits & 0x3);
@@ -208,7 +208,7 @@ static inline uint8_t get_{0}(
*unit = bits >> 2;
}}
- return (bits & 0x7);
+ return (bits & 0x3);
}}
static inline uint8_t get_{0}_bits(
const css_computed_style *style)
diff --git a/src/select/select_generator.py b/src/select/select_generator.py
index d215f2b..c6a03de 100644
--- a/src/select/select_generator.py
+++ b/src/select/select_generator.py
@@ -218,6 +218,8 @@ class CSSProperty:
self.override = get_tuple(override)
self.comments = comments
self.__mask = None
+ self.index = None
+ self.shift = None
def make_values(self, vals):
"""Make list of values for this property."""
@@ -380,7 +382,7 @@ class CSSGroup:
def __init__(self, config):
self.name = config['name']
self.props = [ CSSProperty(*x) for x in config['props'] ]
- self.__bits_array = None
+ self.bits_array = self.make_bits_array()
@property
def bits_size(self):
@@ -397,20 +399,17 @@ class CSSGroup:
"""Sum of all property pointers."""
return sum([ p.ptr_size for p in self.props ])
- @property
- def bits_array(self):
+ def make_bits_array(self):
"""Implement a `best fit first` heuristics for the bin packing
- of property bits in the bits array."""
-
- if self.__bits_array is not None:
- return self.__bits_array
+ of property bits in the bits array.
+ Also generate index, shift and mask for each property in group."""
bin_size = 32 # We're using uint32_t as concrete bins.
- self.__bits_array = []
+ bits_array = []
props = sorted(self.props, key=(lambda x: x.bits_size), reverse=True)
for p in props:
- for b in self.__bits_array:
+ for b in bits_array:
if b.size + p.bits_size <= bin_size:
b.push(p)
p.shift = (bin_size -
@@ -418,17 +417,17 @@ class CSSGroup:
break
else:
p.shift = bin_size - p.bits_size
- self.__bits_array.append(Bin(p))
+ bits_array.append(Bin(p))
p.mask = (sum([ 2 ** x for x in range(p.bits_size) ]) *
2 ** p.shift)
- self.__bits_array.sort(key=(lambda x: x.size), reverse=True)
+ bits_array.sort(key=(lambda x: x.size), reverse=True)
- for i, b in enumerate(self.__bits_array):
+ for i, b in enumerate(bits_array):
for p in b.contents:
p.index = i
- return self.__bits_array
+ return bits_array
def get_idot_grp(self):
"""Make parameters for accessing bits and values in this group."""
-----------------------------------------------------------------------
Summary of changes:
src/select/overrides.py | 10 +++++-----
src/select/select_generator.py | 25 ++++++++++++-------------
2 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/src/select/overrides.py b/src/select/overrides.py
index fc2117b..c8d1a2a 100644
--- a/src/select/overrides.py
+++ b/src/select/overrides.py
@@ -32,16 +32,16 @@ static inline uint8_t get_clip(
rect->top_auto = (bits & 0x20);
rect->top = style->i.uncommon->i.clip_a;
- rect->tunit = bits & 0x3e00000;
+ rect->tunit = bits & 0x3e00000 >> 21;
rect->right = style->i.uncommon->i.clip_b;
- rect->runit = bits & 0x1f0000;
+ rect->runit = bits & 0x1f0000 >> 16;
rect->bottom = style->i.uncommon->i.clip_c;
- rect->bunit = bits & 0xf800;
+ rect->bunit = (bits & 0xf800) >> 11;
rect->left = style->i.uncommon->i.clip_d;
- rect->lunit = bits & 0x7c0;
+ rect->lunit = (bits & 0x7c0) >> 6;
}
return (bits & 0x3);
@@ -208,7 +208,7 @@ static inline uint8_t get_{0}(
*unit = bits >> 2;
}}
- return (bits & 0x7);
+ return (bits & 0x3);
}}
static inline uint8_t get_{0}_bits(
const css_computed_style *style)
diff --git a/src/select/select_generator.py b/src/select/select_generator.py
index d215f2b..c6a03de 100644
--- a/src/select/select_generator.py
+++ b/src/select/select_generator.py
@@ -218,6 +218,8 @@ class CSSProperty:
self.override = get_tuple(override)
self.comments = comments
self.__mask = None
+ self.index = None
+ self.shift = None
def make_values(self, vals):
"""Make list of values for this property."""
@@ -380,7 +382,7 @@ class CSSGroup:
def __init__(self, config):
self.name = config['name']
self.props = [ CSSProperty(*x) for x in config['props'] ]
- self.__bits_array = None
+ self.bits_array = self.make_bits_array()
@property
def bits_size(self):
@@ -397,20 +399,17 @@ class CSSGroup:
"""Sum of all property pointers."""
return sum([ p.ptr_size for p in self.props ])
- @property
- def bits_array(self):
+ def make_bits_array(self):
"""Implement a `best fit first` heuristics for the bin packing
- of property bits in the bits array."""
-
- if self.__bits_array is not None:
- return self.__bits_array
+ of property bits in the bits array.
+ Also generate index, shift and mask for each property in group."""
bin_size = 32 # We're using uint32_t as concrete bins.
- self.__bits_array = []
+ bits_array = []
props = sorted(self.props, key=(lambda x: x.bits_size), reverse=True)
for p in props:
- for b in self.__bits_array:
+ for b in bits_array:
if b.size + p.bits_size <= bin_size:
b.push(p)
p.shift = (bin_size -
@@ -418,17 +417,17 @@ class CSSGroup:
break
else:
p.shift = bin_size - p.bits_size
- self.__bits_array.append(Bin(p))
+ bits_array.append(Bin(p))
p.mask = (sum([ 2 ** x for x in range(p.bits_size) ]) *
2 ** p.shift)
- self.__bits_array.sort(key=(lambda x: x.size), reverse=True)
+ bits_array.sort(key=(lambda x: x.size), reverse=True)
- for i, b in enumerate(self.__bits_array):
+ for i, b in enumerate(bits_array):
for p in b.contents:
p.index = i
- return self.__bits_array
+ return bits_array
def get_idot_grp(self):
"""Make parameters for accessing bits and values in this group."""
--
Cascading Style Sheets library
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
