Commit 87d312db authored by Alberto Garcia's avatar Alberto Garcia
Browse files

New upstream version 2.13.92

parent 11e9455c
......@@ -95,7 +95,7 @@
</colgroup>
<tbody><tr>
<td class="property_type">
<span class="type">GdkRGBA</span> *</td>
<a href="../gdk3/gdk3-RGBA-Colors.html#GdkRGBA"><span class="type">GdkRGBA</span></a> *</td>
<td class="property_name"><a class="link" href="WebKitColorChooserRequest.html#WebKitColorChooserRequest--rgba" title="The “rgba” property">rgba</a></td>
<td class="property_flags">Read / Write / Construct</td>
</tr></tbody>
......@@ -139,7 +139,7 @@
<a name="WebKitColorChooserRequest.description"></a><h2>Description</h2>
<p>Whenever the user interacts with an &lt;input type='color' /&gt;
HTML element, WebKit will need to show a dialog to choose a color. For that
to happen in a general way, instead of just opening a <span class="type">GtkColorChooser</span>
to happen in a general way, instead of just opening a <a href="../gtk3/GtkColorChooser.html#GtkColorChooser-struct"><span class="type">GtkColorChooser</span></a>
(which might be not desirable in some cases, which could prefer to use their
own color chooser dialog), WebKit will fire the
<a class="link" href="WebKitWebView.html#WebKitWebView-run-color-chooser" title="The “run-color-chooser” signal"><span class="type">“run-color-chooser”</span></a> signal with a <a class="link" href="WebKitColorChooserRequest.html" title="WebKitColorChooserRequest"><span class="type">WebKitColorChooserRequest</span></a>
......@@ -148,7 +148,7 @@ selected, to inspect the details of the request (e.g. to get initial color)
and to cancel the request, in case nothing was selected.</p>
<p>In case the client application does not wish to handle this signal,
WebKit will provide a default handler which will asynchronously run
a regular <span class="type">GtkColorChooserDialog</span> for the user to interact with.</p>
a regular <a href="../gtk3/GtkColorChooserDialog.html#GtkColorChooserDialog-struct"><span class="type">GtkColorChooserDialog</span></a> for the user to interact with.</p>
</div>
<div class="refsect1">
<a name="WebKitColorChooserRequest.functions_details"></a><h2>Functions</h2>
......@@ -156,8 +156,8 @@ a regular <span class="type">GtkColorChooserDialog</span> for the user to intera
<a name="webkit-color-chooser-request-get-rgba"></a><h3>webkit_color_chooser_request_get_rgba ()</h3>
<pre class="programlisting"><span class="returnvalue">void</span>
webkit_color_chooser_request_get_rgba (<em class="parameter"><code><a class="link" href="WebKitColorChooserRequest.html" title="WebKitColorChooserRequest"><span class="type">WebKitColorChooserRequest</span></a> *request</code></em>,
<em class="parameter"><code><span class="type">GdkRGBA</span> *rgba</code></em>);</pre>
<p>Gets the current <span class="type">GdkRGBA</span> color of <em class="parameter"><code>request</code></em>
<em class="parameter"><code><a href="../gdk3/gdk3-RGBA-Colors.html#GdkRGBA"><span class="type">GdkRGBA</span></a> *rgba</code></em>);</pre>
<p>Gets the current <a href="../gdk3/gdk3-RGBA-Colors.html#GdkRGBA"><span class="type">GdkRGBA</span></a> color of <em class="parameter"><code>request</code></em>
</p>
<div class="refsect3">
<a name="webkit-color-chooser-request-get-rgba.parameters"></a><h4>Parameters</h4>
......@@ -175,7 +175,7 @@ webkit_color_chooser_request_get_rgba (<em class="parameter"><code><a class="lin
</tr>
<tr>
<td class="parameter_name"><p>rgba</p></td>
<td class="parameter_description"><p> a <span class="type">GdkRGBA</span> to fill in with the current color. </p></td>
<td class="parameter_description"><p> a <a href="../gdk3/gdk3-RGBA-Colors.html#GdkRGBA"><span class="type">GdkRGBA</span></a> to fill in with the current color. </p></td>
<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span></td>
</tr>
</tbody>
......@@ -188,8 +188,8 @@ webkit_color_chooser_request_get_rgba (<em class="parameter"><code><a class="lin
<a name="webkit-color-chooser-request-set-rgba"></a><h3>webkit_color_chooser_request_set_rgba ()</h3>
<pre class="programlisting"><span class="returnvalue">void</span>
webkit_color_chooser_request_set_rgba (<em class="parameter"><code><a class="link" href="WebKitColorChooserRequest.html" title="WebKitColorChooserRequest"><span class="type">WebKitColorChooserRequest</span></a> *request</code></em>,
<em class="parameter"><code>const <span class="type">GdkRGBA</span> *rgba</code></em>);</pre>
<p>Sets the current <span class="type">GdkRGBA</span> color of <em class="parameter"><code>request</code></em>
<em class="parameter"><code>const <a href="../gdk3/gdk3-RGBA-Colors.html#GdkRGBA"><span class="type">GdkRGBA</span></a> *rgba</code></em>);</pre>
<p>Sets the current <a href="../gdk3/gdk3-RGBA-Colors.html#GdkRGBA"><span class="type">GdkRGBA</span></a> color of <em class="parameter"><code>request</code></em>
</p>
<div class="refsect3">
<a name="webkit-color-chooser-request-set-rgba.parameters"></a><h4>Parameters</h4>
......@@ -207,7 +207,7 @@ webkit_color_chooser_request_set_rgba (<em class="parameter"><code><a class="lin
</tr>
<tr>
<td class="parameter_name"><p>rgba</p></td>
<td class="parameter_description"><p>a pointer <span class="type">GdkRGBA</span></p></td>
<td class="parameter_description"><p>a pointer <a href="../gdk3/gdk3-RGBA-Colors.html#GdkRGBA"><span class="type">GdkRGBA</span></a></p></td>
<td class="parameter_annotations"> </td>
</tr>
</tbody>
......@@ -221,7 +221,7 @@ webkit_color_chooser_request_set_rgba (<em class="parameter"><code><a class="lin
<pre class="programlisting"><span class="returnvalue">void</span>
webkit_color_chooser_request_get_element_rectangle
(<em class="parameter"><code><a class="link" href="WebKitColorChooserRequest.html" title="WebKitColorChooserRequest"><span class="type">WebKitColorChooserRequest</span></a> *request</code></em>,
<em class="parameter"><code><a href="../gdk2/gdk2-Points-Rectangles-and-Regions.html#GdkRectangle"><span class="type">GdkRectangle</span></a> *rect</code></em>);</pre>
<em class="parameter"><code><a href="../gdk3/gdk3-Points-Rectangles-and-Regions.html#GdkRectangle"><span class="type">GdkRectangle</span></a> *rect</code></em>);</pre>
<p>Gets the bounding box of the color input element.</p>
<div class="refsect3">
<a name="webkit-color-chooser-request-get-element-rectangle.parameters"></a><h4>Parameters</h4>
......@@ -239,7 +239,7 @@ webkit_color_chooser_request_get_element_rectangle
</tr>
<tr>
<td class="parameter_name"><p>rect</p></td>
<td class="parameter_description"><p> a <a href="../gdk2/gdk2-Points-Rectangles-and-Regions.html#GdkRectangle"><span class="type">GdkRectangle</span></a> to fill in with the element area. </p></td>
<td class="parameter_description"><p> a <a href="../gdk3/gdk3-Points-Rectangles-and-Regions.html#GdkRectangle"><span class="type">GdkRectangle</span></a> to fill in with the element area. </p></td>
<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span></td>
</tr>
</tbody>
......@@ -313,7 +313,7 @@ is emitted to notify that the request has finished.</p>
<a name="WebKitColorChooserRequest.property-details"></a><h2>Property Details</h2>
<div class="refsect2">
<a name="WebKitColorChooserRequest--rgba"></a><h3>The <code class="literal">“rgba”</code> property</h3>
<pre class="programlisting"> “rgba” <span class="type">GdkRGBA</span> *</pre>
<pre class="programlisting"> “rgba” <a href="../gdk3/gdk3-RGBA-Colors.html#GdkRGBA"><span class="type">GdkRGBA</span></a> *</pre>
<p>The current RGBA color for the request.</p>
<p>Flags: Read / Write / Construct</p>
</div>
......
......@@ -82,7 +82,7 @@
</tr>
<tr>
<td class="function_type">
<a href="../gtk2/GtkAction.html#GtkAction-struct"><span class="returnvalue">GtkAction</span></a> *
<a href="../gtk3/GtkAction.html#GtkAction-struct"><span class="returnvalue">GtkAction</span></a> *
</td>
<td class="function_name">
<a class="link" href="WebKitContextMenuItem.html#webkit-context-menu-item-get-action" title="webkit_context_menu_item_get_action ()">webkit_context_menu_item_get_action</a> <span class="c_punctuation">()</span>
......@@ -151,7 +151,7 @@
</div>
<div class="refsect1">
<a name="WebKitContextMenuItem.description"></a><h2>Description</h2>
<p>The <a class="link" href="WebKitContextMenu.html" title="WebKitContextMenu"><span class="type">WebKitContextMenu</span></a> is composed of <a class="link" href="WebKitContextMenuItem.html" title="WebKitContextMenuItem"><span class="type">WebKitContextMenuItem</span></a>s. These items can be created from a <a href="../gtk2/GtkAction.html#GtkAction-struct"><span class="type">GtkAction</span></a>, from a
<p>The <a class="link" href="WebKitContextMenu.html" title="WebKitContextMenu"><span class="type">WebKitContextMenu</span></a> is composed of <a class="link" href="WebKitContextMenuItem.html" title="WebKitContextMenuItem"><span class="type">WebKitContextMenuItem</span></a>s. These items can be created from a <a href="../gtk3/GtkAction.html#GtkAction-struct"><span class="type">GtkAction</span></a>, from a
<a class="link" href="WebKitContextMenuItem.html#WebKitContextMenuAction" title="enum WebKitContextMenuAction"><span class="type">WebKitContextMenuAction</span></a> or from a <a class="link" href="WebKitContextMenuItem.html#WebKitContextMenuAction" title="enum WebKitContextMenuAction"><span class="type">WebKitContextMenuAction</span></a> and a
label. These <a class="link" href="WebKitContextMenuItem.html#WebKitContextMenuAction" title="enum WebKitContextMenuAction"><span class="type">WebKitContextMenuAction</span></a>s denote stock actions
for the items. You can also create separators and submenus.</p>
......@@ -161,7 +161,7 @@ for the items. You can also create separators and submenus.</p>
<div class="refsect2">
<a name="webkit-context-menu-item-new"></a><h3>webkit_context_menu_item_new ()</h3>
<pre class="programlisting"><a class="link" href="WebKitContextMenuItem.html" title="WebKitContextMenuItem"><span class="returnvalue">WebKitContextMenuItem</span></a> *
webkit_context_menu_item_new (<em class="parameter"><code><a href="../gtk2/GtkAction.html#GtkAction-struct"><span class="type">GtkAction</span></a> *action</code></em>);</pre>
webkit_context_menu_item_new (<em class="parameter"><code><a href="../gtk3/GtkAction.html#GtkAction-struct"><span class="type">GtkAction</span></a> *action</code></em>);</pre>
<p>Creates a new <a class="link" href="WebKitContextMenuItem.html" title="WebKitContextMenuItem"><span class="type">WebKitContextMenuItem</span></a> for the given <em class="parameter"><code>action</code></em>
.</p>
<div class="refsect3">
......@@ -174,7 +174,7 @@ webkit_context_menu_item_new (<em class="parameter"><code><a href="../gtk2/GtkAc
</colgroup>
<tbody><tr>
<td class="parameter_name"><p>action</p></td>
<td class="parameter_description"><p>a <a href="../gtk2/GtkAction.html#GtkAction-struct"><span class="type">GtkAction</span></a></p></td>
<td class="parameter_description"><p>a <a href="../gtk3/GtkAction.html#GtkAction-struct"><span class="type">GtkAction</span></a></p></td>
<td class="parameter_annotations"> </td>
</tr></tbody>
</table></div>
......@@ -194,9 +194,9 @@ webkit_context_menu_item_new_from_stock_action
Stock actions are handled automatically by WebKit so that, for example,
when a menu item created with a <a class="link" href="WebKitContextMenuItem.html#WEBKIT-CONTEXT-MENU-ACTION-STOP:CAPS"><code class="literal">WEBKIT_CONTEXT_MENU_ACTION_STOP</code></a> is
activated the action associated will be handled by WebKit and the current
load operation will be stopped. You can get the <a href="../gtk2/GtkAction.html#GtkAction-struct"><span class="type">GtkAction</span></a> of a
load operation will be stopped. You can get the <a href="../gtk3/GtkAction.html#GtkAction-struct"><span class="type">GtkAction</span></a> of a
<a class="link" href="WebKitContextMenuItem.html" title="WebKitContextMenuItem"><span class="type">WebKitContextMenuItem</span></a> created with a <a class="link" href="WebKitContextMenuItem.html#WebKitContextMenuAction" title="enum WebKitContextMenuAction"><span class="type">WebKitContextMenuAction</span></a> with
<a class="link" href="WebKitContextMenuItem.html#webkit-context-menu-item-get-action" title="webkit_context_menu_item_get_action ()"><code class="function">webkit_context_menu_item_get_action()</code></a> and connect to <a href="../gtk2/GtkAction.html#GtkAction-activate"><span class="type">“activate”</span></a> signal
<a class="link" href="WebKitContextMenuItem.html#webkit-context-menu-item-get-action" title="webkit_context_menu_item_get_action ()"><code class="function">webkit_context_menu_item_get_action()</code></a> and connect to <a href="../gtk3/GtkAction.html#GtkAction-activate"><span class="type">“activate”</span></a> signal
to be notified when the item is activated. But you can't prevent the asociated
action from being performed.</p>
<div class="refsect3">
......@@ -308,7 +308,7 @@ webkit_context_menu_item_new_separator
<hr>
<div class="refsect2">
<a name="webkit-context-menu-item-get-action"></a><h3>webkit_context_menu_item_get_action ()</h3>
<pre class="programlisting"><a href="../gtk2/GtkAction.html#GtkAction-struct"><span class="returnvalue">GtkAction</span></a> *
<pre class="programlisting"><a href="../gtk3/GtkAction.html#GtkAction-struct"><span class="returnvalue">GtkAction</span></a> *
webkit_context_menu_item_get_action (<em class="parameter"><code><a class="link" href="WebKitContextMenuItem.html" title="WebKitContextMenuItem"><span class="type">WebKitContextMenuItem</span></a> *item</code></em>);</pre>
<p>Gets the action associated to <em class="parameter"><code>item</code></em>
.</p>
......@@ -329,7 +329,7 @@ webkit_context_menu_item_get_action (<em class="parameter"><code><a class="link"
</div>
<div class="refsect3">
<a name="webkit-context-menu-item-get-action.returns"></a><h4>Returns</h4>
<p> the <a href="../gtk2/GtkAction.html#GtkAction-struct"><span class="type">GtkAction</span></a> associated to the <a class="link" href="WebKitContextMenuItem.html" title="WebKitContextMenuItem"><span class="type">WebKitContextMenuItem</span></a>,
<p> the <a href="../gtk3/GtkAction.html#GtkAction-struct"><span class="type">GtkAction</span></a> associated to the <a class="link" href="WebKitContextMenuItem.html" title="WebKitContextMenuItem"><span class="type">WebKitContextMenuItem</span></a>,
or <a href="../glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>item</code></em>
is a separator. </p>
<p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
......
......@@ -50,7 +50,7 @@
</tr>
<tr>
<td class="function_type">
<a href="../gtk2/gtk2-gtkfilefilter.html#GtkFileFilter-struct"><span class="returnvalue">GtkFileFilter</span></a> *
<a href="../gtk3/GtkFileFilter.html#GtkFileFilter-struct"><span class="returnvalue">GtkFileFilter</span></a> *
</td>
<td class="function_name">
<a class="link" href="WebKitFileChooserRequest.html#webkit-file-chooser-request-get-mime-types-filter" title="webkit_file_chooser_request_get_mime_types_filter ()">webkit_file_chooser_request_get_mime_types_filter</a> <span class="c_punctuation">()</span>
......@@ -101,7 +101,7 @@
<tbody>
<tr>
<td class="property_type">
<a href="../gtk2/gtk2-gtkfilefilter.html#GtkFileFilter-struct"><span class="type">GtkFileFilter</span></a> *</td>
<a href="../gtk3/GtkFileFilter.html#GtkFileFilter-struct"><span class="type">GtkFileFilter</span></a> *</td>
<td class="property_name"><a class="link" href="WebKitFileChooserRequest.html#WebKitFileChooserRequest--filter" title="The “filter” property">filter</a></td>
<td class="property_flags">Read</td>
</tr>
......@@ -148,7 +148,7 @@
HTML element, WebKit will need to show a dialog to choose one or
more files to be uploaded to the server along with the rest of the
form data. For that to happen in a general way, instead of just
opening a <a href="../gtk2/GtkFileChooserDialog.html#GtkFileChooserDialog-struct"><span class="type">GtkFileChooserDialog</span></a> (which might be not desirable in
opening a <a href="../gtk3/GtkFileChooserDialog.html#GtkFileChooserDialog-struct"><span class="type">GtkFileChooserDialog</span></a> (which might be not desirable in
some cases, which could prefer to use their own file chooser
dialog), WebKit will fire the <a class="link" href="WebKitWebView.html#WebKitWebView-run-file-chooser" title="The “run-file-chooser” signal"><span class="type">“run-file-chooser”</span></a>
signal with a <a class="link" href="WebKitFileChooserRequest.html" title="WebKitFileChooserRequest"><span class="type">WebKitFileChooserRequest</span></a> object, which will allow
......@@ -158,7 +158,7 @@ should be allowed) and to cancel the request, in case nothing was
selected.</p>
<p>In case the client application does not wish to handle this signal,
WebKit will provide a default handler which will asynchronously run
a regular <a href="../gtk2/GtkFileChooserDialog.html#GtkFileChooserDialog-struct"><span class="type">GtkFileChooserDialog</span></a> for the user to interact with.</p>
a regular <a href="../gtk3/GtkFileChooserDialog.html#GtkFileChooserDialog-struct"><span class="type">GtkFileChooserDialog</span></a> for the user to interact with.</p>
</div>
<div class="refsect1">
<a name="WebKitFileChooserRequest.functions_details"></a><h2>Functions</h2>
......@@ -201,11 +201,11 @@ should not be modified or freed. </p>
<hr>
<div class="refsect2">
<a name="webkit-file-chooser-request-get-mime-types-filter"></a><h3>webkit_file_chooser_request_get_mime_types_filter ()</h3>
<pre class="programlisting"><a href="../gtk2/gtk2-gtkfilefilter.html#GtkFileFilter-struct"><span class="returnvalue">GtkFileFilter</span></a> *
<pre class="programlisting"><a href="../gtk3/GtkFileFilter.html#GtkFileFilter-struct"><span class="returnvalue">GtkFileFilter</span></a> *
webkit_file_chooser_request_get_mime_types_filter
(<em class="parameter"><code><a class="link" href="WebKitFileChooserRequest.html" title="WebKitFileChooserRequest"><span class="type">WebKitFileChooserRequest</span></a> *request</code></em>);</pre>
<p>Get the filter currently associated with the request, ready to be
used by <a href="../gtk2/GtkFileChooser.html#GtkFileChooser-struct"><span class="type">GtkFileChooser</span></a>. This function should normally be called
used by <a href="../gtk3/GtkFileChooser.html#GtkFileChooser-struct"><span class="type">GtkFileChooser</span></a>. This function should normally be called
before presenting the file chooser dialog to the user, to decide
whether to apply a filter so the user would not be allowed to
select files with other MIME types.</p>
......@@ -228,7 +228,7 @@ interested in getting the list of accepted MIME types.</p>
</div>
<div class="refsect3">
<a name="webkit-file-chooser-request-get-mime-types-filter.returns"></a><h4>Returns</h4>
<p> a <a href="../gtk2/gtk2-gtkfilefilter.html#GtkFileFilter-struct"><span class="type">GtkFileFilter</span></a> if a list of accepted
<p> a <a href="../gtk3/GtkFileFilter.html#GtkFileFilter-struct"><span class="type">GtkFileFilter</span></a> if a list of accepted
MIME types is defined or <a href="../glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> otherwise. The returned object is
owned by WebKitGTK+ should not be modified or freed. </p>
<p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
......@@ -373,7 +373,7 @@ pending forever, which might cause the browser to hang.</p>
<a name="WebKitFileChooserRequest.property-details"></a><h2>Property Details</h2>
<div class="refsect2">
<a name="WebKitFileChooserRequest--filter"></a><h3>The <code class="literal">“filter”</code> property</h3>
<pre class="programlisting"> “filter” <a href="../gtk2/gtk2-gtkfilefilter.html#GtkFileFilter-struct"><span class="type">GtkFileFilter</span></a> *</pre>
<pre class="programlisting"> “filter” <a href="../gtk3/GtkFileFilter.html#GtkFileFilter-struct"><span class="type">GtkFileFilter</span></a> *</pre>
<p>The filter currently associated with the request. See
<a class="link" href="WebKitFileChooserRequest.html#webkit-file-chooser-request-get-mime-types-filter" title="webkit_file_chooser_request_get_mime_types_filter ()"><code class="function">webkit_file_chooser_request_get_mime_types_filter()</code></a> for more
details.</p>
......
......@@ -237,7 +237,7 @@ the navigation was not started by a mouse event.</p>
<pre class="programlisting"><a href="../glib/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a>
webkit_navigation_action_get_modifiers
(<em class="parameter"><code><a class="link" href="WebKitNavigationAction.html" title="WebKitNavigationAction"><span class="type">WebKitNavigationAction</span></a> *navigation</code></em>);</pre>
<p>Return a bitmask of <a href="../gdk2/gdk2-Windows.html#GdkModifierType"><span class="type">GdkModifierType</span></a> values describing the modifier keys that were in effect
<p>Return a bitmask of <a href="../gdk3/gdk3-Windows.html#GdkModifierType"><span class="type">GdkModifierType</span></a> values describing the modifier keys that were in effect
when the navigation was requested</p>
<div class="refsect3">
<a name="webkit-navigation-action-get-modifiers.parameters"></a><h4>Parameters</h4>
......
......@@ -435,7 +435,7 @@ value of that attribute. In all other cases, this value will be <a href="../glib
<pre class="programlisting"> “modifiers” <a href="../glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a></pre>
<p>If the navigation associated with this policy decision was originally
triggered by a mouse event, this property contains a bitmask of various
<a href="../gdk2/gdk2-Windows.html#GdkModifierType"><span class="type">GdkModifierType</span></a> values describing the modifiers used for that click.
<a href="../gdk3/gdk3-Windows.html#GdkModifierType"><span class="type">GdkModifierType</span></a> values describing the modifiers used for that click.
If the navigation was not triggered by a mouse event or no modifiers
were active, the value of this property will be zero.</p>
<div class="warning">
......
......@@ -52,7 +52,7 @@
</tr>
<tr>
<td class="function_type">
<a href="../gtk2/GtkPrintSettings.html#GtkPrintSettings-struct"><span class="returnvalue">GtkPrintSettings</span></a> *
<a href="../gtk3/GtkPrintSettings.html#GtkPrintSettings-struct"><span class="returnvalue">GtkPrintSettings</span></a> *
</td>
<td class="function_name">
<a class="link" href="WebKitPrintOperation.html#webkit-print-operation-get-print-settings" title="webkit_print_operation_get_print_settings ()">webkit_print_operation_get_print_settings</a> <span class="c_punctuation">()</span>
......@@ -68,7 +68,7 @@
</tr>
<tr>
<td class="function_type">
<a href="../gtk2/GtkPageSetup.html#GtkPageSetup-struct"><span class="returnvalue">GtkPageSetup</span></a> *
<a href="../gtk3/GtkPageSetup.html#GtkPageSetup-struct"><span class="returnvalue">GtkPageSetup</span></a> *
</td>
<td class="function_name">
<a class="link" href="WebKitPrintOperation.html#webkit-print-operation-get-page-setup" title="webkit_print_operation_get_page_setup ()">webkit_print_operation_get_page_setup</a> <span class="c_punctuation">()</span>
......@@ -112,13 +112,13 @@
<tbody>
<tr>
<td class="property_type">
<a href="../gtk2/GtkPageSetup.html#GtkPageSetup-struct"><span class="type">GtkPageSetup</span></a> *</td>
<a href="../gtk3/GtkPageSetup.html#GtkPageSetup-struct"><span class="type">GtkPageSetup</span></a> *</td>
<td class="property_name"><a class="link" href="WebKitPrintOperation.html#WebKitPrintOperation--page-setup" title="The “page-setup” property">page-setup</a></td>
<td class="property_flags">Read / Write</td>
</tr>
<tr>
<td class="property_type">
<a href="../gtk2/GtkPrintSettings.html#GtkPrintSettings-struct"><span class="type">GtkPrintSettings</span></a> *</td>
<a href="../gtk3/GtkPrintSettings.html#GtkPrintSettings-struct"><span class="type">GtkPrintSettings</span></a> *</td>
<td class="property_name"><a class="link" href="WebKitPrintOperation.html#WebKitPrintOperation--print-settings" title="The “print-settings” property">print-settings</a></td>
<td class="property_flags">Read / Write</td>
</tr>
......@@ -181,7 +181,7 @@
<div class="refsect1">
<a name="WebKitPrintOperation.description"></a><h2>Description</h2>
<p>A <a class="link" href="WebKitPrintOperation.html" title="WebKitPrintOperation"><span class="type">WebKitPrintOperation</span></a> controls a print operation in WebKit. With
a similar API to <a href="../gtk2/gtk2-High-level-Printing-API.html#GtkPrintOperation-struct"><span class="type">GtkPrintOperation</span></a>, it lets you set the print
a similar API to <a href="../gtk3/gtk3-High-level-Printing-API.html#GtkPrintOperation-struct"><span class="type">GtkPrintOperation</span></a>, it lets you set the print
settings with <a class="link" href="WebKitPrintOperation.html#webkit-print-operation-set-print-settings" title="webkit_print_operation_set_print_settings ()"><code class="function">webkit_print_operation_set_print_settings()</code></a> or
display the print dialog with <a class="link" href="WebKitPrintOperation.html#webkit-print-operation-run-dialog" title="webkit_print_operation_run_dialog ()"><code class="function">webkit_print_operation_run_dialog()</code></a>.</p>
</div>
......@@ -217,7 +217,7 @@ webkit_print_operation_new (<em class="parameter"><code><a class="link" href="We
<hr>
<div class="refsect2">
<a name="webkit-print-operation-get-print-settings"></a><h3>webkit_print_operation_get_print_settings ()</h3>
<pre class="programlisting"><a href="../gtk2/GtkPrintSettings.html#GtkPrintSettings-struct"><span class="returnvalue">GtkPrintSettings</span></a> *
<pre class="programlisting"><a href="../gtk3/GtkPrintSettings.html#GtkPrintSettings-struct"><span class="returnvalue">GtkPrintSettings</span></a> *
webkit_print_operation_get_print_settings
(<em class="parameter"><code><a class="link" href="WebKitPrintOperation.html" title="WebKitPrintOperation"><span class="type">WebKitPrintOperation</span></a> *print_operation</code></em>);</pre>
<p>Return the current print settings of <em class="parameter"><code>print_operation</code></em>
......@@ -241,7 +241,7 @@ have been called.</p>
</div>
<div class="refsect3">
<a name="webkit-print-operation-get-print-settings.returns"></a><h4>Returns</h4>
<p> the current <a href="../gtk2/GtkPrintSettings.html#GtkPrintSettings-struct"><span class="type">GtkPrintSettings</span></a> of <em class="parameter"><code>print_operation</code></em>
<p> the current <a href="../gtk3/GtkPrintSettings.html#GtkPrintSettings-struct"><span class="type">GtkPrintSettings</span></a> of <em class="parameter"><code>print_operation</code></em>
. </p>
<p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
</div>
......@@ -252,7 +252,7 @@ have been called.</p>
<pre class="programlisting"><span class="returnvalue">void</span>
webkit_print_operation_set_print_settings
(<em class="parameter"><code><a class="link" href="WebKitPrintOperation.html" title="WebKitPrintOperation"><span class="type">WebKitPrintOperation</span></a> *print_operation</code></em>,
<em class="parameter"><code><a href="../gtk2/GtkPrintSettings.html#GtkPrintSettings-struct"><span class="type">GtkPrintSettings</span></a> *print_settings</code></em>);</pre>
<em class="parameter"><code><a href="../gtk3/GtkPrintSettings.html#GtkPrintSettings-struct"><span class="type">GtkPrintSettings</span></a> *print_settings</code></em>);</pre>
<p>Set the current print settings of <em class="parameter"><code>print_operation</code></em>
. Current print settings are used for
the initial values of the print dialog when <a class="link" href="WebKitPrintOperation.html#webkit-print-operation-run-dialog" title="webkit_print_operation_run_dialog ()"><code class="function">webkit_print_operation_run_dialog()</code></a> is called.</p>
......@@ -272,7 +272,7 @@ the initial values of the print dialog when <a class="link" href="WebKitPrintOpe
</tr>
<tr>
<td class="parameter_name"><p>print_settings</p></td>
<td class="parameter_description"><p>a <a href="../gtk2/GtkPrintSettings.html#GtkPrintSettings-struct"><span class="type">GtkPrintSettings</span></a> to set</p></td>
<td class="parameter_description"><p>a <a href="../gtk3/GtkPrintSettings.html#GtkPrintSettings-struct"><span class="type">GtkPrintSettings</span></a> to set</p></td>
<td class="parameter_annotations"> </td>
</tr>
</tbody>
......@@ -282,7 +282,7 @@ the initial values of the print dialog when <a class="link" href="WebKitPrintOpe
<hr>
<div class="refsect2">
<a name="webkit-print-operation-get-page-setup"></a><h3>webkit_print_operation_get_page_setup ()</h3>
<pre class="programlisting"><a href="../gtk2/GtkPageSetup.html#GtkPageSetup-struct"><span class="returnvalue">GtkPageSetup</span></a> *
<pre class="programlisting"><a href="../gtk3/GtkPageSetup.html#GtkPageSetup-struct"><span class="returnvalue">GtkPageSetup</span></a> *
webkit_print_operation_get_page_setup (<em class="parameter"><code><a class="link" href="WebKitPrintOperation.html" title="WebKitPrintOperation"><span class="type">WebKitPrintOperation</span></a> *print_operation</code></em>);</pre>
<p>Return the current page setup of <em class="parameter"><code>print_operation</code></em>
. It returns <a href="../glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> until
......@@ -305,7 +305,7 @@ have been called.</p>
</div>
<div class="refsect3">
<a name="webkit-print-operation-get-page-setup.returns"></a><h4>Returns</h4>
<p> the current <a href="../gtk2/GtkPageSetup.html#GtkPageSetup-struct"><span class="type">GtkPageSetup</span></a> of <em class="parameter"><code>print_operation</code></em>
<p> the current <a href="../gtk3/GtkPageSetup.html#GtkPageSetup-struct"><span class="type">GtkPageSetup</span></a> of <em class="parameter"><code>print_operation</code></em>
. </p>
<p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
</div>
......@@ -315,7 +315,7 @@ have been called.</p>
<a name="webkit-print-operation-set-page-setup"></a><h3>webkit_print_operation_set_page_setup ()</h3>
<pre class="programlisting"><span class="returnvalue">void</span>
webkit_print_operation_set_page_setup (<em class="parameter"><code><a class="link" href="WebKitPrintOperation.html" title="WebKitPrintOperation"><span class="type">WebKitPrintOperation</span></a> *print_operation</code></em>,
<em class="parameter"><code><a href="../gtk2/GtkPageSetup.html#GtkPageSetup-struct"><span class="type">GtkPageSetup</span></a> *page_setup</code></em>);</pre>
<em class="parameter"><code><a href="../gtk3/GtkPageSetup.html#GtkPageSetup-struct"><span class="type">GtkPageSetup</span></a> *page_setup</code></em>);</pre>
<p>Set the current page setup of <em class="parameter"><code>print_operation</code></em>
. Current page setup is used for the
initial values of the print dialog when <a class="link" href="WebKitPrintOperation.html#webkit-print-operation-run-dialog" title="webkit_print_operation_run_dialog ()"><code class="function">webkit_print_operation_run_dialog()</code></a> is called.</p>
......@@ -335,7 +335,7 @@ initial values of the print dialog when <a class="link" href="WebKitPrintOperati
</tr>
<tr>
<td class="parameter_name"><p>page_setup</p></td>
<td class="parameter_description"><p>a <a href="../gtk2/GtkPageSetup.html#GtkPageSetup-struct"><span class="type">GtkPageSetup</span></a> to set</p></td>
<td class="parameter_description"><p>a <a href="../gtk3/GtkPageSetup.html#GtkPageSetup-struct"><span class="type">GtkPageSetup</span></a> to set</p></td>
<td class="parameter_annotations"> </td>
</tr>
</tbody>
......@@ -347,7 +347,7 @@ initial values of the print dialog when <a class="link" href="WebKitPrintOperati
<a name="webkit-print-operation-run-dialog"></a><h3>webkit_print_operation_run_dialog ()</h3>
<pre class="programlisting"><a class="link" href="WebKitPrintOperation.html#WebKitPrintOperationResponse" title="enum WebKitPrintOperationResponse"><span class="returnvalue">WebKitPrintOperationResponse</span></a>
webkit_print_operation_run_dialog (<em class="parameter"><code><a class="link" href="WebKitPrintOperation.html" title="WebKitPrintOperation"><span class="type">WebKitPrintOperation</span></a> *print_operation</code></em>,
<em class="parameter"><code><a href="../gtk2/GtkWindow.html#GtkWindow-struct"><span class="type">GtkWindow</span></a> *parent</code></em>);</pre>
<em class="parameter"><code><a href="../gtk3/GtkWindow.html#GtkWindow-struct"><span class="type">GtkWindow</span></a> *parent</code></em>);</pre>
<p>Run the print dialog and start printing using the options selected by
the user. This method returns when the print dialog is closed.
If the print dialog is cancelled <a class="link" href="WebKitPrintOperation.html#WEBKIT-PRINT-OPERATION-RESPONSE-CANCEL:CAPS"><code class="literal">WEBKIT_PRINT_OPERATION_RESPONSE_CANCEL</code></a>
......@@ -461,15 +461,15 @@ operation finishes. If an error occurs while printing the signal
<a name="WebKitPrintOperation.property-details"></a><h2>Property Details</h2>
<div class="refsect2">
<a name="WebKitPrintOperation--page-setup"></a><h3>The <code class="literal">“page-setup”</code> property</h3>
<pre class="programlisting"> “page-setup” <a href="../gtk2/GtkPageSetup.html#GtkPageSetup-struct"><span class="type">GtkPageSetup</span></a> *</pre>
<p>The initial <a href="../gtk2/GtkPageSetup.html#GtkPageSetup-struct"><span class="type">GtkPageSetup</span></a> for the print operation.</p>
<pre class="programlisting"> “page-setup” <a href="../gtk3/GtkPageSetup.html#GtkPageSetup-struct"><span class="type">GtkPageSetup</span></a> *</pre>
<p>The initial <a href="../gtk3/GtkPageSetup.html#GtkPageSetup-struct"><span class="type">GtkPageSetup</span></a> for the print operation.</p>
<p>Flags: Read / Write</p>
</div>
<hr>
<div class="refsect2">
<a name="WebKitPrintOperation--print-settings"></a><h3>The <code class="literal">“print-settings”</code> property</h3>
<pre class="programlisting"> “print-settings” <a href="../gtk2/GtkPrintSettings.html#GtkPrintSettings-struct"><span class="type">GtkPrintSettings</span></a> *</pre>
<p>The initial <a href="../gtk2/GtkPrintSettings.html#GtkPrintSettings-struct"><span class="type">GtkPrintSettings</span></a> for the print operation.</p>
<pre class="programlisting"> “print-settings” <a href="../gtk3/GtkPrintSettings.html#GtkPrintSettings-struct"><span class="type">GtkPrintSettings</span></a> *</pre>
<p>The initial <a href="../gtk3/GtkPrintSettings.html#GtkPrintSettings-struct"><span class="type">GtkPrintSettings</span></a> for the print operation.</p>
<p>Flags: Read / Write</p>
</div>
<hr>
......
......@@ -204,7 +204,7 @@
<a name="WebKitWebInspector.description"></a><h2>Description</h2>
<p>The WebKit Inspector is a graphical tool to inspect and change the
content of a <a class="link" href="WebKitWebView.html" title="WebKitWebView"><span class="type">WebKitWebView</span></a>. It also includes an interactive
JavaScript debugger. Using this class one can get a <a href="../gtk2/GtkWidget.html#GtkWidget-struct"><span class="type">GtkWidget</span></a>
JavaScript debugger. Using this class one can get a <a href="../gtk3/GtkWidget.html#GtkWidget-struct"><span class="type">GtkWidget</span></a>
which can be embedded into an application to show the inspector.</p>
<p>The inspector is available when the <a class="link" href="WebKitSettings.html" title="WebKitSettings"><span class="type">WebKitSettings</span></a> of the
<a class="link" href="WebKitWebView.html" title="WebKitWebView"><span class="type">WebKitWebView</span></a> has set the <a class="link" href="WebKitSettings.html#WebKitSettings--enable-developer-extras" title="The “enable-developer-extras” property"><span class="type">“enable-developer-extras”</span></a>
......@@ -576,7 +576,7 @@ For example, if the inspector view is attached using a tab in a browser
window, the browser window should be raised and the tab containing the
inspector view should be the active one.
In both cases, if this signal is not handled, the default implementation
calls <a href="../gtk2/GtkWindow.html#gtk-window-present"><code class="function">gtk_window_present()</code></a> on the current toplevel <a href="../gtk2/GtkWindow.html#GtkWindow-struct"><span class="type">GtkWindow</span></a> of the
calls <a href="../gtk3/GtkWindow.html#gtk-window-present"><code class="function">gtk_window_present()</code></a> on the current toplevel <a href="../gtk3/GtkWindow.html#GtkWindow-struct"><span class="type">GtkWindow</span></a> of the
inspector view.</p>
<div class="refsect3">
<a name="WebKitWebInspector-bring-to-front.parameters"></a><h4>Parameters</h4>
......@@ -690,7 +690,7 @@ signal and simply return <a href="../glib/glib-Standard-Macros.html#TRUE:CAPS"><
user_function (<a class="link" href="WebKitWebInspector.html" title="WebKitWebInspector"><span class="type">WebKitWebInspector</span></a> *inspector,
<a href="../glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data)</pre>
<p>Emitted when the inspector is requested to open in a separate window.
If this signal is not handled, a <a href="../gtk2/GtkWindow.html#GtkWindow-struct"><span class="type">GtkWindow</span></a> with the inspector will be
If this signal is not handled, a <a href="../gtk3/GtkWindow.html#GtkWindow-struct"><span class="type">GtkWindow</span></a> with the inspector will be
created and shown, so you only need to handle this signal if you want
to use your own window.
This signal is emitted after <a class="link" href="WebKitWebInspector.html#WebKitWebInspector-detach" title="The “detach” signal"><span class="type">“detach”</span></a> to show
......
......@@ -124,7 +124,7 @@
</tr>
<tr>
<td class="property_type">
<a href="../gdk2/gdk2-Points-Rectangles-and-Regions.html#GdkRectangle"><span class="type">GdkRectangle</span></a> *</td>
<a href="../gdk3/gdk3-Points-Rectangles-and-Regions.html#GdkRectangle"><span class="type">GdkRectangle</span></a> *</td>
<td class="property_name"><a class="link" href="WebKitWindowProperties.html#WebKitWindowProperties--geometry" title="The “geometry” property">geometry</a></td>
<td class="property_flags">Read / Write / Construct Only</td>
</tr>
......@@ -290,7 +290,7 @@ to apply the initial window properties. Then you can monitor the
<a name="webkit-window-properties-get-geometry"></a><h3>webkit_window_properties_get_geometry ()</h3>
<pre class="programlisting"><span class="returnvalue">void</span>
webkit_window_properties_get_geometry (<em class="parameter"><code><a class="link" href="WebKitWindowProperties.html" title="WebKitWindowProperties"><span class="type">WebKitWindowProperties</span></a> *window_properties</code></em>,
<em class="parameter"><code><a href="../gdk2/gdk2-Points-Rectangles-and-Regions.html#GdkRectangle"><span class="type">GdkRectangle</span></a> *geometry</code></em>);</pre>
<em class="parameter"><code><a href="../gdk3/gdk3-Points-Rectangles-and-Regions.html#GdkRectangle"><span class="type">GdkRectangle</span></a> *geometry</code></em>);</pre>
<p>Get the geometry the window should have on the screen when shown.</p>
<div class="refsect3">
<a name="webkit-window-properties-get-geometry.parameters"></a><h4>Parameters</h4>
......@@ -524,7 +524,7 @@ webkit_window_properties_get_fullscreen
<hr>
<div class="refsect2">
<a name="WebKitWindowProperties--geometry"></a><h3>The <code class="literal">“geometry”</code> property</h3>
<pre class="programlisting"> “geometry” <a href="../gdk2/gdk2-Points-Rectangles-and-Regions.html#GdkRectangle"><span class="type">GdkRectangle</span></a> *</pre>
<pre class="programlisting"> “geometry” <a href="../gdk3/gdk3-Points-Rectangles-and-Regions.html#GdkRectangle"><span class="type">GdkRectangle</span></a> *</pre>
<p>The size and position of the window on the screen.</p>
<p>Flags: Read / Write / Construct Only</p>
</div>
......
......@@ -14,7 +14,7 @@
<div class="titlepage">
<div>
<div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">WebKit2GTK+ Reference Manual</p></th></tr></table></div>
<div><p class="releaseinfo">for WebKit2GTK+ 2.13.91</p></div>
<div><p class="releaseinfo">for WebKit2GTK+ 2.13.92</p></div>
</div>
<hr>
</div>
......
......@@ -177,7 +177,7 @@ against at application run time.</p>
<hr>
<div class="refsect2">
<a name="WEBKIT-MICRO-VERSION:CAPS"></a><h3>WEBKIT_MICRO_VERSION</h3>
<pre class="programlisting">#define WEBKIT_MICRO_VERSION (91)
<pre class="programlisting">#define WEBKIT_MICRO_VERSION (92)
</pre>
<p>Like <a class="link" href="webkit2gtk-4.0-WebKitVersion.html#webkit-get-micro-version" title="webkit_get_micro_version ()"><code class="function">webkit_get_micro_version()</code></a>, but from the headers used at
application compile time, rather than from the library linked
......
......@@ -14,7 +14,7 @@
<div class="titlepage">
<div>
<div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">WebKitDOMGTK+ Reference Manual</p></th></tr></table></div>
<div><p class="releaseinfo">for WebKitDOMGTK+ 2.13.91</p></div>
<div><p class="releaseinfo">for WebKitDOMGTK+ 2.13.92</p></div>
</div>
<hr>
</div>
......
==================
WebKitGTK+ 2.13.92
==================
What's new in WebKitGTK+ 2.13.92?
- Add clipboard support in Wayland.
- Improve rendering of scrollbars with themes setting a minimum width for the scrollbar CSS gadget.
- Fix another WebProcess crash when the last WebView is destroyed.
- Fix the build with GCC 6.
==================
WebKitGTK+ 2.13.91
==================
......
......@@ -221,6 +221,7 @@ list(APPEND WebCorePlatformGTK_SOURCES
platform/gtk/PasteboardHelper.cpp
platform/gtk/PlatformKeyboardEventGtk.cpp
platform/gtk/PlatformMouseEventGtk.cpp
platform/gtk/PlatformPasteboardGtk.cpp
platform/gtk/PlatformScreenGtk.cpp
platform/gtk/PlatformWheelEventGtk.cpp
platform/gtk/RenderThemeGadget.cpp
......
......@@ -53,16 +53,16 @@ static RefPtr<DocumentFragment> createFragmentFromPasteboardData(Pasteboard& pas
if (!pasteboard.hasData())
return nullptr;
DataObjectGtk* dataObject = pasteboard.dataObject();
if (dataObject->hasMarkup() && frame.document())
return createFragmentFromMarkup(*frame.document(), dataObject->markup(), emptyString(), DisallowScriptingAndPluginContent);
const auto& dataObject = pasteboard.dataObject();
if (dataObject.hasMarkup() && frame.document())
return createFragmentFromMarkup(*frame.document(), dataObject.markup(), emptyString(), DisallowScriptingAndPluginContent);
if (!allowPlainText)
return nullptr;
if (dataObject->hasText()) {
if (dataObject.hasText()) {
chosePlainText = true;
return createFragmentFromText(range, dataObject->text());
return createFragmentFromText(range, dataObject.text());
}
return nullptr;
......@@ -125,7 +125,6 @@ void Editor::writeSelectionToPasteboard(Pasteboard& pasteboard)
pasteboardContent.canSmartCopyOrDelete = canSmartCopyOrDelete();
pasteboardContent.text = selectedTextForDataTransfer();
pasteboardContent.markup = createMarkup(*selectedRange(), nullptr, AnnotateForInterchange, false, ResolveNonLocalURLs);
pasteboardContent.callback = nullptr;
pasteboard.write(pasteboardContent);
}
......
......@@ -32,11 +32,6 @@
#include <wtf/Vector.h>
#include <wtf/text/WTFString.h>
#if PLATFORM(GTK)
typedef struct _GtkClipboard GtkClipboard;
#include <wtf/glib/GRefPtr.h>
#endif
#if PLATFORM(IOS)
OBJC_CLASS NSArray;
OBJC_CLASS NSString;
......@@ -83,7 +78,6 @@ struct PasteboardWebContent {
bool canSmartCopyOrDelete;
String text;
String markup;
GRefPtr<GClosure> callback;
#endif
};
......@@ -143,8 +137,8 @@ public:
~Pasteboard();
#if PLATFORM(GTK)
explicit Pasteboard(const String& name);
explicit Pasteboard(RefPtr<DataObjectGtk>&&);
explicit Pasteboard(GtkClipboard*);
#endif
#if PLATFORM(WIN)
......@@ -193,7 +187,7 @@ public:
#endif
#if PLATFORM(GTK)
DataObjectGtk* dataObject() const;
const DataObjectGtk& dataObject() const;
static std::unique_ptr<Pasteboard> createForGlobalSelection();
#endif
......@@ -226,8 +220,11 @@ private:
#endif
#if PLATFORM(GTK)
enum class ShouldIncludeSmartPaste { No, Yes };
void writeToClipboard(ShouldIncludeSmartPaste = ShouldIncludeSmartPaste::No);
void readFromClipboard();
RefPtr<DataObjectGtk> m_dataObject;
GtkClipboard* m_gtkClipboard;