diff options
Diffstat (limited to 'meta-efl/recipes-efl/e17/eve/0002-adapt-to-webkit-efl-changes.patch')
-rw-r--r-- | meta-efl/recipes-efl/e17/eve/0002-adapt-to-webkit-efl-changes.patch | 109 |
1 files changed, 109 insertions, 0 deletions
diff --git a/meta-efl/recipes-efl/e17/eve/0002-adapt-to-webkit-efl-changes.patch b/meta-efl/recipes-efl/e17/eve/0002-adapt-to-webkit-efl-changes.patch new file mode 100644 index 000000000..4b5e64ee5 --- /dev/null +++ b/meta-efl/recipes-efl/e17/eve/0002-adapt-to-webkit-efl-changes.patch | |||
@@ -0,0 +1,109 @@ | |||
1 | From c1cb2a7b6d8b4661fde442ea4725df6842a94816 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Fri, 18 Apr 2014 11:52:18 +0200 | ||
4 | Subject: [PATCH 2/2] adapt to webkit-efl changes | ||
5 | |||
6 | WIP: just fixes the build, probably doesn't render correctly | ||
7 | |||
8 | https://trac.webkit.org/changeset/164168 | ||
9 | removed cairo.h from public headers and ewk_view_paint_contents | ||
10 | |||
11 | https://trac.webkit.org/changeset/162581 | ||
12 | removed ewk_view_pre_render methods (with whole tiled support) | ||
13 | |||
14 | https://git.enlightenment.org/core/elementary.git/commit/?id=0e465290be2016f12adcbc8c8d74645b3e6a1d9a | ||
15 | ewk_view_tiled_smart_set is gone and ewk_view_single_smart_set is | ||
16 | ewk_view_smart_set | ||
17 | |||
18 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
19 | --- | ||
20 | src/bin/chrome.c | 4 +++- | ||
21 | src/bin/view.c | 22 +++++++--------------- | ||
22 | 2 files changed, 10 insertions(+), 16 deletions(-) | ||
23 | |||
24 | diff --git a/src/bin/chrome.c b/src/bin/chrome.c | ||
25 | index ee8f0c4..b46b29d 100644 | ||
26 | --- a/src/bin/chrome.c | ||
27 | +++ b/src/bin/chrome.c | ||
28 | @@ -5,6 +5,8 @@ | ||
29 | #include <stdio.h> | ||
30 | #include <string.h> | ||
31 | |||
32 | +#include <cairo.h> | ||
33 | + | ||
34 | #include <Eina.h> | ||
35 | #include <Elementary.h> | ||
36 | |||
37 | @@ -1997,7 +1999,7 @@ view_screenshot_add(Evas *evas, const Evas_Object *view) | ||
38 | if (cairo_status(cairo) != CAIRO_STATUS_SUCCESS) | ||
39 | goto error_cairo_create; | ||
40 | |||
41 | - if (!ewk_view_paint_contents(priv, cairo, &rect)) | ||
42 | + if (!ewk_view_screenshot_contents_get(priv, &rect, 1)) | ||
43 | { | ||
44 | evas_object_del(img); | ||
45 | img = NULL; | ||
46 | diff --git a/src/bin/view.c b/src/bin/view.c | ||
47 | index 54de6c1..2b07511 100644 | ||
48 | --- a/src/bin/view.c | ||
49 | +++ b/src/bin/view.c | ||
50 | @@ -335,7 +335,7 @@ _view_load_finished(void *data, Evas_Object *view, void *event_info __UNUSED__) | ||
51 | h *= 2; | ||
52 | |||
53 | INF("load finished, pre-render %d,%d+%dx%d at %0.2f", x, y, w, h, zoom); | ||
54 | - ewk_view_pre_render_region(view, x, y, w, h, zoom); | ||
55 | + //ewk_view_pre_render_region(view, x, y, w, h, zoom); | ||
56 | } | ||
57 | |||
58 | /* stop animators, we changed page */ | ||
59 | @@ -435,7 +435,7 @@ _view_pan_pre_render(View_Smart_Data *sd, Evas_Coord dx, Evas_Coord dy) | ||
60 | |||
61 | INF("pre-render region %d,%d+%dx%d at %0.2f (viewport=%d,%d+%dx%d)", | ||
62 | px, py, pw, ph, zoom, x, y, w, h); | ||
63 | - ewk_view_pre_render_region(sd->base.self, px, py, pw, ph, zoom); | ||
64 | + //ewk_view_pre_render_region(sd->base.self, px, py, pw, ph, zoom); | ||
65 | } | ||
66 | |||
67 | static unsigned int | ||
68 | @@ -611,7 +611,7 @@ _view_pan_start(View_Smart_Data *sd, const Evas_Event_Mouse_Down *ev) | ||
69 | |||
70 | sd->pan.last_move = *p; | ||
71 | |||
72 | - ewk_view_pre_render_cancel(sd->base.self); | ||
73 | + //ewk_view_pre_render_cancel(sd->base.self); | ||
74 | |||
75 | /* register function to collect samples and apply scrolls at fixed interval*/ | ||
76 | if (!sd->animator.pan) | ||
77 | @@ -816,7 +816,7 @@ _view_zoom_start(View_Smart_Data *sd, const Evas_Event_Mouse_Down *ev) | ||
78 | Evas_Coord cw, ch, vw, vh; | ||
79 | float z, zx, zy; | ||
80 | |||
81 | - ewk_view_pre_render_cancel(sd->base.self); | ||
82 | + //ewk_view_pre_render_cancel(sd->base.self); | ||
83 | |||
84 | /* remember starting point so we have a reference */ | ||
85 | sd->zoom.start.zoom = ewk_frame_page_zoom_get(frame); | ||
86 | @@ -1512,17 +1512,9 @@ view_add(Evas_Object *parent, Backing_Store bs) | ||
87 | /* create ewk_view_single subclass, this is done only once! */ | ||
88 | static Ewk_View_Smart_Class api = EWK_VIEW_SMART_CLASS_INIT_NAME_VERSION("EWK_View_Demo"); | ||
89 | |||
90 | - /* set current and parent apis to vanilla ewk_view_single methods */ | ||
91 | - if (bs == BACKING_STORE_TILED) | ||
92 | - { | ||
93 | - ewk_view_tiled_smart_set(&api); | ||
94 | - ewk_view_tiled_smart_set(&_parent_sc); | ||
95 | - } | ||
96 | - else | ||
97 | - { | ||
98 | - ewk_view_single_smart_set(&api); | ||
99 | - ewk_view_single_smart_set(&_parent_sc); | ||
100 | - } | ||
101 | + /* set current and parent apis to vanilla ewk_view methods */ | ||
102 | + ewk_view_smart_set(&api); | ||
103 | + ewk_view_smart_set(&_parent_sc); | ||
104 | |||
105 | /* override methods we want custom behavior */ | ||
106 | api.sc.add = _view_smart_add; | ||
107 | -- | ||
108 | 1.9.1 | ||
109 | |||