]> git.pld-linux.org Git - packages/ewebkit.git/blame - ewebkit-glib.patch
projects / packages / ewebkit.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- fix build with icu 59
[packages/ewebkit.git] / ewebkit-glib.patch
CommitLineData
6cc9bb06
JB		 1--- efl-webkit/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp.orig 2013-12-18 13:27:22.000000000 +0100
2+++ efl-webkit/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp 2015-10-11 21:52:28.072260360 +0200
3@@ -118,7 +118,7 @@
4 WebKitVideoSink* sink = reinterpret_cast<WebKitVideoSink*>(data);
5 WebKitVideoSinkPrivate* priv = sink->priv;
6
7- GMutexLocker lock(priv->bufferMutex);
8+ WebCore::GMutexLocker lock(priv->bufferMutex);
9 GstBuffer* buffer = priv->buffer;
10 priv->buffer = 0;
11 priv->timeoutId = 0;
12@@ -140,7 +140,7 @@
13 WebKitVideoSink* sink = WEBKIT_VIDEO_SINK(baseSink);
14 WebKitVideoSinkPrivate* priv = sink->priv;
15
16- GMutexLocker lock(priv->bufferMutex);
17+ WebCore::GMutexLocker lock(priv->bufferMutex);
18
19 if (priv->unlocked)
20 return GST_FLOW_OK;
21@@ -272,7 +272,7 @@
22
23 static void unlockBufferMutex(WebKitVideoSinkPrivate* priv)
24 {
25- GMutexLocker lock(priv->bufferMutex);
26+ WebCore::GMutexLocker lock(priv->bufferMutex);
27
28 if (priv->buffer) {
29 gst_buffer_unref(priv->buffer);
30@@ -298,7 +298,7 @@
31 WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
32
33 {
34- GMutexLocker lock(priv->bufferMutex);
35+ WebCore::GMutexLocker lock(priv->bufferMutex);
36 priv->unlocked = false;
37 }
38
39@@ -323,7 +323,7 @@
40 {
41 WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
42
43- GMutexLocker lock(priv->bufferMutex);
44+ WebCore::GMutexLocker lock(priv->bufferMutex);
45 priv->unlocked = false;
46 return TRUE;
47 }
48--- efl-webkit/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp.orig 2014-01-29 00:06:51.000000000 +0100
49+++ efl-webkit/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2015-10-11 21:52:40.316229122 +0200
50@@ -335,7 +335,7 @@
51
52 switch (propID) {
53 case PROP_IRADIO_MODE: {
54- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
55+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
56 priv->iradioMode = g_value_get_boolean(value);
57 break;
58 }
59@@ -353,7 +353,7 @@
60 WebKitWebSrc* src = WEBKIT_WEB_SRC(object);
61 WebKitWebSrcPrivate* priv = src->priv;
62
63- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
64+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
65 switch (propID) {
66 case PROP_IRADIO_MODE:
67 g_value_set_boolean(value, priv->iradioMode);
68@@ -406,7 +406,7 @@
69
70 ASSERT(isMainThread());
71
72- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
73+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
74
75 bool seeking = priv->seekID;
76
77@@ -465,7 +465,7 @@
78
79 ASSERT(isMainThread());
80
81- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
82+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
83
84 priv->startID = 0;
85
86@@ -560,7 +560,7 @@
87 return ret;
88 }
89
90- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
91+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
92 switch (transition) {
93 case GST_STATE_CHANGE_READY_TO_PAUSED:
94 GST_DEBUG_OBJECT(src, "READY->PAUSED");
95@@ -591,7 +591,7 @@
96 gst_query_parse_duration(query, &format, NULL);
97
98 GST_DEBUG_OBJECT(src, "duration query in format %s", gst_format_get_name(format));
99- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
100+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
101 if (format == GST_FORMAT_BYTES && src->priv->size > 0) {
102 gst_query_set_duration(query, format, src->priv->size);
103 result = TRUE;
104@@ -599,7 +599,7 @@
105 break;
106 }
107 case GST_QUERY_URI: {
108- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
109+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
110 gst_query_set_uri(query, src->priv->uri);
111 result = TRUE;
112 break;
113@@ -640,7 +640,7 @@
114 WebKitWebSrc* src = WEBKIT_WEB_SRC(handler);
115 gchar* ret;
116
117- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
118+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
119 ret = g_strdup(src->priv->uri);
120 return ret;
121 }
122@@ -655,7 +655,7 @@
123 return FALSE;
124 }
125
126- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
127+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
128
129 g_free(priv->uri);
130 priv->uri = 0;
131@@ -691,7 +691,7 @@
132
133 ASSERT(isMainThread());
134
135- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
136+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
137 // already stopped
138 if (!priv->needDataID)
139 return FALSE;
140@@ -712,7 +712,7 @@
141
142 GST_DEBUG_OBJECT(src, "Need more data: %u", length);
143
144- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
145+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
146 if (priv->needDataID || !priv->paused) {
147 return;
148 }
149@@ -726,7 +726,7 @@
150
151 ASSERT(isMainThread());
152
153- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
154+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
155 // already stopped
156 if (!priv->enoughDataID)
157 return FALSE;
158@@ -747,7 +747,7 @@
159
160 GST_DEBUG_OBJECT(src, "Have enough data");
161
162- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
163+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
164 if (priv->enoughDataID || priv->paused) {
165 return;
166 }
167@@ -761,7 +761,7 @@
168
169 ASSERT(isMainThread());
170
171- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
172+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
173 // already stopped
174 if (!priv->seekID)
175 return FALSE;
176@@ -779,7 +779,7 @@
177 WebKitWebSrcPrivate* priv = src->priv;
178
179 GST_DEBUG_OBJECT(src, "Seeking to offset: %" G_GUINT64_FORMAT, offset);
180- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
181+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
182 if (offset == priv->offset && priv->requestedOffset == priv->offset)
183 return TRUE;
184
185@@ -798,7 +798,7 @@
186 void webKitWebSrcSetMediaPlayer(WebKitWebSrc* src, WebCore::MediaPlayer* player)
187 {
188 ASSERT(player);
189- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
190+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
191 src->priv->player = player;
192 }
193
194@@ -822,7 +822,7 @@
195
196 mapGstBuffer(buffer);
197
198- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
199+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
200 priv->buffer = adoptGRef(buffer);
201 locker.unlock();
202
203@@ -845,7 +845,7 @@
204 return;
205 }
206
207- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
208+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
209
210 if (priv->seekID) {
211 GST_DEBUG_OBJECT(src, "Seek in progress, ignoring response");
212@@ -942,7 +942,7 @@
213 WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src.get());
214 WebKitWebSrcPrivate* priv = src->priv;
215
216- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
217+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
218
219 GST_LOG_OBJECT(src, "Have %lld bytes of data", priv->buffer ? static_cast<long long>(gst_buffer_get_size(priv->buffer.get())) : length);
220
221@@ -1011,7 +1011,7 @@
222
223 GST_DEBUG_OBJECT(src, "Have EOS");
224
225- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
226+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
227 if (!priv->seekID) {
228 locker.unlock();
229 gst_app_src_end_of_stream(priv->appsrc);
230@@ -1156,7 +1156,7 @@
231
232 GST_ERROR_OBJECT(src, "Request was blocked");
233
234- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
235+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
236 uri.reset(g_strdup(src->priv->uri));
237 locker.unlock();
238
239@@ -1170,7 +1170,7 @@
240
241 GST_ERROR_OBJECT(src, "Cannot show URL");
242
243- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
244+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
245 uri.reset(g_strdup(src->priv->uri));
246 locker.unlock();
247
WebKit-EFL - Web content engine for EFL applications
This page took 0.094891 seconds and 4 git commands to generate.