Commit ab504ad3 authored by Alberto Garcia's avatar Alberto Garcia
Browse files

New upstream version 2.22.0

parent 88f8a5fc
......@@ -87,6 +87,8 @@ if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
set(WTF_CPU_ARM 1)
elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")
set(WTF_CPU_ARM64 1)
elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
set(WTF_CPU_MIPS64 1)
elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
set(WTF_CPU_MIPS 1)
elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x64|x86_64|amd64)")
......
......@@ -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">JavaScriptCore GLib Reference Manual</p></th></tr></table></div>
<div><p class="releaseinfo">for JavaScriptCore 2.21.92</p></div>
<div><p class="releaseinfo">for JavaScriptCore 2.22.0</p></div>
</div>
<hr>
</div>
......
......@@ -169,13 +169,13 @@ have included when compiling your code.</p>
<hr>
<div class="refsect2">
<a name="JSC-MINOR-VERSION:CAPS"></a><h3>JSC_MINOR_VERSION</h3>
<pre class="programlisting">#define JSC_MINOR_VERSION (21)
<pre class="programlisting">#define JSC_MINOR_VERSION (22)
</pre>
</div>
<hr>
<div class="refsect2">
<a name="JSC-MICRO-VERSION:CAPS"></a><h3>JSC_MICRO_VERSION</h3>
<pre class="programlisting">#define JSC_MICRO_VERSION (92)
<pre class="programlisting">#define JSC_MICRO_VERSION (0)
</pre>
</div>
</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.21.92</p></div>
<div><p class="releaseinfo">for WebKit2GTK+ 2.22.0</p></div>
</div>
<hr>
</div>
......
......@@ -204,7 +204,7 @@ against at application run time.</p>
<hr>
<div class="refsect2">
<a name="WEBKIT-MINOR-VERSION:CAPS"></a><h3>WEBKIT_MINOR_VERSION</h3>
<pre class="programlisting">#define WEBKIT_MINOR_VERSION (21)
<pre class="programlisting">#define WEBKIT_MINOR_VERSION (22)
</pre>
<p>Like <a class="link" href="webkit2gtk-4.0-WebKitVersion.html#webkit-get-minor-version" title="webkit_get_minor_version ()"><code class="function">webkit_get_minor_version()</code></a>, but from the headers used at
application compile time, rather than from the library linked
......@@ -213,7 +213,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 (92)
<pre class="programlisting">#define WEBKIT_MICRO_VERSION (0)
</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.21.92</p></div>
<div><p class="releaseinfo">for WebKitDOMGTK+ 2.22.0</p></div>
</div>
<hr>
</div>
......
==================
WebKitGTK+ 2.22.0
==================
What's new in WebKitGTK+ 2.22.0?
- Add warn_unused_result attribute to some JavaScriptCore GLib APIs.
- Make pinch to zoom scale the page without changing the layout.
- Fix the build in mips64.
==================
WebKitGTK+ 2.21.92
==================
......
......@@ -182,13 +182,13 @@ JSC_API JSCValue *
jsc_value_object_invoke_method (JSCValue *value,
const char *name,
GType first_parameter_type,
...);
...) G_GNUC_WARN_UNUSED_RESULT;
JSC_API JSCValue *
jsc_value_object_invoke_methodv (JSCValue *value,
const char *name,
guint n_parameters,
JSCValue **parameters);
JSCValue **parameters) G_GNUC_WARN_UNUSED_RESULT;
JSC_API void
jsc_value_object_define_property_data (JSCValue *value,
......@@ -240,12 +240,12 @@ jsc_value_is_function (JSCValue *value);
JSC_API JSCValue *
jsc_value_function_call (JSCValue *value,
GType first_parameter_type,
...);
...) G_GNUC_WARN_UNUSED_RESULT;
JSC_API JSCValue *
jsc_value_function_callv (JSCValue *value,
guint n_parameters,
JSCValue **parameters);
JSCValue **parameters) G_GNUC_WARN_UNUSED_RESULT;
JSC_API gboolean
jsc_value_is_constructor (JSCValue *value);
......
......@@ -59,7 +59,7 @@
namespace IPC {
static const size_t messageMaxSize = 4096;
static const size_t attachmentMaxAmount = 255;
static const size_t attachmentMaxAmount = 254;
class AttachmentInfo {
WTF_MAKE_FAST_ALLOCATED;
......@@ -86,10 +86,12 @@ public:
private:
Attachment::Type m_type { Attachment::Uninitialized };
size_t m_size { 0 };
bool m_isNull { false };
size_t m_size { 0 };
};
static_assert(sizeof(MessageInfo) + sizeof(AttachmentInfo) * attachmentMaxAmount <= messageMaxSize, "messageMaxSize is too small.");
void Connection::platformInitialize(Identifier identifier)
{
m_socketDescriptor = identifier;
......
......@@ -3118,6 +3118,7 @@ void webkit_web_view_set_zoom_level(WebKitWebView* webView, gdouble zoomLevel)
return;
auto& page = getPage(webView);
page.scalePage(1.0, IntPoint()); // Reset page scale when zoom level is changed
if (webkit_settings_get_zoom_text_only(webView->priv->settings.get()))
page.setTextZoomFactor(zoomLevel);
else
......
......@@ -474,14 +474,4 @@ bool PageClientImpl::decidePolicyForInstallMissingMediaPluginsPermissionRequest(
}
#endif
void PageClientImpl::zoom(double zoomLevel)
{
if (WEBKIT_IS_WEB_VIEW(m_viewWidget)) {
webkit_web_view_set_zoom_level(WEBKIT_WEB_VIEW(m_viewWidget), zoomLevel);
return;
}
webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(m_viewWidget))->setPageZoomFactor(zoomLevel);
}
} // namespace WebKit
......@@ -53,8 +53,6 @@ public:
GtkWidget* viewWidget() { return m_viewWidget; }
void zoom(double);
private:
// PageClient
std::unique_ptr<DrawingAreaProxy> createDrawingAreaProxy() override;
......
......@@ -1116,15 +1116,18 @@ private:
void startZoom(const IntPoint& center, double& initialScale, IntPoint& initialPoint) final
{
auto* page = webkitWebViewBaseGetPage(m_webView);
auto* page = m_webView->priv->pageProxy.get();
ASSERT(page);
initialScale = page->pageZoomFactor();
initialScale = page->pageScaleFactor();
page->getCenterForZoomGesture(center, initialPoint);
}
void zoom(double scale) final
void zoom(double scale, const IntPoint& origin) final
{
m_webView->priv->pageClient->zoom(scale);
auto* page = m_webView->priv->pageProxy.get();
ASSERT(page);
page->scalePage(scale, origin);
}
void longPress(GdkEventTouch* event) final
......
......@@ -203,13 +203,20 @@ void GestureController::ZoomGesture::startZoom()
void GestureController::ZoomGesture::handleZoom()
{
m_client.zoom(m_scale);
FloatPoint scaledZoomCenter(m_initialPoint);
scaledZoomCenter.scale(m_scale);
m_client.zoom(m_scale, WebCore::roundedIntPoint(FloatPoint(scaledZoomCenter - m_viewPoint)));
}
void GestureController::ZoomGesture::scaleChanged(ZoomGesture* zoomGesture, double scale, GtkGesture*)
{
zoomGesture->m_scale = zoomGesture->m_initialScale * scale;
if (zoomGesture->m_scale < 1.0)
zoomGesture->m_scale = 1.0;
zoomGesture->m_viewPoint = zoomGesture->center();
if (zoomGesture->m_idle.isActive())
return;
......
......@@ -51,7 +51,7 @@ public:
virtual void swipe(GdkEventTouch*, const WebCore::FloatPoint&) = 0;
virtual void startZoom(const WebCore::IntPoint& center, double& initialScale, WebCore::IntPoint& initialPoint) = 0;
virtual void zoom(double) = 0;
virtual void zoom(double scale, const WebCore::IntPoint& origin) = 0;
virtual void longPress(GdkEventTouch*) = 0;
};
......
include(GNUInstallDirs)
include(VersioningUtils)
SET_PROJECT_VERSION(2 21 92)
SET_PROJECT_VERSION(2 22 0)
set(WEBKITGTK_API_VERSION 4.0)
CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT 70 0 33)
CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(JAVASCRIPTCORE 29 0 11)
CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT 70 1 33)
CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(JAVASCRIPTCORE 29 1 11)
# These are shared variables, but we special case their definition so that we can use the
# CMAKE_INSTALL_* variables that are populated by the GNUInstallDirs macro.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment