Changeset 106627 in webkit

Timestamp:

Feb 2, 2012 9:42:14 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL] Add contentsSize flag into ewk_tiled_backing_store's private data.
​https://bugs.webkit.org/show_bug.cgi?id=77586

Patch by KwangHyuk Kim <​hyuki.kim@samsung.com> on 2012-02-02
Reviewed by Andreas Kling.

As both zoom and content size change are identified by model flag,
ewk_tiled_backing_store can not detect the conflict between them.
In order to prevent conflict between zoom and contents size change,
contentsSize flag is newly added.

• ewk/ewk_tiled_backing_store.cpp:

(_Ewk_Tiled_Backing_Store_Item):
(_Ewk_Tiled_Backing_Store_Data):
(_ewk_tiled_backing_store_smart_calculate):
(ewk_tiled_backing_store_contents_resize):

Location:

trunk/Source/WebKit/efl

Files:

• ChangeLog (modified) (1 diff)
• ewk/ewk_tiled_backing_store.cpp (modified) (5 diffs)

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2012-02-02  KwangHyuk Kim  <hyuki.kim@samsung.com>
+
+        [EFL] Add contentsSize flag into ewk_tiled_backing_store's private data.
+        https://bugs.webkit.org/show_bug.cgi?id=77586
+
+        Reviewed by Andreas Kling.
+
+        As both zoom and content size change are identified by model flag,
+        ewk_tiled_backing_store can not detect the conflict between them.
+        In order to prevent conflict between zoom and contents size change,
+        contentsSize flag is newly added.
+
+        * ewk/ewk_tiled_backing_store.cpp:
+        (_Ewk_Tiled_Backing_Store_Item):
+        (_Ewk_Tiled_Backing_Store_Data):
+        (_ewk_tiled_backing_store_smart_calculate):
+        (ewk_tiled_backing_store_contents_resize):
+
 2012-02-02  Raphael Kubo da Costa  <kubo@profusion.mobi>
 

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

@@ -107 +107 @@
         bool model : 1;
         bool offset : 1;
+        bool contentsSize : 1;
     } changed;
 #ifdef DEBUG_MEM_LEAKS
@@ -1323 +1324 @@
     ewk_tile_matrix_freeze(priv->model.matrix);
 
-    if (priv->changed.model && !priv->changed.size)
+    if (priv->changed.contentsSize)
         ewk_tile_matrix_invalidate(priv->model.matrix);
 
-    if (!priv->render.suspend && priv->changed.model) {
+    if (!priv->render.suspend && (priv->changed.model || priv->changed.contentsSize)) {
         unsigned long columns, rows;
 
@@ -1357 +1358 @@
     }
 
-    if (!priv->render.suspend && priv->changed.model) {
+    if (!priv->render.suspend && (priv->changed.model || priv->changed.contentsSize)) {
         _ewk_tiled_backing_store_fill_renderers(priv);
         ewk_tile_matrix_resize(priv->model.matrix,
@@ -1372 +1373 @@
         ewk_tile_matrix_update(priv->model.matrix, &rect,
                                priv->view.tile.zoom);
+
+        priv->changed.contentsSize = false;
     }
 
@@ -1797 +1800 @@
     priv->model.width = width;
     priv->model.height = height;
-    priv->changed.model = true;
+    priv->changed.contentsSize = true;
 
     DBG("w,h=%d, %d", width, height);