[prev in list] [next in list] [prev in thread] [next in thread] 

List:       webkit-changes
Subject:    [webkit-changes] [133059] trunk/Source
From:       commit-queue () webkit ! org
Date:       2012-10-31 19:29:18
Message-ID: 20121031192919.2BF15301227 () svn ! webkit ! org
[Download RAW message or body]

[Attachment #2 (text/html)]

<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[133059] trunk/Source</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: \
verdana,arial,helvetica,sans-serif; font-size: 10pt;  } #msg dl a { font-weight: \
bold} #msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: \
bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: \
6px; } #logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em \
0; } #logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg \
h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } \
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; \
} #logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: \
-1.5em; padding-left: 1.5em; } #logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em \
1em 0 1em; background: white;} #logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid \
#fa0; border-bottom: 1px solid #fa0; background: #fff; } #logmsg table th { \
text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted \
#fa0; } #logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: \
0.2em 0.5em; } #logmsg table thead th { text-align: center; border-bottom: 1px solid \
#fa0; } #logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: \
6px; } #patch { width: 100%; }
#patch h4 {font-family: \
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
 #patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, \
#patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins \
{background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del \
{background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, \
                .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a \
href="http://trac.webkit.org/projects/webkit/changeset/133059">133059</a></dd> \
<dt>Author</dt> <dd>commit-queue@webkit.org</dd> <dt>Date</dt> <dd>2012-10-31 \
12:29:17 -0700 (Wed, 31 Oct 2012)</dd> </dl>

<h3>Log Message</h3>
<pre>Enable webkit2 introspection
https://bugs.webkit.org/show_bug.cgi?id=94313

Patch by Jesse van den Kieboom &lt;jessevdk@gnome.org&gt; on 2012-10-31
Reviewed by Martin Robinson.

This patch enables generation of introspection information for webkit2
in the same was as it is done for webkit. The resulting gir and
typelib file are named WebKit2-3.0.{gir,typelib}.

* GNUmakefile.am:
* UIProcess/API/gtk/WebKitBackForwardList.cpp:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitgtkGNUmakefileam">trunk/Source/WebKit/gtk/GNUmakefile.am</a></li>
 <li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2GNUmakefileam">trunk/Source/WebKit2/GNUmakefile.am</a></li>
 <li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitBackForwardListcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardList.cpp</a></li>
 </ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitgtkGNUmakefileam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/GNUmakefile.am (133058 => \
133059)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/GNUmakefile.am	2012-10-31 19:20:37 UTC \
                (rev 133058)
+++ trunk/Source/WebKit/gtk/GNUmakefile.am	2012-10-31 19:29:17 UTC (rev 133059)
</span><span class="lines">@@ -329,9 +329,12 @@
</span><span class="cx"> typelibsdir += $(libdir)/girepository-1.0
</span><span class="cx"> typelibs_DATA += $(JSCORE_GIRSOURCES:.gir=.typelib) \
$(WEBKIT_GIRSOURCES:.gir=.typelib) </span><span class="cx"> 
</span><del>-%.typelib: %.gir $(G_IR_COMPILER)
</del><ins>+WebKit-@WEBKITGTK_API_VERSION@.typelib: \
WebKit-@WEBKITGTK_API_VERSION@.gir $(G_IR_COMPILER) </ins><span class="cx"> \
$(AM_V_GEN)$(G_IR_COMPILER) --includedir $(WebKit) --includedir $(top_builddir) $&lt; \
-o $@ </span><span class="cx"> 
</span><ins>+JSCore-@WEBKITGTK_API_VERSION@.typelib: \
JSCore-@WEBKITGTK_API_VERSION@.gir $(G_IR_COMPILER) +	$(AM_V_GEN)$(G_IR_COMPILER) \
--includedir $(WebKit) --includedir $(top_builddir) $&lt; -o $@ +
</ins><span class="cx"> CLEANFILES += $(JSCORE_GIRSOURCES) $(WEBKIT_GIRSOURCES) \
$(typelibs_DATA) </span><span class="cx"> 
</span><span class="cx"> endif
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (133058 => \
133059)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog	2012-10-31 19:20:37 UTC (rev \
                133058)
+++ trunk/Source/WebKit2/ChangeLog	2012-10-31 19:29:17 UTC (rev 133059)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2012-10-31  Jesse van den Kieboom  &lt;jessevdk@gnome.org&gt;
+
+        Enable webkit2 introspection
+        https://bugs.webkit.org/show_bug.cgi?id=94313
+
+        Reviewed by Martin Robinson.
+
+        This patch enables generation of introspection information for webkit2
+        in the same was as it is done for webkit. The resulting gir and
+        typelib file are named WebKit2-3.0.{gir,typelib}.
+
+        * GNUmakefile.am:
+        * UIProcess/API/gtk/WebKitBackForwardList.cpp:
+
</ins><span class="cx"> 2012-10-31  Christophe Dumez  \
&lt;christophe.dumez@intel.com&gt; </span><span class="cx"> 
</span><span class="cx">         [EFL][WK2] Add Ewk_File_Chooser_Request API
</span></span></pre></div>
<a id="trunkSourceWebKit2GNUmakefileam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/GNUmakefile.am (133058 => \
133059)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/GNUmakefile.am	2012-10-31 19:20:37 UTC \
                (rev 133058)
+++ trunk/Source/WebKit2/GNUmakefile.am	2012-10-31 19:29:17 UTC (rev 133059)
</span><span class="lines">@@ -203,6 +203,55 @@
</span><span class="cx"> pkgconfig_DATA += \
Source/WebKit2/webkit2gtk-@WEBKITGTK_API_VERSION@.pc </span><span class="cx"> endif
</span><span class="cx"> 
</span><ins>+if ENABLE_INTROSPECTION
+
+WebKit2-@WEBKITGTK_API_VERSION@.gir: $(G_IR_SCANNER) \
libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
+	$(AM_V_GEN)$(G_IR_SCANNER) -v --warn-all \ +	     --symbol-prefix=webkit \
+	     --identifier-prefix=WebKit \
+	     --namespace=WebKit2 \
+	     --nsversion=@WEBKITGTK_API_VERSION@ \
+	     --include=GObject-2.0 \
+	     --include=Gtk-3.0 \
+	     --include=Soup-2.4 \
+	     --library=webkit2gtk-@WEBKITGTK_API_VERSION@ \
+	     --library=javascriptcoregtk-@WEBKITGTK_API_VERSION@ \
+	     --libtool=&quot;$(LIBTOOL)&quot; \
+	     --pkg=gobject-2.0 \
+	     --pkg=gtk+-@GTK_API_VERSION@ \
+	     --pkg=libsoup-2.4 \
+	     --pkg-export=webkit2gtk-@WEBKITGTK_API_VERSION@ \
+	     --output=$@ \
+	     --add-include-path=$(WebKit2) \
+	     --add-include-path=$(top_builddir) \
+	     --c-include=&quot;webkit2/webkit2.h&quot; \
+	     -I$(srcdir)/Source \
+	     -I$(WebKit2) \
+	     -I$(GENSOURCES) \
+	     -I$(GENSOURCES_WEBKIT2) \
+	     -I$(top_builddir)/Source/WebKit2/UIProcess/API/gtk \
+	     -I$(top_srcdir)/Source/JavaScriptCore/ForwardingHeaders \
+	     -I$(top_srcdir) \
+	     -I$(GENSOURCES_WEBKIT2)/webkit2gtk/include \
+	     -I$(GENSOURCES_WEBKIT2)/webkit2gtk \
+	     -DWEBKIT2_COMPILATION \
+	     $(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2/WebKitEnumTypes.h \
+	     $(webkit2gtk_h_api) \
+	     $(WebKit2)/UIProcess/API/gtk/*.cpp
+
+gir2dir = $(datadir)/gir-1.0
+gir2_DATA = WebKit2-@WEBKITGTK_API_VERSION@.gir
+
+typelibs2dir = $(libdir)/girepository-1.0
+typelibs2_DATA = WebKit2-@WEBKITGTK_API_VERSION@.typelib
+
+WebKit2-@WEBKITGTK_API_VERSION@.typelib: WebKit2-@WEBKITGTK_API_VERSION@.gir \
$(G_IR_COMPILER) +	$(AM_V_GEN)$(G_IR_COMPILER) --includedir $(WebKit2) --includedir \
$(top_builddir) $&lt; -o $@ +
+CLEANFILES += WebKit2-@WEBKITGTK_API_VERSION@.gir \
WebKit2-@WEBKITGTK_API_VERSION@.typelib +
+endif
+
</ins><span class="cx"> # WebKit2 specific variables
</span><span class="cx"> forwarding_headers := $(GENSOURCES_WEBKIT2)/include
</span><span class="cx"> generate-webkit2-forwarding-headers: \
$(WebKit2)/Scripts/generate-forwarding-headers.pl $(libWebKit2_la_SOURCES) \
</span></span></pre></div> <a \
id="trunkSourceWebKit2UIProcessAPIgtkWebKitBackForwardListcpp"></a> <div \
class="modfile"><h4>Modified: \
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardList.cpp (133058 => \
133059)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardList.cpp	2012-10-31 19:20:37 \
                UTC (rev 133058)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardList.cpp	2012-10-31 \
19:29:17 UTC (rev 133059) </span><span class="lines">@@ -248,7 +248,7 @@
</span><span class="cx">  * webkit_back_forward_list_get_back_list:
</span><span class="cx">  * @back_forward_list: a #WebKitBackForwardList
</span><span class="cx">  *
</span><del>- * Returns: (element-type WebKit.BackForwardListItem) (transfer \
container): a #GList of </del><ins>+ * Returns: (element-type \
WebKit2.BackForwardListItem) (transfer container): a #GList of </ins><span \
class="cx">  *    items preceding the current item. </span><span class="cx">  */
</span><span class="cx"> GList* \
webkit_back_forward_list_get_back_list(WebKitBackForwardList* backForwardList) \
</span><span class="lines">@@ -263,7 +263,7 @@ </span><span class="cx">  * \
@back_forward_list: a #WebKitBackForwardList </span><span class="cx">  * @limit: the \
number of items to retrieve </span><span class="cx">  *
</span><del>- * Returns: (element-type WebKit.BackForwardListItem) (transfer \
container): a #GList of </del><ins>+ * Returns: (element-type \
WebKit2.BackForwardListItem) (transfer container): a #GList of </ins><span \
class="cx">  *    items preceding the current item limited by @limit. </span><span \
class="cx">  */ </span><span class="cx"> GList* \
webkit_back_forward_list_get_back_list_with_limit(WebKitBackForwardList* \
backForwardList, guint limit) </span><span class="lines">@@ -278,7 +278,7 @@
</span><span class="cx">  * webkit_back_forward_list_get_forward_list:
</span><span class="cx">  * @back_forward_list: a #WebKitBackForwardList
</span><span class="cx">  *
</span><del>- * Returns: (element-type WebKit.BackForwardListItem) (transfer \
container): a #GList of </del><ins>+ * Returns: (element-type \
WebKit2.BackForwardListItem) (transfer container): a #GList of </ins><span \
class="cx">  *    items following the current item. </span><span class="cx">  */
</span><span class="cx"> GList* \
webkit_back_forward_list_get_forward_list(WebKitBackForwardList* backForwardList) \
</span><span class="lines">@@ -293,7 +293,7 @@ </span><span class="cx">  * \
@back_forward_list: a #WebKitBackForwardList </span><span class="cx">  * @limit: the \
number of items to retrieve </span><span class="cx">  *
</span><del>- * Returns: (element-type WebKit.BackForwardListItem) (transfer \
container): a #GList of </del><ins>+ * Returns: (element-type \
WebKit2.BackForwardListItem) (transfer container): a #GList of </ins><span \
class="cx">  *    items following the current item limited by @limit. </span><span \
class="cx">  */ </span><span class="cx"> GList* \
webkit_back_forward_list_get_forward_list_with_limit(WebKitBackForwardList* \
backForwardList, guint limit) </span></span></pre>
</div>
</div>

</body>
</html>



_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes


[prev in list] [next in list] [prev in thread] [next in thread]

Configure | About | News | Add a list | Sponsored by KoreLogic