Changeset 89800 in webkit

Timestamp:

Jun 27, 2011 1:01:50 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-06-27 KwangHyuk Kim <​hyuki.kim@samsung.com>

Reviewed by Kenneth Rohde Christiansen.

[EFL] Remove dead code related with Ewk_Tiled_Backing_Store_Item's update field.
​https://bugs.webkit.org/show_bug.cgi?id=62967

As some code do not affect any logical flow of tiled backing store except condition check,
I would like to clean dead code related with Ewk_Tiled_Backing_Store_Item's update field
and Ewk_Tiled_Backing_Store_Data's queue field

• ewk/ewk_tiled_backing_store.c: (_ewk_tiled_backing_store_item_process_idler_cb): (_ewk_tiled_backing_store_item_fill): (_ewk_tiled_backing_store_item_add): (_ewk_tiled_backing_store_item_del):

Location:

trunk/Source/WebKit/efl

Files:

• ChangeLog (modified) (1 diff)
• ewk/ewk_tiled_backing_store.c (modified) (10 diffs, 1 prop)

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2011-06-27  KwangHyuk Kim  <hyuki.kim@samsung.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [EFL] Remove dead code related with Ewk_Tiled_Backing_Store_Item's update field.
+        https://bugs.webkit.org/show_bug.cgi?id=62967
+
+        As some code do not affect any logical flow of tiled backing store except condition check,
+        I would like to clean dead code related with Ewk_Tiled_Backing_Store_Item's update field
+        and Ewk_Tiled_Backing_Store_Data's queue field 
+
+        * ewk/ewk_tiled_backing_store.c:
+        (_ewk_tiled_backing_store_item_process_idler_cb):
+        (_ewk_tiled_backing_store_item_fill):
+        (_ewk_tiled_backing_store_item_add):
+        (_ewk_tiled_backing_store_item_del):
+
 2011-06-26  Ryuan Choi  <ryuan.choi@samsung.com>
 

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

@@ -58 +58 @@
         Evas_Coord x, y, w, h;
     } geometry;
-    struct {
-        Eina_List *process;
-        unsigned long row, col;
-        float zoom;
-    } update;
     Eina_Bool smooth_scale;
 };
@@ -105 +100 @@
         Eina_Bool (*cb)(void *data, Ewk_Tile *t, const Eina_Rectangle *area);
         void *data;
-        Eina_List *queue;
         Eina_Bool process_entire_queue;
         Eina_Inlist *pre_render_requests;
@@ -378 +372 @@
     Ewk_Tiled_Backing_Store_Item *it = NULL;
 
-    while (priv->render.queue) {
-        it = priv->render.queue->data;
-        if (it->tile->zoom == priv->view.tile.zoom) {
-            _ewk_tiled_backing_store_item_request_del(priv, it);
-            it = NULL;
-        } else {
-            unsigned long row, col;
-            float zoom;
-            Ewk_Tile *t;
-            if (it->tile) {
-                double last_used = ecore_loop_time_get();
-                _ewk_tiled_backing_store_tile_dissociate(priv, it, last_used);
-            }
-
-            row = it->update.row;
-            col = it->update.col;
-            zoom = it->update.zoom;
-            t = _ewk_tiled_backing_store_tile_new(priv, col, row, zoom);
-            if (!t) {
-                priv->render.idler = NULL;
-                return EINA_FALSE;
-            }
-
-            _ewk_tiled_backing_store_tile_associate(priv, t, it);
-            it->update.process = NULL;
-            priv->render.queue = eina_list_remove_list(priv->render.queue,
-                                                       priv->render.queue);
-            if (!priv->render.process_entire_queue)
-                break;
-        }
-    }
-
     if (priv->process.pre_cb)
         data = priv->process.pre_cb(priv->process.pre_data, priv->self);
@@ -415 +377 @@
     ewk_tile_matrix_updates_process(priv->model.matrix);
 
-    if (!it)
-        _ewk_tiled_backing_store_pre_render_request_process_single(priv);
+    _ewk_tiled_backing_store_pre_render_request_process_single(priv);
 
     if (priv->process.post_cb)
         priv->process.post_cb(priv->process.post_data, data, priv->self);
 
-    if (!priv->render.queue && !priv->render.pre_render_requests) {
+    if (!priv->render.pre_render_requests) {
         priv->render.idler = NULL;
         return EINA_FALSE;
@@ -446 +407 @@
 }
 
-static inline void _ewk_tiled_backing_store_item_request_del(Ewk_Tiled_Backing_Store_Data *priv, Ewk_Tiled_Backing_Store_Item *it)
-{
-    priv->render.queue = eina_list_remove_list(priv->render.queue,
-                                               it->update.process);
-    it->update.process = NULL;
-}
-
-static inline void _ewk_tiled_backing_store_item_request_add(Ewk_Tiled_Backing_Store_Data *priv, Ewk_Tiled_Backing_Store_Item *it, int m_col, int m_row, float zoom)
-{
-    if (it->update.process)
-        return;
-
-    it->update.col = m_col;
-    it->update.row = m_row;
-    it->update.zoom = zoom;
-
-    priv->render.queue = eina_list_append(priv->render.queue, it);
-    it->update.process = eina_list_last(priv->render.queue);
-
-    if (!priv->render.suspend)
-        _ewk_tiled_backing_store_item_process_idler_start(priv);
-}
-
 static Eina_Bool _ewk_tiled_backing_store_disable_render(Ewk_Tiled_Backing_Store_Data *priv)
 {
@@ -502 +440 @@
         || (unsigned long)(m_row) >= priv->model.cur.rows) {
 
-        if (it->tile) {
+        if (it->tile)
             _ewk_tiled_backing_store_tile_dissociate(priv, it, last_used);
-            if (it->update.process)
-                _ewk_tiled_backing_store_item_request_del(priv, it);
-        }
     } else {
         Ewk_Tile *t;
         const float zoom = priv->view.tile.zoom;
-
-        if (it->update.process) {
-            if (it->update.row == (unsigned long)(m_row)
-                && it->update.col == (unsigned long)(m_col)
-                && it->update.zoom == zoom)
-                return EINA_TRUE;
-
-            _ewk_tiled_backing_store_item_request_del(priv, it);
-        }
 
         if (it->tile) {
@@ -527 +453 @@
                 _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 == (unsigned long)(m_row)
                        && old->col == (unsigned long)(m_col)
@@ -553 +478 @@
             }
         } else if (t != it->tile) {
-            if (!it->update.process) {
-                if (it->tile)
-                    _ewk_tiled_backing_store_tile_dissociate(priv,
+            if (it->tile)
+                _ewk_tiled_backing_store_tile_dissociate(priv,
                                                              it, last_used);
-                _ewk_tiled_backing_store_tile_associate(priv, t, it);
-            }
+            _ewk_tiled_backing_store_tile_associate(priv, t, it);
         }
 
@@ -584 +507 @@
 
     it->tile = NULL;
-    it->update.process = NULL;
+
     it->smooth_scale = priv->view.tile.zoom_weak_smooth_scale;
     _ewk_tiled_backing_store_item_move(it, x, y);
@@ -602 +525 @@
         _ewk_tiled_backing_store_tile_dissociate(priv, it, last_used);
     }
-    if (it->update.process)
-        _ewk_tiled_backing_store_item_request_del(priv, it);
+
     free(it);
 }