mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-07 05:10:20 +00:00
Code Issues Projects Releases Wiki Activity

eve: adapt to webkit-efl changes

Browse Source 
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa
2014-03-27 00:43:36 +01:00
parent a9f5016444
commit 38818bf223
2 changed files with 97 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-efl/recipes-efl/e17/eve/adapt-to-webkit-efl-changes.patch
+94
View File
@@ -0,0 +1,94 @@
WIP: just fixes the build, probably doesn't render correctly
https://trac.webkit.org/changeset/164168
removed cairo.h from public headers and ewk_view_paint_contents
https://trac.webkit.org/changeset/162581
removed ewk_view_pre_render methods (with whole tiled support)
https://git.enlightenment.org/core/elementary.git/commit/?id=0e465290be2016f12adcbc8c8d74645b3e6a1d9a
ewk_view_tiled_smart_set is gone and ewk_view_single_smart_set is ewk_view_smart_set
Index: src/bin/chrome.c
===================================================================
--- a/src/bin/chrome.c (revision 84579)
+++ b/src/bin/chrome.c (working copy)
@@ -5,6 +5,8 @@
#include <stdio.h>
#include <string.h>
+#include <cairo.h>
+
#include <Eina.h>
#include <Elementary.h>
@@ -1997,7 +1999,7 @@
if (cairo_status(cairo) != CAIRO_STATUS_SUCCESS)
goto error_cairo_create;
- if (!ewk_view_paint_contents(priv, cairo, &rect))
+ if (!ewk_view_screenshot_contents_get(priv, &rect, 1))
{
evas_object_del(img);
img = NULL;
Index: src/bin/view.c
===================================================================
--- a/src/bin/view.c (revision 84579)
+++ b/src/bin/view.c (working copy)
@@ -335,7 +335,7 @@
h *= 2;
INF("load finished, pre-render %d,%d+%dx%d at %0.2f", x, y, w, h, zoom);
- ewk_view_pre_render_region(view, x, y, w, h, zoom);
+ //ewk_view_pre_render_region(view, x, y, w, h, zoom);
}
/* stop animators, we changed page */
@@ -435,7 +435,7 @@
INF("pre-render region %d,%d+%dx%d at %0.2f (viewport=%d,%d+%dx%d)",
px, py, pw, ph, zoom, x, y, w, h);
- ewk_view_pre_render_region(sd->base.self, px, py, pw, ph, zoom);
+ //ewk_view_pre_render_region(sd->base.self, px, py, pw, ph, zoom);
}
static unsigned int
@@ -611,7 +611,7 @@
sd->pan.last_move = *p;
- ewk_view_pre_render_cancel(sd->base.self);
+ //ewk_view_pre_render_cancel(sd->base.self);
/* register function to collect samples and apply scrolls at fixed interval*/
if (!sd->animator.pan)
@@ -816,7 +816,7 @@
Evas_Coord cw, ch, vw, vh;
float z, zx, zy;
- ewk_view_pre_render_cancel(sd->base.self);
+ //ewk_view_pre_render_cancel(sd->base.self);
/* remember starting point so we have a reference */
sd->zoom.start.zoom = ewk_frame_page_zoom_get(frame);
@@ -1512,17 +1512,9 @@
/* create ewk_view_single subclass, this is done only once! */
static Ewk_View_Smart_Class api = EWK_VIEW_SMART_CLASS_INIT_NAME_VERSION("EWK_View_Demo");
- /* set current and parent apis to vanilla ewk_view_single methods */
- if (bs == BACKING_STORE_TILED)
- {
- ewk_view_tiled_smart_set(&api);
- ewk_view_tiled_smart_set(&_parent_sc);
- }
- else
- {
- ewk_view_single_smart_set(&api);
- ewk_view_single_smart_set(&_parent_sc);
- }
+ /* set current and parent apis to vanilla ewk_view methods */
+ ewk_view_smart_set(&api);
+ ewk_view_smart_set(&_parent_sc);
/* override methods we want custom behavior */
api.sc.add = _view_smart_add;
meta-efl/recipes-efl/e17/eve_svn.bb
+3 -1
View File
@@ -12,7 +12,9 @@ COMPATIBLE_MACHINE_x86-64 = "(.*)"
COMPATIBLE_MACHINE_armv7a = "(.*)"
inherit e gettext
SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep"
SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \
file://adapt-to-webkit-efl-changes.patch \
"
S = "${WORKDIR}/${SRCNAME}"
do_configure_prepend() {