Changeset 93399 in webkit

Timestamp:

Aug 19, 2011 6:23:38 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL] Modify type of both col and row parameters for backing store's internal api.
​https://bugs.webkit.org/show_bug.cgi?id=65302

As both col and row parameter's type for both _ewk_tiled_backing_store_item_fill
and ewk_tiled_backing_store_item_add are different from each other, I modify type of them.

Patch by KwangHyuk Kim <​hyuki.kim@samsung.com> on 2011-08-19
Reviewed by Adam Roben.

• ewk/ewk_tiled_backing_store.c:

(_ewk_tiled_backing_store_item_fill):
(_ewk_tiled_backing_store_item_add):

Location:

trunk/Source/WebKit/efl

Files:

• ChangeLog (modified) (1 diff)
• ewk/ewk_tiled_backing_store.c (modified) (3 diffs)

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2011-08-19  KwangHyuk Kim  <hyuki.kim@samsung.com>
+
+        [EFL] Modify type of both col and row parameters for backing store's internal api.
+        https://bugs.webkit.org/show_bug.cgi?id=65302
+
+        As both col and row parameter's type for both _ewk_tiled_backing_store_item_fill
+        and ewk_tiled_backing_store_item_add are different from each other, I modify type of them.
+
+        Reviewed by Adam Roben.
+
+        * ewk/ewk_tiled_backing_store.c:
+        (_ewk_tiled_backing_store_item_fill):
+        (_ewk_tiled_backing_store_item_add):
+
 2011-08-18  Ryuan Choi  <ryuan.choi@samsung.com>
 

trunk/Source/WebKit/efl/ewk/ewk_tiled_backing_store.c

@@ -425 +425 @@
 }
 
-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)
-{
-    long m_col = priv->model.base.col + col;
-    long m_row = priv->model.base.row + row;
+static inline Eina_Bool _ewk_tiled_backing_store_item_fill(Ewk_Tiled_Backing_Store_Data *priv, Ewk_Tiled_Backing_Store_Item *it, unsigned long col, unsigned long row)
+{
+    unsigned long m_col = priv->model.base.col + col;
+    unsigned long m_row = priv->model.base.row + row;
     double last_used = ecore_loop_time_get();
 
-    if (m_col < 0 || m_row < 0
-        || (unsigned long)(m_col) >= priv->model.cur.cols
-        || (unsigned long)(m_row) >= priv->model.cur.rows) {
-
+    if (m_col >= priv->model.cur.cols || m_row >= priv->model.cur.rows) {
         if (it->tile)
             _ewk_tiled_backing_store_tile_dissociate(priv, it, last_used);
@@ -443 +440 @@
         if (it->tile) {
             Ewk_Tile *old = it->tile;
-            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);
-
-            } else if (old->row == (unsigned long)(m_row)
-                       && old->col == (unsigned long)(m_col)
-                       && old->zoom == zoom)
+            if (old->row != m_row || old->col != m_col || old->zoom != zoom)
+                _ewk_tiled_backing_store_tile_dissociate(priv, it, last_used);
+            else if (old->row == m_row && old->col == m_col && old->zoom == zoom)
                 goto end;
         }
 
-        t = ewk_tile_matrix_tile_exact_get
-            (priv->model.matrix, m_col, m_row, zoom);
+        t = ewk_tile_matrix_tile_exact_get(priv->model.matrix, m_col, m_row, zoom);
+
         if (!t) {
             /* NOTE: it never returns NULL if it->tile was set! */
@@ -487 +478 @@
 }
 
-static Ewk_Tiled_Backing_Store_Item *_ewk_tiled_backing_store_item_add(Ewk_Tiled_Backing_Store_Data *priv, long col, int row)
+static Ewk_Tiled_Backing_Store_Item *_ewk_tiled_backing_store_item_add(Ewk_Tiled_Backing_Store_Data *priv, unsigned long col, unsigned long row)
 {
     Ewk_Tiled_Backing_Store_Item *it;