[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
commit-queue at webkit.org
commit-queue at webkit.org
Fri Jan 21 14:37:42 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit b795383b353584b71907dda1d00a47b8504ecbd4
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Dec 23 14:08:31 2010 +0000
2010-12-23 Lucas De Marchi <lucas.demarchi at profusion.mobi>
Reviewed by Kenneth Rohde Christiansen.
[EFL] Clean warnings in Tiled Backing Store
https://bugs.webkit.org/show_bug.cgi?id=51529
Tiled backing store in EFL was giving the following warnings that are
gone now:
- Static function defined but not used;
- Comparison between signed and unsigned integer expressions;
* ewk/ewk_tiled_backing_store.c:
(_ewk_tiled_backing_store_item_fill):
(_ewk_tiled_backing_store_smart_calculate):
* ewk/ewk_tiled_matrix.c:
(_ewk_tile_matrix_slicer_setup):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74554 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/efl/ChangeLog b/WebKit/efl/ChangeLog
index a866be0..a6b8134 100644
--- a/WebKit/efl/ChangeLog
+++ b/WebKit/efl/ChangeLog
@@ -1,3 +1,22 @@
+2010-12-23 Lucas De Marchi <lucas.demarchi at profusion.mobi>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [EFL] Clean warnings in Tiled Backing Store
+ https://bugs.webkit.org/show_bug.cgi?id=51529
+
+ Tiled backing store in EFL was giving the following warnings that are
+ gone now:
+
+ - Static function defined but not used;
+ - Comparison between signed and unsigned integer expressions;
+
+ * ewk/ewk_tiled_backing_store.c:
+ (_ewk_tiled_backing_store_item_fill):
+ (_ewk_tiled_backing_store_smart_calculate):
+ * ewk/ewk_tiled_matrix.c:
+ (_ewk_tile_matrix_slicer_setup):
+
2010-12-23 Gyuyoung Kim <gyuyoung.kim at samsung.com>
Unreviewed build warning fix.
diff --git a/WebKit/efl/ewk/ewk_tiled_backing_store.c b/WebKit/efl/ewk/ewk_tiled_backing_store.c
index a998c5c..4fbd905 100644
--- a/WebKit/efl/ewk/ewk_tiled_backing_store.c
+++ b/WebKit/efl/ewk/ewk_tiled_backing_store.c
@@ -491,66 +491,15 @@ static Eina_Bool _ewk_tiled_backing_store_enable_render(Ewk_Tiled_Backing_Store_
return EINA_TRUE;
}
-/**
- * Returns a rectangle whose coordinates indicate which tiles are
- * currently inside the viewport.
- *
- * Specifically, the returned rectangle's coordinates have the
- * following meaning:
- * - x: Column number for the top-level tile inside the viewport.
- * - y: Row number for the top-level tile inside the viewport.
- * - w: Number of tiles horizontally inside the viewport.
- * - h: Number of tiles vertically inside the viewport.
- */
-static Eina_Rectangle _ewk_tiled_backing_store_visible_tiles_rect(Ewk_Tiled_Backing_Store_Data *priv)
-{
- Eina_Rectangle r;
-
- const Evas_Coord ox = -priv->view.offset.cur.x;
- const Evas_Coord oy = -priv->view.offset.cur.y;
- const Evas_Coord tw = priv->view.tile.w;
- const Evas_Coord th = priv->view.tile.h;
-
- r.x = MAX(0, ox / tw);
- r.y = MAX(0, oy / th);
- r.w = MIN(priv->model.cur.cols,
- ceil((float)(priv->view.w + (ox % tw)) / tw));
- r.h = MIN(priv->model.cur.rows,
- ceil((float)(priv->view.h + (oy % th)) / th));
-
- DBG("Returning %d,%d+%dx%d", r.x, r.y, r.w, r.h);
-
- return r;
-}
-
-static Eina_Bool _ewk_tiled_backing_store_tile_is_inside_viewport(Ewk_Tiled_Backing_Store_Data *priv, int col, int row)
-{
- const Eina_Rectangle r = _ewk_tiled_backing_store_visible_tiles_rect(priv);
-
- return eina_rectangle_coords_inside(&r, col, row);
-}
-
-static Eina_Bool _ewk_tiled_backing_store_tile_is_adjacent_to_viewport(Ewk_Tiled_Backing_Store_Data *priv, int col, int row)
-{
- const Eina_Rectangle r = _ewk_tiled_backing_store_visible_tiles_rect(priv);
-
- if (row == (r.y - 1) || row == (r.y + r.h))
- return (col >= (r.x - 1) && col <= (r.x + r.w));
-
- if (col == (r.x - 1) || col == (r.x + r.w))
- return (row >= (r.y - 1) && row <= (r.y + r.h));
-
- return EINA_FALSE;
-}
-
static inline Eina_Bool _ewk_tiled_backing_store_item_fill(Ewk_Tiled_Backing_Store_Data *priv, Ewk_Tiled_Backing_Store_Item *it, long col, int row)
{
- int m_col = priv->model.base.col + col;
- int m_row = priv->model.base.row + row;
+ long m_col = priv->model.base.col + col;
+ long m_row = priv->model.base.row + row;
double last_used = ecore_loop_time_get();
if (m_col < 0 || m_row < 0
- || m_col >= priv->model.cur.cols || m_row >= priv->model.cur.rows) {
+ || (unsigned long)(m_col) >= priv->model.cur.cols
+ || (unsigned long)(m_row) >= priv->model.cur.rows) {
if (it->tile) {
_ewk_tiled_backing_store_tile_dissociate(priv, it, last_used);
@@ -562,8 +511,8 @@ static inline Eina_Bool _ewk_tiled_backing_store_item_fill(Ewk_Tiled_Backing_Sto
const float zoom = priv->view.tile.zoom;
if (it->update.process) {
- if (it->update.row == m_row
- && it->update.col == m_col
+ if (it->update.row == (unsigned long)(m_row)
+ && it->update.col == (unsigned long)(m_col)
&& it->update.zoom == zoom)
return EINA_TRUE;
@@ -572,12 +521,15 @@ static inline Eina_Bool _ewk_tiled_backing_store_item_fill(Ewk_Tiled_Backing_Sto
if (it->tile) {
Ewk_Tile *old = it->tile;
- if (old->row != m_row || old->col != m_col || old->zoom != zoom) {
+ if (old->row != (unsigned long)(m_row)
+ || old->col != (unsigned long)(m_col)
+ || old->zoom != zoom) {
_ewk_tiled_backing_store_tile_dissociate(priv, it,
last_used);
if (it->update.process)
_ewk_tiled_backing_store_item_request_del(priv, it);
- } else if (old->row == m_row && old->col == m_col
+ } else if (old->row == (unsigned long)(m_row)
+ && old->col == (unsigned long)(m_col)
&& old->zoom == zoom)
goto end;
}
@@ -1450,7 +1402,7 @@ static void _ewk_tiled_backing_store_smart_calculate(Evas_Object *o)
ewk_tile_matrix_freeze(priv->model.matrix);
if (!priv->render.suspend && priv->changed.model) {
- long cols, rows;
+ unsigned long cols, rows;
cols = priv->model.width / priv->view.tile.w + 1;
rows = priv->model.height / priv->view.tile.h + 1;
diff --git a/WebKit/efl/ewk/ewk_tiled_matrix.c b/WebKit/efl/ewk/ewk_tiled_matrix.c
index fccbfa1..130a48a 100644
--- a/WebKit/efl/ewk/ewk_tiled_matrix.c
+++ b/WebKit/efl/ewk/ewk_tiled_matrix.c
@@ -600,9 +600,9 @@ static Eina_Bool _ewk_tile_matrix_slicer_setup(Ewk_Tile_Matrix *tm, const Eina_R
y = 0;
}
- if (y + h - 1 > rows * th)
+ if (y + h - 1 > (long)(rows * th))
h = rows * th - y;
- if (x + w - 1 > cols * tw)
+ if (x + w - 1 > (long)(cols * tw))
w = cols * tw - x;
return eina_tile_grid_slicer_setup(slicer, x, y, w, h, tw, th);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list