Changeset 161526 in webkit

Timestamp:

Jan 8, 2014 4:59:16 PM (10 years ago)

Author:

ryuan.choi@samsung.com

Message:

[EFL] Merge ewk_view_single into ewk_view
​https://bugs.webkit.org/show_bug.cgi?id=126508

Reviewed by Gyuyoung Kim.

Source/WebKit:

• PlatformEfl.cmake: Removed ewk_view_single.cpp.

Source/WebKit/efl:

Since ewk_view_tiled is removed at r161134, we don't need to keep
ewk_view_single out of ewk_view.cpp.

This patch moves the logic of ewk_view_single to ewk_view and refactors it.
In addition, replaces 0.00001 to episilon.

• ewk/ewk_view.cpp:

(_ewk_view_smart_add):
(_ewk_view_smart_resize): Merged with the logic of ewk_view_single.
(_ewk_view_screen_move): Moved from ewk_view_single.cpp.
(_ewk_view_scroll_process): Ditto.
(_ewk_view_smart_scrolls_process): Ditto.
(_ewk_view_smart_repaints_process): Ditto.
(_ewk_view_smart_calculate): Removed unnecessary check routine for scrolls_process.
(_ewk_view_smart_zoom_weak_set):
(_ewk_view_smart_zoom_weak_smooth_scale_set):
(ewk_view_base_smart_set): Merged smart method of ewk_view_single.
(ewk_view_single_smart_set):
(_ewk_view_single_smart_class_new):
(ewk_view_single_add):
(ewk_view_bg_color_set):
(ewk_view_pre_render_region):
(ewk_view_scrolls_process):

• ewk/ewk_view.h:
• ewk/ewk_view_private.h: Removed unncessary functions.
• ewk/ewk_view_single.cpp: Removed.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• PlatformEfl.cmake (modified) (1 diff)
• efl/ChangeLog (modified) (1 diff)
• efl/ewk/ewk_view.cpp (modified) (15 diffs)
• efl/ewk/ewk_view.h (modified) (4 diffs)
• efl/ewk/ewk_view_private.h (modified) (1 diff)
• efl/ewk/ewk_view_single.cpp (deleted)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2014-01-08  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        [EFL] Merge ewk_view_single into ewk_view
+        https://bugs.webkit.org/show_bug.cgi?id=126508
+
+        Reviewed by Gyuyoung Kim.
+
+        * PlatformEfl.cmake: Removed ewk_view_single.cpp.
+
 2014-01-08  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 

trunk/Source/WebKit/PlatformEfl.cmake

@@ -143 +143 @@
     efl/ewk/ewk_touch_event.cpp
     efl/ewk/ewk_view.cpp
-    efl/ewk/ewk_view_single.cpp
     efl/ewk/ewk_web_database.cpp
     efl/ewk/ewk_window_features.cpp

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2014-01-08  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        [EFL] Merge ewk_view_single into ewk_view
+        https://bugs.webkit.org/show_bug.cgi?id=126508
+
+        Reviewed by Gyuyoung Kim.
+
+        Since ewk_view_tiled is removed at r161134, we don't need to keep
+        ewk_view_single out of ewk_view.cpp.
+
+        This patch moves the logic of ewk_view_single to ewk_view and refactors it.
+        In addition, replaces 0.00001 to episilon.
+
+        * ewk/ewk_view.cpp:
+        (_ewk_view_smart_add):
+        (_ewk_view_smart_resize): Merged with the logic of ewk_view_single.
+        (_ewk_view_screen_move): Moved from ewk_view_single.cpp.
+        (_ewk_view_scroll_process): Ditto.
+        (_ewk_view_smart_scrolls_process): Ditto.
+        (_ewk_view_smart_repaints_process): Ditto.
+        (_ewk_view_smart_calculate): Removed unnecessary check routine for scrolls_process.
+        (_ewk_view_smart_zoom_weak_set):
+        (_ewk_view_smart_zoom_weak_smooth_scale_set):
+        (ewk_view_base_smart_set): Merged smart method of ewk_view_single.
+        (ewk_view_single_smart_set):
+        (_ewk_view_single_smart_class_new):
+        (ewk_view_single_add):
+        (ewk_view_bg_color_set):
+        (ewk_view_pre_render_region):
+        (ewk_view_scrolls_process):
+        * ewk/ewk_view.h:
+        * ewk/ewk_view_private.h: Removed unncessary functions.
+        * ewk/ewk_view_single.cpp: Removed.
+
 2014-01-08  Anders Carlsson  <andersca@apple.com>
 

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

@@ -907 +907 @@
     const Evas_Smart_Class* smartClass = evas_smart_class_get(smart);
     const Ewk_View_Smart_Class* api = reinterpret_cast<const Ewk_View_Smart_Class*>(smartClass);
-    EINA_SAFETY_ON_NULL_RETURN(api->backing_store_add);
     EWK_VIEW_SD_GET(ewkView, smartData);
 
@@ -935 +934 @@
     EWK_VIEW_PRIV_GET(smartData, priv);
 
-    smartData->backing_store = api->backing_store_add(smartData);
-    if (!smartData->backing_store) {
+    smartData->backing_store = evas_object_image_add(smartData->base.evas);
+    if (EINA_UNLIKELY(!smartData->backing_store)) {
         ERR("Could not create backing store object.");
         return;
     }
 
+    const Ecore_Evas* ecoreEvas = ecore_evas_ecore_evas_get(smartData->base.evas);
+    const char* engine = ecore_evas_engine_name_get(ecoreEvas);
+    if (!strncmp(engine, "opengl_x11", strlen("opengl_x11")))
+        evas_object_image_content_hint_set(smartData->backing_store, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
+
+    evas_object_image_alpha_set(smartData->backing_store, false);
+    evas_object_image_smooth_scale_set(smartData->backing_store, smartData->zoom_weak_smooth_scale);
+    evas_object_pass_events_set(smartData->backing_store, true);
     evas_object_smart_member_add(smartData->backing_store, ewkView);
     evas_object_show(smartData->backing_store);
-    evas_object_pass_events_set(smartData->backing_store, true);
 
     smartData->events_rect = evas_object_rectangle_add(smartData->base.evas);
@@ -999 +1005 @@
     // these should be queued and processed in calculate as well!
     evas_object_resize(smartData->backing_store, w, h);
+    evas_object_image_size_set(smartData->backing_store, w, h);
 
     smartData->changed.size = true;
     _ewk_view_smart_changed(smartData);
+
+    if (smartData->animated_zoom.zoom.current < std::numeric_limits<float>::epsilon()) {
+        Evas_Object* clip = evas_object_clip_get(smartData->backing_store);
+        Evas_Coord x, y, contentWidth, contentHeight;
+        evas_object_image_fill_set(smartData->backing_store, 0, 0, w, h);
+        evas_object_geometry_get(smartData->backing_store, &x, &y, 0, 0);
+        evas_object_move(clip, x, y);
+        ewk_frame_contents_size_get(smartData->main_frame, &contentWidth, &contentHeight);
+        if (w > contentWidth)
+            w = contentWidth;
+        if (h > contentHeight)
+            h = contentHeight;
+        evas_object_resize(clip, w, h);
+    }
 }
 
@@ -1011 +1032 @@
 }
 
+static inline void _ewk_view_screen_move(uint32_t* image, size_t destinationX, size_t destinationY, size_t sourceX, size_t sourceY, size_t copyWidth, size_t copyHeight, size_t imageWidth)
+{
+    uint32_t* sourceBegin = image + (imageWidth * sourceY) + sourceX;
+    uint32_t* destinationBegin = image + (imageWidth * destinationY) + destinationX;
+
+    size_t copyLength = copyWidth * 4;
+
+    int moveLineUpDown;
+    int row;
+
+    if (sourceY >= destinationY) {
+        row = 0;
+        moveLineUpDown = 1;
+    } else {
+        row = copyHeight - 1;
+        moveLineUpDown = -1;
+    }
+
+    uint32_t* source, * destination;
+    if ((destinationX > sourceX && destinationX < sourceX + copyWidth)
+        || (destinationX < sourceX && destinationX + copyWidth > sourceX)) {
+        for (size_t i = 0; i < copyHeight; ++i, row += moveLineUpDown) {
+            source = sourceBegin + (imageWidth * row);
+            destination = destinationBegin + (imageWidth * row);
+            memmove(destination, source, copyLength);
+        }
+    } else {
+        for (size_t i = 0; i < copyHeight; ++i, row += moveLineUpDown) {
+            source = sourceBegin + (imageWidth * row);
+            destination = destinationBegin + (imageWidth * row);
+            memcpy(destination, source, copyLength);
+        }
+    }
+}
+
+static inline void _ewk_view_scroll_process(Ewk_View_Smart_Data* smartData, void* pixels, Evas_Coord width, Evas_Coord height, const WebCore::IntSize& scrollOffset, const WebCore::IntRect& rectToScroll)
+{
+    int scrollX = rectToScroll.x();
+    int scrollY = rectToScroll.y();
+    int scrollWidth = rectToScroll.width();
+    int scrollHeight = rectToScroll.height();
+
+    if (abs(scrollOffset.width()) >= scrollWidth || abs(scrollOffset.height()) >= scrollHeight) {
+        ewk_view_repaint_add(smartData->_priv, scrollX, scrollY, scrollWidth, scrollHeight);
+        return;
+    }
+
+    if (scrollX < 0) {
+        scrollWidth += scrollX;
+        scrollX = 0;
+    }
+    if (scrollY < 0) {
+        scrollHeight += scrollY;
+        scrollY = 0;
+    }
+
+    if (scrollX + scrollWidth > width)
+        scrollWidth = width - scrollX;
+    if (scrollY + scrollHeight > height)
+        scrollHeight = height - scrollY;
+
+    if (scrollWidth <= 0 || scrollHeight <= 0)
+        return;
+
+    int sourceX = scrollOffset.width() < 0 ? abs(scrollOffset.width()) : 0;
+    int sourceY = scrollOffset.height() < 0 ? abs(scrollOffset.height()) : 0;
+    int destinationX = scrollOffset.width() < 0 ? 0 : scrollOffset.width();
+    int destinationY = scrollOffset.height() < 0 ? 0 : scrollOffset.height();
+    int copyWidth = scrollWidth - abs(scrollOffset.width());
+    int copyHeight = scrollHeight - abs(scrollOffset.height());
+    if (scrollOffset.width() || scrollOffset.height()) {
+        _ewk_view_screen_move(static_cast<uint32_t*>(pixels), destinationX, destinationY, sourceX, sourceY, copyWidth, copyHeight, width);
+        evas_object_image_data_update_add(smartData->backing_store, destinationX, destinationY, copyWidth, copyHeight);
+    }
+
+    Eina_Rectangle verticalUpdate;
+    verticalUpdate.x = destinationX ? 0 : copyWidth - 1;
+    verticalUpdate.y = 0;
+    verticalUpdate.w = abs(scrollOffset.width());
+    verticalUpdate.h = scrollHeight;
+    if (verticalUpdate.w && verticalUpdate.h)
+        ewk_view_repaint_add(smartData->_priv, verticalUpdate.x, verticalUpdate.y, verticalUpdate.w, verticalUpdate.h);
+
+    Eina_Rectangle horizontalUpdate;
+    horizontalUpdate.x = destinationX;
+    horizontalUpdate.y = destinationY ? 0 : copyHeight - 1;
+    horizontalUpdate.w = copyWidth;
+    horizontalUpdate.h = abs(scrollOffset.height());
+    if (horizontalUpdate.w && horizontalUpdate.h)
+        ewk_view_repaint_add(smartData->_priv, horizontalUpdate.x, horizontalUpdate.y, horizontalUpdate.w, horizontalUpdate.h);
+}
+
+static void _ewk_view_smart_scrolls_process(Ewk_View_Smart_Data* smartData)
+{
+    Evas_Coord imageWidth, imageHeight;
+    const WTF::Vector<WebCore::IntSize>& scrollOffsets = smartData->_priv->m_scrollOffsets;
+    const WTF::Vector<WebCore::IntRect>& rectsToScroll = smartData->_priv->m_rectsToScroll;
+
+    if (!scrollOffsets.size())
+        return;
+
+    evas_object_image_size_get(smartData->backing_store, &imageWidth, &imageHeight);
+
+    WebCore::IntRect rectToScroll(0, 0, imageWidth, imageHeight);
+    WebCore::IntSize scrollOffset;
+    for (size_t i = 0; i < scrollOffsets.size(); ++i) {
+        rectToScroll.intersect(rectsToScroll[i]);
+        scrollOffset += scrollOffsets[i];
+    }
+
+    if (scrollOffset.isZero())
+        return;
+
+    void* pixels = evas_object_image_data_get(smartData->backing_store, 1);
+    _ewk_view_scroll_process(smartData, pixels, imageWidth, imageHeight, scrollOffset, rectToScroll);
+
+    evas_object_image_data_set(smartData->backing_store, pixels);
+
+    return;
+}
+
+static Eina_Bool _ewk_view_smart_repaints_process(Ewk_View_Smart_Data* smartData)
+{
+    if (smartData->animated_zoom.zoom.current < std::numeric_limits<float>::epsilon()) {
+        Evas_Object* clip = evas_object_clip_get(smartData->backing_store);
+
+        // reset effects of zoom_weak_set()
+        evas_object_image_fill_set(smartData->backing_store, 0, 0, smartData->view.w, smartData->view.h);
+        evas_object_move(clip, smartData->view.x, smartData->view.y);
+
+        Evas_Coord width = smartData->view.w;
+        Evas_Coord height = smartData->view.h;
+
+        Evas_Coord centerWidth, centerHeight;
+        ewk_frame_contents_size_get(smartData->main_frame, &centerWidth, &centerHeight);
+        if (width > centerWidth)
+            width = centerWidth;
+
+        if (height > centerHeight)
+            height = centerHeight;
+
+        evas_object_resize(clip, width, height);
+    }
+
+    Evas_Coord imageWidth, imageHeight;
+    evas_object_image_size_get(smartData->backing_store, &imageWidth, &imageHeight);
+
+    Eina_Tiler* tiler = eina_tiler_new(imageWidth, imageHeight);
+    if (!tiler) {
+        ERR("could not create tiler %dx%d", imageWidth, imageHeight);
+        return false;
+    }
+
+    ewk_view_layout_if_needed_recursive(smartData->_priv);
+
+    size_t count;
+    const Eina_Rectangle* paintRequest = ewk_view_repaints_pop(smartData->_priv, &count);
+    const Eina_Rectangle* paintRequestEnd = paintRequest + count;
+    for (; paintRequest < paintRequestEnd; paintRequest++)
+        eina_tiler_rect_add(tiler, paintRequest);
+
+    Eina_Iterator* iterator = eina_tiler_iterator_new(tiler);
+    if (!iterator) {
+        ERR("could not get iterator for tiler");
+        eina_tiler_free(tiler);
+        return false;
+    }
+
+#if USE(TILED_BACKING_STORE)
+    WebCore::Frame* mainFrame = EWKPrivate::coreFrame(smartData->main_frame);
+    if (mainFrame && mainFrame->tiledBackingStore())
+        mainFrame->tiledBackingStore()->coverWithTilesIfNeeded();
+#endif
+
+    Ewk_Paint_Context* context = ewk_paint_context_from_image_new(smartData->backing_store);
+    ewk_paint_context_save(context);
+
+    Eina_Rectangle* rect;
+    EINA_ITERATOR_FOREACH(iterator, rect) {
+        ewk_view_paint(smartData->_priv, context, rect);
+        evas_object_image_data_update_add(smartData->backing_store, rect->x, rect->y, rect->w, rect->h);
+    }
+
+#if ENABLE(INSPECTOR)
+    WebCore::Page* page = EWKPrivate::corePage(smartData->self);
+    if (page) {
+        WebCore::InspectorController* controller = page->inspectorController();
+        if (controller->highlightedNode())
+            controller->drawHighlight(*context->graphicContext);
+    }
+#endif
+
+    ewk_paint_context_restore(context);
+    ewk_paint_context_free(context);
+
+    eina_tiler_free(tiler);
+    eina_iterator_free(iterator);
+
+    return true;
+}
+
 static void _ewk_view_smart_calculate(Evas_Object* ewkView)
 {
@@ -1016 +1238 @@
     EWK_VIEW_PRIV_GET(smartData, priv);
     EINA_SAFETY_ON_NULL_RETURN(smartData->api->contents_resize);
-    EINA_SAFETY_ON_NULL_RETURN(smartData->api->scrolls_process);
     EINA_SAFETY_ON_NULL_RETURN(smartData->api->repaints_process);
     Evas_Coord x, y, width, height;
@@ -1060 +1281 @@
     smartData->changed.position = false;
 
-    if (!smartData->api->scrolls_process(smartData))
-        ERR("failed to process scrolls.");
+    smartData->api->scrolls_process(smartData);
     _ewk_view_scrolls_flush(priv);
 
@@ -1186 +1406 @@
     return ((priv->animatedZoom.zoom.range * delta)
             + priv->animatedZoom.zoom.start);
+}
+
+static Eina_Bool _ewk_view_smart_zoom_weak_set(Ewk_View_Smart_Data* smartData, float zoom, Evas_Coord centerX, Evas_Coord centerY)
+{
+    float scale = zoom / smartData->animated_zoom.zoom.start;
+    Evas_Coord w = smartData->view.w * scale;
+    Evas_Coord h = smartData->view.h * scale;
+    Evas_Coord deltaX, deltaY, contentWidth, contentHeight;
+    Evas_Object* clip = evas_object_clip_get(smartData->backing_store);
+
+    ewk_frame_contents_size_get(smartData->main_frame, &contentWidth, &contentHeight);
+    if (smartData->view.w > 0 && smartData->view.h > 0) {
+        deltaX = (w * (smartData->view.w - centerX)) / smartData->view.w;
+        deltaY = (h * (smartData->view.h - centerY)) / smartData->view.h;
+    } else {
+        deltaX = 0;
+        deltaY = 0;
+    }
+
+    evas_object_image_fill_set(smartData->backing_store, centerX + deltaX, centerY + deltaY, w, h);
+
+    if (smartData->view.w > 0 && smartData->view.h > 0) {
+        deltaX = ((smartData->view.w - w) * centerX) / smartData->view.w;
+        deltaY = ((smartData->view.h - h) * centerY) / smartData->view.h;
+    } else {
+        deltaX = 0;
+        deltaY = 0;
+    }
+    evas_object_move(clip, smartData->view.x + deltaX, smartData->view.y + deltaY);
+
+    if (contentWidth < smartData->view.w)
+        w = contentWidth * scale;
+    if (contentHeight < smartData->view.h)
+        h = contentHeight * scale;
+    evas_object_resize(clip, w, h);
+
+    return true;
+}
+
+static void _ewk_view_smart_zoom_weak_smooth_scale_set(Ewk_View_Smart_Data* smartData, Eina_Bool smooth_scale)
+{
+    evas_object_image_smooth_scale_set(smartData->backing_store, smooth_scale);
 }
 
@@ -1289 +1551 @@
 
     api->contents_resize = _ewk_view_smart_contents_resize;
+    api->scrolls_process = _ewk_view_smart_scrolls_process;
+    api->repaints_process = _ewk_view_smart_repaints_process;
     api->zoom_set = _ewk_view_smart_zoom_set;
+    api->zoom_weak_set = _ewk_view_smart_zoom_weak_set;
+    api->zoom_weak_smooth_scale_set = _ewk_view_smart_zoom_weak_smooth_scale_set;
     api->flush = _ewk_view_smart_flush;
     api->pre_render_region = _ewk_view_smart_pre_render_region;
@@ -1315 +1581 @@
 
     return true;
+}
+
+Eina_Bool ewk_view_single_smart_set(Ewk_View_Smart_Class* api)
+{
+    return ewk_view_base_smart_set(api);
+}
+
+static inline Evas_Smart* _ewk_view_single_smart_class_new(void)
+{
+    static Ewk_View_Smart_Class api = EWK_VIEW_SMART_CLASS_INIT_NAME_VERSION(ewkViewSingleName);
+    static Evas_Smart* smart = 0;
+
+    if (EINA_UNLIKELY(!smart)) {
+        ewk_view_base_smart_set(&api);
+        smart = evas_smart_class_new(&api.sc);
+    }
+
+    return smart;
+}
+
+Evas_Object* ewk_view_single_add(Evas* canvas)
+{
+    return evas_object_smart_add(canvas, _ewk_view_single_smart_class_new());
 }
 
@@ -1425 +1714 @@
     EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData);
     EINA_SAFETY_ON_NULL_RETURN(smartData->api);
-    EINA_SAFETY_ON_NULL_RETURN(smartData->api->bg_color_set);
 
     if (alpha < 0) {
@@ -1454 +1742 @@
     smartData->bg_color.a = alpha;
 
-    smartData->api->bg_color_set(smartData, red, green, blue, alpha);
+    evas_object_image_alpha_set(smartData->backing_store, alpha < 255);
 
     WebCore::FrameView* view = smartData->_priv->mainFrame->view();
@@ -1927 +2215 @@
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false);
     EINA_SAFETY_ON_NULL_RETURN_VAL(smartData->api->pre_render_region, false);
-    float currentZoom;
     Evas_Coord contentsWidth, contentsHeight;
 
@@ -1936 +2223 @@
         return false;
 
-    currentZoom = ewk_frame_page_zoom_get(smartData->main_frame);
-
-    if (currentZoom < 0.00001)
+    float currentZoom = ewk_frame_page_zoom_get(smartData->main_frame);
+    if (currentZoom < std::numeric_limits<float>::epsilon())
         return false;
+
     if (!ewk_frame_contents_size_get(smartData->main_frame, &contentsWidth, &contentsHeight))
         return false;
@@ -2727 +3014 @@
 }
 
-const Vector<WebCore::IntSize>& ewk_view_scroll_offsets_get(const Ewk_View_Private_Data* priv)
-{
-    ASSERT(priv);
-    return priv->m_scrollOffsets;
-}
-
-const Vector<WebCore::IntRect>& ewk_view_scroll_rects_get(const Ewk_View_Private_Data* priv)
-{
-    ASSERT(priv);
-    return priv->m_rectsToScroll;
-}
-
 /**
  * Add a new repaint request to queue.
@@ -2783 +3058 @@
     EINA_SAFETY_ON_NULL_RETURN(smartData);
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv);
-    if (!smartData->api->scrolls_process(smartData))
-        ERR("failed to process scrolls.");
+
+    smartData->api->scrolls_process(smartData);
     _ewk_view_scrolls_flush(priv);
 }

trunk/Source/WebKit/efl/ewk/ewk_view.h

@@ -154 +154 @@
     Evas_Object *(*window_create)(Ewk_View_Smart_Data *sd, Eina_Bool javascript, const Ewk_Window_Features *window_features); /**< creates a new window, requested by webkit */
     void (*window_close)(Ewk_View_Smart_Data *sd); /**< closes a window */
-    // hooks to allow different backing stores
-    Evas_Object *(*backing_store_add)(Ewk_View_Smart_Data *sd); /**< must be defined */
-    Eina_Bool (*scrolls_process)(Ewk_View_Smart_Data *sd); /**< must be defined */
+    void (*scrolls_process)(Ewk_View_Smart_Data *sd); /**< must be defined */
     Eina_Bool (*repaints_process)(Ewk_View_Smart_Data *sd); /**< must be defined */
     Eina_Bool (*contents_resize)(Ewk_View_Smart_Data *sd, int w, int h);
@@ -162 +160 @@
     Eina_Bool (*zoom_weak_set)(Ewk_View_Smart_Data *sd, float zoom, Evas_Coord cx, Evas_Coord cy);
     void (*zoom_weak_smooth_scale_set)(Ewk_View_Smart_Data *sd, Eina_Bool smooth_scale);
-    void (*bg_color_set)(Ewk_View_Smart_Data *sd, unsigned char red, unsigned char green, unsigned char blue, unsigned char alpha);
     void (*flush)(Ewk_View_Smart_Data *sd);
     Eina_Bool (*pre_render_region)(Ewk_View_Smart_Data *sd, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, float zoom);
@@ -204 +201 @@
  * in the @a Ewk_View_Smart_Class structure.
  */
-#define EWK_VIEW_SMART_CLASS_VERSION 7UL
+#define EWK_VIEW_SMART_CLASS_VERSION 8UL
 
 /**
@@ -216 +213 @@
  * @see EWK_VIEW_SMART_CLASS_INIT_NAME_VERSION
  */
-#define EWK_VIEW_SMART_CLASS_INIT(smart_class_init) {smart_class_init, EWK_VIEW_SMART_CLASS_VERSION, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+#define EWK_VIEW_SMART_CLASS_INIT(smart_class_init) {smart_class_init, EWK_VIEW_SMART_CLASS_VERSION, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 
 /**

trunk/Source/WebKit/efl/ewk/ewk_view_private.h

@@ -149 +149 @@
 
 const Eina_Rectangle* ewk_view_repaints_pop(Ewk_View_Private_Data* priv, size_t* count);
-const Vector<WebCore::IntSize>& ewk_view_scroll_offsets_get(const Ewk_View_Private_Data*);
-const Vector<WebCore::IntRect>& ewk_view_scroll_rects_get(const Ewk_View_Private_Data*);
 
 void ewk_view_repaint_add(Ewk_View_Private_Data* priv, Evas_Coord x, Evas_Coord y, Evas_Coord width, Evas_Coord height);